From d41e73c9cb5e1d639fd249732cd6b045c72c5d99 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 8 Nov 2024 15:32:22 -0500 Subject: [PATCH 01/12] [typescript-axios] Add User-Agent Header to Default Axios --- .../src/main/resources/typescript-axios/baseApi.mustache | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache index d14b428f686f..25d20f80ef0d 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache @@ -10,6 +10,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/{{npmVersion}}/typescript-axios"; + /** * * @export From be617cf53cf387568f51c1c6d156ed8a8c057bc8 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 8 Nov 2024 15:37:44 -0500 Subject: [PATCH 02/12] fix if `npmVersion` doesn't exist --- .../src/main/resources/typescript-axios/baseApi.mustache | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache index 25d20f80ef0d..94861180186f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache @@ -10,7 +10,12 @@ import globalAxios from 'axios'; export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); +{{#npmVersion}} globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/{{npmVersion}}/typescript-axios"; +{{/npmVersion}} +{{^npmVersion}} +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; +{{/npmVersion}} /** * From fd18887940a89186096f918af3f9d5db48b966eb Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 8 Nov 2024 15:38:47 -0500 Subject: [PATCH 03/12] generate samples --- samples/client/echo_api/typescript-axios/build/base.ts | 2 ++ .../with-separate-models-and-api-inheritance/base.ts | 2 ++ .../petstore/typescript-axios/builds/composed-schemas/base.ts | 2 ++ samples/client/petstore/typescript-axios/builds/default/base.ts | 2 ++ .../client/petstore/typescript-axios/builds/es6-target/base.ts | 2 ++ .../petstore/typescript-axios/builds/test-petstore/base.ts | 2 ++ .../typescript-axios/builds/with-complex-headers/base.ts | 2 ++ .../base.ts | 2 ++ .../with-interfaces-and-with-single-request-param/base.ts | 2 ++ .../petstore/typescript-axios/builds/with-interfaces/base.ts | 2 ++ .../petstore/typescript-axios/builds/with-node-imports/base.ts | 2 ++ .../builds/with-npm-version-and-separate-models-and-api/base.ts | 2 ++ .../petstore/typescript-axios/builds/with-npm-version/base.ts | 2 ++ .../builds/with-single-request-parameters/base.ts | 2 ++ .../petstore/typescript-axios/builds/with-string-enums/base.ts | 2 ++ 15 files changed, 30 insertions(+) diff --git a/samples/client/echo_api/typescript-axios/build/base.ts b/samples/client/echo_api/typescript-axios/build/base.ts index b95cd69a9ed8..46fc98ce414f 100644 --- a/samples/client/echo_api/typescript-axios/build/base.ts +++ b/samples/client/echo_api/typescript-axios/build/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://localhost:3000".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; + /** * * @export diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts index 208ec53dda46..019eea03b6cd 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts index e215695bd26e..75d376c23967 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://api.example.xyz/v1".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/default/base.ts b/samples/client/petstore/typescript-axios/builds/default/base.ts index b92a383a84c7..c6b70196f0b9 100644 --- a/samples/client/petstore/typescript-axios/builds/default/base.ts +++ b/samples/client/petstore/typescript-axios/builds/default/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/base.ts b/samples/client/petstore/typescript-axios/builds/es6-target/base.ts index b92a383a84c7..6f80d070b8b9 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/base.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts index ba1854123f7c..6be5e55f9358 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io:80/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts index b92a383a84c7..6f80d070b8b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts index ba1854123f7c..6be5e55f9358 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io:80/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts index b92a383a84c7..c6b70196f0b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts index b92a383a84c7..c6b70196f0b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts index b92a383a84c7..c6b70196f0b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts index b92a383a84c7..6f80d070b8b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts index b92a383a84c7..6f80d070b8b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts index b92a383a84c7..c6b70196f0b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts index b92a383a84c7..c6b70196f0b9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts @@ -21,6 +21,8 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; + /** * * @export From 221c32251f24441fe709fc2fc68ad0c7c6cec066 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 8 Nov 2024 15:46:11 -0500 Subject: [PATCH 04/12] single line solution --- .../src/main/resources/typescript-axios/baseApi.mustache | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache index 94861180186f..6f9d669dadbc 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache @@ -10,12 +10,7 @@ import globalAxios from 'axios'; export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); -{{#npmVersion}} -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/{{npmVersion}}/typescript-axios"; -{{/npmVersion}} -{{^npmVersion}} -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; -{{/npmVersion}} +globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios"; /** * From 7b1e9c7952f05c38ce755d945d48510a1083df36 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 6 Dec 2024 15:32:32 -0500 Subject: [PATCH 05/12] move user agent header to config --- .../src/main/resources/typescript-axios/baseApi.mustache | 2 -- .../main/resources/typescript-axios/configuration.mustache | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache index 6f9d669dadbc..d14b428f686f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache @@ -10,8 +10,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios"; - /** * * @export diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache index 836f1275095d..b431c3dae0a2 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache @@ -78,7 +78,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } From 25669c5602dc1d68fc0d24d3adde7ca70ca62ac5 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 6 Dec 2024 15:36:05 -0500 Subject: [PATCH 06/12] generate samples --- samples/client/echo_api/typescript-axios/build/base.ts | 2 -- .../echo_api/typescript-axios/build/configuration.ts | 7 ++++++- .../with-separate-models-and-api-inheritance/base.ts | 2 -- .../configuration.ts | 7 ++++++- .../typescript-axios/builds/composed-schemas/base.ts | 2 -- .../builds/composed-schemas/configuration.ts | 7 ++++++- .../petstore/typescript-axios/builds/default/base.ts | 2 -- .../typescript-axios/builds/default/configuration.ts | 7 ++++++- .../petstore/typescript-axios/builds/es6-target/base.ts | 2 -- .../typescript-axios/builds/es6-target/configuration.ts | 7 ++++++- .../petstore/typescript-axios/builds/test-petstore/base.ts | 2 -- .../typescript-axios/builds/test-petstore/configuration.ts | 7 ++++++- .../typescript-axios/builds/with-complex-headers/base.ts | 2 -- .../builds/with-complex-headers/configuration.ts | 7 ++++++- .../base.ts | 2 -- .../configuration.ts | 7 ++++++- .../with-interfaces-and-with-single-request-param/base.ts | 2 -- .../configuration.ts | 7 ++++++- .../typescript-axios/builds/with-interfaces/base.ts | 2 -- .../builds/with-interfaces/configuration.ts | 7 ++++++- .../typescript-axios/builds/with-node-imports/base.ts | 2 -- .../builds/with-node-imports/configuration.ts | 7 ++++++- .../with-npm-version-and-separate-models-and-api/base.ts | 2 -- .../configuration.ts | 7 ++++++- .../typescript-axios/builds/with-npm-version/base.ts | 2 -- .../builds/with-npm-version/configuration.ts | 7 ++++++- .../builds/with-single-request-parameters/base.ts | 2 -- .../builds/with-single-request-parameters/configuration.ts | 7 ++++++- .../typescript-axios/builds/with-string-enums/base.ts | 2 -- .../builds/with-string-enums/configuration.ts | 7 ++++++- 30 files changed, 90 insertions(+), 45 deletions(-) diff --git a/samples/client/echo_api/typescript-axios/build/base.ts b/samples/client/echo_api/typescript-axios/build/base.ts index 46fc98ce414f..b95cd69a9ed8 100644 --- a/samples/client/echo_api/typescript-axios/build/base.ts +++ b/samples/client/echo_api/typescript-axios/build/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://localhost:3000".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; - /** * * @export diff --git a/samples/client/echo_api/typescript-axios/build/configuration.ts b/samples/client/echo_api/typescript-axios/build/configuration.ts index c952b7aefd76..870e3ec213d8 100644 --- a/samples/client/echo_api/typescript-axios/build/configuration.ts +++ b/samples/client/echo_api/typescript-axios/build/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts index 019eea03b6cd..208ec53dda46 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts index 2b516f9129ed..4af75224a458 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts index 75d376c23967..e215695bd26e 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://api.example.xyz/v1".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts index 46522502419f..faf884518327 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/default/base.ts b/samples/client/petstore/typescript-axios/builds/default/base.ts index c6b70196f0b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/default/base.ts +++ b/samples/client/petstore/typescript-axios/builds/default/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/default/configuration.ts b/samples/client/petstore/typescript-axios/builds/default/configuration.ts index d05f5a0d0835..4421f284052a 100644 --- a/samples/client/petstore/typescript-axios/builds/default/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/default/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/base.ts b/samples/client/petstore/typescript-axios/builds/es6-target/base.ts index 6f80d070b8b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/base.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts index d05f5a0d0835..016c95da1ff8 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts index 6be5e55f9358..ba1854123f7c 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io:80/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts index c8051a678dcf..3cc97598b62d 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts index 6f80d070b8b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts index d05f5a0d0835..016c95da1ff8 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts index 6be5e55f9358..ba1854123f7c 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io:80/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts index c8051a678dcf..3cc97598b62d 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts index c6b70196f0b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts index d05f5a0d0835..4421f284052a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts index c6b70196f0b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts index d05f5a0d0835..4421f284052a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts index c6b70196f0b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts index d05f5a0d0835..4421f284052a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts index 6f80d070b8b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts index d05f5a0d0835..016c95da1ff8 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts index 6f80d070b8b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/1.0.0/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts index d05f5a0d0835..016c95da1ff8 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts index c6b70196f0b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts index d05f5a0d0835..4421f284052a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts index c6b70196f0b9..b92a383a84c7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/base.ts @@ -21,8 +21,6 @@ import globalAxios from 'axios'; export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -globalAxios.defaults.headers.common['User-Agent'] = "OpenAPI-Generator/typescript-axios"; - /** * * @export diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts index d05f5a0d0835..4421f284052a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts @@ -89,7 +89,12 @@ export class Configuration { this.accessToken = param.accessToken; this.basePath = param.basePath; this.serverIndex = param.serverIndex; - this.baseOptions = param.baseOptions; + this.baseOptions = { + ...param.baseOptions, + headers: { + 'User-Agent': "OpenAPI-Generator/typescript-axios" + } + }; this.formDataCtor = param.formDataCtor; } From 195d0193edefa5a084d489ae8a6000bebe5799c9 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 6 Dec 2024 15:38:14 -0500 Subject: [PATCH 07/12] splat for headers as well --- .../src/main/resources/typescript-axios/configuration.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache index b431c3dae0a2..0459ddaf20bc 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache @@ -81,6 +81,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios" } }; From db330101b9f439e84a9e2b68dde18e963a740bff Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 6 Dec 2024 15:38:26 -0500 Subject: [PATCH 08/12] samples --- samples/client/echo_api/typescript-axios/build/configuration.ts | 1 + .../with-separate-models-and-api-inheritance/configuration.ts | 1 + .../typescript-axios/builds/composed-schemas/configuration.ts | 1 + .../petstore/typescript-axios/builds/default/configuration.ts | 1 + .../petstore/typescript-axios/builds/es6-target/configuration.ts | 1 + .../typescript-axios/builds/test-petstore/configuration.ts | 1 + .../builds/with-complex-headers/configuration.ts | 1 + .../configuration.ts | 1 + .../configuration.ts | 1 + .../typescript-axios/builds/with-interfaces/configuration.ts | 1 + .../typescript-axios/builds/with-node-imports/configuration.ts | 1 + .../configuration.ts | 1 + .../typescript-axios/builds/with-npm-version/configuration.ts | 1 + .../builds/with-single-request-parameters/configuration.ts | 1 + .../typescript-axios/builds/with-string-enums/configuration.ts | 1 + 15 files changed, 15 insertions(+) diff --git a/samples/client/echo_api/typescript-axios/build/configuration.ts b/samples/client/echo_api/typescript-axios/build/configuration.ts index 870e3ec213d8..5ec83e55782d 100644 --- a/samples/client/echo_api/typescript-axios/build/configuration.ts +++ b/samples/client/echo_api/typescript-axios/build/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } }; diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts index 4af75224a458..60587af7ce41 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts index faf884518327..a01d0f78c2f6 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/default/configuration.ts b/samples/client/petstore/typescript-axios/builds/default/configuration.ts index 4421f284052a..e83d19620791 100644 --- a/samples/client/petstore/typescript-axios/builds/default/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/default/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts index 016c95da1ff8..fae98574dcc5 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts index 3cc97598b62d..f64cf047c54b 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts index 016c95da1ff8..fae98574dcc5 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts index 3cc97598b62d..f64cf047c54b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts index 4421f284052a..e83d19620791 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts index 4421f284052a..e83d19620791 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts index 4421f284052a..e83d19620791 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts index 016c95da1ff8..fae98574dcc5 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts index 016c95da1ff8..fae98574dcc5 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts index 4421f284052a..e83d19620791 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts index 4421f284052a..e83d19620791 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts @@ -92,6 +92,7 @@ export class Configuration { this.baseOptions = { ...param.baseOptions, headers: { + ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } }; From 7d370bbb57f377156d0ab7e4b6e425a0bb45f4d5 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Tue, 17 Dec 2024 10:55:50 -0500 Subject: [PATCH 09/12] move headers above baseOptions --- .../src/main/resources/typescript-axios/configuration.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache index 0459ddaf20bc..a1d2919cf61b 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache @@ -79,11 +79,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } From 59086c76fa0ed2ebde26f6a6b0fcc10220d637f0 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Tue, 17 Dec 2024 11:14:28 -0500 Subject: [PATCH 10/12] samples --- samples/client/echo_api/typescript-axios/build/configuration.ts | 2 +- .../with-separate-models-and-api-inheritance/configuration.ts | 2 +- .../typescript-axios/builds/composed-schemas/configuration.ts | 2 +- .../petstore/typescript-axios/builds/default/configuration.ts | 2 +- .../typescript-axios/builds/es6-target/configuration.ts | 2 +- .../typescript-axios/builds/test-petstore/configuration.ts | 2 +- .../builds/with-complex-headers/configuration.ts | 2 +- .../configuration.ts | 2 +- .../configuration.ts | 2 +- .../typescript-axios/builds/with-interfaces/configuration.ts | 2 +- .../typescript-axios/builds/with-node-imports/configuration.ts | 2 +- .../configuration.ts | 2 +- .../typescript-axios/builds/with-npm-version/configuration.ts | 2 +- .../builds/with-single-request-parameters/configuration.ts | 2 +- .../typescript-axios/builds/with-string-enums/configuration.ts | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/samples/client/echo_api/typescript-axios/build/configuration.ts b/samples/client/echo_api/typescript-axios/build/configuration.ts index 5ec83e55782d..05d0cf7a66c0 100644 --- a/samples/client/echo_api/typescript-axios/build/configuration.ts +++ b/samples/client/echo_api/typescript-axios/build/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts index 60587af7ce41..a16e7b794103 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts index a01d0f78c2f6..64050803abb4 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/default/configuration.ts b/samples/client/petstore/typescript-axios/builds/default/configuration.ts index e83d19620791..a7fefb3c1323 100644 --- a/samples/client/petstore/typescript-axios/builds/default/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/default/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts index fae98574dcc5..6d7d66fb077e 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts index f64cf047c54b..b90620197a25 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts index fae98574dcc5..6d7d66fb077e 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts index f64cf047c54b..b90620197a25 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts index e83d19620791..a7fefb3c1323 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts index e83d19620791..a7fefb3c1323 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts index e83d19620791..a7fefb3c1323 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts index fae98574dcc5..6d7d66fb077e 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts index fae98574dcc5..6d7d66fb077e 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts index e83d19620791..a7fefb3c1323 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts index e83d19620791..a7fefb3c1323 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts @@ -90,11 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" } + ...param.baseOptions, }; this.formDataCtor = param.formDataCtor; } From 949dd9b18a7e9d9a9c932770ecbe07266b227466 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Tue, 17 Dec 2024 11:15:46 -0500 Subject: [PATCH 11/12] commas are hard --- .../main/resources/typescript-axios/configuration.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache index a1d2919cf61b..b1054b473903 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache @@ -82,8 +82,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator{{#npmVersion}}/{{npmVersion}}{{/npmVersion}}/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } From 34f2792a58ce9e3bd1a081bacfc7518edfd73016 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Tue, 17 Dec 2024 11:16:33 -0500 Subject: [PATCH 12/12] samples again --- .../client/echo_api/typescript-axios/build/configuration.ts | 4 ++-- .../with-separate-models-and-api-inheritance/configuration.ts | 4 ++-- .../typescript-axios/builds/composed-schemas/configuration.ts | 4 ++-- .../petstore/typescript-axios/builds/default/configuration.ts | 4 ++-- .../typescript-axios/builds/es6-target/configuration.ts | 4 ++-- .../typescript-axios/builds/test-petstore/configuration.ts | 4 ++-- .../builds/with-complex-headers/configuration.ts | 4 ++-- .../configuration.ts | 4 ++-- .../configuration.ts | 4 ++-- .../typescript-axios/builds/with-interfaces/configuration.ts | 4 ++-- .../builds/with-node-imports/configuration.ts | 4 ++-- .../configuration.ts | 4 ++-- .../typescript-axios/builds/with-npm-version/configuration.ts | 4 ++-- .../builds/with-single-request-parameters/configuration.ts | 4 ++-- .../builds/with-string-enums/configuration.ts | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/samples/client/echo_api/typescript-axios/build/configuration.ts b/samples/client/echo_api/typescript-axios/build/configuration.ts index 05d0cf7a66c0..3d3a2e171957 100644 --- a/samples/client/echo_api/typescript-axios/build/configuration.ts +++ b/samples/client/echo_api/typescript-axios/build/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts index a16e7b794103..1fce163c5289 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts index 64050803abb4..9a2e0b421507 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/default/configuration.ts b/samples/client/petstore/typescript-axios/builds/default/configuration.ts index a7fefb3c1323..11ef080ada62 100644 --- a/samples/client/petstore/typescript-axios/builds/default/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/default/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts index 6d7d66fb077e..a486597d2e82 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts index b90620197a25..7040acff7e0a 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts index 6d7d66fb077e..a486597d2e82 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts index b90620197a25..7040acff7e0a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts index a7fefb3c1323..11ef080ada62 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts index a7fefb3c1323..11ef080ada62 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts index a7fefb3c1323..11ef080ada62 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts index 6d7d66fb077e..a486597d2e82 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts index 6d7d66fb077e..a486597d2e82 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts index a7fefb3c1323..11ef080ada62 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; } diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts index a7fefb3c1323..11ef080ada62 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/configuration.ts @@ -93,8 +93,8 @@ export class Configuration { headers: { ...param.baseOptions?.headers, 'User-Agent': "OpenAPI-Generator/typescript-axios" - } - ...param.baseOptions, + }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; }