@team-supercharge/oasg 16.7.1-temp-feat-swift-openapi-generator-cd4bb716 → 16.7.1-temp-feat-swift-openapi-generator-58887187

package/README.md

@@ -142,7 +142,7 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
 | `plain-java`                 |🆕  |
 | `flutter`                    |➖  |➖  |➖  |🆕  |
 | `ios`                        |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
-| `swift-openapi-generator`    |🆕  |
+| `apple-swift`                |🆕  |
 | `kmp`                        |➖  |➖  |🆕  |
 | `python`                     |🆕  |
 | `python-legacy`              |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
@@ -702,12 +702,12 @@ TBD
 | interfaceType | Response type of the generated client: `Combine` / `Result` / `RxSwift` / `AsyncAwait` / `PromiseKit` | Y | - |
 | generatorCustomArgs | Custom arguments of the generator | N | - |
 
-#### `swift-openapi-generator`
+#### `apple-swift`
 
 ```json
 {
   "id": "client-ios",
-  "type": "swift-openapi-generator",
+  "type": "apple-swift",
   "source": "source-merged",
   "projectName": "OASgExample",
   "repository": "git@gitlab.supercharge.io:example/openapi-generator-source.git",

package/bin/oasg

@@ -42,7 +42,7 @@ const DEFAULT_GENERATOR_MAPPING = {
   "plain-java":                   { version: '7.11.0',  generator: 'java' },
   "flutter":                      { version: '7.0.1',   generator: 'dart-dio' },
   "ios":                          { version: '7.0.1',   generator: 'swift5' },
-  "swift-openapi-generator":      { version: undefined, generator: undefined },
+  "apple-swift":                  { version: undefined, generator: undefined },
   "kmp":                          { version: '7.8.0',   generator: 'kotlin' },
   "python":                       { version: '7.11.0',  generator: 'python' },
   "python-legacy":                { version: '7.11.0',  generator: 'python-pydantic-v1' },

package/config.schema.yml

@@ -20,7 +20,7 @@ properties:
         - $ref: '#/targets/Stubby'
         - $ref: '#/targets/Android'
         - $ref: '#/targets/ios'
-        - $ref: '#/targets/SwiftOpenAPIGenerator'
+        - $ref: '#/targets/AppleSwift'
         - $ref: '#/targets/Python'
         - $ref: '#/targets/PythonLegacy'
         - $ref: '#/targets/PythonFastApi'
@@ -313,12 +313,12 @@ targets:
         - repository
         - interfaceType
 
-  SwiftOpenAPIGenerator:
+  AppleSwift:
     allOf:
       - $ref: '#/targets/Base'
       - properties:
           type:
-            pattern: "^swift-openapi-generator$"
+            pattern: "^apple-swift$"
           projectName:
             type: string
           repository:

package/package.json

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

package/targets/apple-swift/generate.sh

@@ -0,0 +1,30 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+# Clear the output directory
+rm -rf out/$targetId
+mkdir -p out/$targetId
+
+# Generate swift code from OpenAPI spec
+swift-openapi-generator \
+	generate \
+  --config "$templateDir/openapi-generator-config-client.yaml" \
+  --output-directory "out/$targetId/Sources/$projectName" \
+  "$openApiFile"
+
+swift-openapi-generator \
+	generate \
+  --config "$templateDir/openapi-generator-config-server.yaml" \
+  --output-directory "out/$targetId/Sources/${projectName}Server" \
+  "$openApiFile"
+
+# Copy Package.swift file
+cp "$templateDir/Package.swift" "out/$targetId/"
+
+# Replace the placeholder in Package.swift with the project name
+if [[ "$(uname -s)" == "Darwin"* ]]; then
+  sed -i '' "s/__PROJECT_NAME__/$projectName/" "out/$targetId/Package.swift"
+else
+  sed -i "s/__PROJECT_NAME__/$projectName/" "out/$targetId/Package.swift"
+fi

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

@@ -1,24 +0,0 @@
-#/bin/bash
-
-source $(dirname "$0")/../common.sh
-
-# Clear the output directory
-rm -rf out/$targetId
-mkdir -p out/$targetId
-
-# Generate swift code from OpenAPI spec
-swift-openapi-generator \
-	generate \
-  --config "$(dirname "$0")/openapi-generator-config-client.yaml" \
-  --output-directory "out/$targetId/Sources/$projectName" \
-  "$openApiFile"
-
-swift-openapi-generator \
-	generate \
-  --config "$(dirname "$0")/openapi-generator-config-server.yaml" \
-  --output-directory "out/$targetId/Sources/${projectName}Server" \
-  "$openApiFile"
-
-# Copy Package.swift file
-cp "$(dirname "$0")/Package.swift" "out/$targetId/"
-sed -i '' "s/__PROJECT_NAME__/$projectName/" "out/$targetId/Package.swift"