Skip to content

Commit b226db3

Browse files
authored
Release 8.0.1 (acacode#224)
* feat: add "onFormatRouteName" hook * chore: try to add github workflows * chore: rename gh workflow file to main * chore: fix changelog after rebase * fix incorrect working --route-types with --modular option (acacode#207) * chore: try to fix modular route types problem * fix: --route-types with --modular option; fix: better format namespace name (--route-types) * feat: add extra output util functions * chore: improve getTemplate function * feat: add formatTSContent util function * fix: bugs after rebase * bump: up version to 8.0.1; fix: critical bug linked with customFetch
1 parent 4b809f3 commit b226db3

Some content is hidden

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

63 files changed

+126
-120
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# next release
22

3+
# 8.0.1
4+
5+
Fixes:
6+
- Not working `customFetch`
7+
Error: `Failed to execute 'fetch' on 'Window': Illegal invocation`
8+
39
# 8.0.0
410

511
BREAKING_CHANGES:

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "swagger-typescript-api",
3-
"version": "8.0.0",
3+
"version": "8.0.1",
44
"description": "Generate typescript/javascript api from swagger schema",
55
"scripts": {
66
"cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",

templates/base/http-clients/fetch-http-client.eta

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
3131
baseUrl?: string;
3232
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
3333
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
34-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>
34+
customFetch?: typeof fetch;
3535
}
3636

3737
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -52,7 +52,7 @@ export class HttpClient<SecurityDataType = unknown> {
5252
private securityData: SecurityDataType | null = null;
5353
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
5454
private abortControllers = new Map<CancelToken, AbortController>();
55-
private customFetch = fetch;
55+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
5656

5757
private baseApiParams: RequestParams = {
5858
credentials: 'same-origin',

tests/generated/v2.0/adafruit.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
192192
baseUrl?: string;
193193
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
194194
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
195-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
195+
customFetch?: typeof fetch;
196196
}
197197

198198
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -213,7 +213,7 @@ export class HttpClient<SecurityDataType = unknown> {
213213
private securityData: SecurityDataType | null = null;
214214
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
215215
private abortControllers = new Map<CancelToken, AbortController>();
216-
private customFetch = fetch;
216+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
217217

218218
private baseApiParams: RequestParams = {
219219
credentials: "same-origin",

tests/generated/v2.0/another-example.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
168168
baseUrl?: string;
169169
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
170170
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
171-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
171+
customFetch?: typeof fetch;
172172
}
173173

174174
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -189,7 +189,7 @@ export class HttpClient<SecurityDataType = unknown> {
189189
private securityData: SecurityDataType | null = null;
190190
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
191191
private abortControllers = new Map<CancelToken, AbortController>();
192-
private customFetch = fetch;
192+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
193193

194194
private baseApiParams: RequestParams = {
195195
credentials: "same-origin",

tests/generated/v2.0/another-schema.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
6060
baseUrl?: string;
6161
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
6262
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
63-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
63+
customFetch?: typeof fetch;
6464
}
6565

6666
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -81,7 +81,7 @@ export class HttpClient<SecurityDataType = unknown> {
8181
private securityData: SecurityDataType | null = null;
8282
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
8383
private abortControllers = new Map<CancelToken, AbortController>();
84-
private customFetch = fetch;
84+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
8585

8686
private baseApiParams: RequestParams = {
8787
credentials: "same-origin",

tests/generated/v2.0/api-with-examples.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
3737
baseUrl?: string;
3838
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
3939
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
40-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
40+
customFetch?: typeof fetch;
4141
}
4242

4343
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -58,7 +58,7 @@ export class HttpClient<SecurityDataType = unknown> {
5858
private securityData: SecurityDataType | null = null;
5959
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
6060
private abortControllers = new Map<CancelToken, AbortController>();
61-
private customFetch = fetch;
61+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
6262

6363
private baseApiParams: RequestParams = {
6464
credentials: "same-origin",

tests/generated/v2.0/authentiq.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
8989
baseUrl?: string;
9090
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
9191
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
92-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
92+
customFetch?: typeof fetch;
9393
}
9494

9595
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -110,7 +110,7 @@ export class HttpClient<SecurityDataType = unknown> {
110110
private securityData: SecurityDataType | null = null;
111111
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
112112
private abortControllers = new Map<CancelToken, AbortController>();
113-
private customFetch = fetch;
113+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
114114

115115
private baseApiParams: RequestParams = {
116116
credentials: "same-origin",

tests/generated/v2.0/enums.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
102102
baseUrl?: string;
103103
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
104104
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
105-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
105+
customFetch?: typeof fetch;
106106
}
107107

108108
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -123,7 +123,7 @@ export class HttpClient<SecurityDataType = unknown> {
123123
private securityData: SecurityDataType | null = null;
124124
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
125125
private abortControllers = new Map<CancelToken, AbortController>();
126-
private customFetch = fetch;
126+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
127127

128128
private baseApiParams: RequestParams = {
129129
credentials: "same-origin",

tests/generated/v2.0/example1.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
6464
baseUrl?: string;
6565
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
6666
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
67-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
67+
customFetch?: typeof fetch;
6868
}
6969

7070
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -85,7 +85,7 @@ export class HttpClient<SecurityDataType = unknown> {
8585
private securityData: SecurityDataType | null = null;
8686
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
8787
private abortControllers = new Map<CancelToken, AbortController>();
88-
private customFetch = fetch;
88+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
8989

9090
private baseApiParams: RequestParams = {
9191
credentials: "same-origin",

tests/generated/v2.0/file-formdata-example.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
3737
baseUrl?: string;
3838
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
3939
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
40-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
40+
customFetch?: typeof fetch;
4141
}
4242

4343
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -58,7 +58,7 @@ export class HttpClient<SecurityDataType = unknown> {
5858
private securityData: SecurityDataType | null = null;
5959
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
6060
private abortControllers = new Map<CancelToken, AbortController>();
61-
private customFetch = fetch;
61+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
6262

6363
private baseApiParams: RequestParams = {
6464
credentials: "same-origin",

tests/generated/v2.0/furkot-example.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
100100
baseUrl?: string;
101101
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
102102
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
103-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
103+
customFetch?: typeof fetch;
104104
}
105105

106106
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -121,7 +121,7 @@ export class HttpClient<SecurityDataType = unknown> {
121121
private securityData: SecurityDataType | null = null;
122122
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
123123
private abortControllers = new Map<CancelToken, AbortController>();
124-
private customFetch = fetch;
124+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
125125

126126
private baseApiParams: RequestParams = {
127127
credentials: "same-origin",

tests/generated/v2.0/giphy.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
319319
baseUrl?: string;
320320
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
321321
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
322-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
322+
customFetch?: typeof fetch;
323323
}
324324

325325
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -340,7 +340,7 @@ export class HttpClient<SecurityDataType = unknown> {
340340
private securityData: SecurityDataType | null = null;
341341
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
342342
private abortControllers = new Map<CancelToken, AbortController>();
343-
private customFetch = fetch;
343+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
344344

345345
private baseApiParams: RequestParams = {
346346
credentials: "same-origin",

tests/generated/v2.0/github-swagger.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
14721472
baseUrl?: string;
14731473
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
14741474
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
1475-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
1475+
customFetch?: typeof fetch;
14761476
}
14771477

14781478
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -1493,7 +1493,7 @@ export class HttpClient<SecurityDataType = unknown> {
14931493
private securityData: SecurityDataType | null = null;
14941494
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
14951495
private abortControllers = new Map<CancelToken, AbortController>();
1496-
private customFetch = fetch;
1496+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
14971497

14981498
private baseApiParams: RequestParams = {
14991499
credentials: "same-origin",

tests/generated/v2.0/path-args.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
3737
baseUrl?: string;
3838
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
3939
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
40-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
40+
customFetch?: typeof fetch;
4141
}
4242

4343
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -58,7 +58,7 @@ export class HttpClient<SecurityDataType = unknown> {
5858
private securityData: SecurityDataType | null = null;
5959
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
6060
private abortControllers = new Map<CancelToken, AbortController>();
61-
private customFetch = fetch;
61+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
6262

6363
private baseApiParams: RequestParams = {
6464
credentials: "same-origin",

tests/generated/v2.0/petstore-expanded.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
7474
baseUrl?: string;
7575
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
7676
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
77-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
77+
customFetch?: typeof fetch;
7878
}
7979

8080
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -95,7 +95,7 @@ export class HttpClient<SecurityDataType = unknown> {
9595
private securityData: SecurityDataType | null = null;
9696
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
9797
private abortControllers = new Map<CancelToken, AbortController>();
98-
private customFetch = fetch;
98+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
9999

100100
private baseApiParams: RequestParams = {
101101
credentials: "same-origin",

tests/generated/v2.0/petstore-minimal.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
4545
baseUrl?: string;
4646
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
4747
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
48-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
48+
customFetch?: typeof fetch;
4949
}
5050

5151
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -66,7 +66,7 @@ export class HttpClient<SecurityDataType = unknown> {
6666
private securityData: SecurityDataType | null = null;
6767
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
6868
private abortControllers = new Map<CancelToken, AbortController>();
69-
private customFetch = fetch;
69+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
7070

7171
private baseApiParams: RequestParams = {
7272
credentials: "same-origin",

tests/generated/v2.0/petstore-simple.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
6060
baseUrl?: string;
6161
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
6262
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
63-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
63+
customFetch?: typeof fetch;
6464
}
6565

6666
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -81,7 +81,7 @@ export class HttpClient<SecurityDataType = unknown> {
8181
private securityData: SecurityDataType | null = null;
8282
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
8383
private abortControllers = new Map<CancelToken, AbortController>();
84-
private customFetch = fetch;
84+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
8585

8686
private baseApiParams: RequestParams = {
8787
credentials: "same-origin",

tests/generated/v2.0/petstore-swagger-io.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
105105
baseUrl?: string;
106106
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
107107
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
108-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
108+
customFetch?: typeof fetch;
109109
}
110110

111111
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -126,7 +126,7 @@ export class HttpClient<SecurityDataType = unknown> {
126126
private securityData: SecurityDataType | null = null;
127127
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
128128
private abortControllers = new Map<CancelToken, AbortController>();
129-
private customFetch = fetch;
129+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
130130

131131
private baseApiParams: RequestParams = {
132132
credentials: "same-origin",

tests/generated/v2.0/petstore-with-external-docs.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
5050
baseUrl?: string;
5151
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
5252
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
53-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
53+
customFetch?: typeof fetch;
5454
}
5555

5656
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -71,7 +71,7 @@ export class HttpClient<SecurityDataType = unknown> {
7171
private securityData: SecurityDataType | null = null;
7272
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
7373
private abortControllers = new Map<CancelToken, AbortController>();
74-
private customFetch = fetch;
74+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
7575

7676
private baseApiParams: RequestParams = {
7777
credentials: "same-origin",

tests/generated/v2.0/petstore.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
5252
baseUrl?: string;
5353
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
5454
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
55-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
55+
customFetch?: typeof fetch;
5656
}
5757

5858
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -73,7 +73,7 @@ export class HttpClient<SecurityDataType = unknown> {
7373
private securityData: SecurityDataType | null = null;
7474
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
7575
private abortControllers = new Map<CancelToken, AbortController>();
76-
private customFetch = fetch;
76+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
7777

7878
private baseApiParams: RequestParams = {
7979
credentials: "same-origin",

tests/generated/v2.0/query-path-param.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export interface ApiConfig<SecurityDataType = unknown> {
3737
baseUrl?: string;
3838
baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
3939
securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
40-
customFetch?: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
40+
customFetch?: typeof fetch;
4141
}
4242

4343
export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
@@ -58,7 +58,7 @@ export class HttpClient<SecurityDataType = unknown> {
5858
private securityData: SecurityDataType | null = null;
5959
private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
6060
private abortControllers = new Map<CancelToken, AbortController>();
61-
private customFetch = fetch;
61+
private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
6262

6363
private baseApiParams: RequestParams = {
6464
credentials: "same-origin",

0 commit comments

Comments
 (0)