Implement PR review feedback

Author: abertelrud

Sources/Commands/SwiftPackageTool.swift

@@ -942,7 +942,7 @@ extension SwiftPackageTool {
             // Configure the plugin invocation inputs.
 
             // The `plugins` directory is inside the workspace's main data directory, and contains all temporary files related to all plugins in the workspace.
-            let pluginsDir = try swiftTool.getActiveWorkspace().location.pluginDataDirectory
+            let pluginsDir = try swiftTool.getActiveWorkspace().location.pluginWorkingDirectory
 
             // The `cache` directory is in the plugins directory and is where the plugin script runner caches compiled plugin binaries and any other derived information.
             let cacheDir = pluginsDir.appending(component: "cache")
@@ -953,7 +953,7 @@ extension SwiftPackageTool {
 
             // Build the map of tools that are available to the plugin. This should include the tools in the executables in the toolchain, as well as any executables the plugin depends on (built executables as well as prebuilt binaries).
             // FIXME: At the moment we just pass the built products directory for the host. We will need to extend this with a map of the names of tools available to each plugin. In particular this would not work with any binary targets.
-            let dataDir = try swiftTool.getActiveWorkspace().location.pluginDataDirectory
+            let dataDir = try swiftTool.getActiveWorkspace().location.pluginWorkingDirectory
             let builtToolsDir = dataDir.appending(components: "plugin-tools")
 
             // Create the cache directory, if needed.

Sources/Commands/SwiftTool.swift

@@ -739,7 +739,7 @@ public class SwiftTool {
             // The `plugins` directory is inside the workspace's main data directory, and contains all temporary
             // files related to all plugins in the workspace.
             let buildEnvironment = try buildParameters().buildEnvironment
-            let pluginsDir = try self.getActiveWorkspace().location.pluginDataDirectory
+            let pluginsDir = try self.getActiveWorkspace().location.pluginWorkingDirectory
 
             // The `cache` directory is in the plugins directory and is where the plugin script runner caches
             // compiled plugin binaries and any other derived information.

Sources/SPMBuildCore/PluginInvocation.swift

@@ -74,9 +74,7 @@ extension PluginTarget {
             pluginAction: action)
 
         // Serialize the PluginEvaluationInput to JSON.
-        let encoder = JSONEncoder()
-        encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
-        let inputJSON = try encoder.encode(inputStruct)
+        let inputJSON = try JSONEncoder.makeWithDefaults().encode(inputStruct)
 
         // Call the plugin script runner to actually invoke the plugin.
         // TODO: This should be asynchronous.
@@ -92,8 +90,7 @@ extension PluginTarget {
         // Deserialize the JSON to an PluginScriptRunnerOutput.
         let outputStruct: PluginScriptRunnerOutput
         do {
-            let decoder = JSONDecoder()
-            outputStruct = try decoder.decode(PluginScriptRunnerOutput.self, from: outputJSON)
+            outputStruct = try JSONDecoder.makeWithDefaults().decode(PluginScriptRunnerOutput.self, from: outputJSON)
         }
         catch {
             throw PluginEvaluationError.decodingPluginOutputFailed(json: outputJSON, underlyingError: error)
@@ -155,7 +152,6 @@ extension PluginTarget {
     }
 }
 
-
 extension PackageGraph {
 
     /// Traverses the graph of reachable targets in a package graph, and applies plugins to targets as needed. Each

Sources/Workspace/WorkspaceConfiguration.swift

@@ -78,7 +78,7 @@ extension Workspace {
         }
 
         // Path to temporary files related to running plugins in the workspace
-        public var pluginDataDirectory: AbsolutePath {
+        public var pluginWorkingDirectory: AbsolutePath {
             self.workingDirectory.appending(component: "plugins")
         }