@team-supercharge/oasg 13.1.1 → 13.2.0-feature-python-fastapi-26619e36.0

package/bin/oasg

@@ -45,6 +45,7 @@ const DEFAULT_GENERATOR_MAPPING = {
   "nestjs":           { version: '7.0.1',   generator: 'typescript-angular' },
   "spring":           { version: '7.0.1',   generator: 'spring' },
   "spring-kotlin":    { version: '7.0.1',   generator: 'kotlin-spring' },
+  "python-fastapi":   { version: '7.0.1',   generator: 'python-fastapi' },
   // misc targets
   "contract-testing": { version: '4.3.1',   generator: 'typescript-node' },
   "openapi":          { version: undefined, generator: undefined },

package/config.schema.yml

@@ -20,6 +20,7 @@ properties:
         - $ref: '#/targets/Android'
         - $ref: '#/targets/ios'
         - $ref: '#/targets/Python'
+        - $ref: '#/targets/PythonFastApi'
         - $ref: '#/targets/ContractTesting'
         - $ref: '#/targets/NestJS'
         - $ref: '#/targets/OpenAPI'
@@ -295,6 +296,20 @@ targets:
         - packageName
         - repositoryUrl
 
+  PythonFastApi:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: "^python-fastapi$"
+          packageName:
+            type: string
+          repositoryUrl:
+            type: string
+        required:
+        - packageName
+        - repositoryUrl
+
   ContractTesting:
     allOf:
       - $ref: '#/targets/Base'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "13.1.1",
+  "version": "13.2.0-feature-python-fastapi-26619e36.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/nestjs/templates/rewrite-path-parameters.js

@@ -12,7 +12,7 @@ function rewritePathParameters(fileName) {
     const contents = fs.readFileSync(file, 'utf-8');
 
     var result = contents.replace(/\${this\.configuration\.encodeParam\({name:\s"/g, ':');
-    result = result.replace(/".*}\)}/g, '');
+    result = result.replace(/".*?}\)}/g, '');
 
     var options = { flag : 'w', encoding: 'utf8' };
     fs.writeFileSync(file, result, options);

package/targets/python-fastapi/generate.sh

@@ -0,0 +1,22 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+# change npm pre-release syntax (with - after semver) to python local syntax (with + after semver)
+version=$(echo $version | sed 's/-/\+/')
+echo "[NOTE] version updated to: ${version}"
+
+rm -rf out/$targetId
+mkdir -p out/$targetId
+
+java -jar $binary generate \
+  -g $generatorId \
+  -i $openApiFile \
+  -t $templateDir \
+  -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
+  -p "packageVersion=$version,packageName=$packageName" $generatorCustomArgs
+
+cd out/$targetId
+python3 setup.py sdist bdist_wheel
+cd ../../

package/targets/python-fastapi/generator-config.json

@@ -0,0 +1,7 @@
+{
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/python-fastapi/publish.sh

@@ -0,0 +1,7 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+cd out/$targetId
+python3 -m twine upload --repository-url $repositoryUrl dist/*
+cd ../..