Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generators/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
}

dependencies {
compileOnly 'org.openapitools:openapi-generator:7.13.0'
compileOnly 'org.openapitools:openapi-generator:7.14.0'
}

tasks.withType(JavaCompile) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
// We only wrap if there is a mix between body parameters and other parameters.
for (CodegenOperation ope : operations) {
// Nothing to wrap as there is no parameters
if (!ope.hasParams) {
if (!ope.getHasParams()) {
continue;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void addMethodCall(Map<String, Object> context, ParametersWithDataType pa
context.put("isGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-is-generic", false));
context.put("isCustomRequest", Helpers.CUSTOM_METHODS.contains(ope.operationIdOriginal));
context.put("isAsyncMethod", (boolean) ope.vendorExtensions.getOrDefault("x-asynchronous-helper", true));
context.put("hasParams", ope.hasParams);
context.put("hasParams", ope.getHasParams());
context.put("isHelper", (boolean) ope.vendorExtensions.getOrDefault("x-helper", false));
context.put("hasRequestOptions", requestOptions != null);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>

stepOut.put("stepTemplate", "tests/client/method.mustache");
stepOut.put("isMethod", true); // TODO: remove once kotlin is converted
stepOut.put("hasParams", ope.hasParams);
stepOut.put("hasParams", ope.getHasParams());
stepOut.put("isGeneric", (boolean) ope.vendorExtensions.getOrDefault("x-is-generic", false));
if (ope.returnType != null && ope.returnType.length() > 0) {
stepOut.put("returnType", Helpers.toPascalCase(ope.returnType));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>

test.put("request", req.request);
test.put("isAsyncMethod", true);
test.put("hasParams", ope.hasParams);
test.put("hasParams", ope.getHasParams());
test.put("isHelper", isHelper);

addRequestOptions(paramsType, req.requestOptions, test);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"website:build": "bash scripts/website/build.sh"
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "2.20.2",
"@openapitools/openapi-generator-cli": "2.21.0",
"@redocly/cli": "1.29.0",
"eslint": "8.57.1",
"eslint-plugin-automation-custom": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/pre-gen/generateOpenapitools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export async function generateOpenapitools(
JSON.stringify(
{
'generator-cli': {
version: '7.13.0',
version: '7.14.0',
generators,
},
},
Expand Down
151 changes: 95 additions & 56 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@algolia/api-client-automation@workspace:."
dependencies:
"@openapitools/openapi-generator-cli": "npm:2.20.2"
"@openapitools/openapi-generator-cli": "npm:2.21.0"
"@redocly/cli": "npm:1.29.0"
eslint: "npm:8.57.1"
eslint-plugin-automation-custom: "npm:1.0.0"
Expand Down Expand Up @@ -885,6 +885,22 @@ __metadata:
languageName: node
linkType: hard

"@isaacs/balanced-match@npm:^4.0.1":
version: 4.0.1
resolution: "@isaacs/balanced-match@npm:4.0.1"
checksum: 10/102fbc6d2c0d5edf8f6dbf2b3feb21695a21bc850f11bc47c4f06aa83bd8884fde3fe9d6d797d619901d96865fdcb4569ac2a54c937992c48885c5e3d9967fe8
languageName: node
linkType: hard

"@isaacs/brace-expansion@npm:^5.0.0":
version: 5.0.0
resolution: "@isaacs/brace-expansion@npm:5.0.0"
dependencies:
"@isaacs/balanced-match": "npm:^4.0.1"
checksum: 10/cf3b7f206aff12128214a1df764ac8cdbc517c110db85249b945282407e3dfc5c6e66286383a7c9391a059fc8e6e6a8ca82262fc9d2590bd615376141fbebd2d
languageName: node
linkType: hard

"@isaacs/cliui@npm:^8.0.2":
version: 8.0.2
resolution: "@isaacs/cliui@npm:8.0.2"
Expand Down Expand Up @@ -951,11 +967,11 @@ __metadata:
languageName: node
linkType: hard

"@nestjs/common@npm:11.1.1":
version: 11.1.1
resolution: "@nestjs/common@npm:11.1.1"
"@nestjs/common@npm:11.1.3":
version: 11.1.3
resolution: "@nestjs/common@npm:11.1.3"
dependencies:
file-type: "npm:20.5.0"
file-type: "npm:21.0.0"
iterare: "npm:1.2.1"
load-esm: "npm:1.0.2"
tslib: "npm:2.8.1"
Expand All @@ -970,13 +986,13 @@ __metadata:
optional: true
class-validator:
optional: true
checksum: 10/b58b951984df667b794a6c9cf65dda8ee43fe0c4e552183e045b126c82d99b50cddb1e84ea03b8dd7b04fca512acb107222ffad6b19dba359323f9b813032161
checksum: 10/b1c9699cdf9cee96ed0178e5eed3b1829c210bbdbd703bb9e1e0def2c7456273d73329635439b16164e43de8a8d54dd5b7d1dd5dba65417d746bd731b8c5d685
languageName: node
linkType: hard

"@nestjs/core@npm:11.1.1":
version: 11.1.1
resolution: "@nestjs/core@npm:11.1.1"
"@nestjs/core@npm:11.1.3":
version: 11.1.3
resolution: "@nestjs/core@npm:11.1.3"
dependencies:
"@nuxt/opencollective": "npm:0.4.1"
fast-safe-stringify: "npm:2.1.1"
Expand All @@ -998,7 +1014,7 @@ __metadata:
optional: true
"@nestjs/websockets":
optional: true
checksum: 10/88f8a3c52a98c059e6d93c5faf9194daee4667b1a855f88233582acf51e3be9aedb3e3f7f992da46e0e45df31ad4e045e0296e6e35ea14e2245d4069176711c0
checksum: 10/b46a9f877170f7e96429da5970684525277bcb341f3a24032b6748ad503b5c7164b77410daf9c0f3ca99b5f6b99985d5eb739501cfc01c941218397f32f2d095
languageName: node
linkType: hard

Expand Down Expand Up @@ -1355,22 +1371,22 @@ __metadata:
languageName: node
linkType: hard

"@openapitools/openapi-generator-cli@npm:2.20.2":
version: 2.20.2
resolution: "@openapitools/openapi-generator-cli@npm:2.20.2"
"@openapitools/openapi-generator-cli@npm:2.21.0":
version: 2.21.0
resolution: "@openapitools/openapi-generator-cli@npm:2.21.0"
dependencies:
"@nestjs/axios": "npm:4.0.0"
"@nestjs/common": "npm:11.1.1"
"@nestjs/core": "npm:11.1.1"
"@nestjs/common": "npm:11.1.3"
"@nestjs/core": "npm:11.1.3"
"@nuxtjs/opencollective": "npm:0.3.2"
axios: "npm:1.9.0"
axios: "npm:1.10.0"
chalk: "npm:4.1.2"
commander: "npm:8.3.0"
compare-versions: "npm:4.1.4"
concurrently: "npm:6.5.1"
console.table: "npm:0.10.0"
fs-extra: "npm:11.3.0"
glob: "npm:9.3.5"
glob: "npm:11.0.3"
inquirer: "npm:8.2.6"
lodash: "npm:4.17.21"
proxy-agent: "npm:6.5.0"
Expand All @@ -1379,7 +1395,7 @@ __metadata:
tslib: "npm:2.8.1"
bin:
openapi-generator-cli: main.js
checksum: 10/29807b52555e7307207eff6e0c4c1a25b970252915e13d847a6c275d1d638af0732761e51816f5bb5a91830ebabc044b3924a106db8cffa19dda01517a77be17
checksum: 10/54b83119e6d5ba378e521223025c548153c61a5110c39295e0493ee618392d59a8d56c731d23e8465e742db7201e19a207689df93ae86ae9d929991648888d4f
languageName: node
linkType: hard

Expand Down Expand Up @@ -1963,7 +1979,7 @@ __metadata:
languageName: node
linkType: hard

"@tokenizer/inflate@npm:^0.2.6":
"@tokenizer/inflate@npm:^0.2.7":
version: 0.2.7
resolution: "@tokenizer/inflate@npm:0.2.7"
dependencies:
Expand Down Expand Up @@ -2841,14 +2857,14 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:1.9.0":
version: 1.9.0
resolution: "axios@npm:1.9.0"
"axios@npm:1.10.0":
version: 1.10.0
resolution: "axios@npm:1.10.0"
dependencies:
follow-redirects: "npm:^1.15.6"
form-data: "npm:^4.0.0"
proxy-from-env: "npm:^1.1.0"
checksum: 10/a2f90bba56820883879f32a237e2b9ff25c250365dcafd41cec41b3406a3df334a148f90010182dfdadb4b41dc59f6f0b3e8898ff41b666d1157b5f3f4523497
checksum: 10/d43c80316a45611fd395743e15d16ea69a95f2b7f7095f2bb12cb78f9ca0a905194a02e52a3bf4e0db9f85fd1186d6c690410644c10ecd8bb0a468e57c2040e4
languageName: node
linkType: hard

Expand Down Expand Up @@ -4518,15 +4534,15 @@ __metadata:
languageName: node
linkType: hard

"file-type@npm:20.5.0":
version: 20.5.0
resolution: "file-type@npm:20.5.0"
"file-type@npm:21.0.0":
version: 21.0.0
resolution: "file-type@npm:21.0.0"
dependencies:
"@tokenizer/inflate": "npm:^0.2.6"
strtok3: "npm:^10.2.0"
"@tokenizer/inflate": "npm:^0.2.7"
strtok3: "npm:^10.2.2"
token-types: "npm:^6.0.0"
uint8array-extras: "npm:^1.4.0"
checksum: 10/1cc1ccd7cf76086e10b65cba88c708e0653676fbae900107deeb91c46de011acd1492200bf47e75cddf395de27dbe8584ca042f4cfa4a1efdf933644b7143f1d
checksum: 10/6980e8b0ef870a98b51ab2eac5db94a1884de8476fe49dc02d2f7e0c1d1d7d44d42b6c59e67867ae90f321ddf4edd00fcfda01821591e2fa05385d0e438a9dc1
languageName: node
linkType: hard

Expand Down Expand Up @@ -4620,7 +4636,7 @@ __metadata:
languageName: node
linkType: hard

"foreground-child@npm:^3.1.0":
"foreground-child@npm:^3.1.0, foreground-child@npm:^3.3.1":
version: 3.3.1
resolution: "foreground-child@npm:3.3.1"
dependencies:
Expand Down Expand Up @@ -4834,15 +4850,19 @@ __metadata:
languageName: node
linkType: hard

"glob@npm:9.3.5":
version: 9.3.5
resolution: "glob@npm:9.3.5"
"glob@npm:11.0.3":
version: 11.0.3
resolution: "glob@npm:11.0.3"
dependencies:
fs.realpath: "npm:^1.0.0"
minimatch: "npm:^8.0.2"
minipass: "npm:^4.2.4"
path-scurry: "npm:^1.6.1"
checksum: 10/e5fa8a58adf53525bca42d82a1fad9e6800032b7e4d372209b80cfdca524dd9a7dbe7d01a92d7ed20d89c572457f12c250092bc8817cb4f1c63efefdf9b658c0
foreground-child: "npm:^3.3.1"
jackspeak: "npm:^4.1.1"
minimatch: "npm:^10.0.3"
minipass: "npm:^7.1.2"
package-json-from-dist: "npm:^1.0.0"
path-scurry: "npm:^2.0.0"
bin:
glob: dist/esm/bin.mjs
checksum: 10/2ae536c1360c0266b523b2bfa6aadc10144a8b7e08869b088e37ac3c27cd30774f82e4bfb291cde796776e878f9e13200c7ff44010eb7054e00f46f649397893
languageName: node
linkType: hard

Expand Down Expand Up @@ -5406,6 +5426,15 @@ __metadata:
languageName: node
linkType: hard

"jackspeak@npm:^4.1.1":
version: 4.1.1
resolution: "jackspeak@npm:4.1.1"
dependencies:
"@isaacs/cliui": "npm:^8.0.2"
checksum: 10/ffceb270ec286841f48413bfb4a50b188662dfd599378ce142b6540f3f0a66821dc9dcb1e9ebc55c6c3b24dc2226c96e5819ba9bd7a241bd29031b61911718c7
languageName: node
linkType: hard

"java-parser@npm:2.3.4":
version: 2.3.4
resolution: "java-parser@npm:2.3.4"
Expand Down Expand Up @@ -5792,6 +5821,13 @@ __metadata:
languageName: node
linkType: hard

"lru-cache@npm:^11.0.0":
version: 11.1.0
resolution: "lru-cache@npm:11.1.0"
checksum: 10/5011011675ca98428902de774d0963b68c3a193cd959347cb63b781dad4228924124afab82159fd7b8b4db18285d9aff462b877b8f6efd2b41604f806c1d9db4
languageName: node
linkType: hard

"lru-cache@npm:^7.14.1":
version: 7.18.3
resolution: "lru-cache@npm:7.18.3"
Expand Down Expand Up @@ -5950,6 +5986,15 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:^10.0.3":
version: 10.0.3
resolution: "minimatch@npm:10.0.3"
dependencies:
"@isaacs/brace-expansion": "npm:^5.0.0"
checksum: 10/d5b8b2538b367f2cfd4aeef27539fddeee58d1efb692102b848e4a968a09780a302c530eb5aacfa8c57f7299155fb4b4e85219ad82664dcef5c66f657111d9b8
languageName: node
linkType: hard

"minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
version: 3.1.2
resolution: "minimatch@npm:3.1.2"
Expand All @@ -5968,15 +6013,6 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:^8.0.2":
version: 8.0.4
resolution: "minimatch@npm:8.0.4"
dependencies:
brace-expansion: "npm:^2.0.1"
checksum: 10/aef05598ee565e1013bc8a10f53410ac681561f901c1a084b8ecfd016c9ed919f58f4bbd5b63e05643189dfb26e8106a84f0e1ff12e4a263aa37e1cae7ce9828
languageName: node
linkType: hard

"minimatch@npm:^9.0.4":
version: 9.0.5
resolution: "minimatch@npm:9.0.5"
Expand Down Expand Up @@ -6053,13 +6089,6 @@ __metadata:
languageName: node
linkType: hard

"minipass@npm:^4.2.4":
version: 4.2.8
resolution: "minipass@npm:4.2.8"
checksum: 10/e148eb6dcb85c980234cad889139ef8ddf9d5bdac534f4f0268446c8792dd4c74f4502479be48de3c1cce2f6450f6da4d0d4a86405a8a12be04c1c36b339569a
languageName: node
linkType: hard

"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2":
version: 7.1.2
resolution: "minipass@npm:7.1.2"
Expand Down Expand Up @@ -6657,7 +6686,7 @@ __metadata:
languageName: node
linkType: hard

"path-scurry@npm:^1.11.1, path-scurry@npm:^1.6.1":
"path-scurry@npm:^1.11.1":
version: 1.11.1
resolution: "path-scurry@npm:1.11.1"
dependencies:
Expand All @@ -6667,6 +6696,16 @@ __metadata:
languageName: node
linkType: hard

"path-scurry@npm:^2.0.0":
version: 2.0.0
resolution: "path-scurry@npm:2.0.0"
dependencies:
lru-cache: "npm:^11.0.0"
minipass: "npm:^7.1.2"
checksum: 10/285ae0c2d6c34ae91dc1d5378ede21981c9a2f6de1ea9ca5a88b5a270ce9763b83dbadc7a324d512211d8d36b0c540427d3d0817030849d97a60fa840a2c59ec
languageName: node
linkType: hard

"path-to-regexp@npm:8.2.0, path-to-regexp@npm:^8.0.0":
version: 8.2.0
resolution: "path-to-regexp@npm:8.2.0"
Expand Down Expand Up @@ -7969,7 +8008,7 @@ __metadata:
languageName: node
linkType: hard

"strtok3@npm:^10.2.0":
"strtok3@npm:^10.2.2":
version: 10.3.1
resolution: "strtok3@npm:10.3.1"
dependencies:
Expand Down