From 6f5076edb79c212ad5b4a515651652db04c8fb63 Mon Sep 17 00:00:00 2001 From: sahan Date: Tue, 15 Dec 2020 22:54:13 +1300 Subject: [PATCH] fix: use config basePath instead of the class context basePath (#8186) * fix: use config basePath instead of the class context basePath * chore: build samples --- .../typescript-axios/apiInner.mustache | 4 +- .../builds/composed-schemas/api.ts | 12 +-- .../typescript-axios/builds/default/api.ts | 80 +++++++++---------- .../typescript-axios/builds/es6-target/api.ts | 80 +++++++++---------- .../builds/with-complex-headers/api.ts | 80 +++++++++---------- .../builds/with-interfaces/api.ts | 80 +++++++++---------- .../api/another/level/pet-api.ts | 32 ++++---- .../api/another/level/store-api.ts | 16 ++-- .../api/another/level/user-api.ts | 32 ++++---- .../builds/with-npm-version/api.ts | 80 +++++++++---------- .../with-single-request-parameters/api.ts | 80 +++++++++---------- 11 files changed, 288 insertions(+), 288 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache index c9cd380307c..b8321a3f41f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache @@ -241,8 +241,8 @@ export const {{classname}}Fp = function(configuration?: Configuration) { */ async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>> { const localVarAxiosArgs = await {{classname}}AxiosParamCreator(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts index a9510438c22..20e496d94b0 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts @@ -342,8 +342,8 @@ export const DefaultApiFp = function(configuration?: Configuration) { */ async filePost(inlineObject?: InlineObject, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).filePost(inlineObject, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -355,8 +355,8 @@ export const DefaultApiFp = function(configuration?: Configuration) { */ async petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).petsFilteredPatch(petByAgePetByType, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -368,8 +368,8 @@ export const DefaultApiFp = function(configuration?: Configuration) { */ async petsPatch(catDog?: Cat | Dog, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await DefaultApiAxiosParamCreator(configuration).petsPatch(catDog, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts index e3912afe09c..1aca2afe908 100644 --- a/samples/client/petstore/typescript-axios/builds/default/api.ts +++ b/samples/client/petstore/typescript-axios/builds/default/api.ts @@ -740,8 +740,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -755,8 +755,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -769,8 +769,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -783,8 +783,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -797,8 +797,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -811,8 +811,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -827,8 +827,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -843,8 +843,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1261,8 +1261,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1274,8 +1274,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1288,8 +1288,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1302,8 +1302,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1826,8 +1826,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1840,8 +1840,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1854,8 +1854,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1868,8 +1868,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1882,8 +1882,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1897,8 +1897,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1910,8 +1910,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1925,8 +1925,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts index e3912afe09c..1aca2afe908 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts @@ -740,8 +740,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -755,8 +755,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -769,8 +769,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -783,8 +783,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -797,8 +797,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -811,8 +811,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -827,8 +827,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -843,8 +843,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1261,8 +1261,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1274,8 +1274,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1288,8 +1288,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1302,8 +1302,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1826,8 +1826,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1840,8 +1840,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1854,8 +1854,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1868,8 +1868,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1882,8 +1882,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1897,8 +1897,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1910,8 +1910,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1925,8 +1925,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts index 593dadef502..b330ba8ec8f 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts @@ -791,8 +791,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(pet: Pet, header1?: Pet, header2?: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(pet, header1, header2, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -806,8 +806,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -820,8 +820,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -834,8 +834,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -848,8 +848,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -862,8 +862,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(pet: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(pet, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -878,8 +878,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -894,8 +894,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1316,8 +1316,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1329,8 +1329,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1343,8 +1343,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1357,8 +1357,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(order: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(order, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1881,8 +1881,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(user: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(user, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1895,8 +1895,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(user: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(user, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1909,8 +1909,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(user: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(user, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1923,8 +1923,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1937,8 +1937,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1952,8 +1952,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1965,8 +1965,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1980,8 +1980,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, user: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, user, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts index a3066038f3d..132c7cc9635 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts @@ -740,8 +740,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -755,8 +755,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -769,8 +769,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -783,8 +783,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -797,8 +797,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -811,8 +811,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -827,8 +827,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -843,8 +843,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1354,8 +1354,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1367,8 +1367,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1381,8 +1381,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1395,8 +1395,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1966,8 +1966,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1980,8 +1980,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1994,8 +1994,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2008,8 +2008,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2022,8 +2022,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2037,8 +2037,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2050,8 +2050,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2065,8 +2065,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 82ad964b11f..338ebcd3fc4 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -516,8 +516,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -531,8 +531,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -545,8 +545,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -559,8 +559,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -573,8 +573,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -587,8 +587,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -603,8 +603,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -619,8 +619,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts index 5a75f953af2..ca42fa29018 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts @@ -226,8 +226,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -239,8 +239,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -253,8 +253,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -267,8 +267,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts index 2e2b395b201..bc264d72753 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts @@ -432,8 +432,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -446,8 +446,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -460,8 +460,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -474,8 +474,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -488,8 +488,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -503,8 +503,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -516,8 +516,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -531,8 +531,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts index e3912afe09c..1aca2afe908 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts @@ -740,8 +740,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -755,8 +755,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -769,8 +769,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -783,8 +783,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -797,8 +797,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -811,8 +811,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -827,8 +827,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -843,8 +843,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1261,8 +1261,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1274,8 +1274,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1288,8 +1288,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1302,8 +1302,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(body: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1826,8 +1826,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1840,8 +1840,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1854,8 +1854,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1868,8 +1868,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1882,8 +1882,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1897,8 +1897,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1910,8 +1910,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1925,8 +1925,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts index 02ee4b520ce..601ae3dd581 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts @@ -740,8 +740,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async addPet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).addPet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -755,8 +755,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async deletePet(petId: number, apiKey?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).deletePet(petId, apiKey, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -769,8 +769,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByStatus(status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -783,8 +783,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async findPetsByTags(tags: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).findPetsByTags(tags, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -797,8 +797,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async getPetById(petId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).getPetById(petId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -811,8 +811,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePet(body: Pet, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePet(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -827,8 +827,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async updatePetWithForm(petId: number, name?: string, status?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).updatePetWithForm(petId, name, status, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -843,8 +843,8 @@ export const PetApiFp = function(configuration?: Configuration) { */ async uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await PetApiAxiosParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1399,8 +1399,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async deleteOrder(orderId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).deleteOrder(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1412,8 +1412,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getInventory(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: number; }>> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getInventory(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1426,8 +1426,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async getOrderById(orderId: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).getOrderById(orderId, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -1440,8 +1440,8 @@ export const StoreApiFp = function(configuration?: Configuration) { */ async placeOrder(body?: Order, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await StoreApiAxiosParamCreator(configuration).placeOrder(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2006,8 +2006,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUser(body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUser(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2020,8 +2020,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithArrayInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithArrayInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2034,8 +2034,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async createUsersWithListInput(body: Array, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).createUsersWithListInput(body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2048,8 +2048,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async deleteUser(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).deleteUser(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2062,8 +2062,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async getUserByName(username: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).getUserByName(username, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2077,8 +2077,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async loginUser(username: string, password: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).loginUser(username, password, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2090,8 +2090,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async logoutUser(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).logoutUser(options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, @@ -2105,8 +2105,8 @@ export const UserApiFp = function(configuration?: Configuration) { */ async updateUser(username: string, body: User, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).updateUser(username, body, options); - return (axios: AxiosInstance = globalAxios, basePath: string = this.basePath) => { - const axiosRequestArgs = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs = {...localVarAxiosArgs.options, url: (configuration?.basePath || basePath) + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; },