PackageModel: make some of the private API more public

This extends the visibility of some of the private implementation to the
package level to allow use for testing without `@testable` imports.

Author: compnerd

Sources/PackageModel/MinimumDeploymentTarget.swift

@@ -58,14 +58,14 @@ public struct MinimumDeploymentTarget {
         return nil
     }
 
-    static func computeXCTestMinimumDeploymentTarget(with runResult: AsyncProcessResult, platform: PackageModel.Platform) throws -> PlatformVersion? {
+    package static func computeXCTestMinimumDeploymentTarget(with runResult: AsyncProcessResult, platform: PackageModel.Platform) throws -> PlatformVersion? {
         guard let output = try runResult.utf8Output().spm_chuzzle() else { return nil }
         let sdkPath = try Basics.AbsolutePath(validating: output)
         let xcTestPath = try Basics.AbsolutePath(validating: "Developer/Library/Frameworks/XCTest.framework/XCTest", relativeTo: sdkPath)
         return try computeMinimumDeploymentTarget(of: xcTestPath, platform: platform)
     }
 
-    static func computeXCTestMinimumDeploymentTarget(for platform: PackageModel.Platform) -> PlatformVersion {
+    package static func computeXCTestMinimumDeploymentTarget(for platform: PackageModel.Platform) -> PlatformVersion {
         guard let (sdkName, _) = platform.sdkNameAndPlatform else {
             return platform.oldestSupportedVersion
         }

Sources/PackageModel/PackageIdentity.swift

@@ -21,7 +21,7 @@ public struct PackageIdentity: CustomStringConvertible, Sendable {
 
     /// Creates a package identity from a string.
     /// - Parameter value: A string used to identify a package.
-    init(_ value: String) {
+    package init(_ value: String) {
         self.description = value
     }
 
@@ -296,7 +296,7 @@ extension PackageIdentity {
 
 // MARK: -
 
-struct PackageIdentityParser {
+package struct PackageIdentityParser {
     /// A textual representation of this instance.
     public let description: String
 

Sources/PackageModel/Snippets/Model/Snippet.swift

@@ -23,7 +23,7 @@ public struct Snippet {
         path.basenameWithoutExt
     }
 
-    init(parsing source: String, path: AbsolutePath) {
+    package init(parsing source: String, path: AbsolutePath) {
         let extractor = PlainTextSnippetExtractor(source: source)
         self.path = path
         self.explanation = extractor.explanation

Sources/PackageModel/SwiftSDKs/SwiftSDK.swift

@@ -962,7 +962,7 @@ extension SwiftSDK {
     ///   - properties: properties of the Swift SDK for the given triple.
     ///   - toolset: combined toolset used by this Swift SDK.
     ///   - swiftSDKDirectory: directory used for converting relative paths in `properties` to absolute paths.
-    init(
+    package init(
         targetTriple: Triple,
         properties: SwiftSDKMetadataV4.TripleProperties,
         toolset: Toolset = .init(),
@@ -1164,8 +1164,8 @@ struct SerializedDestinationV3: Decodable {
 }
 
 /// Represents v4 schema of `swift-sdk.json` (previously `destination.json`) files used for cross-compilation.
-struct SwiftSDKMetadataV4: Decodable {
-    struct TripleProperties: Codable {
+package struct SwiftSDKMetadataV4: Decodable {
+    package struct TripleProperties: Codable {
         /// Path relative to `swift-sdk.json` containing SDK root.
         var sdkRootPath: String
 
@@ -1183,6 +1183,15 @@ struct SwiftSDKMetadataV4: Decodable {
 
         /// Array of paths relative to `swift-sdk.json` containing toolset files.
         var toolsetPaths: [String]?
+
+        package init(sdkRootPath: String, swiftResourcesPath: String? = nil, swiftStaticResourcesPath: String? = nil, includeSearchPaths: [String]? = nil, librarySearchPaths: [String]? = nil, toolsetPaths: [String]? = nil) {
+            self.sdkRootPath = sdkRootPath
+            self.swiftResourcesPath = swiftResourcesPath
+            self.swiftStaticResourcesPath = swiftStaticResourcesPath
+            self.includeSearchPaths = includeSearchPaths
+            self.librarySearchPaths = librarySearchPaths
+            self.toolsetPaths = toolsetPaths
+        }
     }
 
     /// Mapping of triple strings to corresponding properties of such target triple.

Sources/PackageModel/SwiftSDKs/SwiftSDKBundle.swift

@@ -21,6 +21,11 @@ public struct SwiftSDKBundle {
     public struct Variant: Equatable {
         let metadata: ArtifactsArchiveMetadata.Variant
         let swiftSDKs: [SwiftSDK]
+
+        package init(metadata: ArtifactsArchiveMetadata.Variant, swiftSDKs: [SwiftSDK]) {
+            self.metadata = metadata
+            self.swiftSDKs = swiftSDKs
+        }
     }
 
     // Path to the bundle root directory.
@@ -31,6 +36,11 @@ public struct SwiftSDKBundle {
 
     /// Name of the Swift SDK bundle that can be used to distinguish it from other bundles.
     public var name: String { path.basename }
+
+    package init(path: AbsolutePath, artifacts: [String:[SwiftSDKBundle.Variant]] = [:]) {
+        self.path = path
+        self.artifacts = artifacts
+    }
 }
 
 extension SwiftSDKBundle.Variant {
@@ -81,7 +91,7 @@ extension [SwiftSDKBundle] {
     ///   - hostTriple: triple of the host building with these Swift SDKs.
     ///   - observabilityScope: observability scope to log warnings about multiple matches.
     /// - Returns: ``SwiftSDK`` value matching `query` either by artifact ID or target triple, `nil` if none found.
-    func selectSwiftSDK(
+    package func selectSwiftSDK(
         matching selector: String,
         hostTriple: Triple,
         observabilityScope: ObservabilityScope

Sources/PackageModel/Toolset.swift

@@ -38,6 +38,11 @@ public struct Toolset: Equatable {
 
         /// Command-line options to be passed to the tool when it's invoked.
         public internal(set) var extraCLIOptions: [String]
+
+        package init(path: AbsolutePath? = nil, extraCLIOptions: [String] = []) {
+            self.path = path
+            self.extraCLIOptions = extraCLIOptions
+        }
     }
 
     /// A dictionary of known tools in this toolset.
@@ -46,10 +51,18 @@ public struct Toolset: Equatable {
     /// An array of paths specified as `rootPath` in toolset files from which this toolset was formed. May be used
     /// for locating tools that aren't currently listed in ``Toolset/KnownTool``.
     public internal(set) var rootPaths: [AbsolutePath] = []
+
+    package init(
+        knownTools: [KnownTool: ToolProperties] = [:],
+        rootPaths: [AbsolutePath] = []
+    ) {
+        self.knownTools = knownTools
+        self.rootPaths = rootPaths
+    }
 }
 
 extension Toolset.ToolProperties {
-    init(path: AbsolutePath) {
+    package init(path: AbsolutePath) {
         self.init(path: path, extraCLIOptions: [])
     }
 }

Sources/PackageModel/UserToolchain.swift

@@ -508,7 +508,7 @@ public final class UserToolchain: Toolchain {
     }
 #endif
 
-    internal static func deriveSwiftCFlags(
+    package static func deriveSwiftCFlags(
         triple: Basics.Triple,
         swiftSDK: SwiftSDK,
         environment: Environment,