Skip to content

Commit 3f7c9d2

Browse files
segevfinerlwj5
authored andcommitted
[typescript-axios] Upgrade to axios@^1 (OpenAPITools#14518)
* [typescript-axios] Upgrade to axios@^1 * Try fixing tests
1 parent 225de17 commit 3f7c9d2

File tree

44 files changed

+1286
-970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1286
-970
lines changed

modules/openapi-generator/src/main/resources/typescript-axios/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{{^withSeparateModelsAndApi}}
66
import type { Configuration } from './configuration';
7-
import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
7+
import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
88
import globalAxios from 'axios';
99
{{#withNodeImports}}
1010
// URLSearchParams not necessarily used

modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{>licenseInfo}}
55

66
import type { Configuration } from '{{apiRelativeToRoot}}configuration';
7-
import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
7+
import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
88
import globalAxios from 'axios';
99
{{#withNodeImports}}
1010
// URLSearchParams not necessarily used
@@ -47,7 +47,7 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
4747
* @deprecated{{/isDeprecated}}
4848
* @throws {RequiredError}
4949
*/
50-
{{nickname}}: async ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
50+
{{nickname}}: async ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
5151
{{#allParams}}
5252
{{#required}}
5353
// verify required parameter '{{paramName}}' is not null or undefined
@@ -258,7 +258,7 @@ export const {{classname}}Fp = function(configuration?: Configuration) {
258258
* @deprecated{{/isDeprecated}}
259259
* @throws {RequiredError}
260260
*/
261-
async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
261+
async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
262262
const localVarAxiosArgs = await localVarAxiosParamCreator.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
263263
const index = configuration?.serverIndex ?? 0;
264264
const operationBasePath = operationServerMap['{{classname}}.{{nickname}}']?.[index]?.url;
@@ -332,7 +332,7 @@ export interface {{classname}}Interface {
332332
* @throws {RequiredError}
333333
* @memberof {{classname}}Interface
334334
*/
335-
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options?: AxiosRequestConfig): AxiosPromise<{{{returnType}}}{{^returnType}}void{{/returnType}}>;
335+
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options?: RawAxiosRequestConfig): AxiosPromise<{{{returnType}}}{{^returnType}}void{{/returnType}}>;
336336

337337
{{/operation}}
338338
}
@@ -398,12 +398,12 @@ export class {{classname}} extends BaseAPI {
398398
* @memberof {{classname}}
399399
*/
400400
{{#useSingleRequestParameter}}
401-
public {{nickname}}({{#allParams.0}}requestParameters: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, {{/allParams.0}}options?: AxiosRequestConfig) {
401+
public {{nickname}}({{#allParams.0}}requestParameters: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, {{/allParams.0}}options?: RawAxiosRequestConfig) {
402402
return {{classname}}Fp(this.configuration).{{nickname}}({{#allParams.0}}{{#allParams}}requestParameters.{{paramName}}, {{/allParams}}{{/allParams.0}}options).then((request) => request(this.axios, this.basePath));
403403
}
404404
{{/useSingleRequestParameter}}
405405
{{^useSingleRequestParameter}}
406-
public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options?: AxiosRequestConfig) {
406+
public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}, {{/allParams}}options?: RawAxiosRequestConfig) {
407407
return {{classname}}Fp(this.configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options).then((request) => request(this.axios, this.basePath));
408408
}
409409
{{/useSingleRequestParameter}}

modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import type { Configuration } from './configuration';
66
// Some imports not used depending on template conditions
77
// @ts-ignore
8-
import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
8+
import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
99
import globalAxios from 'axios';
1010

1111
export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, "");
@@ -28,7 +28,7 @@ export const COLLECTION_FORMATS = {
2828
*/
2929
export interface RequestArgs {
3030
url: string;
31-
options: AxiosRequestConfig;
31+
options: RawAxiosRequestConfig;
3232
}
3333

3434
/**

modules/openapi-generator/src/main/resources/typescript-axios/package.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"prepare": "npm run build"
2727
},
2828
"dependencies": {
29-
"axios": "^0.27.2"
29+
"axios": "^1.6.1"
3030
},
3131
"devDependencies": {
3232
"@types/node": "^12.11.5",

0 commit comments

Comments
 (0)