Make Resolved* in PackageGraph value types

MaxDesiatov · MaxDesiatov · commit cfb04f38be24 · 2023-12-02T20:40:26.000Z
diff --git a/Sources/Build/BuildDescription/ClangTargetBuildDescription.swift b/Sources/Build/BuildDescription/ClangTargetBuildDescription.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import class PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedTarget
 import struct SPMBuildCore.BuildParameters
 import struct SPMBuildCore.BuildToolPluginInvocationResult
 import struct SPMBuildCore.PrebuildCommandResult
diff --git a/Sources/Build/BuildDescription/TargetBuildDescription.swift b/Sources/Build/BuildDescription/TargetBuildDescription.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import class PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedTarget
 import struct PackageModel.Resource
 import struct SPMBuildCore.BuildToolPluginInvocationResult
 
diff --git a/Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift b/Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift
@@ -13,7 +13,7 @@
 import struct LLBuildManifest.Node
 import struct Basics.AbsolutePath
 import struct Basics.InternalError
-import class PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedTarget
 import PackageModel
 
 extension LLBuildManifestBuilder {
diff --git a/Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift b/Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift
@@ -17,7 +17,7 @@ import struct Basics.TSCAbsolutePath
 import struct LLBuildManifest.Node
 import struct LLBuildManifest.LLBuildManifest
 import struct SPMBuildCore.BuildParameters
-import class PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedTarget
 import protocol TSCBasic.FileSystem
 import enum TSCBasic.ProcessEnv
 import func TSCBasic.topologicalSort
diff --git a/Sources/Build/BuildPlan/BuildPlan+Product.swift b/Sources/Build/BuildPlan/BuildPlan+Product.swift
@@ -12,8 +12,8 @@
 
 import struct Basics.AbsolutePath
 import struct Basics.InternalError
-import class PackageGraph.ResolvedProduct
-import class PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedProduct
+import struct PackageGraph.ResolvedTarget
 import class PackageModel.BinaryTarget
 import class PackageModel.ClangTarget
 import class PackageModel.Target
diff --git a/Sources/Build/BuildPlan/BuildPlan+Test.swift b/Sources/Build/BuildPlan/BuildPlan+Test.swift
@@ -16,8 +16,8 @@ import struct Basics.AbsolutePath
 import struct LLBuildManifest.TestDiscoveryTool
 import struct LLBuildManifest.TestEntryPointTool
 import struct PackageGraph.PackageGraph
-import class PackageGraph.ResolvedProduct
-import class PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedProduct
+import struct PackageGraph.ResolvedTarget
 import struct PackageModel.Sources
 import class PackageModel.SwiftTarget
 import class PackageModel.Target
@@ -84,10 +84,10 @@ extension BuildPlan {
                     testDiscoverySrc: Sources(paths: discoveryPaths, root: discoveryDerivedDir)
                 )
                 let discoveryResolvedTarget = ResolvedTarget(
-                    target: discoveryTarget,
+                    underlying: discoveryTarget,
                     dependencies: testProduct.targets.map { .target($0, conditions: []) },
                     defaultLocalization: testProduct.defaultLocalization,
-                    platforms: testProduct.platforms,
+                    supportedPlatforms: testProduct.platforms,
                     platformVersionProvider: testProduct.platformVersionProvider
                 )
                 let discoveryTargetBuildDescription = try SwiftTargetBuildDescription(
@@ -118,10 +118,10 @@ extension BuildPlan {
                     testEntryPointSources: entryPointSources
                 )
                 let entryPointResolvedTarget = ResolvedTarget(
-                    target: entryPointTarget,
+                    underlying: entryPointTarget,
                     dependencies: testProduct.targets.map { .target($0, conditions: []) } + [.target(discoveryResolvedTarget, conditions: [])],
                     defaultLocalization: testProduct.defaultLocalization,
-                    platforms: testProduct.platforms,
+                    supportedPlatforms: testProduct.platforms,
                     platformVersionProvider: testProduct.platformVersionProvider
                 )
                 return try SwiftTargetBuildDescription(
@@ -148,10 +148,10 @@ extension BuildPlan {
                             testEntryPointSources: entryPointResolvedTarget.underlying.sources
                         )
                         let entryPointResolvedTarget = ResolvedTarget(
-                            target: entryPointTarget,
+                            underlying: entryPointTarget,
                             dependencies: entryPointResolvedTarget.dependencies + [.target(discoveryTargets.resolved, conditions: [])],
                             defaultLocalization: testProduct.defaultLocalization,
-                            platforms: testProduct.platforms,
+                            supportedPlatforms: testProduct.platforms,
                             platformVersionProvider: testProduct.platformVersionProvider
                         )
                         let entryPointTargetBuildDescription = try SwiftTargetBuildDescription(
diff --git a/Sources/PackageGraph/PackageGraph+Loading.swift b/Sources/PackageGraph/PackageGraph+Loading.swift
@@ -152,13 +152,9 @@ extension PackageGraph {
             rootManifests: root.manifests,
             unsafeAllowedPackages: unsafeAllowedPackages,
             platformRegistry: customPlatformsRegistry ?? .default,
-            platformVersionProvider: .init(derivedXCTestPlatformProvider: { declared in
-                if let customXCTestMinimumDeploymentTargets {
-                    return customXCTestMinimumDeploymentTargets[declared]
-                } else {
-                    return MinimumDeploymentTarget.default.computeXCTestMinimumDeploymentTarget(for: declared)
-                }
-            }),
+            platformVersionProvider: .init(
+                implementation: .customXCTestMinimumDeploymentTargets(customXCTestMinimumDeploymentTargets)
+            ),
             fileSystem: fileSystem,
             observabilityScope: observabilityScope
         )
@@ -929,12 +925,10 @@ private final class ResolvedTargetBuilder: ResolvedBuilder<ResolvedTarget> {
         }
 
         return ResolvedTarget(
-            storage: .init(
-                underlying: self.target,
-                dependencies: dependencies,
-                defaultLocalization: self.defaultLocalization,
-                supportedPlatforms: self.platforms
-            ),
+            underlying: self.target,
+            dependencies: dependencies,
+            defaultLocalization: self.defaultLocalization,
+            supportedPlatforms: self.platforms,
             platformVersionProvider: self.platformVersionProvider
         )
     }
diff --git a/Sources/PackageGraph/Resolution/PlatformVersionProvider.swift b/Sources/PackageGraph/Resolution/PlatformVersionProvider.swift
@@ -10,24 +10,65 @@
 //
 //===----------------------------------------------------------------------===//
 
+import struct PackageModel.MinimumDeploymentTarget
 import struct PackageModel.Platform
 import struct PackageModel.PlatformVersion
 import struct PackageModel.SupportedPlatform
 
-public struct PlatformVersionProvider {
-    public init(derivedXCTestPlatformProvider: ((Platform) -> PlatformVersion?)?) {
-        self.derivedXCTestPlatformProvider = derivedXCTestPlatformProvider
+/// Merging two sets of supported platforms, preferring the max constraint
+func merge(into partial: inout [SupportedPlatform], platforms: [SupportedPlatform]) {
+    for platformSupport in platforms {
+        if let existing = partial.firstIndex(where: { $0.platform == platformSupport.platform }) {
+            if partial[existing].version < platformSupport.version {
+                partial.remove(at: existing)
+                partial.append(platformSupport)
+            }
+        } else {
+            partial.append(platformSupport)
+        }
+    }
+}
+
+public struct PlatformVersionProvider: Hashable {
+    public enum Implementation: Hashable {
+        case mergingFromTargets([ResolvedTarget])
+        case customXCTestMinimumDeploymentTargets([PackageModel.Platform: PlatformVersion]?)
+        case empty
+    }
+
+    private let implementation: Implementation
+
+    public init(implementation: Implementation) {
+        self.implementation = implementation
     }
     
-    let derivedXCTestPlatformProvider: ((_ declared: PackageModel.Platform) -> PlatformVersion?)?
+    func derivedXCTestPlatformProvider(_ declared: PackageModel.Platform) -> PlatformVersion? {
+        switch implementation {
+        case .mergingFromTargets(let targets):
+            let platforms = targets.reduce(into: [SupportedPlatform]()) { partial, item in
+                merge(into: &partial, platforms: [item.getDerived(for: declared, usingXCTest: item.type == .test)])
+            }
+            return platforms.first!.version
+
+        case .customXCTestMinimumDeploymentTargets(let customXCTestMinimumDeploymentTargets):
+            if let customXCTestMinimumDeploymentTargets {
+                return customXCTestMinimumDeploymentTargets[declared]
+            } else {
+                return MinimumDeploymentTarget.default.computeXCTestMinimumDeploymentTarget(for: declared)
+            }
+
+        case .empty:
+            return nil
+        }
+    }
 
     /// Returns the supported platform instance for the given platform.
     func getDerived(declared: [SupportedPlatform], for platform: Platform, usingXCTest: Bool) -> SupportedPlatform {
         // derived platform based on known minimum deployment target logic
         if let declaredPlatform = declared.first(where: { $0.platform == platform }) {
             var version = declaredPlatform.version
 
-            if usingXCTest, let xcTestMinimumDeploymentTarget = derivedXCTestPlatformProvider?(platform), version < xcTestMinimumDeploymentTarget {
+            if usingXCTest, let xcTestMinimumDeploymentTarget = self.derivedXCTestPlatformProvider(platform), version < xcTestMinimumDeploymentTarget {
                 version = xcTestMinimumDeploymentTarget
             }
 
@@ -43,7 +84,7 @@ public struct PlatformVersionProvider {
             )
         } else {
             let minimumSupportedVersion: PlatformVersion
-            if usingXCTest, let xcTestMinimumDeploymentTarget = derivedXCTestPlatformProvider?(platform), xcTestMinimumDeploymentTarget > platform.oldestSupportedVersion {
+            if usingXCTest, let xcTestMinimumDeploymentTarget = self.derivedXCTestPlatformProvider(platform), xcTestMinimumDeploymentTarget > platform.oldestSupportedVersion {
                 minimumSupportedVersion = xcTestMinimumDeploymentTarget
             } else {
                 minimumSupportedVersion = platform.oldestSupportedVersion
diff --git a/Sources/PackageGraph/Resolution/ResolvedPackage.swift b/Sources/PackageGraph/Resolution/ResolvedPackage.swift
@@ -14,75 +14,47 @@ import Basics
 import PackageModel
 
 /// A fully resolved package. Contains resolved targets, products and dependencies of the package.
-public final class ResolvedPackage {
+public struct ResolvedPackage: Hashable {
     // The identity of the package.
     public var identity: PackageIdentity {
-        return self.storage.underlying.identity
+        return self.underlying.identity
     }
 
     /// The manifest describing the package.
     public var manifest: Manifest {
-        return self.storage.underlying.manifest
+        return self.underlying.manifest
     }
 
     /// The local path of the package.
     public var path: AbsolutePath {
-        return self.storage.underlying.path
+        return self.underlying.path
     }
 
-    /// The underlying package model.
-    public var underlying: Package {
-        self.storage.underlying
-    }
+    /// The underlying package reference.
+    public let underlying: Package
 
     /// The targets contained in the package.
-    public var targets: [ResolvedTarget] {
-        self.storage.targets
-    }
+    public let targets: [ResolvedTarget]
 
     /// The products produced by the package.
-    public var products: [ResolvedProduct] {
-        self.storage.products
-    }
+    public let products: [ResolvedProduct]
 
     /// The dependencies of the package.
-    public var dependencies: [ResolvedPackage] {
-        self.storage.dependencies
-    }
+    public let dependencies: [ResolvedPackage]
 
-    /// If the given package's source is a registry release, this provides additional metadata and signature information.
-    public var registryMetadata: RegistryReleaseMetadata? {
-        self.storage.registryMetadata
-    }
+    /// The default localization for resources.
+    public let defaultLocalization: String?
 
-    struct Storage: Hashable {
-        /// The underlying package reference.
-        public let underlying: Package
-        
-        /// The targets contained in the package.
-        public let targets: [ResolvedTarget]
-        
-        /// The products produced by the package.
-        public let products: [ResolvedProduct]
-        
-        /// The dependencies of the package.
-        public let dependencies: [ResolvedPackage]
-        
-        /// The default localization for resources.
-        public let defaultLocalization: String?
-        
-        /// The list of platforms that are supported by this target.
-        public let platforms: [SupportedPlatform]
-        
-        /// If the given package's source is a registry release, this provides additional metadata and signature information.
-        public let registryMetadata: RegistryReleaseMetadata?
-    }
+    /// The list of platforms that are supported by this target.
+    public let platforms: [SupportedPlatform]
+
+    /// If the given package's source is a registry release, this provides additional metadata and signature information.
+    public let registryMetadata: RegistryReleaseMetadata?
 
-    private let storage: Storage
 
     private let platformVersionProvider: PlatformVersionProvider
 
-    public convenience init(
+    public init(
         package: Package,
         defaultLocalization: String?,
         platforms: [SupportedPlatform],
@@ -92,44 +64,25 @@ public final class ResolvedPackage {
         registryMetadata: RegistryReleaseMetadata?,
         platformVersionProvider: PlatformVersionProvider
     ) {
-        self.init(
-            storage: .init(
-                underlying: package,
-                targets: targets,
-                products: products,
-                dependencies: dependencies,
-                defaultLocalization: defaultLocalization,
-                platforms: platforms,
-                registryMetadata: registryMetadata
-            ),
-            platformVersionProvider: platformVersionProvider
-        )
-    }
-
-    init(storage: Storage, platformVersionProvider: PlatformVersionProvider) {
-        self.storage = storage
+        self.underlying = package
+        self.targets = targets
+        self.products = products
+        self.dependencies = dependencies
+        self.defaultLocalization = defaultLocalization
+        self.platforms = platforms
+        self.registryMetadata = registryMetadata
         self.platformVersionProvider = platformVersionProvider
     }
 
     public func getDerived(for platform: Platform, usingXCTest: Bool) -> SupportedPlatform {
         self.platformVersionProvider.getDerived(
-            declared: self.storage.platforms,
+            declared: self.platforms,
             for: platform,
             usingXCTest: usingXCTest
         )
     }
 }
 
-extension ResolvedPackage: Hashable {
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(self.storage)
-    }
-
-    public static func == (lhs: ResolvedPackage, rhs: ResolvedPackage) -> Bool {
-        lhs.storage == rhs.storage
-    }
-}
-
 extension ResolvedPackage: CustomStringConvertible {
     public var description: String {
         return "<ResolvedPackage: \(self.identity)>"
diff --git a/Sources/PackageGraph/Resolution/ResolvedProduct.swift b/Sources/PackageGraph/Resolution/ResolvedProduct.swift
diff --git a/Sources/PackageGraph/Resolution/ResolvedTarget.swift b/Sources/PackageGraph/Resolution/ResolvedTarget.swift
diff --git a/Sources/SPMTestSupport/PackageGraphTester.swift b/Sources/SPMTestSupport/PackageGraphTester.swift
diff --git a/Tests/PackageGraphTests/TargetTests.swift b/Tests/PackageGraphTests/TargetTests.swift
