NFC: make CLI commands reusable with new CLICommands module (#249)

Prerequisite for #248 to make existing CLI commands reused in both `wasmkit` and `wasmkit-llvm` executables.

Author: MaxDesiatov

.github/workflows/main.yml

@@ -305,7 +305,7 @@ jobs:
           curl -L https://github.com/Kitware/CMake/releases/download/v3.29.2/cmake-3.29.2-linux-x86_64.tar.gz | tar xz --strip-component 1 -C /usr/local/
       - run: cmake -G Ninja -B ./build
       - run: cmake --build ./build
-      - run: ./build/bin/wasmkit-cli --version
+      - run: ./build/bin/wasmkit --version
 
   build-wasi:
     runs-on: ubuntu-24.04

CMakeLists.txt

@@ -52,16 +52,6 @@ add_compile_definitions(
 
 include(FetchContent)
 
-find_package(SwiftSystem CONFIG)
-if(NOT SwiftSystem_FOUND)
-  message("-- Vending SwiftSystem")
-  FetchContent_Declare(SwiftSystem
-    GIT_REPOSITORY https://github.com/apple/swift-system
-    GIT_TAG 1.5.0
-  )
-  FetchContent_MakeAvailable(SwiftSystem)
-endif()
-
 option(WASMKIT_BUILD_CLI "Build wasmkit-cli" ON)
 
 if(WASMKIT_BUILD_CLI)
@@ -77,6 +67,17 @@ if(WASMKIT_BUILD_CLI)
   endif()
 endif()
 
+find_package(SwiftSystem CONFIG)
+if(NOT SwiftSystem_FOUND)
+  message("-- Vending SwiftSystem")
+  FetchContent_Declare(SwiftSystem
+    GIT_REPOSITORY https://github.com/apple/swift-system
+    GIT_TAG 1.5.0
+  )
+  FetchContent_MakeAvailable(SwiftSystem)
+endif()
+
+
 add_subdirectory(Sources)
 add_subdirectory(Tests)
 add_subdirectory(cmake/modules)

Package.swift

@@ -22,6 +22,14 @@ let package = Package(
     targets: [
         .executableTarget(
             name: "CLI",
+            dependencies: [
+                "CLICommands"
+            ],
+            exclude: ["CMakeLists.txt"]
+        ),
+
+        .target(
+            name: "CLICommands",
             dependencies: [
                 "WAT",
                 "WasmKit",

Package@swift-6.1.swift

@@ -6,8 +6,8 @@ import class Foundation.ProcessInfo
 
 let DarwinPlatforms: [Platform] = [.macOS, .iOS, .watchOS, .tvOS, .visionOS]
 
-let cliTarget = Target.executableTarget(
-    name: "CLI",
+let cliCommandsTarget = Target.target(
+    name: "CLICommands",
     dependencies: [
         "WAT",
         "WasmKit",
@@ -36,7 +36,12 @@ let package = Package(
         "WasmDebuggingSupport",
     ],
     targets: [
-        cliTarget,
+        cliCommandsTarget,
+        .executableTarget(
+            name: "CLI",
+            dependencies: ["CLICommands"],
+            exclude: ["CMakeLists.txt"]
+        ),
         .target(
             name: "WasmKit",
             dependencies: [
@@ -193,7 +198,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         ),
     ])
 
-    cliTarget.dependencies.append(contentsOf: [
+    cliCommandsTarget.dependencies.append(contentsOf: [
         .product(name: "Logging", package: "swift-log", condition: .when(traits: ["WasmDebuggingSupport"])),
         .product(name: "NIOCore", package: "swift-nio", condition: .when(traits: ["WasmDebuggingSupport"])),
         .product(name: "NIOPosix", package: "swift-nio", condition: .when(traits: ["WasmDebuggingSupport"])),

Sources/CLI/CLI.swift

@@ -1,4 +1,5 @@
 import ArgumentParser
+import CLICommands
 
 @main
 struct CLI: AsyncParsableCommand {

Sources/CLI/CMakeLists.txt

@@ -1,12 +1,13 @@
-add_executable(wasmkit-cli
-    Commands/Explore.swift
-    Commands/Run.swift
-    Commands/Wat2wasm.swift
+add_executable(wasmkit
     CLI.swift
 )
 
-target_link_wasmkit_libraries(wasmkit-cli PUBLIC
-  ArgumentParser WAT WasmKitWASI)
+target_compile_options(wasmkit PRIVATE
+    -package-name WasmKitPackage
+)
+
+target_link_wasmkit_libraries(wasmkit PUBLIC
+  CLICommands)
 
-install(TARGETS wasmkit-cli
+install(TARGETS wasmkit
   RUNTIME DESTINATION bin)

Sources/CLI/Commands/Parse.swift

@@ -0,0 +1,20 @@
+add_wasmkit_library(CLICommands
+    Explore.swift
+    Run.swift
+    Wat2wasm.swift
+)
+
+target_link_wasmkit_libraries(CLICommands PUBLIC
+  WAT WasmKitWASI)
+
+add_dependencies(
+  CLICommands
+
+  ArgumentParser
+)
+
+target_link_libraries(CLICommands
+
+  PUBLIC
+  ArgumentParser
+)

Sources/CLICommands/CMakeLists.txt

@@ -2,9 +2,9 @@ import ArgumentParser
 import SystemPackage
 @_spi(OnlyForCLI) import WasmKit
 
-struct Explore: ParsableCommand {
+package struct Explore: ParsableCommand {
 
-    static let configuration = CommandConfiguration(
+    package static let configuration = CommandConfiguration(
         abstract: "Explore the compiled functions of a WebAssembly module",
         discussion: """
             This command will parse a WebAssembly module and dump the compiled functions.
@@ -22,7 +22,9 @@ struct Explore: ParsableCommand {
         }
     }
 
-    func run() throws {
+    package init() {}
+
+    package func run() throws {
         let module = try parseWasm(filePath: FilePath(path))
         // Instruction dumping requires token threading model for now
         let configuration = EngineConfiguration(threadingModel: .token)