Paralellize retrieving resolved packages

Sources/Commands/PackageCommands/ResetCommands.swift

@@ -45,8 +45,8 @@ extension SwiftPackageCommand {
         @OptionGroup(visibility: .hidden)
         var globalOptions: GlobalOptions
 
-        func run(_ swiftCommandState: SwiftCommandState) throws {
-            try swiftCommandState.getActiveWorkspace().reset(observabilityScope: swiftCommandState.observabilityScope)
+        func run(_ swiftCommandState: SwiftCommandState) async throws {
+            try await swiftCommandState.getActiveWorkspace().reset(observabilityScope: swiftCommandState.observabilityScope)
         }
     }
 }

Sources/CoreCommands/BuildSystemSupport.swift

@@ -40,7 +40,7 @@ private struct NativeBuildSystemFactory: BuildSystemFactory {
         return try BuildOperation(
             productsBuildParameters: try productsBuildParameters ?? self.swiftCommandState.productsBuildParameters,
             toolsBuildParameters: try toolsBuildParameters ?? self.swiftCommandState.toolsBuildParameters,
-            cacheBuildManifest: cacheBuildManifest && self.swiftCommandState.canUseCachedBuildManifest(),
+            cacheBuildManifest: await self.swiftCommandState.canUseCachedBuildManifest() && cacheBuildManifest,
             packageGraphLoader: packageGraphLoader ?? {
                 try await self.swiftCommandState.loadPackageGraph(
                     explicitProduct: explicitProduct,

Sources/CoreCommands/SwiftCommandState.swift

@@ -99,13 +99,13 @@ extension _SwiftCommand {
 }
 
 public protocol SwiftCommand: ParsableCommand, _SwiftCommand {
-    func run(_ swiftCommandState: SwiftCommandState) throws
+    func run(_ swiftCommandState: SwiftCommandState) async throws
 }
 
 extension SwiftCommand {
     public static var _errorLabel: String { "error" }
 
-    public func run() throws {
+    public func run() async throws {
         let swiftCommandState = try SwiftCommandState(
             options: globalOptions,
             toolWorkspaceConfiguration: self.toolWorkspaceConfiguration,
@@ -119,7 +119,7 @@ extension SwiftCommand {
         swiftCommandState.buildSystemProvider = try buildSystemProvider(swiftCommandState)
         var toolError: Error? = .none
         do {
-            try self.run(swiftCommandState)
+            try await self.run(swiftCommandState)
             if swiftCommandState.observabilityScope.errorsReported || swiftCommandState.executionStatus == .failure {
                 throw ExitCode.failure
             }
@@ -689,7 +689,7 @@ public final class SwiftCommandState {
         try _manifestLoader.get()
     }
 
-    public func canUseCachedBuildManifest() throws -> Bool {
+    public func canUseCachedBuildManifest() async throws -> Bool {
         if !self.options.caching.cacheBuildManifest {
             return false
         }
@@ -706,7 +706,7 @@ public final class SwiftCommandState {
         // Perform steps for build manifest caching if we can enabled it.
         //
         // FIXME: We don't add edited packages in the package structure command yet (SR-11254).
-        let hasEditedPackages = try self.getActiveWorkspace().state.dependencies.contains(where: \.isEdited)
+        let hasEditedPackages = try await self.getActiveWorkspace().state.dependencies.contains(where: \.isEdited)
         if hasEditedPackages {
             return false
         }

Sources/Workspace/ManagedDependency.swift

@@ -172,12 +172,18 @@ extension Workspace.ManagedDependency: CustomStringConvertible {
 
 extension Workspace {
     /// A collection of managed dependencies.
-    final public class ManagedDependencies {
+    public struct ManagedDependencies {
         private var dependencies: [PackageIdentity: ManagedDependency]
 
         init() {
             self.dependencies = [:]
         }
+
+        private init(
+            _ dependencies: [PackageIdentity: ManagedDependency]
+        ) {
+            self.dependencies = dependencies
+        }
 
         init(_ dependencies: [ManagedDependency]) throws {
             // rdar://86857825 do not use Dictionary(uniqueKeysWithValues:) as it can crash the process when input is incorrect such as in older versions of SwiftPM
@@ -204,12 +210,16 @@ extension Workspace {
             return .none
         }
 
-        public func add(_ dependency: ManagedDependency) {
-            self.dependencies[dependency.packageRef.identity] = dependency
+        public func add(_ dependency: ManagedDependency) -> Self {
+            var dependencies = dependencies
+            dependencies[dependency.packageRef.identity] = dependency
+            return ManagedDependencies(dependencies)
         }
 
-        public func remove(_ identity: PackageIdentity) {
-            self.dependencies[identity] = nil
+        public func remove(_ identity: PackageIdentity) -> Self {
+            var dependencies = dependencies
+            dependencies[identity] = nil
+            return ManagedDependencies(dependencies)
         }
     }
 }

Sources/Workspace/Workspace+BinaryArtifacts.swift

@@ -811,7 +811,7 @@ extension Workspace {
         var artifactsToDownload: [BinaryArtifactsManager.RemoteArtifact] = []
         var artifactsToExtract: [ManagedArtifact] = []
 
-        for artifact in state.artifacts {
+        for artifact in await state.artifacts {
             if !manifestArtifacts.local
                 .contains(where: { $0.packageRef == artifact.packageRef && $0.targetName == artifact.targetName }) &&
                 !manifestArtifacts.remote
@@ -822,7 +822,7 @@ extension Workspace {
         }
 
         for artifact in manifestArtifacts.local {
-            let existingArtifact = self.state.artifacts[
+            let existingArtifact = await self.state.artifacts[
                 packageIdentity: artifact.packageRef.identity,
                 targetName: artifact.targetName
             ]
@@ -859,7 +859,7 @@ extension Workspace {
         }
 
         for artifact in manifestArtifacts.remote {
-            let existingArtifact = self.state.artifacts[
+            let existingArtifact = await self.state.artifacts[
                 packageIdentity: artifact.packageRef.identity,
                 targetName: artifact.targetName
             ]
@@ -891,9 +891,9 @@ extension Workspace {
         }
 
         // Remove the artifacts and directories which are not needed anymore.
-        observabilityScope.trap {
+        await observabilityScope.trap {
             for artifact in artifactsToRemove {
-                state.artifacts.remove(packageIdentity: artifact.packageRef.identity, targetName: artifact.targetName)
+                await state.artifacts.remove(packageIdentity: artifact.packageRef.identity, targetName: artifact.targetName)
 
                 if isAtArtifactsDirectory(artifact) {
                     try fileSystem.removeFileTree(artifact.path)
@@ -930,15 +930,15 @@ extension Workspace {
 
         // Add the new artifacts
         for artifact in artifactsToAdd {
-            self.state.artifacts.add(artifact)
+            await self.state.artifacts.add(artifact)
         }
 
         guard !observabilityScope.errorsReported else {
             throw Diagnostics.fatalError
         }
 
-        observabilityScope.trap {
-            try self.state.save()
+        await observabilityScope.trap {
+            try await self.state.save()
         }
 
         func isAtArtifactsDirectory(_ artifact: ManagedArtifact) -> Bool {

Sources/Workspace/Workspace+Dependencies.swift

@@ -169,7 +169,7 @@ extension Workspace {
         }
 
         // Update the resolved file.
-        try self.saveResolvedFile(
+        try await self.saveResolvedFile(
             resolvedPackagesStore: resolvedPackagesStore,
             dependencyManifests: updatedDependencyManifests,
             originHash: resolvedFileOriginHash,
@@ -219,7 +219,7 @@ extension Workspace {
         case .update(let forceResolution):
             return try await resolveAndUpdateResolvedFile(forceResolution: forceResolution)
         case .bestEffort:
-            guard !self.state.dependencies.hasEditedDependencies() else {
+            guard await !self.state.dependencies.hasEditedDependencies() else {
                 return try await resolveAndUpdateResolvedFile(forceResolution: false)
             }
             guard self.fileSystem.exists(self.location.resolvedVersionsFile) else {
@@ -410,9 +410,10 @@ extension Workspace {
         //
         // We require cloning if there is no checkout or if the checkout doesn't
         // match with the pin.
+        let dependencies = await state.dependencies
         let requiredResolvedPackages = resolvedPackagesStore.resolvedPackages.values.filter { pin in
             // also compare the location in case it has changed
-            guard let dependency = state.dependencies[comparingLocation: pin.packageRef] else {
+            guard let dependency = dependencies[comparingLocation: pin.packageRef] else {
                 return true
             }
             switch dependency.state {
@@ -426,26 +427,31 @@ extension Workspace {
         }
 
         // Retrieve the required resolved packages.
-        for resolvedPackage in requiredResolvedPackages {
-            await observabilityScope.makeChildScope(
-                description: "retrieving resolved package versions for dependencies",
-                metadata: resolvedPackage.packageRef.diagnosticsMetadata
-            ).trap {
-                switch resolvedPackage.packageRef.kind {
-                case .localSourceControl, .remoteSourceControl:
-                    _ = try await self.checkoutRepository(
-                        package: resolvedPackage.packageRef,
-                        at: resolvedPackage.state,
-                        observabilityScope: observabilityScope
-                    )
-                case .registry:
-                    _ = try await self.downloadRegistryArchive(
-                        package: resolvedPackage.packageRef,
-                        at: resolvedPackage.state,
-                        observabilityScope: observabilityScope
-                    )
-                default:
-                    throw InternalError("invalid resolved package type \(resolvedPackage.packageRef.kind)")
+        await withThrowingTaskGroup(of: Void.self) { taskGroup in
+            for resolvedPackage in requiredResolvedPackages {
+                let observabilityScope = observabilityScope.makeChildScope(
+                    description: "retrieving resolved package versions for dependencies",
+                    metadata: resolvedPackage.packageRef.diagnosticsMetadata
+                )
+                taskGroup.addTask {
+                    await observabilityScope.trap {
+                        switch resolvedPackage.packageRef.kind {
+                        case .localSourceControl, .remoteSourceControl:
+                            _ = try await self.checkoutRepository(
+                                package: resolvedPackage.packageRef,
+                                at: resolvedPackage.state,
+                                observabilityScope: observabilityScope
+                            )
+                        case .registry:
+                            _ = try await self.downloadRegistryArchive(
+                                package: resolvedPackage.packageRef,
+                                at: resolvedPackage.state,
+                                observabilityScope: observabilityScope
+                            )
+                        default:
+                            throw InternalError("invalid resolved package type \(resolvedPackage.packageRef.kind)")
+                        }
+                    }
                 }
             }
         }
@@ -523,7 +529,7 @@ extension Workspace {
         }
 
         // load and update the `Package.resolved` store with any changes from loading the top level dependencies
-        guard let resolvedPackagesStore = self.loadAndUpdateResolvedPackagesStore(
+        guard let resolvedPackagesStore = await self.loadAndUpdateResolvedPackagesStore(
             dependencyManifests: currentManifests,
             rootManifestsMinimumToolsVersion: rootManifestsMinimumToolsVersion,
             observabilityScope: observabilityScope
@@ -554,7 +560,7 @@ extension Workspace {
             case .notRequired:
                 // since nothing changed we can exit early,
                 // but need update resolved file and download an missing binary artifact
-                try self.saveResolvedFile(
+                try await self.saveResolvedFile(
                     resolvedPackagesStore: resolvedPackagesStore,
                     dependencyManifests: currentManifests,
                     originHash: resolvedFileOriginHash,
@@ -625,7 +631,7 @@ extension Workspace {
         }
 
         // Update the resolved file.
-        try self.saveResolvedFile(
+        try await self.saveResolvedFile(
             resolvedPackagesStore: resolvedPackagesStore,
             dependencyManifests: updatedDependencyManifests,
             originHash: resolvedFileOriginHash,
@@ -679,15 +685,15 @@ extension Workspace {
 
         // First remove the checkouts that are no longer required.
         for (packageRef, state) in packageStateChanges {
-            observabilityScope.makeChildScope(
+            await observabilityScope.makeChildScope(
                 description: "removing unneeded checkouts",
                 metadata: packageRef.diagnosticsMetadata
             ).trap {
                 switch state {
                 case .added, .updated, .unchanged:
                     break
                 case .removed:
-                    try self.remove(package: packageRef)
+                    try await self.remove(package: packageRef)
                 }
             }
         }
@@ -772,8 +778,8 @@ extension Workspace {
                     state: .custom(version: version, path: path),
                     subpath: RelativePath(validating: "")
                 )
-                self.state.dependencies.add(dependency)
-                try self.state.save()
+                await self.state.add(dependency: dependency)
+                try await self.state.save()
                 return path
             } else {
                 throw InternalError("invalid container for \(package.identity) of type \(package.kind)")
@@ -800,8 +806,8 @@ extension Workspace {
                 throw InternalError("invalid package type: \(package.kind)")
             }
 
-            self.state.dependencies.add(dependency)
-            try self.state.save()
+            await self.state.add(dependency: dependency)
+            try await self.state.save()
             return path
         }
     }
@@ -889,7 +895,7 @@ extension Workspace {
         dependencyManifests: DependencyManifests,
         rootManifestsMinimumToolsVersion: ToolsVersion,
         observabilityScope: ObservabilityScope
-    ) -> ResolvedPackagesStore? {
+    ) async -> ResolvedPackagesStore? {
         guard let resolvedPackagesStore = observabilityScope.trap({ try self.resolvedPackagesStore.load() }) else {
             return nil
         }
@@ -899,7 +905,7 @@ extension Workspace {
         else {
             return nil
         }
-        for dependency in self.state.dependencies.filter(\.packageRef.kind.isResolvable) {
+        for dependency in await self.state.dependencies.filter(\.packageRef.kind.isResolvable) {
             // a required dependency that is already loaded (managed) should be represented in the `Package.resolved` store.
             // also comparing location as it may have changed at this point
             if requiredDependencies.contains(where: { $0.equalsIncludingLocation(dependency.packageRef) }) {
@@ -1011,13 +1017,13 @@ extension Workspace {
             // Get the existing managed dependency for this package ref, if any.
 
             // first find by identity only since edit location may be different by design
-            var currentDependency = self.state.dependencies[binding.package.identity]
+            var currentDependency = await self.state.dependencies[binding.package.identity]
             // Check if this is an edited dependency.
             if case .edited(let basedOn, _) = currentDependency?.state, let originalReference = basedOn?.packageRef {
                 packageStateChanges[originalReference.identity] = (originalReference, .unchanged)
             } else {
                 // if not edited, also compare by location since it may have changed
-                currentDependency = self.state.dependencies[comparingLocation: binding.package]
+                currentDependency = await self.state.dependencies[comparingLocation: binding.package]
             }
 
             switch binding.boundVersion {
@@ -1119,7 +1125,7 @@ extension Workspace {
             }
         }
         // Set the state of any old package that might have been removed.
-        for packageRef in self.state.dependencies.lazy.map(\.packageRef)
+        for packageRef in await self.state.dependencies.lazy.map(\.packageRef)
             where packageStateChanges[packageRef.identity] == nil
         {
             packageStateChanges[packageRef.identity] = (packageRef, .removed)

Sources/Workspace/Workspace+Editing.swift

@@ -28,7 +28,7 @@ extension Workspace {
         observabilityScope: ObservabilityScope
     ) async throws {
         // Look up the dependency and check if we can edit it.
-        guard let dependency = self.state.dependencies[.plain(packageIdentity)] else {
+        guard let dependency = await self.state.dependencies[.plain(packageIdentity)] else {
             observabilityScope.emit(.dependencyNotFound(packageName: packageIdentity))
             return
         }
@@ -157,10 +157,10 @@ extension Workspace {
         }
 
         // Save the new state.
-        try self.state.dependencies.add(
-            dependency.edited(subpath: RelativePath(validating: packageIdentity), unmanagedPath: path)
+        try await self.state.add(
+            dependency: dependency.edited(subpath: RelativePath(validating: packageIdentity), unmanagedPath: path)
         )
-        try self.state.save()
+        try await self.state.save()
     }
 
     /// Unedit a managed dependency. See public API unedit(packageName:forceRemove:).
@@ -222,8 +222,8 @@ extension Workspace {
             )
         } else {
             // The original dependency was removed, update the managed dependency state.
-            self.state.dependencies.remove(dependency.packageRef.identity)
-            try self.state.save()
+            await self.state.remove(identity: dependency.packageRef.identity)
+            try await self.state.save()
         }
 
         // Resolve the dependencies if workspace root is provided. We do this to