From 91e8fcbd38e3fd6c6a99a077b3c03efa8da67b06 Mon Sep 17 00:00:00 2001 From: shubham-lakhiwal <64410693+shubham-lakhiwal@users.noreply.github.com> Date: Wed, 10 Aug 2022 22:04:46 +0200 Subject: [PATCH] [Typescript-axios] Dot prefix on every query parameter (#13149) * [#12887] dot prefix fixed for pr #13051 * [#12887] dot prefix fixed for pr #13051 * [#12887] review comment incorporated #13051 --- .../src/main/resources/typescript-axios/common.mustache | 2 +- .../petstore/typescript-axios/builds/composed-schemas/common.ts | 2 +- .../client/petstore/typescript-axios/builds/default/common.ts | 2 +- .../petstore/typescript-axios/builds/es6-target/common.ts | 2 +- .../petstore/typescript-axios/builds/test-petstore/common.ts | 2 +- .../typescript-axios/builds/with-complex-headers/common.ts | 2 +- .../common.ts | 2 +- .../petstore/typescript-axios/builds/with-interfaces/common.ts | 2 +- .../typescript-axios/builds/with-node-imports/common.ts | 2 +- .../with-npm-version-and-separate-models-and-api/common.ts | 2 +- .../petstore/typescript-axios/builds/with-npm-version/common.ts | 2 +- .../builds/with-single-request-parameters/common.ts | 2 +- .../typescript-axios/builds/with-string-enums/common.ts | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache index e9a2378002f..9a97e1c8e6f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache @@ -82,7 +82,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts index 511e05e6b18..57e263ddf75 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/default/common.ts b/samples/client/petstore/typescript-axios/builds/default/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/default/common.ts +++ b/samples/client/petstore/typescript-axios/builds/default/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/common.ts b/samples/client/petstore/typescript-axios/builds/es6-target/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/common.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts index 0ab2c9b4646..b21850044c1 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts index 0ab2c9b4646..b21850044c1 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/common.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/common.ts index 05c568e7f16..60db95f6132 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/common.ts @@ -91,7 +91,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } } diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/common.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/common.ts index 37c079770b7..bb1c102350b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/common.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/common.ts @@ -90,7 +90,7 @@ function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: an } else { Object.keys(parameter).forEach(currentKey => - setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}.${currentKey}`) + setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`) ); } }