fixing more linting issues

Author: leogdion

.swiftlint.yml

@@ -131,4 +131,5 @@ disabled_rules:
     - switch_case_alignment
     - closure_parameter_position
     - trailing_comma
-    - opening_brace
+    - opening_brace
+    - pattern_matching_keywords

Sources/PackageDSLKit/Extensions/URL.swift

@@ -30,10 +30,6 @@
 package import Foundation
 
 extension URL {
-  package func polyfill() -> Polyfill {
-    Polyfill(url: self)
-  }
-
   package struct Polyfill: Sendable {
     private let url: URL
 
@@ -68,4 +64,7 @@ extension URL {
       }
     }
   }
+  package func polyfill() -> Polyfill {
+    Polyfill(url: self)
+  }
 }

Sources/PackageDSLKit/Types/ComponentWriter.swift

@@ -31,7 +31,7 @@ import SyntaxKit
 
 internal struct ComponentWriter: Sendable, StructureWriter {
   /// Creates a struct using SyntaxKit
-  func syntaxKitNode(from component: Component) -> Struct {
+  internal func syntaxKitNode(from component: Component) -> Struct {
     // Convert properties to SyntaxKit CodeBlocks
     let properties: [CodeBlock] = component.properties.values.map { property in
       PropertyWriter.syntaxKitNode(from: property)

Sources/SwiftPackageManagerKit/Execution/Executor.swift

@@ -31,19 +31,19 @@ public import Foundation
 
 /// Executor for Swift Package Manager commands
 public struct Executor: Sendable {
-  /// The package directory
-  public let packageDirectory: URL
-
-  /// Default timeout for SPM commands (in seconds)
-  public let defaultTimeout: TimeInterval
-
   /// Closure type for executing Swift commands
   public typealias SwiftCommandExecutor = @Sendable (
     _ arguments: [String],
     _ workingDirectory: URL?,
     _ timeout: TimeInterval
   ) async throws -> ProcessResult
 
+  /// The package directory
+  public let packageDirectory: URL
+
+  /// Default timeout for SPM commands (in seconds)
+  public let defaultTimeout: TimeInterval
+
   /// The Swift command executor
   private let swiftExecutor: SwiftCommandExecutor
 

Sources/package/Commands/Initialize.swift

@@ -33,6 +33,9 @@ import PackageDSLKit
 
 extension Package {
   internal struct Initialize: ParsableCommand, Sendable {
+    internal static let configuration: CommandConfiguration = .init(
+      commandName: "init"
+    )
     @OptionGroup internal var settings: Settings
 
     @Option
@@ -48,10 +51,6 @@ extension Package {
       self.settings.path != nil
     }
 
-    internal static let configuration: CommandConfiguration = .init(
-      commandName: "init"
-    )
-
     internal func run() throws {
       if shouldCreateDirectory {
         try self.settings.fileManager.createDirectory(

Tests/PackageDSLKitTests/Extensions/Platform.swift

@@ -5,8 +5,8 @@
 //  Created by Leo Dion on 8/28/25.
 //
 
-enum Platform {
-  static let allowsProcess: Bool = {
+internal enum Platform {
+  internal static let allowsProcess: Bool = {
     #if canImport(Foundation) && (os(macOS) || os(Linux))
       true
     #else

Tests/PackageDSLKitTests/Types/PackageDSLManagerBasicTests.swift

@@ -4,9 +4,9 @@ import Testing
 @testable import PackageDSLKit
 
 @Suite
-struct PackageDSLManagerBasicTests {
+internal struct PackageDSLManagerBasicTests {
   @Test
-  func generatePackageSwiftCreatesFiles() async throws {
+  internal func generatePackageSwiftCreatesFiles() async throws {
     let tempDirectory = FileManager.default.temporaryDirectory
       .appendingPathComponent("PackageDSLManagerTests-\(UUID().uuidString)")
     let packageManager = await PackageDSLManager(
@@ -39,7 +39,7 @@ struct PackageDSLManagerBasicTests {
   }
 
   @Test
-  func hasDSLComponentsReturnsFalseWhenNoFiles() async {
+  internal func hasDSLComponentsReturnsFalseWhenNoFiles() async {
     let tempDirectory = FileManager.default.temporaryDirectory
       .appendingPathComponent("PackageDSLManagerTests-\(UUID().uuidString)")
     let packageManager = await PackageDSLManager(
@@ -58,7 +58,7 @@ struct PackageDSLManagerBasicTests {
   }
 
   @Test
-  func hasTraditionalPackageSwiftDetectsFile() async throws {
+  internal func hasTraditionalPackageSwiftDetectsFile() async throws {
     let tempDirectory = FileManager.default.temporaryDirectory
       .appendingPathComponent("PackageDSLManagerTests-\(UUID().uuidString)")
     let packageManager = await PackageDSLManager(

Tests/PackageDSLKitTests/Types/PackageDSLManagerComplexTests.swift

@@ -4,9 +4,9 @@ import Testing
 @testable import PackageDSLKit
 
 @Suite
-struct PackageDSLManagerComplexTests {
+internal struct PackageDSLManagerComplexTests {
   @Test
-  func generateAndValidateComplexPackage() async throws {
+  internal func generateAndValidateComplexPackage() async throws {
     let tempDirectory = FileManager.default.temporaryDirectory
       .appendingPathComponent("PackageDSLManagerTests-ComplexPackage-\(UUID().uuidString)")
     let packageManager = await PackageDSLManager(

Tests/PackageDSLKitTests/Types/PackageDSLManagerSPMTests.swift

@@ -5,7 +5,7 @@ import Testing
 @testable import SwiftPackageManagerKit
 
 @Suite
-struct PackageDSLManagerSPMTests {
+internal struct PackageDSLManagerSPMTests {
   @Test(
     .disabled(
       if: ProcessInfo.processInfo.shouldDisableSPMValidation(),
@@ -16,8 +16,9 @@ struct PackageDSLManagerSPMTests {
       "Unable to run SPM commands in non-macOS platforms"
     )
   )
-  func validateGeneratedPackageWithSPMValidation() async throws {
-    print("Is running Xcode Test in Github CI? \(ProcessInfo.processInfo.shouldDisableSPMValidation())")
+  internal func validateGeneratedPackageWithSPMValidation() async throws {
+    print(
+      "Is running Xcode Test in Github CI? \(ProcessInfo.processInfo.shouldDisableSPMValidation())")
     print("Does allow Process API? \(Platform.allowsProcess)")
     #if canImport(Foundation) && (os(macOS) || os(Linux))
       let tempDirectory = FileManager.default.temporaryDirectory
@@ -95,47 +96,47 @@ struct PackageDSLManagerSPMTests {
     try packageSwiftContent.write(to: packageSwiftFile, atomically: true, encoding: .utf8)
   }
 
-#if canImport(Foundation) && (os(macOS) || os(Linux))
-  private func validateWithSPMCommands(_ tempDirectory: URL) async throws -> Executor {
-    // Test SPM commands through our SPMExecutor
-    let spmExecutor = try Executor(packageDirectory: tempDirectory, defaultTimeout: 60)
+  #if canImport(Foundation) && (os(macOS) || os(Linux))
+    private func validateWithSPMCommands(_ tempDirectory: URL) async throws -> Executor {
+      // Test SPM commands through our SPMExecutor
+      let spmExecutor = try Executor(packageDirectory: tempDirectory, defaultTimeout: 60)
 
-    // Test package dump-package
-    let packageInfo = try await spmExecutor.dumpPackage()
-    #expect(packageInfo.name == "SPMValidationTest")
-    #expect(packageInfo.products.count == 1)
-    #expect(packageInfo.products.first?.name == "SPMValidationTest")
-    #expect(packageInfo.targets.count == 1)
-    #expect(packageInfo.targets.first?.name == "SPMValidationTest")
+      // Test package dump-package
+      let packageInfo = try await spmExecutor.dumpPackage()
+      #expect(packageInfo.name == "SPMValidationTest")
+      #expect(packageInfo.products.count == 1)
+      #expect(packageInfo.products.first?.name == "SPMValidationTest")
+      #expect(packageInfo.targets.count == 1)
+      #expect(packageInfo.targets.first?.name == "SPMValidationTest")
 
-    // Test package resolve (should be quick since no external dependencies)
-    try await spmExecutor.resolvePackage()
+      // Test package resolve (should be quick since no external dependencies)
+      try await spmExecutor.resolvePackage()
 
-    // Test build (this ensures the package structure is correct)
-    try await spmExecutor.buildPackage()
+      // Test build (this ensures the package structure is correct)
+      try await spmExecutor.buildPackage()
 
-    // Verify build artifacts were created
-    let buildDirectory = tempDirectory.appendingPathComponent(".build")
-    #expect(FileManager.default.fileExists(atPath: buildDirectory.path))
+      // Verify build artifacts were created
+      let buildDirectory = tempDirectory.appendingPathComponent(".build")
+      #expect(FileManager.default.fileExists(atPath: buildDirectory.path))
 
-    return spmExecutor
-  }
+      return spmExecutor
+    }
 
-  private func validateCoexistenceOfFormats(_ packageManager: PackageDSLManager) async {
-    // Test that our PackageDSLManager can detect the traditional Package.swift
-    #expect(await packageManager.hasTraditionalPackageSwift())
+    private func validateCoexistenceOfFormats(_ packageManager: PackageDSLManager) async {
+      // Test that our PackageDSLManager can detect the traditional Package.swift
+      #expect(await packageManager.hasTraditionalPackageSwift())
 
-    // Generate DSL files alongside the Package.swift
-    do {
-      try await packageManager.generatePackageSwift()
-    } catch {
-      Issue.record("Failed to generate DSL files: \(error)")
-      return
-    }
+      // Generate DSL files alongside the Package.swift
+      do {
+        try await packageManager.generatePackageSwift()
+      } catch {
+        Issue.record("Failed to generate DSL files: \(error)")
+        return
+      }
 
-    // Verify both formats coexist
-    #expect(await packageManager.hasTraditionalPackageSwift())
-    #expect(await packageManager.hasDSLComponents())
-  }
+      // Verify both formats coexist
+      #expect(await packageManager.hasTraditionalPackageSwift())
+      #expect(await packageManager.hasDSLComponents())
+    }
   #endif
 }