loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 14:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[typescript-axios] Update to Axios 0.23.0 (#10626)

Browse Source 
* [typescript-axios] Update Axios to 0.23.0

BREAKING CHANGE: Axios 0.23.0 has a breaking TypeScript defintion change
which is incompatible with older versions of Axios.

* [typescript-axios] Update samples

* [typescript-axios] Use default binding for config to support older versions

With 2 generics arguments and leaving the AxiosRequestConfig arguments to it's
default the generated code can work both with 0.23.0 and older versions
This commit is contained in:
Vesa Poikajärvi 2021-10-19 08:55:39 +03:00 committed by GitHub
parent ff286aa06f
commit 124511e7be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/typescript-axios/common.mustache vendored
View File

@ -4,7 +4,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -120,8 +120,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/default/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/es6-target/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/test-petstore/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }

6
samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts
View File

@ -15,7 +15,7 @@
import { Configuration } from "./configuration"; import { Configuration } from "./configuration";
import { RequiredError, RequestArgs } from "./base"; import { RequiredError, RequestArgs } from "./base";
import { AxiosInstance } from 'axios'; import { AxiosInstance, AxiosResponse } from 'axios';
/** /**
* *
@ -131,8 +131,8 @@ export const toPathString = function (url: URL) {
* @export * @export
*/ */
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url}; const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
return axios.request(axiosRequestArgs); return axios.request<T, R>(axiosRequestArgs);
}; };
} }