Migrate workspace tests

Sources/CoreCommands/Options.swift

@@ -330,8 +330,7 @@ public struct ResolverOptions: ParsableArguments {
     public var skipDependencyUpdate: Bool = false
 
     @Flag(help: "Define automatic transformation of source control based dependencies to registry based ones.")
-    public var sourceControlToRegistryDependencyTransformation: SourceControlToRegistryDependencyTransformation =
-        .disabled
+    public var sourceControlToRegistryDependencyTransformation: SourceControlToRegistryDependencyTransformation?
 
     /// Enables pruning unused dependencies to omit redundant calculations during resolution, and each phase thereafter.
     /// Hidden from the generated help text as this feature is only currently being considered for traits.

Sources/CoreCommands/SwiftCommandState.swift

@@ -583,7 +583,7 @@ public final class SwiftCommandState {
                 signingEntityCheckingMode: self.options.security.signingEntityCheckingMode,
                 skipSignatureValidation: !self.options.security.signatureValidation,
                 sourceControlToRegistryDependencyTransformation: self.options.resolver
-                    .sourceControlToRegistryDependencyTransformation.workspaceConfiguration,
+                    .sourceControlToRegistryDependencyTransformation?.workspaceConfiguration,
                 defaultRegistry: self.options.resolver.defaultRegistryURL.flatMap {
                     // TODO: should supportsAvailability be a flag as well?
                     .init(url: $0, supportsAvailability: true)

Sources/PackageRegistry/RegistryConfiguration.swift

@@ -26,19 +26,21 @@ public struct RegistryConfiguration: Hashable {
     public enum Version: Int, Codable {
         case v1 = 1
     }
-
+    
     public static let version: Version = .v1
 
     public var defaultRegistry: Registry?
     public var scopedRegistries: [PackageIdentity.Scope: Registry]
     public var registryAuthentication: [String: Authentication]
     public var security: Security?
+    public var replaceScmWithRegistry: Bool?
 
     public init() {
         self.defaultRegistry = .none
         self.scopedRegistries = [:]
         self.registryAuthentication = [:]
         self.security = .none
+        self.replaceScmWithRegistry = nil
     }
 
     public mutating func merge(_ other: RegistryConfiguration) {
@@ -57,6 +59,10 @@ public struct RegistryConfiguration: Hashable {
         if let security = other.security {
             self.security = security
         }
+
+        if let replaceScmWithRegistry = other.replaceScmWithRegistry {
+            self.replaceScmWithRegistry = replaceScmWithRegistry
+        }
     }
 
     public func registry(for package: PackageIdentity) -> Registry? {
@@ -317,6 +323,7 @@ extension RegistryConfiguration: Codable {
         case authentication
         case security
         case version
+        case replaceScmWithRegistry
     }
 
     fileprivate struct ScopeCodingKey: CodingKey, Hashable {
@@ -369,6 +376,7 @@ extension RegistryConfiguration: Codable {
                 forKey: .authentication
             ) ?? [:]
             self.security = try container.decodeIfPresent(Security.self, forKey: .security) ?? nil
+            self.replaceScmWithRegistry = try container.decodeIfPresent(Bool.self, forKey: .replaceScmWithRegistry)
         case nil:
             throw DecodingError.dataCorruptedError(
                 forKey: .version,

Sources/Workspace/Workspace+Configuration.swift

@@ -818,7 +818,7 @@ public struct WorkspaceConfiguration {
     public var skipSignatureValidation: Bool
 
     ///  Attempt to transform source control based dependencies to registry ones
-    public var sourceControlToRegistryDependencyTransformation: SourceControlToRegistryDependencyTransformation
+    public var sourceControlToRegistryDependencyTransformation: SourceControlToRegistryDependencyTransformation?
 
     /// URL of the implicitly configured, default registry
     public var defaultRegistry: Registry?
@@ -857,7 +857,7 @@ public struct WorkspaceConfiguration {
         fingerprintCheckingMode: CheckingMode,
         signingEntityCheckingMode: CheckingMode,
         skipSignatureValidation: Bool,
-        sourceControlToRegistryDependencyTransformation: SourceControlToRegistryDependencyTransformation,
+        sourceControlToRegistryDependencyTransformation: SourceControlToRegistryDependencyTransformation?,
         defaultRegistry: Registry?,
         manifestImportRestrictions: (startingToolsVersion: ToolsVersion, allowedImports: [String])?,
         usePrebuilts: Bool,
@@ -897,7 +897,7 @@ public struct WorkspaceConfiguration {
             fingerprintCheckingMode: .strict,
             signingEntityCheckingMode: .warn,
             skipSignatureValidation: false,
-            sourceControlToRegistryDependencyTransformation: .disabled,
+            sourceControlToRegistryDependencyTransformation: nil,
             defaultRegistry: .none,
             manifestImportRestrictions: .none,
             usePrebuilts: false,

Sources/Workspace/Workspace.swift

@@ -552,8 +552,19 @@ public class Workspace {
         // register the registry dependencies downloader with the cancellation handler
         cancellator?.register(name: "registry downloads", handler: registryDownloadsManager)
 
+        // registries.json acts as a default; an explicit CLI flag overrides.
+        let effectiveTransformation: WorkspaceConfiguration.SourceControlToRegistryDependencyTransformation = {
+            if let cliValue = configuration.sourceControlToRegistryDependencyTransformation {
+                return cliValue
+            }
+            if registriesConfiguration.replaceScmWithRegistry == true {
+                return .swizzle
+            }
+            return .disabled
+        }()
+
         if let transformationMode = RegistryAwareManifestLoader
-            .TransformationMode(configuration.sourceControlToRegistryDependencyTransformation)
+            .TransformationMode(effectiveTransformation)
         {
             manifestLoader = RegistryAwareManifestLoader(
                 underlying: manifestLoader,

Sources/_InternalTestSupport/MockWorkspace.swift

@@ -100,7 +100,7 @@ public final class MockWorkspace {
     public let delegate = MockWorkspaceDelegate()
     let skipDependenciesUpdates: Bool
     public var sourceControlToRegistryDependencyTransformation: WorkspaceConfiguration
-        .SourceControlToRegistryDependencyTransformation
+        .SourceControlToRegistryDependencyTransformation?
     var defaultRegistry: Registry?
     public let traitConfiguration: TraitConfiguration
     public var enabledTraitsMap: EnabledTraitsMap
@@ -122,7 +122,7 @@ public final class MockWorkspace {
         customPackageContainerProvider: MockPackageContainerProvider? = .none,
         skipDependenciesUpdates: Bool = false,
         sourceControlToRegistryDependencyTransformation: WorkspaceConfiguration
-            .SourceControlToRegistryDependencyTransformation = .disabled,
+            .SourceControlToRegistryDependencyTransformation? = nil,
         defaultRegistry: Registry? = .none,
         customHostTriple: Triple = hostTriple,
         traitConfiguration: TraitConfiguration = .default,
@@ -457,8 +457,8 @@ public final class MockWorkspace {
         path: AbsolutePath? = nil,
         revision: Revision? = nil,
         checkoutBranch: String? = nil,
-        _ result: ([Basics.Diagnostic]) -> Void
-    ) async {
+        _ result: ([Basics.Diagnostic]) throws -> Void
+    ) async rethrows {
         let observability = ObservabilitySystem.makeForTesting()
         await observability.topScope.trap {
             let ws = try self.getOrCreateWorkspace()
@@ -470,15 +470,15 @@ public final class MockWorkspace {
                 observabilityScope: observability.topScope
             )
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
     public func checkUnedit(
         packageIdentity: String,
         roots: [String],
         forceRemove: Bool = false,
-        _ result: ([Basics.Diagnostic]) -> Void
-    ) async {
+        _ result: ([Basics.Diagnostic]) throws -> Void
+    ) async rethrows {
         let observability = ObservabilitySystem.makeForTesting()
         await observability.topScope.trap {
             let rootInput = try PackageGraphRootInput(
@@ -493,15 +493,15 @@ public final class MockWorkspace {
                 observabilityScope: observability.topScope
             )
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
     public func checkResolve(
         pkg: String,
         roots: [String],
         version: TSCUtility.Version,
-        _ result: ([Basics.Diagnostic]) -> Void
-    ) async {
+        _ result: ([Basics.Diagnostic]) throws -> Void
+    ) async rethrows {
         let observability = ObservabilitySystem.makeForTesting()
         await observability.topScope.trap {
             let rootInput = try PackageGraphRootInput(
@@ -518,32 +518,32 @@ public final class MockWorkspace {
                 observabilityScope: observability.topScope
             )
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
-    public func checkClean(_ result: ([Basics.Diagnostic]) -> Void) {
+    public func checkClean(_ result: ([Basics.Diagnostic]) throws -> Void) rethrows {
         let observability = ObservabilitySystem.makeForTesting()
         observability.topScope.trap {
             let workspace = try self.getOrCreateWorkspace()
             workspace.clean(observabilityScope: observability.topScope)
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
-    public func checkReset(_ result: ([Basics.Diagnostic]) -> Void) async {
+    public func checkReset(_ result: ([Basics.Diagnostic]) throws -> Void) async rethrows {
         let observability = ObservabilitySystem.makeForTesting()
         await observability.topScope.trap {
             let workspace = try self.getOrCreateWorkspace()
             await workspace.reset(observabilityScope: observability.topScope)
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
     public func checkUpdate(
         roots: [String] = [],
         deps: [MockDependency] = [],
         packages: [String] = [],
-        _ result: ([Basics.Diagnostic]) -> Void
+        _ result: ([Basics.Diagnostic]) throws -> Void
     ) async throws {
         let dependencies = try deps.map { try $0.convert(
             baseURL: self.packagesDir,
@@ -564,13 +564,13 @@ public final class MockWorkspace {
                 observabilityScope: observability.topScope
             )
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
     public func checkUpdateDryRun(
         roots: [String] = [],
         deps: [MockDependency] = [],
-        _ result: ([(PackageReference, Workspace.PackageStateChange)]?, [Basics.Diagnostic]) -> Void
+        _ result: ([(PackageReference, Workspace.PackageStateChange)]?, [Basics.Diagnostic]) throws -> Void
     ) async throws {
         let dependencies = try deps.map { try $0.convert(
             baseURL: self.packagesDir,
@@ -591,7 +591,7 @@ public final class MockWorkspace {
                 observabilityScope: observability.topScope
             )
         } ?? nil
-        result(changes, observability.diagnostics)
+        try result(changes, observability.diagnostics)
     }
 
     public func checkPackageGraph(
@@ -638,21 +638,21 @@ public final class MockWorkspace {
     public func checkPackageGraphFailure(
         roots: [String] = [],
         deps: [MockDependency],
-        _ result: ([Basics.Diagnostic]) -> Void
+        _ result: ([Basics.Diagnostic]) throws -> Void
     ) async throws {
         let dependencies = try deps.map { try $0.convert(
             baseURL: self.packagesDir,
             identityResolver: self.identityResolver
         ) }
-        await self.checkPackageGraphFailure(roots: roots, dependencies: dependencies, result)
+        try await self.checkPackageGraphFailure(roots: roots, dependencies: dependencies, result)
     }
 
     public func checkPackageGraphFailure(
         roots: [String] = [],
         dependencies: [PackageDependency] = [],
         forceResolvedVersions: Bool = false,
-        _ result: ([Basics.Diagnostic]) -> Void
-    ) async {
+        _ result: ([Basics.Diagnostic]) throws -> Void
+    ) async rethrows {
         let observability = ObservabilitySystem.makeForTesting()
         await observability.topScope.trap {
             let rootInput = try PackageGraphRootInput(
@@ -667,7 +667,7 @@ public final class MockWorkspace {
                 observabilityScope: observability.topScope
             )
         }
-        result(observability.diagnostics)
+        try result(observability.diagnostics)
     }
 
     public struct ResolutionPrecomputationResult {
@@ -942,7 +942,7 @@ public final class MockWorkspace {
     public func loadDependencyManifests(
         roots: [String] = [],
         deps: [MockDependency] = [],
-        _ result: (Workspace.DependencyManifests, [Basics.Diagnostic]) -> Void
+        _ result: (Workspace.DependencyManifests, [Basics.Diagnostic]) throws -> Void
     ) async throws {
         let observability = ObservabilitySystem.makeForTesting()
         let dependencies = try deps.map { try $0.convert(
@@ -967,7 +967,7 @@ public final class MockWorkspace {
             root: graphRoot,
             observabilityScope: observability.topScope
         )
-        result(manifests, observability.diagnostics)
+        try result(manifests, observability.diagnostics)
     }
 
     public func checkManagedDependencies(

Sources/_InternalTestSupport/SwiftTesting+StringPatternMatching.swift

@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TSCTestSupport
+
+extension String {
+    /// Returns `true` if the receiver matches the given `StringPattern`.
+    ///
+    /// Intended for use inside Swift Testing's `#expect` / `#require`, e.g.
+    /// `#expect(output.matches(.contains("hello")))`.
+    public func matches(_ pattern: StringPattern) -> Bool {
+        pattern ~= self
+    }
+}
+
+extension Optional where Wrapped == String {
+    /// Returns `true` if the wrapped value exists and matches the given `StringPattern`.
+    ///
+    /// A `nil` receiver never matches.
+    public func matches(_ pattern: StringPattern) -> Bool {
+        guard let self else { return false }
+        return pattern ~= self
+    }
+}
+
+extension Array where Element == String {
+    /// Returns `true` if the receiver matches the given sequence of `StringPattern`s.
+    public func matches(_ pattern: [StringPattern]) -> Bool {
+        pattern ~= self
+    }
+}