Code review

Author: FranzBusch

Sources/PackageGraph/GraphLoadingNode.swift

@@ -30,7 +30,7 @@ public struct GraphLoadingNode: Equatable, Hashable {
     public let productFilter: ProductFilter
 
     /// The enabled traits for this package.
-    public var enabledTraits: Set<String>
+    package var enabledTraits: Set<String>
 
     public init(
         identity: PackageIdentity,

Sources/PackageGraph/Resolution/ResolvedPackage.swift

@@ -40,7 +40,7 @@ public struct ResolvedPackage {
     public let products: [ResolvedProduct]
 
     /// The enabled traits of this package.
-    public let enabledTraits: Set<String>
+    package let enabledTraits: Set<String>
 
     /// The dependencies of the package.
     public let dependencies: [PackageIdentity]

Sources/PackageLoading/PackageBuilder.swift

@@ -177,7 +177,7 @@ extension ModuleError: CustomStringConvertible {
             """
         case .invalidTrait(let package, let trait):
             return """
-            Tried to enable invalid trait "\(trait)" for package \(package)
+            Trait '"\(trait)"' is not declared by package '\(package)'.
             """
         }
     }

Sources/PackageModel/DependencyMapper.swift

@@ -133,9 +133,9 @@ public struct MappablePackageDependency {
     public let parentPackagePath: AbsolutePath
     public let kind: Kind
     public let productFilter: ProductFilter
-    public let traits: Set<PackageDependency.Trait>?
+    package let traits: Set<PackageDependency.Trait>?
 
-    public init(
+    package init(
         parentPackagePath: AbsolutePath,
         kind: Kind,
         productFilter: ProductFilter,
@@ -147,6 +147,19 @@ public struct MappablePackageDependency {
         self.traits = traits
     }
 
+    public init(
+        parentPackagePath: AbsolutePath,
+        kind: Kind,
+        productFilter: ProductFilter
+    ) {
+        self.init(
+            parentPackagePath: parentPackagePath,
+            kind: kind,
+            productFilter: productFilter,
+            traits: nil
+        )
+    }
+
     public enum Kind {
         case fileSystem(name: String?, path: String)
         case sourceControl(name: String?, location: String, requirement: PackageDependency.SourceControl.Requirement)

Sources/PackageModel/Manifest/PackageDependencyDescription.swift

@@ -20,29 +20,29 @@ import struct TSCUtility.Version
 /// Represents a package dependency.
 public enum PackageDependency: Equatable, Hashable, Sendable {
     /// A struct representing an enabled trait of a dependency.
-    public struct Trait: Hashable, Sendable, Codable, ExpressibleByStringLiteral {
+    package struct Trait: Hashable, Sendable, Codable, ExpressibleByStringLiteral {
         /// A condition that limits the application of a dependencies trait.
-        public struct Condition: Hashable, Sendable, Codable {
+        package struct Condition: Hashable, Sendable, Codable {
             /// The set of traits of this package that enable the dependencie's trait.
-            public let traits: Set<String>?
+            package let traits: Set<String>?
 
             public init(traits: Set<String>?) {
                 self.traits = traits
             }
         }
 
         /// The name of the enabled trait.
-        public var name: String
+        package var name: String
 
         /// The condition under which the trait is enabled.
-        public var condition: Condition?
+        package var condition: Condition?
 
         /// Initializes a new enabled trait.
         ///
         /// - Parameters:
         ///   - name: The name of the enabled trait.
         ///   - condition: The condition under which the trait is enabled.
-        public init(
+        package init(
             name: String,
             condition: Condition? = nil
         ) {
@@ -59,7 +59,7 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
         /// - Parameters:
         ///   - name: The name of the enabled trait.
         ///   - condition: The condition under which the trait is enabled.
-        public static func trait(
+        package static func trait(
             name: String,
             condition: Condition? = nil
         ) -> Trait {
@@ -79,7 +79,7 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
         public let nameForTargetDependencyResolutionOnly: String?
         public let path: AbsolutePath
         public let productFilter: ProductFilter
-        public let traits: Set<Trait>?
+        package let traits: Set<Trait>?
     }
 
     public struct SourceControl: Equatable, Hashable, Encodable, Sendable {
@@ -88,7 +88,7 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
         public let location: Location
         public let requirement: Requirement
         public let productFilter: ProductFilter
-        public let traits: Set<Trait>?
+        package let traits: Set<Trait>?
 
         public enum Requirement: Equatable, Hashable, Sendable {
             case exact(Version)
@@ -107,7 +107,7 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
         public let identity: PackageIdentity
         public let requirement: Requirement
         public let productFilter: ProductFilter
-        public let traits: Set<Trait>?
+        package let traits: Set<Trait>?
 
         /// The dependency requirement.
         public enum Requirement: Equatable, Hashable, Sendable {
@@ -116,7 +116,7 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
         }
     }
 
-    public var traits: Set<Trait>? {
+    package var traits: Set<Trait>? {
         switch self {
         case .fileSystem(let settings):
             return settings.traits
@@ -210,6 +210,21 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
     }
 
     public static func fileSystem(
+        identity: PackageIdentity,
+        nameForTargetDependencyResolutionOnly: String?,
+        path: AbsolutePath,
+        productFilter: ProductFilter
+    ) -> Self {
+        .fileSystem(
+            identity: identity,
+            nameForTargetDependencyResolutionOnly: nameForTargetDependencyResolutionOnly,
+            path: path,
+            productFilter: productFilter,
+            traits: nil
+        )
+    }
+
+    package static func fileSystem(
         identity: PackageIdentity,
         nameForTargetDependencyResolutionOnly: String?,
         path: AbsolutePath,
@@ -228,6 +243,23 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
     }
 
     public static func localSourceControl(
+        identity: PackageIdentity,
+        nameForTargetDependencyResolutionOnly: String?,
+        path: AbsolutePath,
+        requirement: SourceControl.Requirement,
+        productFilter: ProductFilter
+    ) -> Self {
+        .localSourceControl(
+            identity: identity,
+            nameForTargetDependencyResolutionOnly: nameForTargetDependencyResolutionOnly,
+            path: path,
+            requirement: requirement,
+            productFilter: productFilter,
+            traits: nil
+        )
+    }
+
+    package static func localSourceControl(
         identity: PackageIdentity,
         nameForTargetDependencyResolutionOnly: String?,
         path: AbsolutePath,
@@ -246,6 +278,23 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
     }
 
     public static func remoteSourceControl(
+        identity: PackageIdentity,
+        nameForTargetDependencyResolutionOnly: String?,
+        url: SourceControlURL,
+        requirement: SourceControl.Requirement,
+        productFilter: ProductFilter
+    ) -> Self {
+        .remoteSourceControl(
+            identity: identity,
+            nameForTargetDependencyResolutionOnly: nameForTargetDependencyResolutionOnly,
+            url: url,
+            requirement: requirement,
+            productFilter: productFilter,
+            traits: nil
+        )
+    }
+
+    package static func remoteSourceControl(
         identity: PackageIdentity,
         nameForTargetDependencyResolutionOnly: String?,
         url: SourceControlURL,
@@ -264,6 +313,23 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
     }
 
     public static func sourceControl(
+        identity: PackageIdentity,
+        nameForTargetDependencyResolutionOnly: String?,
+        location: SourceControl.Location,
+        requirement: SourceControl.Requirement,
+        productFilter: ProductFilter
+    ) -> Self {
+        .sourceControl(
+            identity: identity,
+            nameForTargetDependencyResolutionOnly: nameForTargetDependencyResolutionOnly,
+            location: location,
+            requirement: requirement,
+            productFilter: productFilter,
+            traits: nil
+        )
+    }
+
+    package static func sourceControl(
         identity: PackageIdentity,
         nameForTargetDependencyResolutionOnly: String?,
         location: SourceControl.Location,
@@ -284,6 +350,19 @@ public enum PackageDependency: Equatable, Hashable, Sendable {
     }
 
     public static func registry(
+        identity: PackageIdentity,
+        requirement: Registry.Requirement,
+        productFilter: ProductFilter
+    ) -> Self {
+        .registry(
+            identity: identity,
+            requirement: requirement,
+            productFilter: productFilter,
+            traits: nil
+        )
+    }
+
+    package static func registry(
         identity: PackageIdentity,
         requirement: Registry.Requirement,
         productFilter: ProductFilter,

Sources/SPMTestSupport/MockDependency.swift

@@ -22,7 +22,7 @@ public struct MockDependency {
     public let deprecatedName: String?
     public let location: Location
     public let products: ProductFilter
-    public let traits: Set<PackageDependency.Trait>
+    package let traits: Set<PackageDependency.Trait>
 
     init(
         deprecatedName: String? = nil,

Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift

@@ -16,7 +16,7 @@ import PackageModel
 
 import struct TSCUtility.Version
 
-public extension PackageDependency {
+package extension PackageDependency {
     static func fileSystem(
         identity: PackageIdentity? = nil,
         deprecatedName: String? = nil,