Make Resolved* in PackageGraph value types

Author: MaxDesiatov

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

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
 

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 {

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

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

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,7 +84,7 @@ 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,
                     supportedPlatforms: testProduct.supportedPlatforms,
@@ -118,7 +118,7 @@ extension BuildPlan {
                     testEntryPointSources: entryPointSources
                 )
                 let entryPointResolvedTarget = ResolvedTarget(
-                    target: entryPointTarget,
+                    underlying: entryPointTarget,
                     dependencies: testProduct.targets.map { .target($0, conditions: []) } + [.target(discoveryResolvedTarget, conditions: [])],
                     defaultLocalization: testProduct.defaultLocalization,
                     supportedPlatforms: testProduct.supportedPlatforms,
@@ -148,7 +148,7 @@ extension BuildPlan {
                             testEntryPointSources: entryPointResolvedTarget.underlying.sources
                         )
                         let entryPointResolvedTarget = ResolvedTarget(
-                            target: entryPointTarget,
+                            underlying: entryPointTarget,
                             dependencies: entryPointResolvedTarget.dependencies + [.target(discoveryTargets.resolved, conditions: [])],
                             defaultLocalization: testProduct.defaultLocalization,
                             supportedPlatforms: testProduct.supportedPlatforms,

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -924,12 +924,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
         )
     }

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)>"