[Plugins] NFC: Rename "prebuild command" into "command plugin" to better fit the proposal

Author: xedin

Sources/Build/BuildDescription/ClangModuleBuildDescription.swift

@@ -18,7 +18,7 @@ import struct PackageGraph.ModulesGraph
 import struct PackageGraph.ResolvedModule
 import struct SPMBuildCore.BuildParameters
 import struct SPMBuildCore.BuildToolPluginInvocationResult
-import struct SPMBuildCore.PrebuildCommandResult
+import struct SPMBuildCore.CommandPluginResult
 
 @available(*, deprecated, renamed: "ClangModuleBuildDescription")
 public typealias ClangTargetBuildDescription = ClangModuleBuildDescription
@@ -120,7 +120,7 @@ public final class ClangModuleBuildDescription {
         additionalFileRules: [FileRuleDescription] = [],
         buildParameters: BuildParameters,
         buildToolPluginInvocationResults: [BuildToolPluginInvocationResult] = [],
-        prebuildCommandResults: [PrebuildCommandResult] = [],
+        prebuildCommandResults: [CommandPluginResult] = [],
         fileSystem: FileSystem,
         observabilityScope: ObservabilityScope
     ) throws {

Sources/Build/BuildDescription/SwiftModuleBuildDescription.swift

@@ -235,7 +235,7 @@ public final class SwiftModuleBuildDescription {
     public let buildToolPluginInvocationResults: [BuildToolPluginInvocationResult]
 
     /// The results of running any prebuild commands for this target.
-    public let prebuildCommandResults: [PrebuildCommandResult]
+    public let prebuildCommandResults: [CommandPluginResult]
 
     /// Any macro products that this target requires to build.
     public let requiredMacroProducts: [ProductBuildDescription]
@@ -257,7 +257,7 @@ public final class SwiftModuleBuildDescription {
         additionalFileRules: [FileRuleDescription] = [],
         buildParameters: BuildParameters,
         buildToolPluginInvocationResults: [BuildToolPluginInvocationResult] = [],
-        prebuildCommandResults: [PrebuildCommandResult] = [],
+        prebuildCommandResults: [CommandPluginResult] = [],
         requiredMacroProducts: [ProductBuildDescription] = [],
         testTargetRole: TestTargetRole? = nil,
         shouldGenerateTestObservation: Bool = false,

Sources/Build/BuildPlan/BuildPlan.swift

@@ -220,7 +220,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
 
     /// The results of running any prebuild commands for the targets in this build.  This includes any derived
     /// source files as well as directories to which any changes should cause us to reevaluate the build plan.
-    public let prebuildCommandResults: [ResolvedModule.ID: [PrebuildCommandResult]]
+    public let prebuildCommandResults: [ResolvedModule.ID: [CommandPluginResult]]
 
     @_spi(SwiftPMInternal)
     public private(set) var derivedTestTargetsMap: [ResolvedProduct.ID: [ResolvedModule]] = [:]
@@ -283,7 +283,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
         self.observabilityScope = observabilityScope.makeChildScope(description: "Build Plan")
 
         var buildToolPluginInvocationResults: [ResolvedModule.ID: [BuildToolPluginInvocationResult]] = [:]
-        var prebuildCommandResults: [ResolvedModule.ID: [PrebuildCommandResult]] = [:]
+        var prebuildCommandResults: [ResolvedModule.ID: [CommandPluginResult]] = [:]
 
         var productMap: [ResolvedProduct.ID: (product: ResolvedProduct, buildDescription: ProductBuildDescription)] =
             [:]
@@ -378,7 +378,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
                 }
 
                 buildToolPluginInvocationResults[target.id] = pluginInvocationResults
-                prebuildCommandResults[target.id] = try Self.runPrebuildCommands(
+                prebuildCommandResults[target.id] = try Self.runCommandPlugins(
                     using: pluginConfiguration,
                     for: pluginInvocationResults,
                     fileSystem: fileSystem,
@@ -864,14 +864,14 @@ extension BuildPlan {
         return buildToolPluginResults
     }
 
-    /// Runs any prebuild commands associated with the given list of plugin invocation results,
+    /// Runs any command plugins associated with the given list of plugin invocation results,
     /// in order, and returns the results of running those prebuild commands.
-    fileprivate static func runPrebuildCommands(
+    fileprivate static func runCommandPlugins(
         using pluginConfiguration: PluginConfiguration,
         for pluginResults: [BuildToolPluginInvocationResult],
         fileSystem: any FileSystem,
         observabilityScope: ObservabilityScope
-    ) throws -> [PrebuildCommandResult] {
+    ) throws -> [CommandPluginResult] {
         // Run through all the commands from all the plugin usages in the target.
         try pluginResults.map { pluginResult in
             // As we go we will collect a list of prebuild output directories whose contents should be input to the
@@ -916,7 +916,7 @@ extension BuildPlan {
             }
 
             // Add the results of running any prebuild commands for this invocation.
-            return PrebuildCommandResult(derivedFiles: derivedFiles, outputDirectories: prebuildOutputDirs)
+            return CommandPluginResult(derivedFiles: derivedFiles, outputDirectories: prebuildOutputDirs)
         }
     }
 }

Sources/SPMBuildCore/CMakeLists.txt

@@ -22,7 +22,7 @@ add_library(SPMBuildCore
   Plugins/PluginInvocation.swift
   Plugins/PluginMessages.swift
   Plugins/PluginScriptRunner.swift
-  PrebuildCommandResult.swift
+  CommandPluginResult.swift
   ResolvedPackage+Extensions.swift
   Triple+Extensions.swift
   XCFrameworkMetadata.swift)

Sources/SPMBuildCore/PrebuildCommandResult.swift renamed to Sources/SPMBuildCore/CommandPluginResult.swift

@@ -12,8 +12,15 @@
 
 import Basics
 
-/// Represents the result of running prebuild commands for a single plugin invocation for a target.
-public struct PrebuildCommandResult {
+@available(*,
+    deprecated,
+    renamed: "CommandPluginResult",
+    message: "renamed to unify terminology with the Swift Evolution proposal"
+)
+public typealias PrebuildCommandResult = CommandPluginResult
+
+/// Represents the result of running a command plugin for a single plugin invocation for a target.
+public struct CommandPluginResult {
     /// Paths of any derived files that should be included in the build.
     public var derivedFiles: [AbsolutePath]
 

Sources/SPMBuildCore/Plugins/PluginInvocation.swift

@@ -537,7 +537,7 @@ extension ModulesGraph {
         additionalFileRules: [FileRuleDescription],
         buildParameters: BuildParameters,
         buildToolPluginInvocationResults: [BuildToolPluginInvocationResult],
-        prebuildCommandResults: [PrebuildCommandResult],
+        prebuildCommandResults: [CommandPluginResult],
         observabilityScope: ObservabilityScope
     ) -> (pluginDerivedSources: Sources, pluginDerivedResources: [Resource]) {
         var pluginDerivedSources = Sources(paths: [], root: buildParameters.dataPath)