diff --git a/package-lock.json b/package-lock.json index c6abd6b0f..0d3f8f3b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openapi-typescript-codegen", - "version": "0.29.0", + "version": "0.29.0-fork6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openapi-typescript-codegen", - "version": "0.29.0", + "version": "0.29.0-fork6", "license": "MIT", "dependencies": { "@apidevtools/json-schema-ref-parser": "^11.5.4", diff --git a/package.json b/package.json index d322b8bc5..838b855df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openapi-typescript-codegen", - "version": "0.29.0", + "version": "0.29.0-fork6", "description": "Library that generates Typescript clients based on the OpenAPI specification.", "author": "Ferdi Koomen", "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen", @@ -42,7 +42,7 @@ "types/index.d.ts" ], "scripts": { - "clean": "rimraf ./dist ./test/generated ./test/e2e/generated ./samples/generated ./coverage ./node_modules/.cache", + "clean": "npx rimraf ./dist ./test/generated ./test/e2e/generated ./samples/generated ./coverage ./node_modules/.cache", "build": "rollup --config --environment NODE_ENV:development", "build:watch": "rollup --config --environment NODE_ENV:development --watch", "release": "rollup --config --environment NODE_ENV:production", diff --git a/src/openApi/v3/interfaces/OpenApiSchema.d.ts b/src/openApi/v3/interfaces/OpenApiSchema.d.ts index 9d9b43751..88b726874 100644 --- a/src/openApi/v3/interfaces/OpenApiSchema.d.ts +++ b/src/openApi/v3/interfaces/OpenApiSchema.d.ts @@ -55,4 +55,5 @@ export interface OpenApiSchema extends OpenApiReference, WithEnumExtension { externalDocs?: OpenApiExternalDocs; example?: any; deprecated?: boolean; + ['x-enum-varname']?: string; } diff --git a/src/openApi/v3/parser/getModelProperties.ts b/src/openApi/v3/parser/getModelProperties.ts index 6e25ca833..04cea1957 100644 --- a/src/openApi/v3/parser/getModelProperties.ts +++ b/src/openApi/v3/parser/getModelProperties.ts @@ -74,8 +74,8 @@ export const getModelProperties = ( const model = getType(property.$ref); models.push({ export: 'reference', - type: model.type, - base: model.base, + type: property['x-enum-varname'] ? `${model.type}.${property['x-enum-varname']}` : model.type, + base: property['x-enum-varname'] ? `${model.base}.${property['x-enum-varname']}` : model.base, template: model.template, link: null, isNullable: model.isNullable || property.nullable === true, diff --git a/src/templates/core/ApiError.hbs b/src/templates/core/ApiError.hbs index ab6849d18..29b67db3c 100644 --- a/src/templates/core/ApiError.hbs +++ b/src/templates/core/ApiError.hbs @@ -9,8 +9,9 @@ export class ApiError extends Error { public readonly statusText: string; public readonly body: any; public readonly request: ApiRequestOptions; + public readonly code?: string; - constructor(request: ApiRequestOptions, response: ApiResult, message: string) { + constructor(request: ApiRequestOptions, response: ApiResult, message: string, code?: string) { super(message); this.name = 'ApiError'; @@ -19,5 +20,6 @@ export class ApiError extends Error { this.statusText = response.statusText; this.body = response.body; this.request = request; + this.code = code; } } diff --git a/src/templates/core/AxiosRequestOptions.hbs b/src/templates/core/AxiosRequestOptions.hbs new file mode 100644 index 000000000..febe3dcf6 --- /dev/null +++ b/src/templates/core/AxiosRequestOptions.hbs @@ -0,0 +1,8 @@ +{{>header}} + +import { AxiosProgressEvent } from 'axios'; + +export type AxiosRequestOptions = { + readonly onUploadProgress?: (progress: AxiosProgressEvent) => void; + readonly signal?: AbortSignal; +}; diff --git a/src/templates/core/BaseHttpRequest.hbs b/src/templates/core/BaseHttpRequest.hbs index 43ff79cbb..ba09b10a1 100644 --- a/src/templates/core/BaseHttpRequest.hbs +++ b/src/templates/core/BaseHttpRequest.hbs @@ -6,6 +6,11 @@ import type { Observable } from 'rxjs'; import type { ApiRequestOptions } from './ApiRequestOptions'; import type { OpenAPIConfig } from './OpenAPI'; +{{else equals @root.httpclient 'axios'}} +import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { AxiosRequestOptions } from './AxiosRequestOptions'; +import type { CancelablePromise } from './CancelablePromise'; +import type { OpenAPIConfig } from './OpenAPI'; {{else}} import type { ApiRequestOptions } from './ApiRequestOptions'; import type { CancelablePromise } from './CancelablePromise'; @@ -25,6 +30,8 @@ export abstract class BaseHttpRequest { {{#equals @root.httpClient 'angular'}} public abstract request(options: ApiRequestOptions): Observable; + {{else equals @root.httpClient 'axios'}} + public abstract request(options: ApiRequestOptions & AxiosRequestOptions): Promise; {{else}} public abstract request(options: ApiRequestOptions): CancelablePromise; {{/equals}} diff --git a/src/templates/core/HttpRequest.hbs b/src/templates/core/HttpRequest.hbs index e1620a3c0..1d323bd74 100644 --- a/src/templates/core/HttpRequest.hbs +++ b/src/templates/core/HttpRequest.hbs @@ -10,6 +10,12 @@ import { BaseHttpRequest } from './BaseHttpRequest'; import type { OpenAPIConfig } from './OpenAPI'; import { OpenAPI } from './OpenAPI'; import { request as __request } from './request'; +{{else equals @root.httpClient 'axios'}} +import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { AxiosRequestOptions } from './AxiosRequestOptions'; +import { BaseHttpRequest } from './BaseHttpRequest'; +import type { OpenAPIConfig } from './OpenAPI'; +import { request as __request } from './request'; {{else}} import type { ApiRequestOptions } from './ApiRequestOptions'; import { BaseHttpRequest } from './BaseHttpRequest'; @@ -47,6 +53,14 @@ export class {{httpRequest}} extends BaseHttpRequest { public override request(options: ApiRequestOptions): Observable { return __request(this.config, this.http, options); } + {{else equals @root.httpClient 'axios'}} + /** + * Request method + * @param options The request options from the service + * @returns Promise + * @throws ApiError + */ + public override request(options: ApiRequestOptions & AxiosRequestOptions): Promise { {{else}} /** * Request method diff --git a/src/templates/core/axios/getHeaders.hbs b/src/templates/core/axios/getHeaders.hbs index 23bfb2cf5..34ec05c5e 100644 --- a/src/templates/core/axios/getHeaders.hbs +++ b/src/templates/core/axios/getHeaders.hbs @@ -6,13 +6,10 @@ export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptio resolve(options, config.HEADERS), ]); - const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {} - const headers = Object.entries({ Accept: 'application/json', ...additionalHeaders, ...options.headers, - ...formHeaders, }) .filter(([_, value]) => isDefined(value)) .reduce((headers, [key, value]) => ({ diff --git a/src/templates/core/axios/request.hbs b/src/templates/core/axios/request.hbs index 6612f1614..ba7f0ed6d 100644 --- a/src/templates/core/axios/request.hbs +++ b/src/templates/core/axios/request.hbs @@ -2,13 +2,11 @@ import axios from 'axios'; import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios'; -import FormData from 'form-data'; import { ApiError } from './ApiError'; import type { ApiRequestOptions } from './ApiRequestOptions'; +import type { AxiosRequestOptions } from './AxiosRequestOptions'; import type { ApiResult } from './ApiResult'; -import { CancelablePromise } from './CancelablePromise'; -import type { OnCancel } from './CancelablePromise'; import type { OpenAPIConfig } from './OpenAPI'; {{>functions/isDefined}} @@ -70,33 +68,31 @@ import type { OpenAPIConfig } from './OpenAPI'; * @returns CancelablePromise * @throws ApiError */ -export const request = (config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise => { - return new CancelablePromise(async (resolve, reject, onCancel) => { - try { - const url = getUrl(config, options); - const formData = getFormData(options); - const body = getRequestBody(options); - const headers = await getHeaders(config, options, formData); - - if (!onCancel.isCancelled) { - const response = await sendRequest(config, options, url, body, formData, headers, onCancel, axiosClient); - const responseBody = getResponseBody(response); - const responseHeader = getResponseHeader(response, options.responseHeader); - - const result: ApiResult = { - url, - ok: isSuccess(response.status), - status: response.status, - statusText: response.statusText, - body: responseHeader ?? responseBody, - }; - - catchErrorCodes(options, result); - - resolve(result.body); - } - } catch (error) { - reject(error); - } - }); +export const request = async ( + config: OpenAPIConfig, + options: ApiRequestOptions & AxiosRequestOptions, + axiosClient: AxiosInstance = axios +): Promise => { + const url = getUrl(config, options); + const formData = getFormData(options); + const body = getRequestBody(options); + const headers = await getHeaders(config, options, formData); + + options.signal?.throwIfAborted(); + + const response = await sendRequest(config, options, url, body, formData, headers, axiosClient); + const responseBody = getResponseBody(response); + const responseHeader = getResponseHeader(response, options.responseHeader); + + const result: ApiResult = { + url, + ok: isSuccess(response.status), + status: response.status, + statusText: response.statusText, + body: responseHeader ?? responseBody, + }; + + catchErrorCodes(options, result); + + return result.body as T; }; diff --git a/src/templates/core/axios/sendRequest.hbs b/src/templates/core/axios/sendRequest.hbs index 66b5dcb1d..9412f8256 100644 --- a/src/templates/core/axios/sendRequest.hbs +++ b/src/templates/core/axios/sendRequest.hbs @@ -1,15 +1,12 @@ export const sendRequest = async ( config: OpenAPIConfig, - options: ApiRequestOptions, + options: ApiRequestOptions & AxiosRequestOptions, url: string, body: any, formData: FormData | undefined, headers: Record, - onCancel: OnCancel, axiosClient: AxiosInstance ): Promise> => { - const source = axios.CancelToken.source(); - const requestConfig: AxiosRequestConfig = { url, headers, @@ -17,11 +14,11 @@ export const sendRequest = async ( method: options.method, withCredentials: config.WITH_CREDENTIALS, withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false, - cancelToken: source.token, + validateStatus: isSuccess, + signal: options.signal, + onUploadProgress: options.onUploadProgress }; - onCancel(() => source.cancel('The user aborted a request.')); - try { return await axiosClient.request(requestConfig); } catch (error) { diff --git a/src/templates/core/functions/catchErrorCodes.hbs b/src/templates/core/functions/catchErrorCodes.hbs index 42f69d071..009d8a13b 100644 --- a/src/templates/core/functions/catchErrorCodes.hbs +++ b/src/templates/core/functions/catchErrorCodes.hbs @@ -6,6 +6,7 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): 401: 'Unauthorized', 403: 'Forbidden', 404: 'Not Found', + 457: 'Coauthor Error', 500: 'Internal Server Error', 502: 'Bad Gateway', 503: 'Service Unavailable', @@ -14,7 +15,14 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): const error = errors[result.status]; if (error) { - throw new ApiError(options, result, error); + const code = result.status === 457 && + typeof result.body === 'object' && + result.body !== null && + 'code' in result.body + ? result.body.code + : undefined; + + throw new ApiError(options, result, error, code); } if (!result.ok) { diff --git a/src/templates/core/functions/isSuccess.hbs b/src/templates/core/functions/isSuccess.hbs index 5749d56e4..86467f16e 100644 --- a/src/templates/core/functions/isSuccess.hbs +++ b/src/templates/core/functions/isSuccess.hbs @@ -1,3 +1,3 @@ export const isSuccess = (status: number): boolean => { - return status >= 200 && status < 300; + return (status >= 200 && status < 300) || status === 304; }; diff --git a/src/templates/exportService.hbs b/src/templates/exportService.hbs index d6bccbbeb..a86d74889 100644 --- a/src/templates/exportService.hbs +++ b/src/templates/exportService.hbs @@ -17,9 +17,12 @@ import type { {{{this}}} } from '../models/{{{this}}}'; {{/each}} {{/if}} -{{#notEquals @root.httpClient 'angular'}} +{{#equals @root.httpClient 'angular'}} +{{else equals @root.httpClient 'axios'}} +import type { AxiosRequestOptions } from '../core/AxiosRequestOptions'; +{{else}} import type { CancelablePromise } from '../core/CancelablePromise'; -{{/notEquals}} +{{/equals}} {{#if @root.exportClient}} {{#equals @root.httpClient 'angular'}} import { BaseHttpRequest } from '../core/BaseHttpRequest'; @@ -74,6 +77,9 @@ export class {{{name}}}{{{@root.postfix}}} { {{#equals @root.httpClient 'angular'}} public {{{name}}}({{>parameters}}): Observable<{{>result}}> { return this.httpRequest.request({ + {{else equals @root.httpClient 'axios'}} + public {{{name}}}({{>parameters}} options?: AxiosRequestOptions): Promise<{{>result}}> { + return this.httpRequest.request({ {{else}} public {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> { return this.httpRequest.request({ @@ -82,6 +88,9 @@ export class {{{name}}}{{{@root.postfix}}} { {{#equals @root.httpClient 'angular'}} public {{{name}}}({{>parameters}}): Observable<{{>result}}> { return __request(OpenAPI, this.http, { + {{else equals @root.httpClient 'axios'}} + public static {{{name}}}({{>parameters}} options?: AxiosRequestOptions): Promise<{{>result}}> { + return __request(OpenAPI, { {{else}} public static {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> { return __request(OpenAPI, { @@ -144,6 +153,9 @@ export class {{{name}}}{{{@root.postfix}}} { {{{code}}}: `{{{escapeDescription description}}}`, {{/each}} }, + {{#equals @root.httpClient 'axios'}} + ...options, + {{/equals}} {{/if}} }); } diff --git a/src/templates/index.hbs b/src/templates/index.hbs index 6f5b27d8c..7e8ee0ecb 100644 --- a/src/templates/index.hbs +++ b/src/templates/index.hbs @@ -9,7 +9,9 @@ export { ApiError } from './core/ApiError'; {{#if @root.exportClient}} export { BaseHttpRequest } from './core/BaseHttpRequest'; {{/if}} +{{#notEquals @root.httpClient 'axios'}} export { CancelablePromise, CancelError } from './core/CancelablePromise'; +{{/notEquals}} export { OpenAPI } from './core/OpenAPI'; export type { OpenAPIConfig } from './core/OpenAPI'; {{/if}} diff --git a/src/utils/registerHandlebarTemplates.spec.ts b/src/utils/registerHandlebarTemplates.spec.ts index 5e1302384..7b0518ada 100644 --- a/src/utils/registerHandlebarTemplates.spec.ts +++ b/src/utils/registerHandlebarTemplates.spec.ts @@ -15,6 +15,7 @@ describe('registerHandlebarTemplates', () => { expect(templates.core.settings).toBeDefined(); expect(templates.core.apiError).toBeDefined(); expect(templates.core.apiRequestOptions).toBeDefined(); + expect(templates.core.axiosRequestOptions).toBeDefined(); expect(templates.core.apiResult).toBeDefined(); expect(templates.core.request).toBeDefined(); }); diff --git a/src/utils/registerHandlebarTemplates.ts b/src/utils/registerHandlebarTemplates.ts index bf77cbdc1..fc4f6554e 100644 --- a/src/utils/registerHandlebarTemplates.ts +++ b/src/utils/registerHandlebarTemplates.ts @@ -17,6 +17,7 @@ import axiosGetResponseBody from '../templates/core/axios/getResponseBody.hbs'; import axiosGetResponseHeader from '../templates/core/axios/getResponseHeader.hbs'; import axiosRequest from '../templates/core/axios/request.hbs'; import axiosSendRequest from '../templates/core/axios/sendRequest.hbs'; +import templateCoreAxiosRequestOptions from '../templates/core/AxiosRequestOptions.hbs'; import templateCoreBaseHttpRequest from '../templates/core/BaseHttpRequest.hbs'; import templateCancelablePromise from '../templates/core/CancelablePromise.hbs'; import fetchGetHeaders from '../templates/core/fetch/getHeaders.hbs'; @@ -97,6 +98,7 @@ export interface Templates { settings: Handlebars.TemplateDelegate; apiError: Handlebars.TemplateDelegate; apiRequestOptions: Handlebars.TemplateDelegate; + axiosRequestOptions: Handlebars.TemplateDelegate; apiResult: Handlebars.TemplateDelegate; cancelablePromise: Handlebars.TemplateDelegate; request: Handlebars.TemplateDelegate; @@ -129,6 +131,7 @@ export const registerHandlebarTemplates = (root: { settings: Handlebars.template(templateCoreSettings), apiError: Handlebars.template(templateCoreApiError), apiRequestOptions: Handlebars.template(templateCoreApiRequestOptions), + axiosRequestOptions: Handlebars.template(templateCoreAxiosRequestOptions), apiResult: Handlebars.template(templateCoreApiResult), cancelablePromise: Handlebars.template(templateCancelablePromise), request: Handlebars.template(templateCoreRequest), diff --git a/src/utils/writeClient.spec.ts b/src/utils/writeClient.spec.ts index 3c06a95a5..6368c8db1 100644 --- a/src/utils/writeClient.spec.ts +++ b/src/utils/writeClient.spec.ts @@ -28,6 +28,7 @@ describe('writeClient', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request', diff --git a/src/utils/writeClient.ts b/src/utils/writeClient.ts index cea2f3d88..d5ba202d4 100644 --- a/src/utils/writeClient.ts +++ b/src/utils/writeClient.ts @@ -105,6 +105,7 @@ export const writeClient = async ( client, templates, outputPath, + httpClient, useUnionTypes, exportCore, exportServices, diff --git a/src/utils/writeClientClass.spec.ts b/src/utils/writeClientClass.spec.ts index 102f2eb57..2fbc5380c 100644 --- a/src/utils/writeClientClass.spec.ts +++ b/src/utils/writeClientClass.spec.ts @@ -28,6 +28,7 @@ describe('writeClientClass', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request', diff --git a/src/utils/writeClientCore.spec.ts b/src/utils/writeClientCore.spec.ts index 7db71f59b..7514d928c 100644 --- a/src/utils/writeClientCore.spec.ts +++ b/src/utils/writeClientCore.spec.ts @@ -31,6 +31,7 @@ describe('writeClientCore', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request', diff --git a/src/utils/writeClientCore.ts b/src/utils/writeClientCore.ts index 6d35849d2..98e3fc7ad 100644 --- a/src/utils/writeClientCore.ts +++ b/src/utils/writeClientCore.ts @@ -1,7 +1,7 @@ import { resolve } from 'path'; import type { Client } from '../client/interfaces/Client'; -import type { HttpClient } from '../HttpClient'; +import { HttpClient } from '../HttpClient'; import type { Indent } from '../Indent'; import { copyFile, exists, writeFile } from './fileSystem'; import { formatIndentation as i } from './formatIndentation'; @@ -41,7 +41,17 @@ export const writeClientCore = async ( await writeFile(resolve(outputPath, 'ApiError.ts'), i(templates.core.apiError(context), indent)); await writeFile(resolve(outputPath, 'ApiRequestOptions.ts'), i(templates.core.apiRequestOptions(context), indent)); await writeFile(resolve(outputPath, 'ApiResult.ts'), i(templates.core.apiResult(context), indent)); - await writeFile(resolve(outputPath, 'CancelablePromise.ts'), i(templates.core.cancelablePromise(context), indent)); + if (context.httpClient === HttpClient.AXIOS) { + await writeFile( + resolve(outputPath, 'AxiosRequestOptions.ts'), + i(templates.core.axiosRequestOptions(context), indent) + ); + } else { + await writeFile( + resolve(outputPath, 'CancelablePromise.ts'), + i(templates.core.cancelablePromise(context), indent) + ); + } await writeFile(resolve(outputPath, 'request.ts'), i(templates.core.request(context), indent)); if (isDefined(clientName)) { diff --git a/src/utils/writeClientIndex.spec.ts b/src/utils/writeClientIndex.spec.ts index a7d5b610a..f8617b9e5 100644 --- a/src/utils/writeClientIndex.spec.ts +++ b/src/utils/writeClientIndex.spec.ts @@ -1,6 +1,7 @@ import { resolve } from 'path'; import type { Client } from '../client/interfaces/Client'; +import { HttpClient } from '../HttpClient'; import { writeFile } from './fileSystem'; import type { Templates } from './registerHandlebarTemplates'; import { writeClientIndex } from './writeClientIndex'; @@ -28,6 +29,7 @@ describe('writeClientIndex', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request', @@ -36,7 +38,7 @@ describe('writeClientIndex', () => { }, }; - await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service', ''); + await writeClientIndex(client, templates, '/', HttpClient.FETCH, true, true, true, true, true, 'Service', ''); expect(writeFile).toBeCalledWith(resolve('/', '/index.ts'), 'index'); }); diff --git a/src/utils/writeClientIndex.ts b/src/utils/writeClientIndex.ts index 5044294d5..f8391b107 100644 --- a/src/utils/writeClientIndex.ts +++ b/src/utils/writeClientIndex.ts @@ -1,6 +1,7 @@ import { resolve } from 'path'; import type { Client } from '../client/interfaces/Client'; +import { HttpClient } from '../HttpClient'; import { writeFile } from './fileSystem'; import { isDefined } from './isDefined'; import { Templates } from './registerHandlebarTemplates'; @@ -27,6 +28,7 @@ export const writeClientIndex = async ( client: Client, templates: Templates, outputPath: string, + httpClient: HttpClient, useUnionTypes: boolean, exportCore: boolean, exportServices: boolean, @@ -37,6 +39,7 @@ export const writeClientIndex = async ( clientName?: string ): Promise => { const templateResult = templates.index({ + httpClient, exportCore, exportServices, exportModels, diff --git a/src/utils/writeClientModels.spec.ts b/src/utils/writeClientModels.spec.ts index ee0f2b4f6..fc122aca8 100644 --- a/src/utils/writeClientModels.spec.ts +++ b/src/utils/writeClientModels.spec.ts @@ -44,6 +44,7 @@ describe('writeClientModels', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request', diff --git a/src/utils/writeClientSchemas.spec.ts b/src/utils/writeClientSchemas.spec.ts index e75928b8c..a206d5ebd 100644 --- a/src/utils/writeClientSchemas.spec.ts +++ b/src/utils/writeClientSchemas.spec.ts @@ -44,6 +44,7 @@ describe('writeClientSchemas', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request', diff --git a/src/utils/writeClientServices.spec.ts b/src/utils/writeClientServices.spec.ts index f936d6609..9857c90e4 100644 --- a/src/utils/writeClientServices.spec.ts +++ b/src/utils/writeClientServices.spec.ts @@ -32,6 +32,7 @@ describe('writeClientServices', () => { settings: () => 'settings', apiError: () => 'apiError', apiRequestOptions: () => 'apiRequestOptions', + axiosRequestOptions: () => 'axiosRequestOptions', apiResult: () => 'apiResult', cancelablePromise: () => 'cancelablePromise', request: () => 'request',