WIP: Rename Extension to Plugin and separate out the use of plugins from dependencies

Author: abertelrud

Fixtures/Miscellaneous/Extensions/MySourceGenClient/Package.swift

@@ -4,21 +4,21 @@ import PackageDescription
 let package = Package(
     name: "MySourceGenClient",
     dependencies: [
-        .package(path: "../MySourceGenExtension")
+        .package(path: "../MySourceGenPlugin")
     ],
     targets: [
-        // A tool that uses an extension.
+        // A tool that uses an plugin.
         .executableTarget(
             name: "MyTool",
             dependencies: [
-                .product(name: "MySourceGenExt", package: "MySourceGenExtension")
+                .product(name: "MySourceGenPlugin", package: "MySourceGenPlugin")
             ]
         ),
-        // A unit that uses the extension.
+        // A unit that uses the plugin.
         .testTarget(
             name: "MyTests",
             dependencies: [
-                .product(name: "MySourceGenExt", package: "MySourceGenExtension")
+                .product(name: "MySourceGenPlugin", package: "MySourceGenPlugin")
             ]
         )
     ]

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Package.swift renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Package.swift

@@ -2,29 +2,29 @@
 import PackageDescription
 
 let package = Package(
-    name: "MySourceGenExtension",
+    name: "MySourceGenPlugin",
     products: [
-        // The product that vends MySourceGenExt to client packages.
-        .extension(
-            name: "MySourceGenExt",
-            targets: ["MySourceGenExt"]
+        // The product that vends MySourceGenPlugin to client packages.
+        .plugin(
+            name: "MySourceGenPlugin",
+            targets: ["MySourceGenPlugin"]
         ),
         .executable(
             name: "MySourceGenTool",
             targets: ["MySourceGenTool"]
         )
     ],
     targets: [
-        // A local tool that uses an extension.
+        // A local tool that uses a plugin.
         .executableTarget(
             name: "MyLocalTool",
-            dependencies: [
-                "MySourceGenExt",
+            plugins: [
+                "MySourceGenPlugin",
             ]
         ),
-        // The target that implements the extension and generates commands to invoke MySourceGenTool.
-        .extension(
-            name: "MySourceGenExt",
+        // The target that implements the plugin and generates commands to invoke MySourceGenTool.
+        .plugin(
+            name: "MySourceGenPlugin",
             capability: .buildTool(),
             dependencies: [
                 "MySourceGenTool"
@@ -45,12 +45,14 @@ let package = Package(
         .target(
             name: "MySourceGenRuntimeLib"
         ),
-        // Unit tests for the extension.
+        // Unit tests for the plugin.
         .testTarget(
-            name: "MySourceGenExtTests",
+            name: "MySourceGenPluginTests",
             dependencies: [
-                "MySourceGenExt",
                 "MySourceGenRuntimeLib"
+            ],
+            plugins: [
+                "MySourceGenPlugin",
             ]
         )
     ]

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Sources/MyLocalTool/Foo.dat renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Sources/MyLocalTool/Foo.dat

@@ -717,7 +717,7 @@ public final class SwiftTargetBuildDescription {
         case .library, .test:
             result.append("-parse-as-library")
 
-        case .executable, .systemModule, .binary, .extension:
+        case .executable, .systemModule, .binary, .plugin:
             do { }
         }
 
@@ -1133,8 +1133,8 @@ public final class ProductBuildDescription {
                 }
             }
             args += ["-emit-executable"]
-        case .extension:
-            throw InternalError("unexpectedly asked to generate linker arguments for an extension product")
+        case .plugin:
+            throw InternalError("unexpectedly asked to generate linker arguments for a plugin product")
         }
 
         // Set rpath such that dynamic libraries are looked up
@@ -1150,7 +1150,7 @@ public final class ProductBuildDescription {
         // Embed the swift stdlib library path inside tests and executables on Darwin.
         if containsSwiftTargets {
           switch product.type {
-          case .library, .extension: break
+          case .library, .plugin: break
           case .test, .executable:
               if buildParameters.triple.isDarwin() {
                   let stdlib = buildParameters.toolchain.macosSwiftStdlib
@@ -1396,7 +1396,7 @@ public class BuildPlan {
                     buildParameters: buildParameters,
                     fileSystem: fileSystem,
                     diagnostics: diagnostics))
-            case is SystemLibraryTarget, is BinaryTarget, is ExtensionTarget:
+            case is SystemLibraryTarget, is BinaryTarget, is PluginTarget:
                  break
             default:
                  fatalError("unhandled \(target.underlyingTarget)")
@@ -1425,7 +1425,7 @@ public class BuildPlan {
         var productMap: [ResolvedProduct: ProductBuildDescription] = [:]
         // Create product description for each product we have in the package graph except
         // for automatic libraries and extension because they don't produce any output.
-        for product in graph.allProducts where product.type != .library(.automatic) && product.type != .extension {
+        for product in graph.allProducts where product.type != .library(.automatic) && product.type != .plugin {
             productMap[product] = ProductBuildDescription(
                 product: product, buildParameters: buildParameters,
                 fs: fileSystem,
@@ -1594,7 +1594,7 @@ public class BuildPlan {
             // need to statically link it or if it's an extension.
             case .product(let product, _):
                 switch product.type {
-                case .library(.automatic), .library(.static), .extension:
+                case .library(.automatic), .library(.static), .plugin:
                     return product.targets.map { .target($0, conditions: []) }
                 case .library(.dynamic), .test, .executable:
                     return []
@@ -1640,7 +1640,7 @@ public class BuildPlan {
                         let tools = try self.parseArtifactsArchive(for: binaryTarget)
                         tools.forEach { availableTools[$0.name] = $0.executablePath  }
                     }
-                case .extension:
+                case .plugin:
                     continue
                 }
 

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Sources/MyLocalTool/main.swift renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Sources/MyLocalTool/main.swift

@@ -511,7 +511,7 @@ extension LLBuildManifestBuilder {
             // Ignore Binary Modules.
             if target.underlyingTarget is BinaryTarget { return }
             // Ignore Extension Targets.
-            if target.underlyingTarget is ExtensionTarget { return }
+            if target.underlyingTarget is PluginTarget { return }
 
             // Depend on the binary for executable targets.
             if target.type == .executable {
@@ -554,8 +554,8 @@ extension LLBuildManifestBuilder {
                     // Establish a dependency on binary of the product.
                     inputs.append(file: planProduct.binary)
 
-                // For automatic and static libraries, and extensions, add their targets as static input.
-                case .library(.automatic), .library(.static), .extension:
+                // For automatic and static libraries, and plugins, add their targets as static input.
+                case .library(.automatic), .library(.static), .plugin:
                     for target in product.targets {
                         try addStaticTargetInputs(target)
                     }
@@ -575,7 +575,7 @@ extension LLBuildManifestBuilder {
             }
         }
 
-        // Add any build tool commands created by extensions for the target (prebuild and postbuild commands are handled outside the build).
+        // Add any build tool commands created by plugins for the target (prebuild and postbuild commands are handled outside the build).
         for command in target.extensionEvaluationResults.reduce([], { $0 + $1.commands }) {
             if case .buildToolCommand(let displayName, let executable, let arguments, _, _, let inputPaths, let outputPaths, _) = command {
                 // Create a shell command to invoke the executable.  We include the path of the executable as a dependency.
@@ -674,7 +674,7 @@ extension LLBuildManifestBuilder {
                     let binary = planProduct.binary
                     inputs.append(file: binary)
 
-                case .library(.automatic), .library(.static), .extension:
+                case .library(.automatic), .library(.static), .plugin:
                     for target in product.targets {
                         addStaticTargetInputs(target)
                     }
@@ -847,8 +847,8 @@ extension ResolvedProduct {
             throw InternalError("automatic library not supported")
         case .executable:
             return "\(name)-\(config).exe"
-        case .extension:
-            throw InternalError("unexpectedly asked for the llbuild target name of an extension product")
+        case .plugin:
+            throw InternalError("unexpectedly asked for the llbuild target name of a plugin product")
         }
     }
 

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Sources/MySourceGenExt/extension.swift renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Sources/MySourceGenPlugin/plugin.swift

@@ -132,11 +132,11 @@ fileprivate struct DescribedPackage: Encodable {
         }
     }
 
-    /// Represents a extension capability for the sole purpose of generating a description.
-    struct DescribedExtensionCapability: Encodable {
+    /// Represents a plugin capability for the sole purpose of generating a description.
+    struct DescribedPluginCapability: Encodable {
         let type: String
 
-        init(from capability: ExtensionCapability, in package: Package) {
+        init(from capability: PluginCapability, in package: Package) {
             switch capability {
             case .prebuild:
                 self.type = "prebuild"
@@ -154,7 +154,7 @@ fileprivate struct DescribedPackage: Encodable {
         let type: String
         let c99name: String?
         let moduleType: String?
-        let extensionCapability: DescribedExtensionCapability?
+        let pluginCapability: DescribedPluginCapability?
         let path: String
         let sources: [String]
         let resources: [PackageModel.Resource]?
@@ -166,7 +166,7 @@ fileprivate struct DescribedPackage: Encodable {
             self.type = target.type.rawValue
             self.c99name = target.c99name
             self.moduleType = String(describing: Swift.type(of: target))
-            self.extensionCapability = (target as? ExtensionTarget).map{ DescribedExtensionCapability(from: $0.capability, in: package) }
+            self.pluginCapability = (target as? PluginTarget).map{ DescribedPluginCapability(from: $0.capability, in: package) }
             self.path = target.sources.root.relative(to: package.path).pathString
             self.sources = target.sources.relativePaths.map{ $0.pathString }
             self.resources = target.resources.isEmpty ? nil : target.resources

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Sources/MySourceGenRuntimeLib/library.swift renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Sources/MySourceGenRuntimeLib/library.swift

@@ -350,7 +350,7 @@ extension PackageModel.ProductType {
         case .executable:
             self = .executable
         case .extension:
-            self = .extension
+            self = .plugin
         case .test:
             self = .test
         }

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Sources/MySourceGenTool/main.swift renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Sources/MySourceGenTool/main.swift

@@ -592,7 +592,7 @@ extension SystemPackageProvider: Encodable {
     }
 }
 
-extension Target.ExtensionCapability: Encodable {
+extension Target.PluginCapability: Encodable {
     private enum CodingKeys: CodingKey {
         case type
     }

Fixtures/Miscellaneous/Extensions/MySourceGenExtension/Sources/MySourceGenToolLib/library.swift renamed to Fixtures/Miscellaneous/Extensions/MySourceGenPlugin/Sources/MySourceGenToolLib/library.swift

@@ -128,13 +128,13 @@ public class Product: Encodable {
         }
     }
 
-    /// The extension product of a Swift package.
-    public final class Extension: Product {
-        private enum ExtensionCodingKeys: CodingKey {
+    /// The plugin product of a Swift package.
+    public final class Plugin: Product {
+        private enum PluginCodingKeys: CodingKey {
             case targets
         }
 
-        /// The name of the extension target to vend as a product.
+        /// The name of the plugin target to vend as a product.
         public let targets: [String]
 
         init(name: String, targets: [String]) {
@@ -145,9 +145,9 @@ public class Product: Encodable {
         public override func encode(to encoder: Encoder) throws {
             try super.encode(to: encoder)
             var productContainer = encoder.container(keyedBy: ProductCodingKeys.self)
-            try productContainer.encode("extension", forKey: .type)
-            var extensionContainer = encoder.container(keyedBy: ExtensionCodingKeys.self)
-            try extensionContainer.encode(targets, forKey: .targets)
+            try productContainer.encode("plugin", forKey: .type)
+            var pluginContainer = encoder.container(keyedBy: PluginCodingKeys.self)
+            try pluginContainer.encode(targets, forKey: .targets)
         }
     }
 
@@ -185,17 +185,17 @@ public class Product: Encodable {
         return Executable(name: name, targets: targets)
     }
 
-    /// Creates an extension package product.
+    /// Creates an plugin package product.
     ///
     /// - Parameters:
-    ///     - name: The name of the extension product.
-    ///     - targets: The extension targets to vend as a product.
+    ///     - name: The name of the plugin product.
+    ///     - targets: The plugin targets to vend as a product.
     @available(_PackageDescription, introduced: 999.0)
-    public static func `extension`(
+    public static func plugin(
         name: String,
         targets: [String]
     ) -> Product {
-        return Extension(name: name, targets: targets)
+        return Plugin(name: name, targets: targets)
     }
 
     public func encode(to encoder: Encoder) throws {