@team-supercharge/oasg 16.7.1-temp-feat-swift-openapi-generator-e02341ef → 16.7.1-temp-feat-swift-openapi-generator-f4a258e6

package/config.schema.yml

@@ -20,6 +20,7 @@ properties:
         - $ref: '#/targets/Stubby'
         - $ref: '#/targets/Android'
         - $ref: '#/targets/ios'
+        - $ref: '#/targets/SwiftOpenAPIGenerator'
         - $ref: '#/targets/Python'
         - $ref: '#/targets/PythonLegacy'
         - $ref: '#/targets/PythonFastApi'
@@ -318,13 +319,13 @@ targets:
       - properties:
           type:
             pattern: "^swift-openapi-generator$"
-          packageName:
+          projectName:
             type: string
-          repositoryUrl:
+          repository:
             type: string
         required:
-        - packageName
-        - repositoryUrl
+        - projectName
+        - repository
 
   Python:
     allOf:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "16.7.1-temp-feat-swift-openapi-generator-e02341ef",
+  "version": "16.7.1-temp-feat-swift-openapi-generator-f4a258e6",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/swift-openapi-generator/Package.swift

@@ -8,6 +8,10 @@ let package = Package(
         .library(
             name: "__PROJECT_NAME__",
             targets: ["__PROJECT_NAME__"]
+        ),
+        .library(
+            name: "__PROJECT_NAME__Server",
+            targets: ["__PROJECT_NAME__Server"]
         )
     ],
     dependencies: [
@@ -21,6 +25,12 @@ let package = Package(
                 .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
                 .product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
             ]
-        )
+        ),
+        .target(
+            name: "__PROJECT_NAME__Server",
+            dependencies: [
+                .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+            ]
+        ),
     ]
 )

package/targets/swift-openapi-generator/generate.sh

@@ -1,47 +1,24 @@
 #/bin/bash
 
-CURRENT_WORKING_DIR=$(pwd)
-
 source $(dirname "$0")/../common.sh
 
 # Clear the output directory
 rm -rf out/$targetId
 mkdir -p out/$targetId
 
-# Variables
-SWIFT_OPENAPI_GENERATOR_GIT_URL=https://github.com/apple/swift-openapi-generator
-SWIFT_OPENAPI_GENERATOR_GIT_TAG=1.7.2
-SWIFT_OPENAPI_GENERATOR_CLONE_DIR=swift-openapi-generator/$SWIFT_OPENAPI_GENERATOR_GIT_TAG
-SWIFT_OPENAPI_GENERATOR_BIN="$SWIFT_OPENAPI_GENERATOR_CLONE_DIR/.build/release/swift-openapi-generator"
-OPENAPI_GENERATOR_CONFIG_PATH=openapi-generator-config.yaml
-
-# Clear OpenAPI generator directory
-rm -rf "$SWIFT_OPENAPI_GENERATOR_CLONE_DIR"
-mkdir -p "$SWIFT_OPENAPI_GENERATOR_CLONE_DIR"
-
-# Checkout the swift-openapi-generator repo
-git \
-  -c advice.detachedHead=false \
-  clone \
-  --branch "$SWIFT_OPENAPI_GENERATOR_GIT_TAG" \
-  --depth 1 \
-  "$SWIFT_OPENAPI_GENERATOR_GIT_URL" \
-  "$SWIFT_OPENAPI_GENERATOR_CLONE_DIR"
-
-# Build the swift-openapi-generator
-swift \
-  build \
-  --package-path "$SWIFT_OPENAPI_GENERATOR_CLONE_DIR" \
-  --configuration release \
-  --product swift-openapi-generator
-
-# Generate the swift client
-"$SWIFT_OPENAPI_GENERATOR_BIN" \
+# Generate swift code from OpenAPI spec
+swift-openapi-generator \
 	generate \
-  --config "$OPENAPI_GENERATOR_CONFIG_PATH" \
+  --config "openapi-generator-config-client.yaml" \
   --output-directory "out/$targetId/Sources/$projectName" \
   "$openApiFile"
 
+swift-openapi-generator \
+	generate \
+  --config "openapi-generator-config-server.yaml" \
+  --output-directory "out/$targetId/Sources/${projectName}Server" \
+  "$openApiFile"
+
 # Copy Package.swift file
 cp Package.swift out/$targetId
 sed -i '' "s/__PROJECT_NAME__/$projectName/" out/$targetId/Package.swift

package/targets/swift-openapi-generator/openapi-generator-config-server.yaml

@@ -0,0 +1,5 @@
+generate:
+  - types
+  - server
+accessModifier: public
+namingStrategy: idiomatic