@team-supercharge/oasg 15.1.2-chore-update-deps-7b65b380.0 → 15.2.0-typescript-axios-41a9a301.0

package/README.md

@@ -123,6 +123,7 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
 | `kmp`                        |➖  |🆕  |
 | `python`                     |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
 | `react`                      |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `typescript-axios`           |🆕  |
 | **Server Targets**           | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
 | `nestjs`                     |💥  |➖  |💥  |✨  |➖  |➖  |🐛  |➖  |➖  |✨  |🆕  |
 | `python-fastapi`             |➖  |🆕  |
@@ -994,6 +995,23 @@ Validations from OpenAPI spec:
 |-|-|-|-|
 | fileName | Name of the generated file | N | `collection.json` |
 
+#### `typescript-axios`
+
+```json
+{
+  "id": "client-typescript-axios",
+  "type": "typescript-axios",
+  "source": "source-simple",
+  "packageName": "@project/oasg-example-typescript-axios-simple",
+  "repository": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/npm/"
+}
+```
+
+|Parameter| Description| Required | Default |
+|-|-|-|-|
+| packageName | Name of the generated NPM package | Y | - |
+| repository | URL of the NPM package registry | Y | - |
+
 ---
 
 # Migration Guide

package/bin/oasg

@@ -44,6 +44,7 @@ const DEFAULT_GENERATOR_MAPPING = {
   "kmp":                          { version: '7.8.0',   generator: 'kotlin' },
   "python":                       { version: '7.0.1',   generator: 'python' },
   "react":                        { version: '7.0.1',   generator: 'typescript-fetch' },
+  "typescript-axios":             { version: '7.11.0',  generator: 'typescript-axios' },
   // server targets
   "nestjs":                       { version: '7.0.1',   generator: 'typescript-angular' },
   "spring":                       { version: '7.0.1',   generator: 'spring' },

package/config.schema.yml

@@ -29,6 +29,7 @@ properties:
         - $ref: '#/targets/Kmp'
         - $ref: '#/targets/Dotnet'
         - $ref: '#/targets/Postman'
+        - $ref: '#/targets/TypeScriptAxios'
 required:
   - targets
 additionalProperties: false
@@ -356,6 +357,20 @@ targets:
           - packageName
           - repository
 
+  TypeScriptAxios:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: "^typescript-axios$"
+          packageName:
+            type: string
+          repository:
+            type: string
+        required:
+          - packageName
+          - repository
+
   OpenAPI:
     allOf:
       - $ref: '#/targets/Base'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "15.1.2-chore-update-deps-7b65b380.0",
+  "version": "15.2.0-typescript-axios-41a9a301.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",
@@ -15,7 +15,7 @@
     "url": "git@gitlab.com:team-supercharge/oasg.git"
   },
   "engines": {
-    "node": "^20.17",
+    "node": "^20.15",
     "npm": "^10"
   },
   "files": [
@@ -31,7 +31,7 @@
     "@redocly/cli": "1.25.11",
     "@stoplight/prism-cli": "5.12.0",
     "@stoplight/spectral-cli": "6.14.1",
-    "ajv": "^8.17.1",
+    "ajv": "^8.12.0",
     "command-exists": "^1.2.9",
     "express": "^4.18.2",
     "express-http-proxy": "^1.6.3",

package/targets/angular/generate.sh

@@ -18,6 +18,6 @@ npm install
 # This is a workaround for an issue with the angular generator. Root cause is the missing package-lock.json: https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources/typescript-angular
 # some of the transitive dependency has @types/node@": "*" in their package.json
 # use "npm explain @types/node" in the generated folder (./out/$TARGET) to get more info
-npm install --save-dev @types/node@20.17.0
+npm install --save-dev @types/node@20.15.0
 npm run build
 cd ../..

package/targets/contract-testing/generate.sh

@@ -35,7 +35,7 @@ npm install
 npm uninstall bluebird @types/bluebird
 # schema validator dependencies
 npm install typescript@4.2
-npm install ajv@8.17.1 ajv-formats@2.1.1
+npm install ajv@8.8.2 ajv-formats@2.1.1
 # needed by typescript-node
 npm install @types/node@8
 npm run build -- --resolveJsonModule --esModuleInterop

package/targets/typescript-axios/generate.sh

@@ -0,0 +1,20 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+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 "npmVersion=$version,npmName=$packageName,npmRepository=$repository" $generatorCustomArgs
+
+cd out/$targetId
+
+npm install
+npm run build
+cd ../..

package/targets/typescript-axios/generator-config.json

@@ -0,0 +1,20 @@
+{
+  "modelPropertyNaming": "original",
+  "supportsES6": "true",
+  "providedInRoot": "true",
+  "ngVersion": "10.0.2",
+  "serviceSuffix": "Api",
+  "serviceFileSuffix": ".api",
+  "stringEnums": "true",
+  "enumPropertyNaming": "UPPERCASE",
+  "fileNaming": "kebab-case",
+  "useSingleRequestParameter": "false",
+  "sortModelPropertiesByRequiredFlag": "false",
+  "sortParamsByRequiredFlag": "true",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true",
+    "RESOLVE_INLINE_ENUMS": "true"
+  }
+}

package/targets/typescript-axios/publish.sh

@@ -0,0 +1,8 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+cd out/$targetId
+npm publish \
+  $(if [[ "$preRelease" == "true" ]]; then echo "--tag next"; fi)
+cd ../..