Skip to content

Commit 11ca862

Browse files
GregoryMerletGregoryMerlet
committed
fix: fix type error
1 parent 28783ab commit 11ca862

7 files changed

Lines changed: 91 additions & 91 deletions

File tree

‎modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { HttpService } from '@nestjs/axios';
88
{{^useAxiosHttpModule}}
99
import { HttpService, Injectable, Optional } from '@nestjs/common';
1010
{{/useAxiosHttpModule}}
11-
import { AxiosResponse, RawAxiosRequestConfig } from 'axios';
11+
import { AxiosRequestConfig, AxiosResponse } from 'axios';
1212
import { Observable, from, of, switchMap } from 'rxjs';
1313
{{#imports}}
1414
import { {{classname}} } from '../{{filename}}';
@@ -96,12 +96,12 @@ export class {{classname}} {
9696
* @param {*} [options] Override http request option.
9797
*/
9898
{{#useSingleRequestParameter}}
99-
public {{nickname}}({{#allParams.0}}requestParameters: {{classname}}{{operationIdCamelCase}}Request, {{/allParams.0}}options?: RawAxiosRequestConfig): Observable<AxiosResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
100-
public {{nickname}}({{#allParams.0}}requestParameters: {{classname}}{{operationIdCamelCase}}Request, {{/allParams.0}}options?: RawAxiosRequestConfig): Observable<any> {
99+
public {{nickname}}({{#allParams.0}}requestParameters: {{classname}}{{operationIdCamelCase}}Request, {{/allParams.0}}options?: AxiosRequestConfig): Observable<AxiosResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
100+
public {{nickname}}({{#allParams.0}}requestParameters: {{classname}}{{operationIdCamelCase}}Request, {{/allParams.0}}options?: AxiosRequestConfig): Observable<any> {
101101
{{/useSingleRequestParameter}}
102102
{{^useSingleRequestParameter}}
103-
public {{nickname}}({{#allParams}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/allParams}}options?: RawAxiosRequestConfig): Observable<AxiosResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
104-
public {{nickname}}({{#allParams}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/allParams}}options?: RawAxiosRequestConfig): Observable<any> {
103+
public {{nickname}}({{#allParams}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/allParams}}options?: AxiosRequestConfig): Observable<AxiosResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
104+
public {{nickname}}({{#allParams}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/allParams}}options?: AxiosRequestConfig): Observable<any> {
105105
{{/useSingleRequestParameter}}
106106
{{#allParams.0}}
107107
{{#useSingleRequestParameter}}

‎samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* tslint:disable:no-unused-variable member-ordering */
1313

1414
import { HttpService, Injectable, Optional } from '@nestjs/common';
15-
import { AxiosResponse, RawAxiosRequestConfig } from 'axios';
15+
import { AxiosRequestConfig, AxiosResponse } from 'axios';
1616
import { Observable, from, of, switchMap } from 'rxjs';
1717
import { ApiResponse } from '../model/apiResponse';
1818
import { Pet } from '../model/pet';
@@ -51,8 +51,8 @@ export class PetService {
5151
* @param reportProgress flag to report request and response progress.
5252
* @param {*} [options] Override http request option.
5353
*/
54-
public addPet(pet: Pet, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Pet>>;
55-
public addPet(pet: Pet, options?: RawAxiosRequestConfig): Observable<any> {
54+
public addPet(pet: Pet, options?: AxiosRequestConfig): Observable<AxiosResponse<Pet>>;
55+
public addPet(pet: Pet, options?: AxiosRequestConfig): Observable<any> {
5656
if (pet === null || pet === undefined) {
5757
throw new Error('Required parameter pet was null or undefined when calling addPet.');
5858
}
@@ -113,8 +113,8 @@ export class PetService {
113113
* @param reportProgress flag to report request and response progress.
114114
* @param {*} [options] Override http request option.
115115
*/
116-
public deletePet(petId: number, apiKey?: string, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
117-
public deletePet(petId: number, apiKey?: string, options?: RawAxiosRequestConfig): Observable<any> {
116+
public deletePet(petId: number, apiKey?: string, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
117+
public deletePet(petId: number, apiKey?: string, options?: AxiosRequestConfig): Observable<any> {
118118
if (petId === null || petId === undefined) {
119119
throw new Error('Required parameter petId was null or undefined when calling deletePet.');
120120
}
@@ -168,8 +168,8 @@ export class PetService {
168168
* @param reportProgress flag to report request and response progress.
169169
* @param {*} [options] Override http request option.
170170
*/
171-
public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Array<Pet>>>;
172-
public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: RawAxiosRequestConfig): Observable<any> {
171+
public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Observable<AxiosResponse<Array<Pet>>>;
172+
public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Observable<any> {
173173
if (status === null || status === undefined) {
174174
throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
175175
}
@@ -228,8 +228,8 @@ export class PetService {
228228
* @param reportProgress flag to report request and response progress.
229229
* @param {*} [options] Override http request option.
230230
*/
231-
public findPetsByTags(tags: Array<string>, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Array<Pet>>>;
232-
public findPetsByTags(tags: Array<string>, options?: RawAxiosRequestConfig): Observable<any> {
231+
public findPetsByTags(tags: Array<string>, options?: AxiosRequestConfig): Observable<AxiosResponse<Array<Pet>>>;
232+
public findPetsByTags(tags: Array<string>, options?: AxiosRequestConfig): Observable<any> {
233233
if (tags === null || tags === undefined) {
234234
throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
235235
}
@@ -288,8 +288,8 @@ export class PetService {
288288
* @param reportProgress flag to report request and response progress.
289289
* @param {*} [options] Override http request option.
290290
*/
291-
public getPetById(petId: number, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Pet>>;
292-
public getPetById(petId: number, options?: RawAxiosRequestConfig): Observable<any> {
291+
public getPetById(petId: number, options?: AxiosRequestConfig): Observable<AxiosResponse<Pet>>;
292+
public getPetById(petId: number, options?: AxiosRequestConfig): Observable<any> {
293293
if (petId === null || petId === undefined) {
294294
throw new Error('Required parameter petId was null or undefined when calling getPetById.');
295295
}
@@ -340,8 +340,8 @@ export class PetService {
340340
* @param reportProgress flag to report request and response progress.
341341
* @param {*} [options] Override http request option.
342342
*/
343-
public updatePet(pet: Pet, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Pet>>;
344-
public updatePet(pet: Pet, options?: RawAxiosRequestConfig): Observable<any> {
343+
public updatePet(pet: Pet, options?: AxiosRequestConfig): Observable<AxiosResponse<Pet>>;
344+
public updatePet(pet: Pet, options?: AxiosRequestConfig): Observable<any> {
345345
if (pet === null || pet === undefined) {
346346
throw new Error('Required parameter pet was null or undefined when calling updatePet.');
347347
}
@@ -403,8 +403,8 @@ export class PetService {
403403
* @param reportProgress flag to report request and response progress.
404404
* @param {*} [options] Override http request option.
405405
*/
406-
public updatePetWithForm(petId: number, name?: string, status?: string, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
407-
public updatePetWithForm(petId: number, name?: string, status?: string, options?: RawAxiosRequestConfig): Observable<any> {
406+
public updatePetWithForm(petId: number, name?: string, status?: string, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
407+
public updatePetWithForm(petId: number, name?: string, status?: string, options?: AxiosRequestConfig): Observable<any> {
408408
if (petId === null || petId === undefined) {
409409
throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
410410
}
@@ -479,8 +479,8 @@ export class PetService {
479479
* @param reportProgress flag to report request and response progress.
480480
* @param {*} [options] Override http request option.
481481
*/
482-
public uploadFile(petId: number, additionalMetadata?: string, file?: Blob, options?: RawAxiosRequestConfig): Observable<AxiosResponse<ApiResponse>>;
483-
public uploadFile(petId: number, additionalMetadata?: string, file?: Blob, options?: RawAxiosRequestConfig): Observable<any> {
482+
public uploadFile(petId: number, additionalMetadata?: string, file?: Blob, options?: AxiosRequestConfig): Observable<AxiosResponse<ApiResponse>>;
483+
public uploadFile(petId: number, additionalMetadata?: string, file?: Blob, options?: AxiosRequestConfig): Observable<any> {
484484
if (petId === null || petId === undefined) {
485485
throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
486486
}

‎samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* tslint:disable:no-unused-variable member-ordering */
1313

1414
import { HttpService, Injectable, Optional } from '@nestjs/common';
15-
import { AxiosResponse, RawAxiosRequestConfig } from 'axios';
15+
import { AxiosRequestConfig, AxiosResponse } from 'axios';
1616
import { Observable, from, of, switchMap } from 'rxjs';
1717
import { Order } from '../model/order';
1818
import { Configuration } from '../configuration';
@@ -50,8 +50,8 @@ export class StoreService {
5050
* @param reportProgress flag to report request and response progress.
5151
* @param {*} [options] Override http request option.
5252
*/
53-
public deleteOrder(orderId: string, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
54-
public deleteOrder(orderId: string, options?: RawAxiosRequestConfig): Observable<any> {
53+
public deleteOrder(orderId: string, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
54+
public deleteOrder(orderId: string, options?: AxiosRequestConfig): Observable<any> {
5555
if (orderId === null || orderId === undefined) {
5656
throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
5757
}
@@ -94,8 +94,8 @@ export class StoreService {
9494
* @param reportProgress flag to report request and response progress.
9595
* @param {*} [options] Override http request option.
9696
*/
97-
public getInventory(options?: RawAxiosRequestConfig): Observable<AxiosResponse<{ [key: string]: number; }>>;
98-
public getInventory(options?: RawAxiosRequestConfig): Observable<any> {
97+
public getInventory(options?: AxiosRequestConfig): Observable<AxiosResponse<{ [key: string]: number; }>>;
98+
public getInventory(options?: AxiosRequestConfig): Observable<any> {
9999
let headers = {...this.defaultHeaders};
100100

101101
let accessTokenObservable: Observable<any> = of(null);
@@ -141,8 +141,8 @@ export class StoreService {
141141
* @param reportProgress flag to report request and response progress.
142142
* @param {*} [options] Override http request option.
143143
*/
144-
public getOrderById(orderId: number, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Order>>;
145-
public getOrderById(orderId: number, options?: RawAxiosRequestConfig): Observable<any> {
144+
public getOrderById(orderId: number, options?: AxiosRequestConfig): Observable<AxiosResponse<Order>>;
145+
public getOrderById(orderId: number, options?: AxiosRequestConfig): Observable<any> {
146146
if (orderId === null || orderId === undefined) {
147147
throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
148148
}
@@ -188,8 +188,8 @@ export class StoreService {
188188
* @param reportProgress flag to report request and response progress.
189189
* @param {*} [options] Override http request option.
190190
*/
191-
public placeOrder(order: Order, options?: RawAxiosRequestConfig): Observable<AxiosResponse<Order>>;
192-
public placeOrder(order: Order, options?: RawAxiosRequestConfig): Observable<any> {
191+
public placeOrder(order: Order, options?: AxiosRequestConfig): Observable<AxiosResponse<Order>>;
192+
public placeOrder(order: Order, options?: AxiosRequestConfig): Observable<any> {
193193
if (order === null || order === undefined) {
194194
throw new Error('Required parameter order was null or undefined when calling placeOrder.');
195195
}

‎samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/user.service.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* tslint:disable:no-unused-variable member-ordering */
1313

1414
import { HttpService, Injectable, Optional } from '@nestjs/common';
15-
import { AxiosResponse, RawAxiosRequestConfig } from 'axios';
15+
import { AxiosRequestConfig, AxiosResponse } from 'axios';
1616
import { Observable, from, of, switchMap } from 'rxjs';
1717
import { User } from '../model/user';
1818
import { Configuration } from '../configuration';
@@ -50,8 +50,8 @@ export class UserService {
5050
* @param reportProgress flag to report request and response progress.
5151
* @param {*} [options] Override http request option.
5252
*/
53-
public createUser(user: User, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
54-
public createUser(user: User, options?: RawAxiosRequestConfig): Observable<any> {
53+
public createUser(user: User, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
54+
public createUser(user: User, options?: AxiosRequestConfig): Observable<any> {
5555
if (user === null || user === undefined) {
5656
throw new Error('Required parameter user was null or undefined when calling createUser.');
5757
}
@@ -106,8 +106,8 @@ export class UserService {
106106
* @param reportProgress flag to report request and response progress.
107107
* @param {*} [options] Override http request option.
108108
*/
109-
public createUsersWithArrayInput(user: Array<User>, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
110-
public createUsersWithArrayInput(user: Array<User>, options?: RawAxiosRequestConfig): Observable<any> {
109+
public createUsersWithArrayInput(user: Array<User>, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
110+
public createUsersWithArrayInput(user: Array<User>, options?: AxiosRequestConfig): Observable<any> {
111111
if (user === null || user === undefined) {
112112
throw new Error('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
113113
}
@@ -162,8 +162,8 @@ export class UserService {
162162
* @param reportProgress flag to report request and response progress.
163163
* @param {*} [options] Override http request option.
164164
*/
165-
public createUsersWithListInput(user: Array<User>, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
166-
public createUsersWithListInput(user: Array<User>, options?: RawAxiosRequestConfig): Observable<any> {
165+
public createUsersWithListInput(user: Array<User>, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
166+
public createUsersWithListInput(user: Array<User>, options?: AxiosRequestConfig): Observable<any> {
167167
if (user === null || user === undefined) {
168168
throw new Error('Required parameter user was null or undefined when calling createUsersWithListInput.');
169169
}
@@ -218,8 +218,8 @@ export class UserService {
218218
* @param reportProgress flag to report request and response progress.
219219
* @param {*} [options] Override http request option.
220220
*/
221-
public deleteUser(username: string, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
222-
public deleteUser(username: string, options?: RawAxiosRequestConfig): Observable<any> {
221+
public deleteUser(username: string, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
222+
public deleteUser(username: string, options?: AxiosRequestConfig): Observable<any> {
223223
if (username === null || username === undefined) {
224224
throw new Error('Required parameter username was null or undefined when calling deleteUser.');
225225
}
@@ -268,8 +268,8 @@ export class UserService {
268268
* @param reportProgress flag to report request and response progress.
269269
* @param {*} [options] Override http request option.
270270
*/
271-
public getUserByName(username: string, options?: RawAxiosRequestConfig): Observable<AxiosResponse<User>>;
272-
public getUserByName(username: string, options?: RawAxiosRequestConfig): Observable<any> {
271+
public getUserByName(username: string, options?: AxiosRequestConfig): Observable<AxiosResponse<User>>;
272+
public getUserByName(username: string, options?: AxiosRequestConfig): Observable<any> {
273273
if (username === null || username === undefined) {
274274
throw new Error('Required parameter username was null or undefined when calling getUserByName.');
275275
}
@@ -316,8 +316,8 @@ export class UserService {
316316
* @param reportProgress flag to report request and response progress.
317317
* @param {*} [options] Override http request option.
318318
*/
319-
public loginUser(username: string, password: string, options?: RawAxiosRequestConfig): Observable<AxiosResponse<string>>;
320-
public loginUser(username: string, password: string, options?: RawAxiosRequestConfig): Observable<any> {
319+
public loginUser(username: string, password: string, options?: AxiosRequestConfig): Observable<AxiosResponse<string>>;
320+
public loginUser(username: string, password: string, options?: AxiosRequestConfig): Observable<any> {
321321
if (username === null || username === undefined) {
322322
throw new Error('Required parameter username was null or undefined when calling loginUser.');
323323
}
@@ -375,8 +375,8 @@ export class UserService {
375375
* @param reportProgress flag to report request and response progress.
376376
* @param {*} [options] Override http request option.
377377
*/
378-
public logoutUser(options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
379-
public logoutUser(options?: RawAxiosRequestConfig): Observable<any> {
378+
public logoutUser(options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
379+
public logoutUser(options?: AxiosRequestConfig): Observable<any> {
380380
let headers = {...this.defaultHeaders};
381381

382382
let accessTokenObservable: Observable<any> = of(null);
@@ -422,8 +422,8 @@ export class UserService {
422422
* @param reportProgress flag to report request and response progress.
423423
* @param {*} [options] Override http request option.
424424
*/
425-
public updateUser(username: string, user: User, options?: RawAxiosRequestConfig): Observable<AxiosResponse<any>>;
426-
public updateUser(username: string, user: User, options?: RawAxiosRequestConfig): Observable<any> {
425+
public updateUser(username: string, user: User, options?: AxiosRequestConfig): Observable<AxiosResponse<any>>;
426+
public updateUser(username: string, user: User, options?: AxiosRequestConfig): Observable<any> {
427427
if (username === null || username === undefined) {
428428
throw new Error('Required parameter username was null or undefined when calling updateUser.');
429429
}

0 commit comments

Comments
 (0)