Skip to content

Commit d7d91ef

Browse files
committed
fix: fix typing issue
1 parent ddd1905 commit d7d91ef

File tree

8 files changed

+28
-8
lines changed

8 files changed

+28
-8
lines changed

src/templates/core/HttpRequest.hbs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
99
import { BaseHttpRequest } from './BaseHttpRequest';
1010
import type { OpenAPIConfig } from './OpenAPI';
1111
import { OpenAPI } from './OpenAPI';
12-
import { request as __request } from './request';
12+
import { request as __request, ClientOptions } from './request';
13+
export type { ClientOptions } from './request';
1314
{{else}}
1415
import type { ApiRequestOptions } from './ApiRequestOptions';
1516
import { BaseHttpRequest } from './BaseHttpRequest';
1617
import type { CancelablePromise } from './CancelablePromise';
1718
import type { OpenAPIConfig } from './OpenAPI';
18-
import { request as __request } from './request';
19+
import { request as __request, ClientOptions } from './request';
20+
export type { ClientOptions } from './request';
1921
{{/equals}}
2022

2123
{{#equals @root.httpClient 'angular'}}
@@ -44,7 +46,7 @@ export class {{httpRequest}} extends BaseHttpRequest {
4446
* @returns Observable<T>
4547
* @throws ApiError
4648
*/
47-
public override request<T>(options: ApiRequestOptions): Observable<T> {
49+
public override request<T>(options: ApiRequestOptions<ClientOptions>): Observable<T> {
4850
return __request(this.config, this.http, options);
4951
}
5052
{{else}}

src/templates/core/angular/request.hbs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ import type { OpenAPIConfig } from './OpenAPI';
5959
{{>functions/catchErrorCodes}}
6060

6161

62+
export interface ClientOptions {}
63+
64+
6265
/**
6366
* Request method
6467
* @param config The OpenAPI configuration object

src/templates/core/axios/request.hbs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ import type { OpenAPIConfig } from './OpenAPI';
6262
{{>functions/catchErrorCodes}}
6363

6464

65+
export interface ClientOptions {}
66+
67+
6568
/**
6669
* Request method
6770
* @param config The OpenAPI configuration object

src/templates/core/fetch/request.hbs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ import type { OpenAPIConfig } from './OpenAPI';
5555
{{>functions/catchErrorCodes}}
5656

5757

58+
export interface ClientOptions {}
59+
60+
5861
/**
5962
* Request method
6063
* @param config The OpenAPI configuration object

src/templates/core/nextjs/request.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import type { OpenAPIConfig } from './OpenAPI';
5454

5555
{{>functions/catchErrorCodes}}
5656

57-
interface ClientOptions {
57+
export interface ClientOptions {
5858
cache?: 'force-cache' | 'no-store';
5959
next?: {
6060
revalidate?: false | number;

src/templates/core/node/request.hbs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ import type { OpenAPIConfig } from './OpenAPI';
6060
{{>functions/catchErrorCodes}}
6161

6262

63+
export interface ClientOptions {}
64+
65+
6366
/**
6467
* Request method
6568
* @param config The OpenAPI configuration object

src/templates/core/xhr/request.hbs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ import type { OpenAPIConfig } from './OpenAPI';
5858
{{>functions/catchErrorCodes}}
5959

6060

61+
export interface ClientOptions {}
62+
63+
6164
/**
6265
* Request method
6366
* @param config The OpenAPI configuration object

src/templates/exportService.hbs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import { HttpClient } from '@angular/common/http';
1010
import type { Observable } from 'rxjs';
1111
{{/if}}
1212

13+
import { ClientOptions } from './core/{{{httpRequest}}}';
14+
1315
{{/equals}}
1416
{{#if imports}}
1517
{{#each imports}}
@@ -72,18 +74,18 @@ export class {{{name}}}{{{@root.postfix}}} {
7274
*/
7375
{{#if @root.exportClient}}
7476
{{#equals @root.httpClient 'angular'}}
75-
public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
77+
public {{{name}}}({{>parameters}}, clientOptions?: ClientOptions): Observable<{{>result}}> {
7678
return this.httpRequest.request({
7779
{{else}}
78-
public {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
80+
public {{{name}}}({{>parameters}}, clientOptions?: ClientOptions): CancelablePromise<{{>result}}> {
7981
return this.httpRequest.request({
8082
{{/equals}}
8183
{{else}}
8284
{{#equals @root.httpClient 'angular'}}
83-
public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
85+
public {{{name}}}({{>parameters}}, clientOptions?: ClientOptions): Observable<{{>result}}> {
8486
return __request(OpenAPI, this.http, {
8587
{{else}}
86-
public static {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
88+
public static {{{name}}}({{>parameters}}, clientOptions?: ClientOptions): CancelablePromise<{{>result}}> {
8789
return __request(OpenAPI, {
8890
{{/equals}}
8991
{{/if}}
@@ -144,6 +146,7 @@ export class {{{name}}}{{{@root.postfix}}} {
144146
{{{code}}}: `{{{escapeDescription description}}}`,
145147
{{/each}}
146148
},
149+
clientOptions,
147150
{{/if}}
148151
});
149152
}

0 commit comments

Comments
 (0)