Re-organize the naming convention of module, type, product, and file to have consistent project structure (#450)

* rename modules

* rename to CartonReleaseCommand

* call async overload

* fix commandName

* frontend name

Author: omochi

Package.swift

@@ -14,12 +14,12 @@ let package = Package(
     .library(name: "SwiftToolchain", targets: ["SwiftToolchain"]),
     .library(name: "CartonHelpers", targets: ["CartonHelpers"]),
     .library(name: "CartonKit", targets: ["CartonKit"]),
-    .library(name: "CartonCLI", targets: ["CartonCLI"]),
+    .library(name: "CartonFrontend", targets: ["CartonFrontend"]),
     .executable(name: "carton", targets: ["carton"]),
     .executable(name: "carton-release", targets: ["carton-release"]),
-    .plugin(name: "CartonBundle", targets: ["CartonBundle"]),
-    .plugin(name: "CartonTest", targets: ["CartonTest"]),
-    .plugin(name: "CartonDev", targets: ["CartonDev"]),
+    .plugin(name: "CartonBundlePlugin", targets: ["CartonBundlePlugin"]),
+    .plugin(name: "CartonTestPlugin", targets: ["CartonTestPlugin"]),
+    .plugin(name: "CartonDevPlugin", targets: ["CartonDevPlugin"]),
     .executable(name: "carton-plugin-helper", targets: ["carton-plugin-helper"]),
   ],
   dependencies: [
@@ -43,47 +43,47 @@ let package = Package(
       ]
     ),
     .executableTarget(
-      name: "CartonFrontend",
+      name: "carton-frontend",
       dependencies: [
-        "CartonCLI",
+        "CartonFrontend"
       ]
     ),
     .plugin(
-        name: "CartonBundle",
+        name: "CartonBundlePlugin",
         capability: .command(
             intent: .custom(
                 verb: "carton-bundle",
                 description: "Produces an optimized app bundle for distribution."
             )
         ),
-        dependencies: ["CartonFrontend"],
+        dependencies: ["carton-frontend"],
         exclude: ["CartonPluginShared/README.md"]
     ),
     .plugin(
-        name: "CartonTest",
+        name: "CartonTestPlugin",
         capability: .command(
             intent: .custom(
                 verb: "carton-test",
                 description: "Run the tests in a WASI environment."
             )
         ),
-        dependencies: ["CartonFrontend"],
+        dependencies: ["carton-frontend"],
         exclude: ["CartonPluginShared/README.md"]
     ),
     .plugin(
-        name: "CartonDev",
+        name: "CartonDevPlugin",
         capability: .command(
             intent: .custom(
                 verb: "carton-dev",
                 description: "Watch the current directory, host the app, rebuild on change."
             )
         ),
-        dependencies: ["CartonFrontend"],
+        dependencies: ["carton-frontend"],
         exclude: ["CartonPluginShared/README.md"]
     ),
     .executableTarget(name: "carton-plugin-helper"),
     .target(
-      name: "CartonCLI",
+      name: "CartonFrontend",
       dependencies: [
         .product(name: "Logging", package: "swift-log"),
         "CartonKit",
@@ -136,7 +136,7 @@ let package = Package(
     .testTarget(
       name: "CartonCommandTests",
       dependencies: [
-        "CartonCLI",
+        "CartonFrontend",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
       ]
     ),

Plugins/CartonBundle/Plugin.swift renamed to Plugins/CartonBundlePlugin/CartonBundlePluginCommand.swift

@@ -16,7 +16,7 @@ import Foundation
 import PackagePlugin
 
 @main
-struct CartonBundlePlugin: CommandPlugin {
+struct CartonBundlePluginCommand: CommandPlugin {
 
   struct Options {
     var product: String?

Plugins/CartonBundle/CartonPluginShared renamed to Plugins/CartonBundlePlugin/CartonPluginShared

@@ -16,7 +16,7 @@ import Foundation
 import PackagePlugin
 
 @main
-struct CartonDevPlugin: CommandPlugin {
+struct CartonDevPluginCommand: CommandPlugin {
   struct Options {
     var product: String?
     var release: Bool

Plugins/CartonDev/Plugin.swift renamed to Plugins/CartonDevPlugin/CartonDevPluginCommand.swift

@@ -194,7 +194,7 @@ internal func checkHelpFlag(_ arguments: [String], subcommand: String, context:
 internal func makeCartonFrontendProcess(context: PluginContext, arguments: [String]) throws
   -> Process
 {
-  let frontend = try context.tool(named: "CartonFrontend")
+  let frontend = try context.tool(named: "carton-frontend")
 
   Diagnostics.remark(
     "Running " + ([frontend.path.string] + arguments).map { "\"\($0)\"" }.joined(separator: " "))

Plugins/CartonDev/CartonPluginShared renamed to Plugins/CartonDevPlugin/CartonPluginShared

@@ -16,7 +16,7 @@ import Foundation
 import PackagePlugin
 
 @main
-struct CartonTestPlugin: CommandPlugin {
+struct CartonTestPluginCommand: CommandPlugin {
   struct Options {
     var environment: Environment
     var prebuiltTestBundlePath: String?

Plugins/CartonPluginShared/PluginShared.swift

@@ -15,11 +15,16 @@
 import ArgumentParser
 import CartonHelpers
 
-public struct Carton: AsyncParsableCommand {
+public struct CartonFrontendCommand: AsyncParsableCommand {
   public static let configuration = CommandConfiguration(
+    commandName: "carton-frontend",
     abstract: "📦 Watcher, bundler, and test runner for your SwiftWasm apps.",
     version: cartonVersion,
-    subcommands: [Bundle.self, Dev.self, Test.self]
+    subcommands: [
+      CartonFrontendBundleCommand.self,
+      CartonFrontendDevCommand.self,
+      CartonFrontendTestCommand.self
+    ]
   )
 
   public init() {}

Plugins/CartonTest/CartonPluginShared renamed to Plugins/CartonTestPlugin/CartonPluginShared

@@ -22,7 +22,7 @@ enum WasmOptimizations: String, CaseIterable, ExpressibleByArgument {
   case size, none
 }
 
-struct Bundle: AsyncParsableCommand {
+struct CartonFrontendBundleCommand: AsyncParsableCommand {
   @Argument(
     help: ArgumentHelp(
       "Internal: Path to the main WebAssembly file built by the SwiftPM Plugin process.",
@@ -67,6 +67,7 @@ struct Bundle: AsyncParsableCommand {
   var output: String
 
   static let configuration = CommandConfiguration(
+    commandName: "bundle",
     abstract: "Produces an optimized app bundle for distribution."
   )