Merge pull request #35 from sidepelican/transport

Use macro for Server Side Swift code

Author: sidepelican

.github/workflows/test.yml

@@ -9,16 +9,15 @@ on:
 
 jobs:
   build_and_test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     defaults:
       run:
         working-directory: example
     steps:
-    - uses: swift-actions/setup-swift@v1
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 20
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: npm ci
       working-directory: example/TSClient
     - run: ./test.sh vapor

Package.resolved

@@ -1,36 +1,70 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
+import CompilerPluginSupport
 import PackageDescription
 
 let package = Package(
     name: "CallableKit",
-    platforms: [.macOS(.v13)],
+    platforms: [.macOS(.v14)],
     products: [
         .executable(name: "codegen", targets: ["Codegen"]),
         .library(name: "CallableKit", targets: ["CallableKit"]),
+        .library(name: "CallableKitVaporTransport", targets: ["CallableKitVaporTransport"]),
+        .library(name: "CallableKitHummingbirdTransport", targets: ["CallableKitHummingbirdTransport"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
-        .package(url: "https://github.com/omochi/CodableToTypeScript", from: "2.11.0"),
-        .package(url: "https://github.com/omochi/SwiftTypeReader", from: "2.8.0"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.1"),
+        .package(url: "https://github.com/omochi/CodableToTypeScript.git", from: "2.11.0"),
+        .package(url: "https://github.com/omochi/SwiftTypeReader.git", from: "2.8.0"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.106.7"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.5.0"),
     ],
     targets: [
         .executableTarget(
             name: "Codegen",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                "CallableKit"
+                "CodegenImpl",
             ]
         ),
         .target(
-            name: "CallableKit",
+            name: "CodegenImpl",
             dependencies: [
                 "CodableToTypeScript",
-                "SwiftTypeReader"
+                "SwiftTypeReader",
             ],
             swiftSettings: [
                 .enableUpcomingFeature("BareSlashRegexLiterals"),
             ]
+        ),
+        .target(
+            name: "CallableKit",
+            dependencies: [
+                "CallableKitMacros",
+            ]
+        ),
+        .macro(
+            name: "CallableKitMacros",
+            dependencies: [
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+                .product(name: "SwiftDiagnostics", package: "swift-syntax"),
+                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+            ]
+        ),
+        .target(
+            name: "CallableKitVaporTransport",
+            dependencies: [
+                .product(name: "Vapor", package: "vapor"),
+                "CallableKit",
+            ]
+        ),
+        .target(
+            name: "CallableKitHummingbirdTransport",
+            dependencies: [
+                .product(name: "Hummingbird", package: "hummingbird"),
+                "CallableKit",
+            ]
         )
     ]
 )