Reduce API surface exposed by TargetBuildGraph

Author: owenv

Sources/SWBCore/DependencyResolution.swift

@@ -15,8 +15,6 @@ import struct SWBProtocol.RunDestinationInfo
 import SWBMacro
 
 public protocol TargetGraph: Sendable {
-    var workspaceContext: WorkspaceContext { get }
-
     var allTargets: OrderedSet<ConfiguredTarget> { get }
 
     func dependencies(of target: ConfiguredTarget) -> [ConfiguredTarget]

Sources/SWBCore/TargetDependencyResolver.swift

@@ -79,12 +79,12 @@ public struct TargetBuildGraph: TargetGraph, Sendable {
     }
 
     /// The workspace context this graph is for.
-    public let workspaceContext: WorkspaceContext
+    private let workspaceContext: WorkspaceContext
 
     /// The build request the graph is for.
-    public let buildRequest: BuildRequest
+    private let buildRequest: BuildRequest
 
-    public let buildRequestContext: BuildRequestContext
+    private let buildRequestContext: BuildRequestContext
 
     /// The complete list of configured targets, in topological order. That is, each target will be included in the array only after all of the targets that it depends on (unless there is a target dependency cycle).
     public let allTargets: OrderedSet<ConfiguredTarget>

Sources/SWBTaskConstruction/ProductPlanning/ProductPlan.swift

@@ -644,7 +644,7 @@ package final class GlobalProductPlan: GlobalTargetInfoProvider
             guard staticTarget.type == .packageProduct else { continue }
 
             let packageTargetDependencies = staticTarget.dependencies.compactMap { targetDependency in
-                planRequest.buildGraph.workspaceContext.workspace.target(for: targetDependency.guid)
+                planRequest.workspaceContext.workspace.target(for: targetDependency.guid)
             }.filter {
                 $0.type != .packageProduct
             }

Sources/SWBTestSupport/BuildDescriptionBasedTests.swift

@@ -42,7 +42,7 @@ extension CoreBasedTests {
         let buildRequest = BuildRequest(parameters: parameters, buildTargets: buildTargets, dependencyScope: dependencyScope, continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: useImplicitDependencies, useDryRun: false)
 
         // Create the build graph.
-        return await TargetBuildGraph(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext)
+        return await (TargetBuildGraph(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext), buildRequest)
     }
 
     package func planRequest(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool) async throws -> BuildPlanRequest {
@@ -57,7 +57,7 @@ extension CoreBasedTests {
 
         let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
 
-        let buildGraph = await self.buildGraph(for: workspaceContext, buildRequestContext: buildRequestContext, configuration: configuration, activeRunDestination: activeRunDestination, overrides: overrides, fs: fs, includingTargets: predicate)
+        let (buildGraph, buildRequest) = await self.buildGraph(for: workspaceContext, buildRequestContext: buildRequestContext, configuration: configuration, activeRunDestination: activeRunDestination, overrides: overrides, fs: fs, includingTargets: predicate)
 
         // Construct an appropriate set of provisioning inputs. This is important for performance testing to ensure we end up with representative code signing tasks, which trigger the mutable node analysis during build description construction.
         var provisioningInputs = [ConfiguredTarget: ProvisioningTaskInputs]()
@@ -66,7 +66,7 @@ extension CoreBasedTests {
             provisioningInputs[ct] = ProvisioningTaskInputs(identityHash: "-")
         }
 
-        return BuildPlanRequest(workspaceContext: buildGraph.workspaceContext, buildRequest: buildGraph.buildRequest, buildRequestContext: buildRequestContext, buildGraph: buildGraph, provisioningInputs: provisioningInputs)
+        return BuildPlanRequest(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, buildGraph: buildGraph, provisioningInputs: provisioningInputs)
     }
 
     package func buildDescription(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool = { _ in true }) async throws -> (BuildDescription, WorkspaceContext) {

Tests/SWBCoreTests/IndexTargetDependencyResolverTests.swift

@@ -134,6 +134,7 @@ import SWBUtil
                     ])])
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
+        let workspaceContext = WorkspaceContext(core: core, workspace: tester.workspace, processExecutionCache: .sharedForTesting)
         try await tester.checkIndexBuildGraph(targets: [macApp, macApp2, iosApp, iosApp2, fwkTarget_mac, fwkTarget_ios], workspaceOperation: true) { results in
             #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
                 "FwkTarget_mac-macos", "macApp-macos", "macApp2-macos",
@@ -150,7 +151,7 @@ import SWBUtil
             try results.checkDependencies(of: fwkTarget_mac, are: [])
             try results.checkDependencies(of: .init(fwkTarget_ios, "iphoneos"), are: [])
             try results.checkDependencies(of: .init(fwkTarget_ios, "iphonesimulator"), are: [])
-            if results.buildGraph.workspaceContext.userPreferences.enableDebugActivityLogs {
+            if workspaceContext.userPreferences.enableDebugActivityLogs {
                 results.delegate.checkDiagnostics([
                     "FwkTarget_mac rejected as an implicit dependency because its SUPPORTED_PLATFORMS (macosx) does not contain this target's platform (iphoneos). (in target 'iosApp' from project 'aProject')",
                     "FwkTarget_ios rejected as an implicit dependency because its SUPPORTED_PLATFORMS (iphoneos iphonesimulator) does not contain this target's platform (macosx). (in target 'macApp' from project 'aProject')",
@@ -260,6 +261,7 @@ import SWBUtil
                     ])])
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
+        let workspaceContext = WorkspaceContext(core: core, workspace: tester.workspace, processExecutionCache: .sharedForTesting)
         try await tester.checkIndexBuildGraph(targets: [macApp, iosApp, watchKitApp, watchKitExt], workspaceOperation: true) { results in
             #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
                 "macApp-macos", "iosApp-iphoneos", "iosApp-iphonesimulator",
@@ -270,7 +272,7 @@ import SWBUtil
             try results.checkDependencies(of: .init(iosApp, "iphonesimulator"), are: [])
             try results.checkDependencies(of: .init(watchKitApp, "watchos"), are: [.init(watchKitExt, "watchos")])
             try results.checkDependencies(of: .init(watchKitApp, "watchsimulator"), are: [.init(watchKitExt, "watchsimulator")])
-            if results.buildGraph.workspaceContext.userPreferences.enableDebugActivityLogs {
+            if workspaceContext.userPreferences.enableDebugActivityLogs {
                 results.delegate.checkDiagnostics([
                     "Watchable WatchKit App rejected as an implicit dependency because its SUPPORTED_PLATFORMS (watchos watchsimulator) does not contain this target's platform (iphoneos). (in target 'iosApp' from project 'aProject')",
                     "Watchable WatchKit App rejected as an implicit dependency because its SUPPORTED_PLATFORMS (watchos watchsimulator) does not contain this target's platform (iphonesimulator). (in target 'iosApp' from project 'aProject')"
@@ -755,6 +757,7 @@ import SWBUtil
                     ])])
 
         let tester = try await BuildOperationTester(core, workspace, simulated: false)
+        let workspaceContext = WorkspaceContext(core: core, workspace: tester.workspace, processExecutionCache: .sharedForTesting)
         try await tester.checkIndexBuildGraph(targets: [catalystAppTarget1, catalystAppTarget2, catalystAppTarget3, osxAppTarget, osxAppTarget_iosmac, fwkTarget, fwkTarget_osx], workspaceOperation: true) { results in
             #expect(results.targets().map { results.targetNameAndPlatform($0) } == [
                 "FwkTarget-iphoneos", "catalystApp1-iphoneos", "FwkTarget-iphonesimulator", "catalystApp1-iphonesimulator", "FwkTarget-iosmac", "catalystApp1-iosmac", "catalystApp2-iphoneos", "catalystApp2-iphonesimulator", "catalystApp2-iosmac", "catalystApp3-iphoneos", "catalystApp3-iphonesimulator", "catalystApp3-iosmac", "FwkTarget_osx-macos", "catalystApp3-macos", "osxApp-macos", "osxApp_iosmac-iosmac", "FwkTarget_osx-iosmac",
@@ -773,7 +776,7 @@ import SWBUtil
             try results.checkDependencies(of: osxAppTarget, are: [.init(fwkTarget_osx, "macos")])
             try results.checkDependencies(of: osxAppTarget_iosmac, are: [.init(fwkTarget, "iosmac")])
 
-            if results.buildGraph.workspaceContext.userPreferences.enableDebugActivityLogs  {
+            if workspaceContext.userPreferences.enableDebugActivityLogs  {
                 results.delegate.checkDiagnostics([
                     "FwkTarget rejected as an implicit dependency because its SUPPORTED_PLATFORMS (iphoneos iphonesimulator) does not contain this target's platform (macosx). (in target 'catalystApp3' from project 'aProject')",
                     "FwkTarget rejected as an implicit dependency because its SUPPORTED_PLATFORMS (iphoneos iphonesimulator) does not contain this target's platform (macosx). (in target 'osxApp' from project 'aProject')",