fixing issues with linting script

leogdion · leogdion · commit ea3505c7e674 · 2025-08-29T10:37:18.000-04:00
diff --git a/Sources/PackageDSLKit/Extensions/Property+Extensions.swift b/Sources/PackageDSLKit/Extensions/Property+Extensions.swift
@@ -36,30 +36,30 @@ extension Property {
     self.init(name: name, type: type, code: code)
   }
 }
-extension Property {
-  internal struct MissingFieldsError: OptionSet, Error, Sendable {
-    internal typealias RawValue = Int
-
-    internal static let name = MissingFieldsError(rawValue: 1)
-    internal static let type = MissingFieldsError(rawValue: 2)
-    // static let code = MissingFieldsError(rawValue: 4)
-
-    internal var rawValue: Int
-  }
-
-  internal init(name: String?, type: String?, code: [String]) throws(MissingFieldsError) {
-    var error: MissingFieldsError = []
-    if name == nil {
-      error.insert(.name)
-    }
-    if type == nil {
-      error.insert(.type)
-    }
-    if !error.isEmpty {
-      throw error
-    } else {
-      assert(name != nil && type != nil)
-      self.init(name: name ?? "", type: type ?? "", code: code)
-    }
-  }
-}
+// extension Property {
+//  internal struct MissingFieldsError: OptionSet, Error, Sendable {
+//    internal typealias RawValue = Int
+//
+//    internal static let name = MissingFieldsError(rawValue: 1)
+//    internal static let type = MissingFieldsError(rawValue: 2)
+//    // static let code = MissingFieldsError(rawValue: 4)
+//
+//    internal var rawValue: Int
+//  }
+//
+//  internal init(name: String?, type: String?, code: [String]) throws(MissingFieldsError) {
+//    var error: MissingFieldsError = []
+//    if name == nil {
+//      error.insert(.name)
+//    }
+//    if type == nil {
+//      error.insert(.type)
+//    }
+//    if !error.isEmpty {
+//      throw error
+//    } else {
+//      assert(name != nil && type != nil)
+//      self.init(name: name ?? "", type: type ?? "", code: code)
+//    }
+//  }
+// }
diff --git a/Sources/PackageDSLKit/Protocols/ComponentBuildable.swift b/Sources/PackageDSLKit/Protocols/ComponentBuildable.swift
@@ -34,5 +34,5 @@ internal protocol ComponentBuildable: Sendable {
   static var directoryName: String { get }
   init(component: Component, requirements: Requirements)
   static func requirements(from component: Component) -> Requirements?
-  func createComponent() -> Component
+  // func createComponent() -> Component
 }
diff --git a/Sources/PackageDSLKit/Types/PackageFiles.swift b/Sources/PackageDSLKit/Types/PackageFiles.swift
@@ -30,7 +30,7 @@
 import Foundation
 
 public struct PackageFiles: PackageFilesFactory, Sendable {
-  public static let `default`: PackageFilesFactory = PackageFiles()
+  public static let `default`: any PackageFilesFactory = PackageFiles()
 
   private static let defaultTypes:
     [PackageFilesInterfaceType: @Sendable () -> any PackageFilesInterface] = [
diff --git a/Sources/PackageDSLKit/Types/PackageParser.swift b/Sources/PackageDSLKit/Types/PackageParser.swift
@@ -34,7 +34,7 @@ public struct PackageParser: Sendable, Hashable, Codable {
   public init() {
   }
   #if canImport(Foundation) && (os(macOS) || os(Linux))
-    public func parse(at directoryURL: URL, with fileManager: FileManager)
+    public func parse(at directoryURL: URL)
       async throws(PackageDSLError)
       -> PackageSpecifications
     {
diff --git a/Sources/PackageDSLKit/Types/PackageWriter.swift b/Sources/PackageDSLKit/Types/PackageWriter.swift
@@ -40,9 +40,9 @@ public struct PackageWriter: Sendable {
   ]
 
   private let fileInterfaceType: PackageFilesInterfaceType
-  private let fileAccessor: PackageFilesFactory
-  private let indexWriter: IndexCodeWriter
-  private let componentWriter: StructureWriter
+  private let fileAccessor: any PackageFilesFactory
+  private let indexWriter: any IndexCodeWriter
+  private let componentWriter: any StructureWriter
 
   public init() {
     self.init(componentWriter: ComponentWriter())
diff --git a/Sources/SwiftPackageManagerKit/Models/Dependency.swift b/Sources/SwiftPackageManagerKit/Models/Dependency.swift
@@ -48,7 +48,7 @@ public enum Dependency: Codable, Hashable, Sendable {
     }
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if container.contains(.sourceControl) {
@@ -79,7 +79,7 @@ public enum Dependency: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/SwiftPackageManagerKit/Models/DependencyLocation.swift b/Sources/SwiftPackageManagerKit/Models/DependencyLocation.swift
@@ -43,7 +43,7 @@ public enum DependencyLocation: Codable, Hashable, Sendable {
     let urlString: String
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if container.contains(.remote) {
@@ -66,7 +66,7 @@ public enum DependencyLocation: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/SwiftPackageManagerKit/Models/PackageKind.swift b/Sources/SwiftPackageManagerKit/Models/PackageKind.swift
@@ -41,7 +41,7 @@ public enum PackageKind: Codable, Hashable, Sendable {
     case remote
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if let rootPaths = try? container.decode([String].self, forKey: .root) {
@@ -60,7 +60,7 @@ public enum PackageKind: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/SwiftPackageManagerKit/Models/Product.swift b/Sources/SwiftPackageManagerKit/Models/Product.swift
@@ -53,7 +53,7 @@ public struct Product: Codable, Hashable, Sendable {
   }
 
   // Custom decoding to handle missing settings field
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     self.name = try container.decode(String.self, forKey: .name)
diff --git a/Sources/SwiftPackageManagerKit/Models/ProductType.swift b/Sources/SwiftPackageManagerKit/Models/ProductType.swift
@@ -47,7 +47,7 @@ public enum ProductType: Codable, Hashable, Sendable {
     case plugin
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if let libraryTypes = try? container.decode([LibraryType].self, forKey: .library) {
@@ -65,7 +65,7 @@ public enum ProductType: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/SwiftPackageManagerKit/Models/ResourceRule.swift b/Sources/SwiftPackageManagerKit/Models/ResourceRule.swift
@@ -39,7 +39,7 @@ public enum ResourceRule: Codable, Hashable, Sendable {
     case process
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if container.contains(.copy) {
@@ -54,7 +54,7 @@ public enum ResourceRule: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/SwiftPackageManagerKit/Models/Target.swift b/Sources/SwiftPackageManagerKit/Models/Target.swift
@@ -62,7 +62,7 @@ public struct Target: Codable, Hashable, Sendable {
   }
 
   // Custom decoding to handle missing optional fields gracefully
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     self.name = try container.decode(String.self, forKey: .name)
diff --git a/Sources/SwiftPackageManagerKit/Models/TargetDependency.swift b/Sources/SwiftPackageManagerKit/Models/TargetDependency.swift
@@ -39,7 +39,7 @@ public enum TargetDependency: Codable, Hashable, Sendable {
     case product
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if container.contains(.byName) {
@@ -72,7 +72,7 @@ public enum TargetDependency: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/SwiftPackageManagerKit/Models/ToolsVersion.swift b/Sources/SwiftPackageManagerKit/Models/ToolsVersion.swift
@@ -41,12 +41,12 @@ public struct ToolsVersion: Codable, Hashable, Sendable {
     self.version = version
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     self.version = try container.decode(String.self, forKey: .version)
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(version, forKey: .version)
   }
diff --git a/Sources/SwiftPackageManagerKit/Models/VersionRequirement.swift b/Sources/SwiftPackageManagerKit/Models/VersionRequirement.swift
@@ -53,7 +53,7 @@ public enum VersionRequirement: Codable, Hashable, Sendable {
     let upperBound: String
   }
 
-  public init(from decoder: Decoder) throws {
+  public init(from decoder: any Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
     if container.contains(.range) {
@@ -80,7 +80,7 @@ public enum VersionRequirement: Codable, Hashable, Sendable {
     }
   }
 
-  public func encode(to encoder: Encoder) throws {
+  public func encode(to encoder: any Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
 
     switch self {
diff --git a/Sources/package/Commands/Dump.swift b/Sources/package/Commands/Dump.swift
@@ -36,7 +36,7 @@ extension Package {
       @OptionGroup internal var settings: Settings
       internal func run() async throws {
         let parser = PackageParser()
-        let package = try await parser.parse(at: settings.dslSourcesURL, with: .default)
+        let package = try await parser.parse(at: settings.dslSourcesURL)
       }
     }
   #endif
diff --git a/Sources/package/Commands/Product.swift b/Sources/package/Commands/Product.swift
@@ -48,10 +48,10 @@ import PackageDSLKit
 
       internal func run() async throws {
         let parser = PackageParser()
-        let package = try await parser.parse(at: settings.dslSourcesURL, with: .default)
+        let package = try await parser.parse(at: settings.dslSourcesURL)
         let newPackage = package.updating(descriptor: Product.self) { products in
           var newProducts = products
-          newProducts.append(.init(typeName: name))
+          newProducts.append(Product(typeName: name))
           return newProducts
         }
         let writer = PackageWriter()
diff --git a/Tests/PackageDSLKitTests/Types/MockComponentBuildable.swift b/Tests/PackageDSLKitTests/Types/MockComponentBuildable.swift
@@ -43,7 +43,7 @@ internal struct MockComponentBuildable: ComponentBuildable {
     )
   }
 
-  internal func createComponent() -> PackageDSLKit.Component {
-    component
-  }
+  //  internal func createComponent() -> PackageDSLKit.Component {
+  //    component
+  //  }
 }
diff --git a/Tests/PackageDSLKitTests/Types/PackageDSLManagerBasicTests.swift b/Tests/PackageDSLKitTests/Types/PackageDSLManagerBasicTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import Testing
 
 @testable import PackageDSLKit
-@testable import SwiftPackageManagerKit
 
 @Suite
 struct PackageDSLManagerBasicTests {
diff --git a/Tests/PackageDSLKitTests/Types/PackageDSLManagerComplexTests.swift b/Tests/PackageDSLKitTests/Types/PackageDSLManagerComplexTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import Testing
 
 @testable import PackageDSLKit
-@testable import SwiftPackageManagerKit
 
 @Suite
 struct PackageDSLManagerComplexTests {
@@ -52,7 +51,7 @@ struct PackageDSLManagerComplexTests {
   }
 
   private func validateComplexPackageGeneration(
-    _ packageManager: PackageDSLManager,
+    _ _: PackageDSLManager,
     _ tempDirectory: URL
   ) async throws {
     // Verify core DSL files were created

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@ internal protocol ComponentBuildable: Sendable {`
`34`	`34`	`static var directoryName: String { get }`
`35`	`35`	`init(component: Component, requirements: Requirements)`
`36`	`36`	`static func requirements(from component: Component) -> Requirements?`
`37`		`- func createComponent() -> Component`
	`37`	`+ // func createComponent() -> Component`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public struct PackageParser: Sendable, Hashable, Codable {`
`34`	`34`	`public init() {`
`35`	`35`	`}`
`36`	`36`	`#if canImport(Foundation) && (os(macOS) \|\| os(Linux))`
`37`		`- public func parse(at directoryURL: URL, with fileManager: FileManager)`
	`37`	`+ public func parse(at directoryURL: URL)`
`38`	`38`	`async throws(PackageDSLError)`
`39`	`39`	`-> PackageSpecifications`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public enum Dependency: Codable, Hashable, Sendable {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- public init(from decoder: Decoder) throws {`
	`51`	`+ public init(from decoder: any Decoder) throws {`
`52`	`52`	`let container = try decoder.container(keyedBy: CodingKeys.self)`
`53`	`53`
`54`	`54`	`if container.contains(.sourceControl) {`
`@@ -79,7 +79,7 @@ public enum Dependency: Codable, Hashable, Sendable {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- public func encode(to encoder: Encoder) throws {`
	`82`	`+ public func encode(to encoder: any Encoder) throws {`
`83`	`83`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`84`	`84`
`85`	`85`	`switch self {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public enum DependencyLocation: Codable, Hashable, Sendable {`
`43`	`43`	`let urlString: String`
`44`	`44`	`}`
`45`	`45`
`46`		`- public init(from decoder: Decoder) throws {`
	`46`	`+ public init(from decoder: any Decoder) throws {`
`47`	`47`	`let container = try decoder.container(keyedBy: CodingKeys.self)`
`48`	`48`
`49`	`49`	`if container.contains(.remote) {`
`@@ -66,7 +66,7 @@ public enum DependencyLocation: Codable, Hashable, Sendable {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- public func encode(to encoder: Encoder) throws {`
	`69`	`+ public func encode(to encoder: any Encoder) throws {`
`70`	`70`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`71`	`71`
`72`	`72`	`switch self {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public enum PackageKind: Codable, Hashable, Sendable {`
`41`	`41`	`case remote`
`42`	`42`	`}`
`43`	`43`
`44`		`- public init(from decoder: Decoder) throws {`
	`44`	`+ public init(from decoder: any Decoder) throws {`
`45`	`45`	`let container = try decoder.container(keyedBy: CodingKeys.self)`
`46`	`46`
`47`	`47`	`if let rootPaths = try? container.decode([String].self, forKey: .root) {`
`@@ -60,7 +60,7 @@ public enum PackageKind: Codable, Hashable, Sendable {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- public func encode(to encoder: Encoder) throws {`
	`63`	`+ public func encode(to encoder: any Encoder) throws {`
`64`	`64`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`65`	`65`
`66`	`66`	`switch self {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public struct Product: Codable, Hashable, Sendable {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// Custom decoding to handle missing settings field`
`56`		`- public init(from decoder: Decoder) throws {`
	`56`	`+ public init(from decoder: any Decoder) throws {`
`57`	`57`	`let container = try decoder.container(keyedBy: CodingKeys.self)`
`58`	`58`
`59`	`59`	`self.name = try container.decode(String.self, forKey: .name)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public enum ProductType: Codable, Hashable, Sendable {`
`47`	`47`	`case plugin`
`48`	`48`	`}`
`49`	`49`
`50`		`- public init(from decoder: Decoder) throws {`
	`50`	`+ public init(from decoder: any Decoder) throws {`
`51`	`51`	`let container = try decoder.container(keyedBy: CodingKeys.self)`
`52`	`52`
`53`	`53`	`if let libraryTypes = try? container.decode([LibraryType].self, forKey: .library) {`
`@@ -65,7 +65,7 @@ public enum ProductType: Codable, Hashable, Sendable {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- public func encode(to encoder: Encoder) throws {`
	`68`	`+ public func encode(to encoder: any Encoder) throws {`
`69`	`69`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`70`	`70`
`71`	`71`	`switch self {`