@team-supercharge/oasg 18.2.0 → 18.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +9 -7
  2. package/config.schema.yml +4 -0
  3. package/package.json +4 -2
  4. package/targets/msw/templates/modelOneOf.mustache +7 -0
  5. package/targets/plain-java/generator-config.json +1 -0
  6. package/targets/python/generate.sh +6 -1
  7. package/targets/python-legacy/generate.sh +6 -1
package/README.md CHANGED
@@ -140,15 +140,15 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
140
140
  | `dotnet-system-text-json` |🆕➖|
141
141
  | `dotnet-webapi` |✨ |➖ |🆕➖|
142
142
  | `dotnet-webapi-system-text-json` |🆕➖|
143
- | `feign` |➖ |🐛 |✨ |➖ |➖ |➖ |➖ |➖ |✨ |💥 |💥 |➖ |➖ |🐛 |🐛 |🆕 |
144
- | `feign-kotlin` |➖ |🐛 |✨ |➖ |➖ |➖ |➖ |➖ |🆕 |
145
- | `plain-java` |➖ |🐛 |🆕 |
143
+ | `feign` |🐛 |🐛 |✨ |➖ |➖ |➖ |➖ |➖ |✨ |💥 |💥 |➖ |➖ |🐛 |🐛 |🆕 |
144
+ | `feign-kotlin` |🐛 |🐛 |✨ |➖ |➖ |➖ |➖ |➖ |🆕 |
145
+ | `plain-java` |🐛 |🐛 |🆕 |
146
146
  | `flutter` |➖ |➖ |➖ |➖ |➖ |🆕 |
147
147
  | `ios` |➖ |➖ |➖ |➖ |➖ |💥 |🐛 |➖ |➖ |➖ |✨ |➖ |💥 |➖ |➖ |✨ |🆕 |
148
148
  | `apple-swift` |➖ |➖ |🆕 |
149
149
  | `kmp` |✨ |✨ |➖ |➖ |🆕 |
150
- | `python` |➖ |➖ |🆕 |
151
- | `python-legacy` |➖ |➖ |💥 |➖ |🐛 |💥 |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |🆕 |
150
+ | `python` |🐛 |➖ |🆕 |
151
+ | `python-legacy` |🐛 |➖ |💥 |➖ |🐛 |💥 |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |🆕 |
152
152
  | `react` |💥 |➖ |🐛 |🐛 |➖ |💥 |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |🆕 |
153
153
  | `typescript-axios` |✨ |➖ |🆕 |
154
154
  | `typescript-fetch` |✨ |➖ |🆕 |
@@ -156,8 +156,8 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
156
156
  | `nestjs` |✨ |🐛 |💥 |💥 |➖ |💥 |✨ |➖ |➖ |🐛 |➖ |➖ |✨ |🆕 |
157
157
  | `python-fastapi` |➖ |➖ |➖ |➖ |🆕 |
158
158
  | `python-fastapi-raw-request` |➖ |➖ |➖ |➖ |🆕 |
159
- | `spring` |➖ |🐛 |✨ |➖ |➖ |➖ |➖ |➖ |✨ |💥 |💥 |➖ |➖ |➖ |✨ |➖ |🆕 |
160
- | `spring-kotlin` |➖ |✨ |✨ |➖ |➖ |➖ |➖ |➖ |✨ |💥 |💥 |➖ |➖ |🐛 |✨ |➖ |🆕 |
159
+ | `spring` |🐛 |🐛 |✨ |➖ |➖ |➖ |➖ |➖ |✨ |💥 |💥 |➖ |➖ |➖ |✨ |➖ |🆕 |
160
+ | `spring-kotlin` |🐛 |✨ |✨ |➖ |➖ |➖ |➖ |➖ |✨ |💥 |💥 |➖ |➖ |🐛 |✨ |➖ |🆕 |
161
161
  | **Misc Targets** | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 |
162
162
  | `contract-testing` |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |➖ |🆕 |
163
163
  | `openapi` |➖ |➖ |➖ |➖ |➖ |➖ |💥 |➖ |➖ |✨ |➖ |🆕 |
@@ -907,6 +907,7 @@ TBD
907
907
  |-|-|-|-|
908
908
  | packageName | Package nem for the project (convention: snake_case) | Y | - |
909
909
  | repositoryUrl | URL of the PyPI repository | Y | - |
910
+ | projectName | Internal project name, inherits value of packageName (advised to keep the same) | N | $packageName |
910
911
 
911
912
  Publishing the PyPI packages is done with Twine. For authentication against the PiPI repository you need to set the `TWINE_USERNAME` and `TWINE_PASSWORD` environment variables.
912
913
 
@@ -926,6 +927,7 @@ Publishing the PyPI packages is done with Twine. For authentication against the
926
927
  |-|-|-|-|
927
928
  | packageName | Package nem for the project (convention: snake_case) | Y | - |
928
929
  | repositoryUrl | URL of the PyPI repository | Y | - |
930
+ | projectName | Internal project name, inherits value of packageName (advised to keep the same) | N | $packageName |
929
931
 
930
932
  > ⚠️ Using Pydantic v1 for legacy reasons, this target will be discontinued.
931
933
 
package/config.schema.yml CHANGED
@@ -344,6 +344,8 @@ targets:
344
344
  type: string
345
345
  repositoryUrl:
346
346
  type: string
347
+ projectName:
348
+ type: string
347
349
  required:
348
350
  - packageName
349
351
  - repositoryUrl
@@ -358,6 +360,8 @@ targets:
358
360
  type: string
359
361
  repositoryUrl:
360
362
  type: string
363
+ projectName:
364
+ type: string
361
365
  required:
362
366
  - packageName
363
367
  - repositoryUrl
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@team-supercharge/oasg",
3
- "version": "18.2.0",
3
+ "version": "18.2.1",
4
4
  "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
5
5
  "author": "Supercharge",
6
6
  "license": "MIT",
@@ -48,6 +48,8 @@
48
48
  "@types/jest": "^29.5.12",
49
49
  "execa": "^5.0.0",
50
50
  "fs-extra": "^11.1.1",
51
- "jest": "^29.5.0"
51
+ "jest": "^29.5.0",
52
+ "jest-html-reporter": "^4.4.0",
53
+ "jest-junit": "^17.0.0"
52
54
  }
53
55
  }
package/targets/msw/templates/modelOneOf.mustache ADDED
@@ -0,0 +1,7 @@
1
+ {{#hasImports}}
2
+ {{#oneOf}}
3
+ import type { {{{.}}} } from './{{#lambda.camelcase}}{{.}}{{/lambda.camelcase}}{{importFileExtension}}';
4
+ {{/oneOf}}
5
+
6
+ {{/hasImports}}
7
+ {{>modelOneOfInterfaces}}
package/targets/plain-java/generator-config.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "library": "native",
3
+ "hideGenerationTimestamp": true,
3
4
  "openApiNullable": false,
4
5
  "useRuntimeException": true,
5
6
  "annotationLibrary": "none",
package/targets/python/generate.sh CHANGED
@@ -9,6 +9,11 @@ if [[ $version == *"-"* ]]; then
9
9
  echo "[NOTE] version updated to: ${version}"
10
10
  fi
11
11
 
12
+ # set projectName to packageName if projectName is not provided
13
+ if [[ -z "$projectName" ]]; then
14
+ projectName="$packageName"
15
+ fi
16
+
12
17
  rm -rf out/$targetId
13
18
  mkdir -p out/$targetId
14
19
 
@@ -18,7 +23,7 @@ java -jar $binary generate \
18
23
  -t $templateDir \
19
24
  -o out/$targetId \
20
25
  -c $(dirname "$0")/generator-config.json \
21
- -p "packageVersion=$version,packageName=$packageName" $generatorCustomArgs
26
+ -p "packageVersion=$version,packageName=$packageName,projectName=$projectName" $generatorCustomArgs
22
27
 
23
28
  cd out/$targetId
24
29
  python3 setup.py sdist bdist_wheel
package/targets/python-legacy/generate.sh CHANGED
@@ -9,6 +9,11 @@ if [[ $version == *"-"* ]]; then
9
9
  echo "[NOTE] version updated to: ${version}"
10
10
  fi
11
11
 
12
+ # set projectName to packageName if projectName is not provided
13
+ if [[ -z "$projectName" ]]; then
14
+ projectName="$packageName"
15
+ fi
16
+
12
17
  rm -rf out/$targetId
13
18
  mkdir -p out/$targetId
14
19
 
@@ -18,7 +23,7 @@ java -jar $binary generate \
18
23
  -t $templateDir \
19
24
  -o out/$targetId \
20
25
  -c $(dirname "$0")/generator-config.json \
21
- -p "packageVersion=$version,packageName=$packageName" $generatorCustomArgs
26
+ -p "packageVersion=$version,packageName=$packageName,projectName=$projectName" $generatorCustomArgs
22
27
 
23
28
  cd out/$targetId
24
29
  python3 setup.py sdist bdist_wheel