soon-fetch 4.0.1 → 4.0.2-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -8,12 +8,13 @@
8
8
 
9
9
  > - 🌐 automatic parse restful api url parameters
10
10
  > - ⭐ rapid define a request api
11
+ > - 🎯 fork sub-instance with prefix and default options
11
12
  > - ⌛ timeout disconnect
12
13
  > - 📦 request reusing
13
14
  > - 🚀 request race
14
15
  > - 📝 response cache
15
16
  > - 🔤 automatic serialization of JSON
16
- > - 📏 .min size less than **6K**, smaller after zip
17
+ > - 📏 .min size less than **10K**, smaller after zip
17
18
  > - 💡 smart type tips with Typescript
18
19
 
19
20
  - [Example](#example)
@@ -229,7 +230,7 @@ Create a soon request instance.
229
230
 
230
231
  - `request`: A function to handle the actual request, receives url and options, returns a Promise
231
232
 
232
- **Returns:** An object containing request method, API methods (GET, POST, PUT, DELETE, PATCH), and shortcut methods (get, post, put, delete, patch, head, options)
233
+ **Returns:** An object containing request method, API methods (GET, POST, PUT, DELETE, PATCH), shortcut methods (get, post, put, delete, patch, head, options), and fork method for creating sub-instances
233
234
 
234
235
  **Example:**
235
236
 
@@ -283,6 +284,43 @@ const user = await getUserById({ id: 1 });
283
284
  const newUser = await createUser({ name: "John", email: "john@example.com" });
284
285
  ```
285
286
 
287
+ #### fork
288
+
289
+ Create a sub-instance with a URL prefix and default options.
290
+
291
+ **Parameters:**
292
+
293
+ - `prefix`: URL prefix string (e.g. "/api/v1")
294
+ - `defaultOptions?`: Default options that apply to all requests via this sub-instance
295
+
296
+ **Returns:** A new `createSoon` instance with the prefix and default options pre-applied.
297
+
298
+ **Example:**
299
+
300
+ ```typescript
301
+ // Create a forked sub-instance for a specific API version
302
+ const v1 = soon.fork("/api/v1", { timeout: 5000 });
303
+ const v2 = soon.fork("/api/v2", { timeout: 10000 });
304
+
305
+ // All requests are automatically prefixed and use default options
306
+ v1.get("/users"); // GET /api/v1/users with timeout: 5000
307
+ v2.get("/users"); // GET /api/v2/users with timeout: 10000
308
+
309
+ // Options can still be overridden per request
310
+ v1.get("/users", { timeout: 8000 }); // GET /api/v1/users with timeout: 8000
311
+
312
+ // Chain API definitions work too
313
+ const getUser = v1.GET("/users/:id").Params<{ id: number }>().Ok<User>();
314
+ getUser({ id: 1 }); // GET /api/v1/users/1 with timeout: 5000
315
+
316
+ // Fork can be nested
317
+ const admin = v1.fork("/admin");
318
+ admin.get("/stats"); // GET /api/v1/admin/stats with timeout: 5000
319
+
320
+ // Absolute URLs bypass the prefix
321
+ v1.get("https://other-api.com/data"); // Uses the absolute URL directly
322
+ ```
323
+
286
324
  #### createShortApi
287
325
 
288
326
  Factory function to create API shortcut methods.
@@ -409,7 +447,7 @@ Handle baseURL, path parameters and query parameters to generate complete URL.
409
447
  - `url`: Original URL
410
448
  - `config`: Configuration object, including query parameters, path parameters and base URL
411
449
 
412
- **Returns:** Processed complete URL
450
+ **Returns:** Object containing `url` (complete URL string), `path` (URL without query string), and `query` (URLSearchParams instance)
413
451
 
414
452
  **Example:**
415
453
 
@@ -422,6 +460,30 @@ const { url } = parseUrl("/api/users/:id", {
422
460
  // Returns: 'https://api.example.com/api/users/123?filter=active'
423
461
  ```
424
462
 
463
+ #### parseQuery2Arr
464
+
465
+ Parse query parameters into a `[key, value][]` array.
466
+ Supports multiple input formats: string, URLSearchParams, Record, and array-of-tuples.
467
+
468
+ **Parameters:**
469
+
470
+ - `query`: Query parameters in any supported format (string, URLSearchParams, Record, array-of-tuples)
471
+
472
+ **Returns:** Array of `[key, value]` pairs
473
+
474
+ **Example:**
475
+
476
+ ```typescript
477
+ parseQuery2Arr("page=1&size=10");
478
+ // Returns: [["page", "1"], ["size", "10"]]
479
+
480
+ parseQuery2Arr({ id: 123, status: "active" });
481
+ // Returns: [["id", "123"], ["status", "active"]]
482
+
483
+ parseQuery2Arr(new URLSearchParams("page=1"));
484
+ // Returns: [["page", "1"]]
485
+ ```
486
+
425
487
  #### mergeOptions
426
488
 
427
489
  Merge multiple option objects.
@@ -468,14 +530,18 @@ isBodyJson("string"); // false
468
530
 
469
531
  #### genRequestKey
470
532
 
471
- Generate a unique identification key for the request.
472
- Generate a unique key value based on the request's URL, method, headers, body, query parameters, etc., used for caching and request sharing.
533
+ Generate a unique identification key for the request (sync).
534
+ Generate a unique key value based on the request's URL, method, headers, query parameters, etc., used for caching and request sharing.
535
+
536
+ > **Note:** This is the synchronous version. For body types like `Blob`/`FormData` that require async processing (e.g., SHA-256 digest), it falls back to a non-deterministic key (nonce-based) to avoid blocking. Use `genRequestKeyAsync` for fully deterministic key generation.
537
+ > **Note:** The SHA-256 digest used by `genRequestKeyAsync` requires a [secure context](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts) (HTTPS). Under plain HTTP, `crypto.subtle.digest` is unavailable, and `genRequestKeyAsync` will fall back to a non-deterministic key for `Blob`/`ArrayBuffer`/`DataView` bodies, preventing incorrect cache hits or request sharing.
473
538
 
474
539
  **Parameters:**
475
540
 
476
541
  - `req`: Request object containing url and options
542
+ - `sortObjKeys?`: Whether to sort object keys for stable serialization
477
543
 
478
- **Returns:** Unique identification string of the request
544
+ **Returns:** The unique identification string of the request
479
545
 
480
546
  **Example:**
481
547
 
@@ -486,6 +552,27 @@ const key = genRequestKey({
486
552
  });
487
553
  ```
488
554
 
555
+ #### genRequestKeyAsync
556
+
557
+ Generate a unique identification key for the request (async).
558
+ Same as `genRequestKey`, but supports async digest of `Blob`/`FormData` bodies for fully deterministic key generation.
559
+
560
+ **Parameters:**
561
+
562
+ - `req`: Request object containing url and options
563
+ - `sortObjKeys?`: Whether to sort object keys for stable serialization
564
+
565
+ **Returns:** Promise resolving to the unique identification string of the request
566
+
567
+ **Example:**
568
+
569
+ ```typescript
570
+ const key = await genRequestKeyAsync({
571
+ url: "/api/users",
572
+ options: { method: "GET", params: { id: 1 } },
573
+ });
574
+ ```
575
+
489
576
  #### createRequestStore
490
577
 
491
578
  Create request store instance.
@@ -495,7 +582,6 @@ Provides request caching, sharing, and race condition handling.
495
582
 
496
583
  - `options`: Configuration options
497
584
  - `maxCacheSize`: Maximum cache size (default: 100000)
498
- - `checkInterval`: Cache check interval in milliseconds (default: 60000)
499
585
 
500
586
  **Returns:** Request store object with the following methods:
501
587
  - `entry(key)`: Get entry for specific request key
@@ -512,7 +598,7 @@ Provides request caching, sharing, and race condition handling.
512
598
  **Example:**
513
599
 
514
600
  ```typescript
515
- const store = createRequestStore({ maxCacheSize: 1000, checkInterval: 30000 });
601
+ const store = createRequestStore({ maxCacheSize: 1000 });
516
602
  // Use store in requests
517
603
  ```
518
604
 
@@ -694,16 +780,17 @@ const data = await requestWithStore(store, () => fetch(url, options), requestKey
694
780
 
695
781
  #### soon-fetch
696
782
 
697
- **极轻量的请求库,不到 6K**
783
+ **极轻量的请求库,不到 10K**
698
784
 
699
785
  > - 🌐 自动解析 rest Url 的参数
700
786
  > - ⭐ 快捷定义请求 api
787
+ > - 🎯 fork 子实例(前缀+默认选项)
701
788
  > - ⌛ 超时断开
702
789
  > - 📦 请求复用
703
790
  > - 🚀 请求竞态
704
791
  > - 📝 响应缓存
705
792
  > - 🔤 自动处理 JSON
706
- > - 📏 不到 **6K** , zip 后会更小
793
+ > - 📏 不到 **10K** , zip 后会更小
707
794
  > - 💡 用 typescript 有智能类型提醒
708
795
 
709
796
  - [示例](#示例)
@@ -927,7 +1014,7 @@ type SoonOptions = Omit<RequestInit, "body"> & {
927
1014
 
928
1015
  - `request`: 用于处理实际请求的函数,接收 url 和 options,返回一个 Promise
929
1016
 
930
- **返回:** 包含 request 方法、API 方法(GET、POST、PUT、DELETE、PATCH)和快捷方法(get、post、put、delete、patch、head、options)的对象
1017
+ **返回:** 包含 request 方法、API 方法(GET、POST、PUT、DELETE、PATCH)和快捷方法(get、post、put、delete、patch、head、options)以及 fork 方法的对象
931
1018
 
932
1019
  **示例:**
933
1020
 
@@ -953,6 +1040,43 @@ login({ username: "admin", password: "123" }).then((res) => {
953
1040
  });
954
1041
  ```
955
1042
 
1043
+ #### fork
1044
+
1045
+ 创建一个带有 URL 前缀和默认选项的子实例。
1046
+
1047
+ **参数:**
1048
+
1049
+ - `prefix`: URL 前缀字符串(如 "/api/v1")
1050
+ - `defaultOptions?`: 默认选项,对该子实例的所有请求生效
1051
+
1052
+ **返回:** 一个新的 `createSoon` 实例,已预置前缀和默认选项。
1053
+
1054
+ **示例:**
1055
+
1056
+ ```typescript
1057
+ // 为不同 API 版本创建 fork 子实例
1058
+ const v1 = soon.fork("/api/v1", { timeout: 5000 });
1059
+ const v2 = soon.fork("/api/v2", { timeout: 10000 });
1060
+
1061
+ // 所有请求会自动添加前缀并使用默认选项
1062
+ v1.get("/users"); // GET /api/v1/users with timeout: 5000
1063
+ v2.get("/users"); // GET /api/v2/users with timeout: 10000
1064
+
1065
+ // 单次请求仍可覆盖默认选项
1066
+ v1.get("/users", { timeout: 8000 }); // GET /api/v1/users with timeout: 8000
1067
+
1068
+ // 链式 API 定义同样适用
1069
+ const getUser = v1.GET("/users/:id").Params<{ id: number }>().Ok<User>();
1070
+ getUser({ id: 1 }); // GET /api/v1/users/1 with timeout: 5000
1071
+
1072
+ // fork 支持嵌套
1073
+ const admin = v1.fork("/admin");
1074
+ admin.get("/stats"); // GET /api/v1/admin/stats with timeout: 5000
1075
+
1076
+ // 绝对 URL 会绕过前缀
1077
+ v1.get("https://other-api.com/data"); // 直接使用该 URL
1078
+ ```
1079
+
956
1080
  #### createShortApi
957
1081
 
958
1082
  创建 API 快捷方法的工厂函数。
@@ -1076,17 +1200,41 @@ const mergedSignal = mergeSignals(
1076
1200
  - `url`: 原始 URL
1077
1201
  - `config`: 配置对象,包含查询参数、路径参数和基础 URL
1078
1202
 
1079
- **返回:** 处理后的完整 URL
1203
+ **返回:** 包含 `url`(完整 URL 字符串)、`path`(不含查询参数的 URL)和 `query`(URLSearchParams 实例)的对象
1080
1204
 
1081
1205
  **示例:**
1082
1206
 
1083
1207
  ```typescript
1084
- const url = parseUrl("/api/users/:id", {
1208
+ const { url } = parseUrl("/api/users/:id", {
1085
1209
  params: { id: "123" },
1086
1210
  query: { filter: "active" },
1087
1211
  baseURL: "https://api.example.com",
1088
1212
  });
1089
- // 返回: 'https://api.example.com/api/users/123?filter=active'
1213
+ // url: 'https://api.example.com/api/users/123?filter=active'
1214
+ ```
1215
+
1216
+ #### parseQuery2Arr
1217
+
1218
+ 将查询参数解析为 `[key, value][]` 数组。
1219
+ 支持多种输入格式:string、URLSearchParams、Record 和元组数组。
1220
+
1221
+ **参数:**
1222
+
1223
+ - `query`: 任意支持的查询参数格式(string、URLSearchParams、Record、元组数组)
1224
+
1225
+ **返回:** `[key, value]` 键值对数组
1226
+
1227
+ **示例:**
1228
+
1229
+ ```typescript
1230
+ parseQuery2Arr("page=1&size=10");
1231
+ // 返回: [["page", "1"], ["size", "10"]]
1232
+
1233
+ parseQuery2Arr({ id: 123, status: "active" });
1234
+ // 返回: [["id", "123"], ["status", "active"]]
1235
+
1236
+ parseQuery2Arr(new URLSearchParams("page=1"));
1237
+ // 返回: [["page", "1"]]
1090
1238
  ```
1091
1239
 
1092
1240
  #### mergeOptions
@@ -1135,14 +1283,18 @@ isBodyJson("string"); // false
1135
1283
 
1136
1284
  #### genRequestKey
1137
1285
 
1138
- 生成请求的唯一标识键。
1139
- 根据请求的 URL、方法、headers、body、查询参数等生成唯一键值,用于缓存和请求共享。
1286
+ 生成请求的唯一标识键(同步)。
1287
+ 根据请求的 URL、方法、headers、查询参数等生成唯一键值,用于缓存和请求共享。
1288
+
1289
+ > **注意:** 这是同步版本。对于 `Blob`/`FormData` 等需要异步处理的 body 类型,会回退为非确定性 key(基于 nonce)。使用 `genRequestKeyAsync` 可生成完全确定性的 key。
1290
+ > **注意:** `genRequestKeyAsync` 使用的 SHA-256 摘要需要[安全上下文](https://developer.mozilla.org/zh-CN/docs/Web/Security/Secure_Contexts)(HTTPS)。在纯 HTTP 下 `crypto.subtle.digest` 不可用,`genRequestKeyAsync` 会对 `Blob`/`ArrayBuffer`/`DataView` body 回退为非确定性 key,避免错误命中缓存或请求共享。
1140
1291
 
1141
1292
  **参数:**
1142
1293
 
1143
1294
  - `req`: 包含 url 和 options 的请求对象
1295
+ - `sortObjKeys?`: 是否对对象键进行排序以获得稳定序列化
1144
1296
 
1145
- **返回:** 请求的唯一标识字符串
1297
+ **返回:** 唯一标识字符串
1146
1298
 
1147
1299
  **示例:**
1148
1300
 
@@ -1153,6 +1305,27 @@ const key = genRequestKey({
1153
1305
  });
1154
1306
  ```
1155
1307
 
1308
+ #### genRequestKeyAsync
1309
+
1310
+ 生成请求的唯一标识键(异步)。
1311
+ 与 `genRequestKey` 功能相同,但支持异步处理 `Blob`/`FormData` body,生成完全确定性的 key。
1312
+
1313
+ **参数:**
1314
+
1315
+ - `req`: 包含 url 和 options 的请求对象
1316
+ - `sortObjKeys?`: 是否对对象键进行排序以获得稳定序列化
1317
+
1318
+ **返回:** 解析为唯一标识字符串的 Promise
1319
+
1320
+ **示例:**
1321
+
1322
+ ```typescript
1323
+ const key = await genRequestKeyAsync({
1324
+ url: "/api/users",
1325
+ options: { method: "GET", params: { id: 1 } },
1326
+ });
1327
+ ```
1328
+
1156
1329
  #### createRequestStore
1157
1330
 
1158
1331
  创建请求存储实例。
@@ -1162,7 +1335,6 @@ const key = genRequestKey({
1162
1335
 
1163
1336
  - `options`: 配置选项
1164
1337
  - `maxCacheSize`: 最大缓存大小(默认: 100000)
1165
- - `checkInterval`: 缓存检查间隔(毫秒,默认: 60000)
1166
1338
 
1167
1339
  **返回:** 请求存储对象,包含以下方法:
1168
1340
  - `entry(key)`: 获取特定请求键的条目
@@ -1179,7 +1351,7 @@ const key = genRequestKey({
1179
1351
  **示例:**
1180
1352
 
1181
1353
  ```typescript
1182
- const store = createRequestStore({ maxCacheSize: 1000, checkInterval: 30000 });
1354
+ const store = createRequestStore({ maxCacheSize: 1000 });
1183
1355
  // 在请求中使用 store
1184
1356
  ```
1185
1357
 
package/dist/index.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  export declare function createRequestStore(options?: {
2
2
  maxCacheSize?: number;
3
- checkInterval?: number;
4
3
  }): {
5
4
  entry: (key: string) => {
6
5
  cache: {
@@ -145,6 +144,329 @@ export declare function createShortMethods<Methods extends readonly string[], Wr
145
144
  export declare function createSilentRefresh(refreshFn: () => Promise<void>): (success: () => void, fail: () => void) => void;
146
145
 
147
146
  export declare function createSoon<Options extends SoonOptions>(request: <T>(url: string, options?: Options) => Promise<T>): {
147
+ fork: (prefix: string, defaultOptions?: Partial<Options>) => {
148
+ fork: /*elided*/ any;
149
+ options: <T>(url: string, options?: Options) => Promise<T>;
150
+ get: <T>(url: string, options?: Options) => Promise<T>;
151
+ post: <T>(url: string, options?: Options) => Promise<T>;
152
+ put: <T>(url: string, options?: Options) => Promise<T>;
153
+ delete: <T>(url: string, options?: Options) => Promise<T>;
154
+ patch: <T>(url: string, options?: Options) => Promise<T>;
155
+ head: <T>(url: string, options?: Options) => Promise<T>;
156
+ GET: <Url extends string>(url: Url) => {
157
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
158
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
159
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
160
+ };
161
+ Params: <Params extends Record<string, string | number>>() => {
162
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
163
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
164
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
165
+ };
166
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
167
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
168
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
169
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
170
+ };
171
+ };
172
+ };
173
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
174
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
175
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
176
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
177
+ };
178
+ };
179
+ };
180
+ POST: <Url extends string>(url: Url) => {
181
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
182
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
183
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
184
+ };
185
+ Body: <Body>() => unknown extends Body ? never : {
186
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
187
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
188
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
189
+ };
190
+ };
191
+ FormData: <Body>() => unknown extends Body ? never : {
192
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
193
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
194
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
195
+ };
196
+ };
197
+ Params: <Params extends Record<string, string | number>>() => {
198
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
199
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
200
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
201
+ };
202
+ Body: <Body>() => unknown extends Body ? never : {
203
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
204
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
205
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
206
+ };
207
+ };
208
+ FormData: <Body>() => unknown extends Body ? never : {
209
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
210
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
211
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
212
+ };
213
+ };
214
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
215
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
216
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
217
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
218
+ };
219
+ Body: <Body>() => unknown extends Body ? never : {
220
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
221
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
222
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
223
+ };
224
+ };
225
+ FormData: <Body>() => unknown extends Body ? never : {
226
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
227
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
228
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
229
+ };
230
+ };
231
+ };
232
+ };
233
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
234
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
235
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
236
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
237
+ };
238
+ Body: <Body>() => unknown extends Body ? never : {
239
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
240
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
241
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
242
+ };
243
+ };
244
+ FormData: <Body>() => unknown extends Body ? never : {
245
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
246
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
247
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
248
+ };
249
+ };
250
+ };
251
+ };
252
+ PATCH: <Url extends string>(url: Url) => {
253
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
254
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
255
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
256
+ };
257
+ Body: <Body>() => unknown extends Body ? never : {
258
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
259
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
260
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
261
+ };
262
+ };
263
+ FormData: <Body>() => unknown extends Body ? never : {
264
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
265
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
266
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
267
+ };
268
+ };
269
+ Params: <Params extends Record<string, string | number>>() => {
270
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
271
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
272
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
273
+ };
274
+ Body: <Body>() => unknown extends Body ? never : {
275
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
276
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
277
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
278
+ };
279
+ };
280
+ FormData: <Body>() => unknown extends Body ? never : {
281
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
282
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
283
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
284
+ };
285
+ };
286
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
287
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
288
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
289
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
290
+ };
291
+ Body: <Body>() => unknown extends Body ? never : {
292
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
293
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
294
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
295
+ };
296
+ };
297
+ FormData: <Body>() => unknown extends Body ? never : {
298
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
299
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
300
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
301
+ };
302
+ };
303
+ };
304
+ };
305
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
306
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
307
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
308
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
309
+ };
310
+ Body: <Body>() => unknown extends Body ? never : {
311
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
312
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
313
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
314
+ };
315
+ };
316
+ FormData: <Body>() => unknown extends Body ? never : {
317
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
318
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
319
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
320
+ };
321
+ };
322
+ };
323
+ };
324
+ DELETE: <Url extends string>(url: Url) => {
325
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
326
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
327
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
328
+ };
329
+ Body: <Body>() => unknown extends Body ? never : {
330
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
331
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
332
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
333
+ };
334
+ };
335
+ FormData: <Body>() => unknown extends Body ? never : {
336
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
337
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
338
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
339
+ };
340
+ };
341
+ Params: <Params extends Record<string, string | number>>() => {
342
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
343
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
344
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
345
+ };
346
+ Body: <Body>() => unknown extends Body ? never : {
347
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
348
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
349
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
350
+ };
351
+ };
352
+ FormData: <Body>() => unknown extends Body ? never : {
353
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
354
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
355
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
356
+ };
357
+ };
358
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
359
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
360
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
361
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
362
+ };
363
+ Body: <Body>() => unknown extends Body ? never : {
364
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
365
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
366
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
367
+ };
368
+ };
369
+ FormData: <Body>() => unknown extends Body ? never : {
370
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
371
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
372
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
373
+ };
374
+ };
375
+ };
376
+ };
377
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
378
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
379
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
380
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
381
+ };
382
+ Body: <Body>() => unknown extends Body ? never : {
383
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
384
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
385
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
386
+ };
387
+ };
388
+ FormData: <Body>() => unknown extends Body ? never : {
389
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
390
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
391
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
392
+ };
393
+ };
394
+ };
395
+ };
396
+ PUT: <Url extends string>(url: Url) => {
397
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
398
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
399
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
400
+ };
401
+ Body: <Body>() => unknown extends Body ? never : {
402
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
403
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
404
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
405
+ };
406
+ };
407
+ FormData: <Body>() => unknown extends Body ? never : {
408
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
409
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
410
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
411
+ };
412
+ };
413
+ Params: <Params extends Record<string, string | number>>() => {
414
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
415
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
416
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
417
+ };
418
+ Body: <Body>() => unknown extends Body ? never : {
419
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
420
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
421
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
422
+ };
423
+ };
424
+ FormData: <Body>() => unknown extends Body ? never : {
425
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
426
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
427
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
428
+ };
429
+ };
430
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
431
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
432
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
433
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
434
+ };
435
+ Body: <Body>() => unknown extends Body ? never : {
436
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
437
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
438
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
439
+ };
440
+ };
441
+ FormData: <Body>() => unknown extends Body ? never : {
442
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
443
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
444
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<Params>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
445
+ };
446
+ };
447
+ };
448
+ };
449
+ Query: <Query extends Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams>() => unknown extends Query ? never : {
450
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
451
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
452
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
453
+ };
454
+ Body: <Body>() => unknown extends Body ? never : {
455
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
456
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
457
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
458
+ };
459
+ };
460
+ FormData: <Body>() => unknown extends Body ? never : {
461
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
462
+ Options: (options: Omit<Options, "body" | "method" | "query" | "params"> | undefined) => {
463
+ Ok: <Res = unknown>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Omit<Options, "body" | "method" | "query" | "params"> | undefined]) => Promise<Res>;
464
+ };
465
+ };
466
+ };
467
+ };
468
+ request: <T>(url: string, options?: Options) => Promise<T>;
469
+ };
148
470
  options: <T>(url: string, options?: Options) => Promise<T>;
149
471
  get: <T>(url: string, options?: Options) => Promise<T>;
150
472
  post: <T>(url: string, options?: Options) => Promise<T>;
@@ -473,16 +795,27 @@ export declare function genRequestKey(req: {
473
795
  url: string;
474
796
  options?: {
475
797
  method?: string;
476
- headers?: RequestInit["headers"];
477
798
  body?: RequestInit["body"] | object;
478
- query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
799
+ headers?: RequestInit["headers"];
479
800
  params?: Record<string, string | number>;
801
+ query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
480
802
  };
481
803
  }, sortObjKeys?: boolean): string;
482
804
 
805
+ export declare function genRequestKeyAsync(req: {
806
+ url: string;
807
+ options?: {
808
+ method?: string;
809
+ body?: RequestInit["body"] | object;
810
+ headers?: RequestInit["headers"];
811
+ params?: Record<string, string | number>;
812
+ query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
813
+ };
814
+ }, sortObjKeys?: boolean): Promise<string>;
815
+
483
816
  declare type GetUrlKey<Url> = Url extends `${string}/:${infer Key}/${infer Right}` ? `${Key}` | GetUrlKey<`/${Right}`> : Url extends `${string}/:${infer Key}` ? `${Key}` : never;
484
817
 
485
- export declare function isBodyJson(body: any): boolean;
818
+ export declare function isBodyJson(body: unknown): boolean;
486
819
 
487
820
  export declare const mergeHeaders: (...headersList: (HeadersInit | undefined)[]) => Headers;
488
821
 
@@ -514,6 +847,8 @@ export declare function parseOptions<Options extends SoonOptions>(urlOptions: {
514
847
  abortController: AbortController;
515
848
  };
516
849
 
850
+ export declare const parseQuery2Arr: (query?: string | string[][] | Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams) => string[][];
851
+
517
852
  export declare const parseUrl: (url: string, config: {
518
853
  query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
519
854
  params?: Record<string, string | number>;
package/dist/index.js CHANGED
@@ -1 +1 @@
1
- var e=e=>{const t=[],r=e.match(/:([^:/\d]+)\/?/g);return r&&r.forEach(e=>{t.push(e.replace(/\//g,"").replace(/:/g,""))}),t},t=(e="")=>e.endsWith("/")?e.slice(0,-1):e,r=(e="")=>e.startsWith("/")?e:"/"+e,o=(e="")=>e.startsWith("http"),n=e=>{if(!e)return[];if(e instanceof URLSearchParams||"string"==typeof e||Array.isArray(e))return Array.from(new URLSearchParams(e).entries());const t=[];return Object.entries(e).forEach(([e,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{t.push([e,String(r??"")])})}),t},a=(a,s)=>{const{query:c,params:i,baseURL:h}=s;let l=a.trim();e(a).forEach(e=>{i&&(l=l.replace(":"+e,""+i[e]))});const[u,d]=l.split("?"),p=new URLSearchParams([...n(d),...n(c)]);let y=((e,n)=>o(e)?e:t(o(n)?n:r(n))+t(r(e)))(u,h),f=y;return p.size&&(f=y+"?"+p),{query:p,url:f,path:y}},s=(...e)=>{const t=new Headers;return e.forEach(e=>{e&&(e instanceof Headers?e.forEach((e,r)=>t.set(r,e)):Array.isArray(e)?e.forEach(([e,r])=>t.set(e,r)):Object.entries(e).forEach(([e,r])=>t.set(e,r)))}),t};function c(e,t){const r=(e??[]).filter(e=>!!e);return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function i(e){return!(!e||"object"!=typeof e||(e instanceof Blob||e instanceof ArrayBuffer||e instanceof FormData||e instanceof File||e instanceof DataView||e instanceof URLSearchParams||e instanceof ReadableStream||(t=e,[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(e=>t instanceof e))));var t}function h(e){const t=new FormData;return e&&"object"==typeof e&&!Array.isArray(e)&&Object.entries(e).forEach(([e,r])=>{if(null==r||"function"==typeof r)return;let o;o=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),t.append(e,o)}),t}var l=e=>{if(e instanceof Response)return e.clone();if("function"==typeof e||e instanceof Promise||null===e||"object"!=typeof e)return e;try{return structuredClone(e)}catch(t){return JSON.parse(JSON.stringify(e))}};function u(...e){const t=Object.assign({},...e);return t.headers=s(...e.map(e=>e?.headers)),t.signal=c(e.map(e=>e?.signal),t.timeout),t}function d(e){const{url:t,options:r,baseURL:o,baseOptions:n}=e,s=u(n,r),{url:h,query:l}=a(t,{...s,baseURL:o});s.query=l;const d=s?.body,p=i(d);s.body=p?JSON.stringify(d):d,p&&s.headers.append("Content-Type","application/json");const y=new AbortController;return s.signal=c([s.signal,y.signal]),{url:h,options:s,is_body_json:p,abortController:y}}var p=["get","post","put","delete","patch"];function y(e,t){const r={};return e.forEach(e=>{r[e]=t(e)}),r}function f(t){const r=(r,o,n)=>{const a=!!e(r).length;return(...e)=>{const s=[...e],{hasBody:c,hasQuery:i,isFormData:l,options:u}=n||{},d=a?s.shift():void 0,p=i?s.shift():void 0;let y=c?s.shift():void 0;l&&(y=h(y));const f=s.shift(),m=u?{...u,...f}:f;return t(r,o,d,p,y,m)}},o={};return p.forEach(e=>{const t=e.toUpperCase();o[t]=t=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0,options:o})})}),Params:()=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0,options:o})})}),Query:()=>({Ok:()=>r(t,e,{hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasQuery:!0,options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0,options:o})})})})}),Query:()=>({Ok:()=>r(t,e,{hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasQuery:!0,options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0,options:o})})})})})}),o}function m(e,t=!1){if(Array.isArray(e)){const r=[...e];return t&&r.sort(),r.map(e=>m(e,t))}if("object"==typeof e&&null!==e){const r={};return Object.keys(e).sort().forEach(o=>{r[o]=m(e[o],t)}),r}return e}function b(e,t){const{url:r,options:o}=e,{headers:n,method:a,body:s,query:c,params:i}=o??{},h={params:i,query:c,body:s,headers:Object.fromEntries(new Headers(n).entries())};return(a??"get").toLowerCase()+r+JSON.stringify(t?h:m(h))}function O(e={}){const t=e.maxCacheSize??1e5,r=e.checkInterval??6e4,o={},n=e=>o[e],a=(e,t)=>{const r=o[e];r?Object.assign(r,t):o[e]={...t}},s=e=>{delete o[e]},c=(e,t)=>{try{const r=n(e);r&&(t(r),Object.keys(r).some(e=>void 0!==r[e])?a(e,r):s(e))}catch(r){console.error("Error during request cleanup:",r);try{s(e)}catch(o){console.error("Failed to remove request after cleanup error:",o)}}};function i(e,r,s){const i=n(e)||{};i.cache=l(r),i.cache_expiredTime=s,a(e,i),(()=>{try{const e=Object.entries(o).filter(([e,t])=>void 0!==t.cache);if(e.length>t){e.sort(([,e],[,t])=>(e.cache_expiredTime||0)-(t.cache_expiredTime||0));const r=e.length-t;e.slice(0,r).forEach(([e])=>{c(e,e=>{delete e.cache,delete e.cache_expiredTime})})}}catch(e){console.error("Error during cache size management:",e)}})()}const h=setInterval(()=>{try{const e=Date.now();Object.entries(o).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&c(t,e=>{delete e.cache,delete e.cache_expiredTime})})}catch(e){console.warn("Error during periodic cache cleanup:",e)}},r);return{entry:e=>({cache:{get:()=>function(e){const t=n(e);if(t&&void 0!==t.cache)return t.cache_expiredTime&&t.cache_expiredTime>Date.now()?l(t.cache):void c(e,e=>{delete e.cache,delete e.cache_expiredTime})}(e),remove:()=>function(e){c(e,e=>{delete e.cache,delete e.cache_expiredTime})}(e),set:(t,r)=>i(e,t,r)},share:{get:()=>function(e){return n(e)?.promise}(e),set:t=>function(e,t){const r=n(e)||{};r.promise=t,a(e,r),t.finally(()=>{c(e,e=>{delete e.promise})})}(e,t)},abort(t,r){r&&r.length>0&&r[r.length-1]!==n(e)?.abortController&&(r.pop()?.abort("race abort"),r.push(t),a(e,{abortController:t}))}}),dispose:()=>{clearInterval(h)},get:n,set:a,remove:s,getAll:()=>({...o}),removeAll:()=>{Object.keys(o).forEach(e=>{delete o[e]})},clearCache:()=>{Object.entries(o).forEach(([e,t])=>{void 0!==t.cache&&c(e,e=>{delete e.cache,delete e.cache_expiredTime})})},clearExpiredCache:()=>{const e=Date.now();Object.entries(o).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&c(t,e=>{delete e.cache,delete e.cache_expiredTime})})},abortAll:()=>{Object.entries(o).forEach(([e,t])=>{t.abortController&&t.abortController.abort("abort all")})}}}function g(e){let t=[],r=!1;return(o,n)=>{t.push({success:o,fail:n}),r||(r=!0,e().then(()=>{t.forEach(e=>e.success())}).catch(e=>{t.forEach(e=>e.fail())}).finally(()=>{r=!1,t=[]}))}}function A(e,t,r=0){return new Promise((o,n)=>{let a=0;const s=e.getReader(),c=[];!function e(){s.read().then(({done:n,value:s})=>{if(n){const e=new Uint8Array(a);let n=0;return c.forEach(t=>{e.set(t,n),n+=t.length}),t(100,a,r),void o(e.buffer)}s&&(c.push(s),a+=s.length,r>0?t(Math.min(100,Math.round(a/r*100)),a,r):t(0,a,0)),e()}).catch(e=>{console.error("Error reading response body:",e),n(e)})}()})}function E(e,t){return new Promise((r,o)=>{if(!e.body)return void o(/* @__PURE__ */new Error("Response body is null"));const n=e.headers.get("content-length"),a=n?parseInt(n,10):0;A(e.body,t,a).then(r).catch(o)})}function k(e,t,r,o,n){return new Promise((a,s)=>{const c=e.entry(r),{share:i,aborts:h,staleTime:u}=n??{},d=new AbortController;if(d.signal.addEventListener("abort",()=>{s(d.signal.reason)}),c.abort(i?d:o,h),i){const e=c.share.get();if(e)return a(e.then(e=>l(e)))}if(u){const e=c.cache.get();if(void 0!==e)return a(e)}const p=t();i&&c.share.set(p),p.then(e=>{a(e),u&&c.cache.set(e,/* @__PURE__ */(new Date).getTime()+u)}).catch(e=>s(e))})}var v=O(),B=e=>{const t=d(e),r=b({url:e.url,options:{method:t.options?.method,headers:t.options?.headers}},e.sortRequestKey);return k(e.store??v,()=>fetch(t.url,t.options),r,t.abortController,t.options)};function j(e){const t=f((t,r,o,n,a,s)=>e(t,{...s,method:r,params:o,query:n,body:a})),r=y([...p,"head","options"],t=>(r,o)=>e(r,{...o,method:t}));return{request:e,...t,...r}}export{O as createRequestStore,f as createShortApi,y as createShortMethods,g as createSilentRefresh,j as createSoon,m as deepSort,b as genRequestKey,i as isBodyJson,s as mergeHeaders,u as mergeOptions,c as mergeSignals,d as parseOptions,a as parseUrl,E as progressDownload,A as progressReadBody,k as requestWithStore,B as soonFetch,h as toFormData};
1
+ var t=t=>{const e=[],r=t.match(/:([^:/]+)\/?/g);return r&&r.forEach(t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))}),e},e=(t="")=>t.endsWith("/")?t.slice(0,-1):t,r=(t="")=>t.startsWith("/")?t:"/"+t,n=(t="")=>t.startsWith("http"),o=(t,o)=>n(t)?t:e(n(o)?o:r(o))+e(r(t)),a=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const e=[];return Object.entries(t).forEach(([t,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{e.push([t,String(r??"")])})}),e},s=(e,r)=>{const{query:n,params:s,baseURL:i}=r;let c=e.trim();t(e).forEach(t=>{s&&void 0!==s[t]&&(c=c.replaceAll(":"+t,""+s[t]))});const[f,u]=c.split("?"),l=new URLSearchParams([...a(u),...a(n)]),h=o(f??"",i);let p=h;return l.size&&(p=h+"?"+l),{query:l,url:p,path:h}},i=(...t)=>{const e=new Headers;return t.forEach(t=>{t&&(t instanceof Headers?t.forEach((t,r)=>e.set(r,t)):Array.isArray(t)?t.forEach(([t,r])=>e.set(t,r)):Object.entries(t).forEach(([t,r])=>e.set(t,r)))}),e};function c(t,e){const r=(t??[]).filter(t=>!!t);return e&&r.push(AbortSignal.timeout(e)),r.length?AbortSignal.any(r):void 0}function f(t){return[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(e=>t instanceof e)}function u(t){return null!=t&&("object"==typeof t&&(!(t instanceof FormData)&&(!(t instanceof Blob)&&(!(t instanceof ArrayBuffer)&&(!(t instanceof DataView)&&(!(t instanceof ReadableStream)&&(!(t instanceof URLSearchParams)&&!f(t))))))))}function l(t){const e=new FormData;return t&&"object"==typeof t&&!Array.isArray(t)&&Object.entries(t).forEach(([t,r])=>{if(null==r||"function"==typeof r)return;let n;n=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),e.append(t,n)}),e}var h=0,p=(t="")=>`${t}_nonce_${Date.now()}_${h++}__`;function y(t){return Array.from(new Uint8Array(t)).map(t=>t.toString(16).padStart(2,"0")).join("")}async function b(t){const e=await t.arrayBuffer();return globalThis.crypto?.subtle?.digest?y(await globalThis.crypto.subtle.digest("SHA-256",e)):p("blob")}async function d(t){if(null==t)return t;if("string"==typeof t)return t;if("object"!=typeof t)return String(t);if(t instanceof FormData){const e={},r=[];t.forEach((t,e)=>r.push([e,t]));for(const[t,n]of r)e[t]=n instanceof Blob?`__blob_${await b(n)}__`:n;return e}if(t instanceof Blob)return`__blob_${await b(t)}__`;if(t instanceof ArrayBuffer)return globalThis.crypto?.subtle?.digest?`__ab_${y(await globalThis.crypto.subtle.digest("SHA-256",t))}__`:p("__ab");if(t instanceof DataView){const e=t.buffer.slice(t.byteOffset,t.byteOffset+t.byteLength);return globalThis.crypto?.subtle?.digest?`__ab_${y(await globalThis.crypto.subtle.digest("SHA-256",e))}__`:p("__ab")}return t instanceof URLSearchParams?t.toString():t instanceof ReadableStream?p("_"):(f(t),t)}var g=t=>{if(t instanceof Response)return t.clone();if("function"==typeof t||t instanceof Promise||null===t||"object"!=typeof t)return t;try{return structuredClone(t)}catch(e){return JSON.parse(JSON.stringify(t))}};function m(...t){const e=Object.assign({},...t);return e.headers=i(...t.map(t=>t?.headers)),e.signal=c(t.map(t=>t?.signal),e.timeout),e}function O(t){const{url:e,options:r,baseURL:n,baseOptions:o}=t,a=m(o,r),{url:i,query:f}=s(e,{...a,baseURL:n});a.query=f;const l=a?.body,h=u(l);a.body=h?JSON.stringify(l):null!=l&&"string"!=typeof l&&"object"!=typeof l?String(l):l,h&&a.headers.set("Content-Type","application/json");const p=new AbortController;return a.signal=c([a.signal,p.signal]),{url:i,options:a,is_body_json:h,abortController:p}}var _=["get","post","put","delete","patch"];function A(t,e){const r={};return t.forEach(t=>{r[t]=e(t)}),r}function E(e){const r=(r,n,o)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:f,options:u}=o||{},h=a?s.shift():void 0,p=c?s.shift():void 0;let y=i?s.shift():void 0;f&&(y=l(y));const b=s.shift(),d=u?{...u,...b}:b;return e(r,n,h,p,y,d)}},n={hasBody:!0},o={hasQuery:!0},a={isFormData:!0},s={};return _.forEach(t=>{const e=t.toUpperCase();s[e]=e=>({Ok:()=>r(e,t),Options:n=>({Ok:()=>r(e,t,{options:n})}),Body:()=>({Ok:()=>r(e,t,{...n}),Options:o=>({Ok:()=>r(e,t,{...n,options:o})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...a}),Options:o=>({Ok:()=>r(e,t,{...n,...a,options:o})})}),Params:()=>({Ok:()=>r(e,t),Options:n=>({Ok:()=>r(e,t,{options:n})}),Body:()=>({Ok:()=>r(e,t,{...n}),Options:o=>({Ok:()=>r(e,t,{...n,options:o})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...a}),Options:o=>({Ok:()=>r(e,t,{...n,...a,options:o})})}),Query:()=>({Ok:()=>r(e,t,{...o}),Options:n=>({Ok:()=>r(e,t,{...o,options:n})}),Body:()=>({Ok:()=>r(e,t,{...n,...o}),Options:a=>({Ok:()=>r(e,t,{...n,...o,options:a})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...o,...a}),Options:s=>({Ok:()=>r(e,t,{...n,...o,...a,options:s})})})})}),Query:()=>({Ok:()=>r(e,t,{...o}),Options:n=>({Ok:()=>r(e,t,{...o,options:n})}),Body:()=>({Ok:()=>r(e,t,{...n,...o}),Options:a=>({Ok:()=>r(e,t,{...n,...o,options:a})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...o,...a}),Options:s=>({Ok:()=>r(e,t,{...n,...o,...a,options:s})})})})})}),s}function k(t,e=!1){if(Array.isArray(t)){const r=[...t];return e&&r.sort(),r.map(t=>k(t,e))}if("object"==typeof t&&null!==t){const r={};return Object.keys(t).sort().forEach(n=>{r[n]=k(t[n],e)}),r}return t}function S(t,e,r){const n={body:e,headers:Object.fromEntries(t.headers.entries())};return(t.method??"get").toLowerCase()+t.url+JSON.stringify(r?k(n):n)}async function w(t,e){const{url:r,options:n}=O(t);return S({url:r,...n},await d(t.options?.body),e)}function v(t,e){const{url:r,options:n}=O(t);return S({url:r,...n},function(t){if(null==t)return t;if("string"==typeof t)return t;if("object"!=typeof t)return String(t);if(t instanceof FormData){const e={},r=[];t.forEach((t,e)=>r.push([e,t]));for(const[t,n]of r)e[t]=n instanceof Blob?p("__blob"):n;return e}return t instanceof URLSearchParams?t.toString():u(t)||f(t)?t:p("_")}(t.options?.body),e)}function j(t={}){const e=t.maxCacheSize??1e5,r={},n=t=>r[t],o=(t,e)=>{const n=r[t];n?Object.assign(n,e):r[t]={...e}},a=t=>{delete r[t]},s=(t,e)=>{try{const r=n(t);r&&(e(r),Object.keys(r).some(t=>void 0!==r[t])?o(t,r):a(t))}catch(r){console.error("Error during request cleanup:",r);try{a(t)}catch(s){console.error("Failed to remove request after cleanup error:",s)}}},i=t=>delete t.cache,c=t=>delete t.cache_expiredTime;function f(t,a,f){const u=n(t)||{};u.cache=g(a),u.cache_expiredTime=f,o(t,u),(()=>{try{const t=Object.entries(r).filter(([t,e])=>void 0!==e.cache);if(t.length>e){t.sort(([,t],[,e])=>(t.cache_expiredTime||0)-(e.cache_expiredTime||0));const r=t.length-e;t.slice(0,r).forEach(([t])=>{s(t,t=>{i(t),c(t)})})}}catch(t){console.error("Error during cache size management:",t)}})()}const u=()=>{Object.keys(r).forEach(t=>{delete r[t]})},l=()=>{Object.entries(r).forEach(([t,e])=>{e.abortController&&e.abortController.abort("abort all")})};return{entry:t=>({cache:{get:()=>function(t){const e=n(t);if(e&&void 0!==e.cache)return e.cache_expiredTime&&e.cache_expiredTime>Date.now()?g(e.cache):void s(t,t=>{i(t),c(t)})}(t),remove:()=>function(t){s(t,t=>{i(t),c(t)})}(t),set:(e,r)=>f(t,e,r)},share:{get:()=>function(t){return n(t)?.promise}(t),set:e=>function(t,e){const r=n(t)||{};r.promise=e,o(t,r),e.finally(()=>{s(t,t=>{delete t.promise})})}(t,e)},abort(e,r){r&&r.length>0&&r[r.length-1]!==n(t)?.abortController&&(r.pop()?.abort("race abort"),r.push(e),o(t,{abortController:e}))}}),dispose:()=>{l(),u()},get:n,set:o,remove:a,getAll:()=>({...r}),removeAll:u,clearCache:()=>{Object.entries(r).forEach(([t,e])=>{void 0!==e.cache&&s(t,t=>{i(t),c(t)})})},clearExpiredCache:()=>{const t=Date.now();Object.entries(r).forEach(([e,r])=>{r.cache_expiredTime&&r.cache_expiredTime<t&&s(e,t=>{i(t),c(t)})})},abortAll:l}}function T(t){let e=[],r=!1;return(n,o)=>{e.push({success:n,fail:o}),r||(r=!0,t().then(()=>{e.forEach(t=>t.success())}).catch(t=>{e.forEach(t=>t.fail())}).finally(()=>{r=!1,e=[]}))}}function U(t,e,r=0){return new Promise((n,o)=>{let a=0;const s=t.getReader(),i=[];!function t(){s.read().then(({done:o,value:s})=>{if(o){const t=new Uint8Array(a);let o=0;return i.forEach(e=>{t.set(e,o),o+=e.length}),e(100,a,r),void n(t.buffer)}s&&(i.push(s),a+=s.length,r>0?e(Math.min(100,Math.round(a/r*100)),a,r):e(0,a,0)),t()}).catch(t=>{console.error("Error reading response body:",t),o(t)})}()})}function B(t,e){return new Promise((r,n)=>{if(!t.body)return void n(/* @__PURE__ */new Error("Response body is null"));const o=t.headers.get("content-length"),a=o?parseInt(o,10):0;U(t.body,e,a).then(r).catch(n)})}function C(t,e,r,n,o){return new Promise((a,s)=>{const i=t.entry(r),{share:c,aborts:f,staleTime:u}=o??{},l=new AbortController,h=()=>l.signal.removeEventListener("abort",p),p=()=>{h(),s(l.signal.reason)};if(l.signal.addEventListener("abort",p),i.abort(c?l:n,f),c){const t=i.share.get();if(t)return h(),a(t.then(t=>g(t)))}if(u){const t=i.cache.get();if(void 0!==t)return h(),a(t)}const y=e();c&&i.share.set(y),y.then(t=>{h(),a(t),u&&i.cache.set(t,/* @__PURE__ */(new Date).getTime()+u)}).catch(t=>{h(),s(t)})})}var D=j(),R=async t=>{const e=O(t),r=e.options,n=e.url,{share:o,staleTime:a,aborts:s}=r??{};if(!o&&!a&&!s)return fetch(n,r);const i=S({url:n,...r},await d(t.options?.body),t.sortRequestKey);return C(t.store??D,()=>fetch(n,r),i,e.abortController,r)};function F(t){const e=E((e,r,n,o,a,s)=>t(e,{...s,method:r,params:n,query:o,body:a})),r=A([..._,"head","options"],e=>(r,n)=>t(r,{...n,method:e}));return{request:t,...e,...r,fork:(e,r)=>F((n,a)=>t(o(n,e),r?{...r,...a}:a))}}export{j as createRequestStore,E as createShortApi,A as createShortMethods,T as createSilentRefresh,F as createSoon,k as deepSort,v as genRequestKey,w as genRequestKeyAsync,u as isBodyJson,i as mergeHeaders,m as mergeOptions,c as mergeSignals,O as parseOptions,a as parseQuery2Arr,s as parseUrl,B as progressDownload,U as progressReadBody,C as requestWithStore,R as soonFetch,l as toFormData};
package/dist/index.umd.js CHANGED
@@ -1 +1 @@
1
- !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).SoonFetch={})}(this,function(e){Object.defineProperty(e,Symbol.toStringTag,{value:"Module"});var t=e=>{const t=[],r=e.match(/:([^:/\d]+)\/?/g);return r&&r.forEach(e=>{t.push(e.replace(/\//g,"").replace(/:/g,""))}),t},r=(e="")=>e.endsWith("/")?e.slice(0,-1):e,o=(e="")=>e.startsWith("/")?e:"/"+e,n=(e="")=>e.startsWith("http"),a=e=>{if(!e)return[];if(e instanceof URLSearchParams||"string"==typeof e||Array.isArray(e))return Array.from(new URLSearchParams(e).entries());const t=[];return Object.entries(e).forEach(([e,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{t.push([e,String(r??"")])})}),t},s=(e,s)=>{const{query:i,params:c,baseURL:h}=s;let l=e.trim();t(e).forEach(e=>{c&&(l=l.replace(":"+e,""+c[e]))});const[u,d]=l.split("?"),p=new URLSearchParams([...a(d),...a(i)]);let f=((e,t)=>n(e)?e:r(n(t)?t:o(t))+r(o(e)))(u,h),y=f;return p.size&&(y=f+"?"+p),{query:p,url:y,path:f}},i=(...e)=>{const t=new Headers;return e.forEach(e=>{e&&(e instanceof Headers?e.forEach((e,r)=>t.set(r,e)):Array.isArray(e)?e.forEach(([e,r])=>t.set(e,r)):Object.entries(e).forEach(([e,r])=>t.set(e,r)))}),t};function c(e,t){const r=(e??[]).filter(e=>!!e);return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function h(e){return!(!e||"object"!=typeof e||(e instanceof Blob||e instanceof ArrayBuffer||e instanceof FormData||e instanceof File||e instanceof DataView||e instanceof URLSearchParams||e instanceof ReadableStream||(t=e,[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(e=>t instanceof e))));var t}function l(e){const t=new FormData;return e&&"object"==typeof e&&!Array.isArray(e)&&Object.entries(e).forEach(([e,r])=>{if(null==r||"function"==typeof r)return;let o;o=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),t.append(e,o)}),t}var u=e=>{if(e instanceof Response)return e.clone();if("function"==typeof e||e instanceof Promise||null===e||"object"!=typeof e)return e;try{return structuredClone(e)}catch(t){return JSON.parse(JSON.stringify(e))}};function d(...e){const t=Object.assign({},...e);return t.headers=i(...e.map(e=>e?.headers)),t.signal=c(e.map(e=>e?.signal),t.timeout),t}function p(e){const{url:t,options:r,baseURL:o,baseOptions:n}=e,a=d(n,r),{url:i,query:l}=s(t,{...a,baseURL:o});a.query=l;const u=a?.body,p=h(u);a.body=p?JSON.stringify(u):u,p&&a.headers.append("Content-Type","application/json");const f=new AbortController;return a.signal=c([a.signal,f.signal]),{url:i,options:a,is_body_json:p,abortController:f}}var f=["get","post","put","delete","patch"];function y(e,t){const r={};return e.forEach(e=>{r[e]=t(e)}),r}function m(e){const r=(r,o,n)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:h,options:u}=n||{},d=a?s.shift():void 0,p=c?s.shift():void 0;let f=i?s.shift():void 0;h&&(f=l(f));const y=s.shift(),m=u?{...u,...y}:y;return e(r,o,d,p,f,m)}},o={};return f.forEach(e=>{const t=e.toUpperCase();o[t]=t=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0,options:o})})}),Params:()=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,isFormData:!0,options:o})})}),Query:()=>({Ok:()=>r(t,e,{hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasQuery:!0,options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0,options:o})})})})}),Query:()=>({Ok:()=>r(t,e,{hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasQuery:!0,options:o})}),Body:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,options:o})})}),FormData:()=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0}),Options:o=>({Ok:()=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0,options:o})})})})})}),o}function b(e,t=!1){if(Array.isArray(e)){const r=[...e];return t&&r.sort(),r.map(e=>b(e,t))}if("object"==typeof e&&null!==e){const r={};return Object.keys(e).sort().forEach(o=>{r[o]=b(e[o],t)}),r}return e}function g(e,t){const{url:r,options:o}=e,{headers:n,method:a,body:s,query:i,params:c}=o??{},h={params:c,query:i,body:s,headers:Object.fromEntries(new Headers(n).entries())};return(a??"get").toLowerCase()+r+JSON.stringify(t?h:b(h))}function O(e={}){const t=e.maxCacheSize??1e5,r=e.checkInterval??6e4,o={},n=e=>o[e],a=(e,t)=>{const r=o[e];r?Object.assign(r,t):o[e]={...t}},s=e=>{delete o[e]},i=(e,t)=>{try{const r=n(e);r&&(t(r),Object.keys(r).some(e=>void 0!==r[e])?a(e,r):s(e))}catch(r){console.error("Error during request cleanup:",r);try{s(e)}catch(o){console.error("Failed to remove request after cleanup error:",o)}}};function c(e,r,s){const c=n(e)||{};c.cache=u(r),c.cache_expiredTime=s,a(e,c),(()=>{try{const e=Object.entries(o).filter(([e,t])=>void 0!==t.cache);if(e.length>t){e.sort(([,e],[,t])=>(e.cache_expiredTime||0)-(t.cache_expiredTime||0));const r=e.length-t;e.slice(0,r).forEach(([e])=>{i(e,e=>{delete e.cache,delete e.cache_expiredTime})})}}catch(e){console.error("Error during cache size management:",e)}})()}const h=setInterval(()=>{try{const e=Date.now();Object.entries(o).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&i(t,e=>{delete e.cache,delete e.cache_expiredTime})})}catch(e){console.warn("Error during periodic cache cleanup:",e)}},r);return{entry:e=>({cache:{get:()=>function(e){const t=n(e);if(t&&void 0!==t.cache)return t.cache_expiredTime&&t.cache_expiredTime>Date.now()?u(t.cache):void i(e,e=>{delete e.cache,delete e.cache_expiredTime})}(e),remove:()=>function(e){i(e,e=>{delete e.cache,delete e.cache_expiredTime})}(e),set:(t,r)=>c(e,t,r)},share:{get:()=>function(e){return n(e)?.promise}(e),set:t=>function(e,t){const r=n(e)||{};r.promise=t,a(e,r),t.finally(()=>{i(e,e=>{delete e.promise})})}(e,t)},abort(t,r){r&&r.length>0&&r[r.length-1]!==n(e)?.abortController&&(r.pop()?.abort("race abort"),r.push(t),a(e,{abortController:t}))}}),dispose:()=>{clearInterval(h)},get:n,set:a,remove:s,getAll:()=>({...o}),removeAll:()=>{Object.keys(o).forEach(e=>{delete o[e]})},clearCache:()=>{Object.entries(o).forEach(([e,t])=>{void 0!==t.cache&&i(e,e=>{delete e.cache,delete e.cache_expiredTime})})},clearExpiredCache:()=>{const e=Date.now();Object.entries(o).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&i(t,e=>{delete e.cache,delete e.cache_expiredTime})})},abortAll:()=>{Object.entries(o).forEach(([e,t])=>{t.abortController&&t.abortController.abort("abort all")})}}}function A(e,t,r=0){return new Promise((o,n)=>{let a=0;const s=e.getReader(),i=[];!function e(){s.read().then(({done:n,value:s})=>{if(n){const e=new Uint8Array(a);let n=0;return i.forEach(t=>{e.set(t,n),n+=t.length}),t(100,a,r),void o(e.buffer)}s&&(i.push(s),a+=s.length,r>0?t(Math.min(100,Math.round(a/r*100)),a,r):t(0,a,0)),e()}).catch(e=>{console.error("Error reading response body:",e),n(e)})}()})}function E(e,t,r,o,n){return new Promise((a,s)=>{const i=e.entry(r),{share:c,aborts:h,staleTime:l}=n??{},d=new AbortController;if(d.signal.addEventListener("abort",()=>{s(d.signal.reason)}),i.abort(c?d:o,h),c){const e=i.share.get();if(e)return a(e.then(e=>u(e)))}if(l){const e=i.cache.get();if(void 0!==e)return a(e)}const p=t();c&&i.share.set(p),p.then(e=>{a(e),l&&i.cache.set(e,(new Date).getTime()+l)}).catch(e=>s(e))})}var k=O();e.createRequestStore=O,e.createShortApi=m,e.createShortMethods=y,e.createSilentRefresh=function(e){let t=[],r=!1;return(o,n)=>{t.push({success:o,fail:n}),r||(r=!0,e().then(()=>{t.forEach(e=>e.success())}).catch(e=>{t.forEach(e=>e.fail())}).finally(()=>{r=!1,t=[]}))}},e.createSoon=function(e){const t=m((t,r,o,n,a,s)=>e(t,{...s,method:r,params:o,query:n,body:a})),r=y([...f,"head","options"],t=>(r,o)=>e(r,{...o,method:t}));return{request:e,...t,...r}},e.deepSort=b,e.genRequestKey=g,e.isBodyJson=h,e.mergeHeaders=i,e.mergeOptions=d,e.mergeSignals=c,e.parseOptions=p,e.parseUrl=s,e.progressDownload=function(e,t){return new Promise((r,o)=>{if(!e.body)return void o(new Error("Response body is null"));const n=e.headers.get("content-length"),a=n?parseInt(n,10):0;A(e.body,t,a).then(r).catch(o)})},e.progressReadBody=A,e.requestWithStore=E,e.soonFetch=e=>{const t=p(e),r=g({url:e.url,options:{method:t.options?.method,headers:t.options?.headers}},e.sortRequestKey);return E(e.store??k,()=>fetch(t.url,t.options),r,t.abortController,t.options)},e.toFormData=l});
1
+ !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).SoonFetch={})}(this,function(e){Object.defineProperty(e,Symbol.toStringTag,{value:"Module"});var t=e=>{const t=[],r=e.match(/:([^:/]+)\/?/g);return r&&r.forEach(e=>{t.push(e.replace(/\//g,"").replace(/:/g,""))}),t},r=(e="")=>e.endsWith("/")?e.slice(0,-1):e,o=(e="")=>e.startsWith("/")?e:"/"+e,n=(e="")=>e.startsWith("http"),a=(e,t)=>n(e)?e:r(n(t)?t:o(t))+r(o(e)),s=e=>{if(!e)return[];if(e instanceof URLSearchParams||"string"==typeof e||Array.isArray(e))return Array.from(new URLSearchParams(e).entries());const t=[];return Object.entries(e).forEach(([e,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{t.push([e,String(r??"")])})}),t},i=(e,r)=>{const{query:o,params:n,baseURL:i}=r;let c=e.trim();t(e).forEach(e=>{n&&void 0!==n[e]&&(c=c.replaceAll(":"+e,""+n[e]))});const[f,u]=c.split("?"),l=new URLSearchParams([...s(u),...s(o)]),h=a(f??"",i);let p=h;return l.size&&(p=h+"?"+l),{query:l,url:p,path:h}},c=(...e)=>{const t=new Headers;return e.forEach(e=>{e&&(e instanceof Headers?e.forEach((e,r)=>t.set(r,e)):Array.isArray(e)?e.forEach(([e,r])=>t.set(e,r)):Object.entries(e).forEach(([e,r])=>t.set(e,r)))}),t};function f(e,t){const r=(e??[]).filter(e=>!!e);return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function u(e){return[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(t=>e instanceof t)}function l(e){return null!=e&&("object"==typeof e&&(!(e instanceof FormData)&&(!(e instanceof Blob)&&(!(e instanceof ArrayBuffer)&&(!(e instanceof DataView)&&(!(e instanceof ReadableStream)&&(!(e instanceof URLSearchParams)&&!u(e))))))))}function h(e){const t=new FormData;return e&&"object"==typeof e&&!Array.isArray(e)&&Object.entries(e).forEach(([e,r])=>{if(null==r||"function"==typeof r)return;let o;o=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),t.append(e,o)}),t}var p=0,y=(e="")=>`${e}_nonce_${Date.now()}_${p++}__`;function d(e){return Array.from(new Uint8Array(e)).map(e=>e.toString(16).padStart(2,"0")).join("")}async function b(e){const t=await e.arrayBuffer();return globalThis.crypto?.subtle?.digest?d(await globalThis.crypto.subtle.digest("SHA-256",t)):y("blob")}async function g(e){if(null==e)return e;if("string"==typeof e)return e;if("object"!=typeof e)return String(e);if(e instanceof FormData){const t={},r=[];e.forEach((e,t)=>r.push([t,e]));for(const[e,o]of r)t[e]=o instanceof Blob?`__blob_${await b(o)}__`:o;return t}if(e instanceof Blob)return`__blob_${await b(e)}__`;if(e instanceof ArrayBuffer)return globalThis.crypto?.subtle?.digest?`__ab_${d(await globalThis.crypto.subtle.digest("SHA-256",e))}__`:y("__ab");if(e instanceof DataView){const t=e.buffer.slice(e.byteOffset,e.byteOffset+e.byteLength);return globalThis.crypto?.subtle?.digest?`__ab_${d(await globalThis.crypto.subtle.digest("SHA-256",t))}__`:y("__ab")}return e instanceof URLSearchParams?e.toString():e instanceof ReadableStream?y("_"):(u(e),e)}var m=e=>{if(e instanceof Response)return e.clone();if("function"==typeof e||e instanceof Promise||null===e||"object"!=typeof e)return e;try{return structuredClone(e)}catch(t){return JSON.parse(JSON.stringify(e))}};function O(...e){const t=Object.assign({},...e);return t.headers=c(...e.map(e=>e?.headers)),t.signal=f(e.map(e=>e?.signal),t.timeout),t}function _(e){const{url:t,options:r,baseURL:o,baseOptions:n}=e,a=O(n,r),{url:s,query:c}=i(t,{...a,baseURL:o});a.query=c;const u=a?.body,h=l(u);a.body=h?JSON.stringify(u):null!=u&&"string"!=typeof u&&"object"!=typeof u?String(u):u,h&&a.headers.set("Content-Type","application/json");const p=new AbortController;return a.signal=f([a.signal,p.signal]),{url:s,options:a,is_body_json:h,abortController:p}}var A=["get","post","put","delete","patch"];function S(e,t){const r={};return e.forEach(e=>{r[e]=t(e)}),r}function E(e){const r=(r,o,n)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:f,options:u}=n||{},l=a?s.shift():void 0,p=c?s.shift():void 0;let y=i?s.shift():void 0;f&&(y=h(y));const d=s.shift(),b=u?{...u,...d}:d;return e(r,o,l,p,y,b)}},o={hasBody:!0},n={hasQuery:!0},a={isFormData:!0},s={};return A.forEach(e=>{const t=e.toUpperCase();s[t]=t=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{...o}),Options:n=>({Ok:()=>r(t,e,{...o,options:n})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...a}),Options:n=>({Ok:()=>r(t,e,{...o,...a,options:n})})}),Params:()=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{...o}),Options:n=>({Ok:()=>r(t,e,{...o,options:n})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...a}),Options:n=>({Ok:()=>r(t,e,{...o,...a,options:n})})}),Query:()=>({Ok:()=>r(t,e,{...n}),Options:o=>({Ok:()=>r(t,e,{...n,options:o})}),Body:()=>({Ok:()=>r(t,e,{...o,...n}),Options:a=>({Ok:()=>r(t,e,{...o,...n,options:a})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...n,...a}),Options:s=>({Ok:()=>r(t,e,{...o,...n,...a,options:s})})})})}),Query:()=>({Ok:()=>r(t,e,{...n}),Options:o=>({Ok:()=>r(t,e,{...n,options:o})}),Body:()=>({Ok:()=>r(t,e,{...o,...n}),Options:a=>({Ok:()=>r(t,e,{...o,...n,options:a})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...n,...a}),Options:s=>({Ok:()=>r(t,e,{...o,...n,...a,options:s})})})})})}),s}function k(e,t=!1){if(Array.isArray(e)){const r=[...e];return t&&r.sort(),r.map(e=>k(e,t))}if("object"==typeof e&&null!==e){const r={};return Object.keys(e).sort().forEach(o=>{r[o]=k(e[o],t)}),r}return e}function w(e,t,r){const o={body:t,headers:Object.fromEntries(e.headers.entries())};return(e.method??"get").toLowerCase()+e.url+JSON.stringify(r?k(o):o)}function v(e={}){const t=e.maxCacheSize??1e5,r={},o=e=>r[e],n=(e,t)=>{const o=r[e];o?Object.assign(o,t):r[e]={...t}},a=e=>{delete r[e]},s=(e,t)=>{try{const r=o(e);r&&(t(r),Object.keys(r).some(e=>void 0!==r[e])?n(e,r):a(e))}catch(r){console.error("Error during request cleanup:",r);try{a(e)}catch(s){console.error("Failed to remove request after cleanup error:",s)}}},i=e=>delete e.cache,c=e=>delete e.cache_expiredTime;function f(e,a,f){const u=o(e)||{};u.cache=m(a),u.cache_expiredTime=f,n(e,u),(()=>{try{const e=Object.entries(r).filter(([e,t])=>void 0!==t.cache);if(e.length>t){e.sort(([,e],[,t])=>(e.cache_expiredTime||0)-(t.cache_expiredTime||0));const r=e.length-t;e.slice(0,r).forEach(([e])=>{s(e,e=>{i(e),c(e)})})}}catch(e){console.error("Error during cache size management:",e)}})()}const u=()=>{Object.keys(r).forEach(e=>{delete r[e]})},l=()=>{Object.entries(r).forEach(([e,t])=>{t.abortController&&t.abortController.abort("abort all")})};return{entry:e=>({cache:{get:()=>function(e){const t=o(e);if(t&&void 0!==t.cache)return t.cache_expiredTime&&t.cache_expiredTime>Date.now()?m(t.cache):void s(e,e=>{i(e),c(e)})}(e),remove:()=>function(e){s(e,e=>{i(e),c(e)})}(e),set:(t,r)=>f(e,t,r)},share:{get:()=>function(e){return o(e)?.promise}(e),set:t=>function(e,t){const r=o(e)||{};r.promise=t,n(e,r),t.finally(()=>{s(e,e=>{delete e.promise})})}(e,t)},abort(t,r){r&&r.length>0&&r[r.length-1]!==o(e)?.abortController&&(r.pop()?.abort("race abort"),r.push(t),n(e,{abortController:t}))}}),dispose:()=>{l(),u()},get:o,set:n,remove:a,getAll:()=>({...r}),removeAll:u,clearCache:()=>{Object.entries(r).forEach(([e,t])=>{void 0!==t.cache&&s(e,e=>{i(e),c(e)})})},clearExpiredCache:()=>{const e=Date.now();Object.entries(r).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&s(t,e=>{i(e),c(e)})})},abortAll:l}}function j(e,t,r=0){return new Promise((o,n)=>{let a=0;const s=e.getReader(),i=[];!function e(){s.read().then(({done:n,value:s})=>{if(n){const e=new Uint8Array(a);let n=0;return i.forEach(t=>{e.set(t,n),n+=t.length}),t(100,a,r),void o(e.buffer)}s&&(i.push(s),a+=s.length,r>0?t(Math.min(100,Math.round(a/r*100)),a,r):t(0,a,0)),e()}).catch(e=>{console.error("Error reading response body:",e),n(e)})}()})}function T(e,t,r,o,n){return new Promise((a,s)=>{const i=e.entry(r),{share:c,aborts:f,staleTime:u}=n??{},l=new AbortController,h=()=>l.signal.removeEventListener("abort",p),p=()=>{h(),s(l.signal.reason)};if(l.signal.addEventListener("abort",p),i.abort(c?l:o,f),c){const e=i.share.get();if(e)return h(),a(e.then(e=>m(e)))}if(u){const e=i.cache.get();if(void 0!==e)return h(),a(e)}const y=t();c&&i.share.set(y),y.then(e=>{h(),a(e),u&&i.cache.set(e,(new Date).getTime()+u)}).catch(e=>{h(),s(e)})})}var R=v();e.createRequestStore=v,e.createShortApi=E,e.createShortMethods=S,e.createSilentRefresh=function(e){let t=[],r=!1;return(o,n)=>{t.push({success:o,fail:n}),r||(r=!0,e().then(()=>{t.forEach(e=>e.success())}).catch(e=>{t.forEach(e=>e.fail())}).finally(()=>{r=!1,t=[]}))}},e.createSoon=function e(t){const r=E((e,r,o,n,a,s)=>t(e,{...s,method:r,params:o,query:n,body:a})),o=S([...A,"head","options"],e=>(r,o)=>t(r,{...o,method:e}));return{request:t,...r,...o,fork:(r,o)=>e((e,n)=>t(a(e,r),o?{...o,...n}:n))}},e.deepSort=k,e.genRequestKey=function(e,t){const{url:r,options:o}=_(e);return w({url:r,...o},function(e){if(null==e)return e;if("string"==typeof e)return e;if("object"!=typeof e)return String(e);if(e instanceof FormData){const t={},r=[];e.forEach((e,t)=>r.push([t,e]));for(const[e,o]of r)t[e]=o instanceof Blob?y("__blob"):o;return t}return e instanceof URLSearchParams?e.toString():l(e)||u(e)?e:y("_")}(e.options?.body),t)},e.genRequestKeyAsync=async function(e,t){const{url:r,options:o}=_(e);return w({url:r,...o},await g(e.options?.body),t)},e.isBodyJson=l,e.mergeHeaders=c,e.mergeOptions=O,e.mergeSignals=f,e.parseOptions=_,e.parseQuery2Arr=s,e.parseUrl=i,e.progressDownload=function(e,t){return new Promise((r,o)=>{if(!e.body)return void o(new Error("Response body is null"));const n=e.headers.get("content-length"),a=n?parseInt(n,10):0;j(e.body,t,a).then(r).catch(o)})},e.progressReadBody=j,e.requestWithStore=T,e.soonFetch=async e=>{const t=_(e),r=t.options,o=t.url,{share:n,staleTime:a,aborts:s}=r??{};if(!n&&!a&&!s)return fetch(o,r);const i=w({url:o,...r},await g(e.options?.body),e.sortRequestKey);return T(e.store??R,()=>fetch(o,r),i,t.abortController,r)},e.toFormData=h});
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "soon-fetch",
3
- "version": "4.0.1",
3
+ "version": "4.0.2-beta.1",
4
4
  "description": "a request lib alternative to axios with timeout, request reusing, race, response cache ...",
5
5
  "homepage": "https://github.com/leafio/soon-fetch",
6
6
  "type": "module",