soon-fetch 3.0.0 → 3.1.0

package/README.md

@@ -36,17 +36,20 @@
 import { createSoon } from "soon-fetch";
 
 const soon = createSoon(
-  (url, options) => ({
-    url,
-    options,
-    baseURL: "/api",
-    baseOptions: {
-      headers: new Headers({
-        Authorization: "Bearer " + localStorage.getItem("token"),
-      }),
-      timeout: 5000,
-    },
-  }),
+  (url, options) => {
+    const isGet = !options?.method || options?.method.toLocaleLowerCase() === "get"
+    return {
+      baseURL: '/api',
+      baseOptions: {
+        timeout: 20 * 1000,
+        headers: new Headers({
+          Authorization: "Bearer " + localStorage.getItem("token"),
+        }),
+        share: isGet ? true : false,
+        staleTime: isGet ? 2 * 1000 : 0,
+      },
+    }
+  },
   ({ parsed }) => {
     return <T>() => {
       return fetch(parsed.url, parsed.options).then((res) =>
@@ -204,13 +207,373 @@ type SoonOptions = Omit<RequestInit, "body"> & {
 };
 ```
 
+#### createSoon
+
+Create a soon request instance.
+
+**Parameters:**
+
+- `getConfig`: A function to get request configuration, receives url and options, returns an object containing url, options, baseURL, and baseOptions
+- `wrapper`: A wrapper function to handle request logic
+
+**Returns:** An object containing request method and various shortcut methods
+
+**Example:**
+
+```javascript
+const soon = createSoon(
+  (url, options) => ({ url, options,baseURL：'/api', baseOptions:{timeout: 5000} }),
+  ({ parsed }) =>
+    async (url, options) => {
+      const response = await fetch(parsed.url, parsed.options);
+      return response.json();
+    }
+);
+
+// Usage example
+const data = await soon.get("/api/users");
+```
+
+#### createShortApi
+
+Factory function to create API shortcut methods.
+Used to generate type-safe API calling methods, supporting path parameters, query parameters, and request body.
+
+**Parameters:**
+
+- `wrapper`: Wrapper function to handle actual request logic
+
+**Returns:** An object containing GET, POST, PUT, DELETE, PATCH and other methods, each method supports chain calling
+
+**Example:**
+
+```javascript
+const API = createShortApi(
+  async (url, method, params, query, body, options) => {
+    // Handle request logic
+    const _url = mergeUrl(url, { params, query });
+    const response = await fetch(_url, { ...options, method, body });
+    return response.json();
+  }
+);
+
+// Usage example
+const getUser = API.GET("/api/users/:id").Send();
+const userData = await getUser({ id: 1 });
+```
+
+#### createShortMethods
+
+Factory function to create shortcut methods.
+
+**Parameters:**
+
+- `methods`: HTTP methods array
+- `wrapper`: Wrapper function that receives method name and returns a function to process requests
+
+**Returns:** Shortcut call object containing specified methods
+
+**Example:**
+
+```javascript
+const methods = createShortMethods(["get", "post"], (method) => {
+  return (url, options) => fetch(url, { ...options, method });
+});
+// Usage: methods.get('/api/users')
+```
+
+#### parseUrlOptions
+
+Parse URL options.
+
+**Parameters:**
+
+- `urlOptions`: Object containing url, options, baseURL and baseOptions
+
+**Returns:** Tuple of processed url and options
+
+**Example:**
+
+```javascript
+const [url, options] = parseUrlOptions({
+  url: "/api/users/:id",
+  options: { params: { id: "123" } },
+  baseURL: "https://api.example.com",
+});
+// Returns: ['https://api.example.com/api/users/123', options]
+```
+
+#### mergeHeaders
+
+Merge multiple Headers objects.
+
+**Parameters:**
+
+- `headersList`: List of Headers objects to merge
+
+**Returns:** Merged Headers object, later ones will overwrite earlier ones with the same name
+
+**Example:**
+
+```javascript
+const headers1 = { "Content-Type": "application/json" };
+const headers2 = { Authorization: "Bearer token" };
+const mergedHeaders = mergeHeaders(headers1, headers2);
+```
+
+#### mergeSignals
+
+Merge multiple AbortSignal signals.
+
+**Parameters:**
+
+- `signals`: Array of AbortSignals to merge
+- `timeout`: Optional timeout time (milliseconds)
+
+**Returns:** Merged AbortSignal, any signal termination will trigger termination
+
+**Example:**
+
+```javascript
+const controller1 = new AbortController();
+const controller2 = new AbortController();
+const mergedSignal = mergeSignals(
+  [controller1.signal, controller2.signal],
+  5000
+);
+```
+
+#### mergeUrl
+
+Merge URL and its related parameters.
+Handle baseURL, path parameters and query parameters to generate complete URL.
+
+**Parameters:**
+
+- `url`: Original URL
+- `config`: Configuration object, including query parameters, path parameters and base URL
+
+**Returns:** Processed complete URL
+
+**Example:**
+
+```javascript
+const url = mergeUrl("/api/users/:id", {
+  params: { id: "123" },
+  query: { filter: "active" },
+  baseURL: "https://api.example.com",
+});
+// Returns: 'https://api.example.com/api/users/123?filter=active'
+```
+
+#### mergeOptions
+
+Merge multiple option objects.
+Merge request options, including special handling of headers and signals.
+
+**Parameters:**
+
+- `optionsList`: List of option objects to merge
+
+**Returns:** Merged option object
+
+**Example:**
+
+```javascript
+const defaultOptions = {
+  timeout: 5000,
+  headers: { "Content-Type": "application/json" },
+};
+const requestOptions = {
+  method: "POST",
+  body: JSON.stringify({ name: "John" }),
+};
+const mergedOptions = mergeOptions(defaultOptions, requestOptions);
+```
+
+#### isBodyJson
+
+Determine if the request body is a JSON object.
+Check if body is a plain object, not special types like FormData or Blob.
+
+**Parameters:**
+
+- `body`: Request body
+
+**Returns:** Returns true if it is a JSON object, otherwise false
+
+**Example:**
+
+```javascript
+isBodyJson({ name: "John" }); // true
+isBodyJson(new FormData()); // false
+isBodyJson("string"); // false
+```
+
+#### genRequestKey
+
+Generate a unique identification key for the request.
+Generate a unique key value based on the request's URL, method, headers, body, query parameters, etc., used for caching and request sharing.
+
+**Parameters:**
+
+- `req`: Request object containing url and options
+
+**Returns:** Unique identification string of the request
+
+**Example:**
+
+```javascript
+const key = genRequestKey({
+  url: "/api/users",
+  options: { method: "GET", params: { id: 1 } },
+});
+```
+
+#### raceAbort
+
+Race condition handling function.
+Used to handle request race conditions, terminating previous requests.
+
+**Parameters:**
+
+- `abortController`: Controller of the current request
+- `controllers`: Array of existing controllers
+
+**Example:**
+
+```javascript
+const controller = new AbortController();
+const controllers = [];
+raceAbort(controller, controllers); // Terminate previous requests and add current controller
+```
+
+#### createCache
+
+Create cache instance.
+Provides request result caching function, supports expiration time.
+
+**Returns:** Cache object containing get, set, remove methods
+
+**Example:**
+
+```javascript
+const cache = createCache();
+cache.set("key", { data: "value" }, Date.now() + 60000); // Cache for 1 minute
+const data = cache.get("key");
+cache.remove("key");
+```
+
+#### deepSort
+
+Deep sort object keys.
+Recursively sort the keys of an object to generate a stable object serialization result.
+
+**Parameters:**
+
+- `obj`: Object to sort
+
+**Returns:** Object with sorted keys
+
+**Example:**
+
+```javascript
+const obj = { b: 2, a: 1, c: { z: 3, y: 2 } };
+const sorted = deepSort(obj);
+// Returns: { a: 1, b: 2, c: { y: 2, z: 3 } }
+```
+
+#### createShare
+
+Create request sharing instance.
+Used to share the same request to avoid duplicate requests.
+
+**Returns:** Sharing object containing get and set methods
+
+**Example:**
+
+```javascript
+const share = createShare();
+const promise = fetch("/api/data");
+share.set("key", promise);
+const sharedPromise = share.get("key"); // Get the same promise
+```
+
+#### createSilentRefresh
+
+Create silent refresh instance.
+Used to handle silent refresh functionality when token expires.
+
+**Parameters:**
+
+- `refresh_token_fn`: Function to refresh token
+
+**Returns:** Function that accepts success and failure callbacks
+
+**Example:**
+
+```javascript
+const silentRefresh = createSilentRefresh(async () => {
+  // Refresh token logic
+  await refreshToken();
+});
+
+// Usage example
+silentRefresh(
+  () => console.log("Refresh successful"),
+  () => console.log("Refresh failed")
+);
+```
+
+#### parseWithBase
+
+Parse base URL configuration.
+Process baseURL, headers, body and other configuration items to generate final request configuration.
+
+**Parameters:**
+
+- `urlOptions`: Object containing url, options, baseURL and baseOptions
+
+**Returns:** Processed url, options, is_body_json and abortController
+
+**Example:**
+
+```javascript
+const result = parseWithBase({
+  url: "/api/users",
+  options: { method: "GET" },
+  baseURL: "https://api.example.com",
+});
+```
+
+#### toFormData
+
+Convert object to FormData.
+Used to convert plain objects to FormData format, supports files and regular values.
+
+**Parameters:**
+
+- `body`: Object to convert
+
+**Returns:** Converted FormData object
+
+**Example:**
+
+```javascript
+const formData = toFormData({
+  name: "John",
+  avatar: fileBlob,
+  age: 30,
+});
+```
+
 [English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)
 
 <!-- omit in toc -->
 
 #### soon-fetch
 
-**极轻量的请求库，不到 3K**
+**极轻量的请求库，不到 5K**
 
 > - 🌐 自动解析 rest Url 的参数
 > - ⭐ 快捷定义请求 api
@@ -243,17 +606,20 @@ type SoonOptions = Omit<RequestInit, "body"> & {
 
 ```typescript
 const soon = createSoon(
-  (url, options) => ({
-    url,
-    options,
-    baseURL: "/api",
-    baseOptions: {
-      headers: new Headers({
-        Authorization: "Bearer " + localStorage.getItem("token"),
-      }),
-      timeout: 5000,
-    },
-  }),
+  (url, options) => {
+    const isGet = !options?.method || options?.method.toLocaleLowerCase() === "get"
+    return {
+      baseURL: '/api',
+      baseOptions: {
+        timeout: 20 * 1000,
+        headers: new Headers({
+          Authorization: "Bearer " + localStorage.getItem("token"),
+        }),
+        share: isGet ? true : false,
+        staleTime: isGet ? 2 * 1000 : 0,
+      },
+    }
+  },
   ({ parsed }) => {
     return <T>() => {
       return fetch(parsed.url, parsed.options).then((res) =>
@@ -414,6 +780,366 @@ type SoonOptions = Omit<RequestInit, "body"> & {
 };
 ```
 
+#### createSoon
+
+创建一个 soon 请求实例。
+
+**参数:**
+
+- `getConfig`: 用于获取请求配置的函数，接收 url 和 options，返回包含 url、options、baseURL 和 baseOptions 的对象
+- `wrapper`: 包装器函数，用于处理请求逻辑
+
+**返回:** 包含 request 方法和各种快捷方法的对象
+
+**示例:**
+
+```javascript
+const soon = createSoon(
+  (url, options) => ({ url, options,baseURL：'/api', baseOptions:{timeout: 5000} }),
+  ({ parsed }) =>
+    async (url, options) => {
+      const response = await fetch(parsed.url, parsed.options);
+      return response.json();
+    }
+);
+// 使用示例
+const data = await soon.get("/api/users");
+```
+
+#### createShortApi
+
+创建 API 快捷方法的工厂函数。
+用于生成类型安全的 API 调用方法，支持路径参数、查询参数和请求体。
+
+**参数:**
+
+- `wrapper`: 包装函数，用于处理实际的请求逻辑
+
+**返回:** 包含 GET、POST、PUT、DELETE、PATCH 等方法的对象，每个方法都支持链式调用
+
+**示例:**
+
+```javascript
+const API = createShortApi(
+  async (url, method, params, query, body, options) => {
+    // 处理请求逻辑
+    const _url = mergeUrl(url, { params, query });
+    const response = await fetch(_url, { ...options, method, body });
+    return response.json();
+  }
+);
+
+// 使用示例
+const getUser = API.GET("/api/users/:id").Send();
+const userData = await getUser({ id: 1 });
+```
+
+#### createShortMethods
+
+创建快捷方法的工厂函数。
+
+**参数:**
+
+- `methods`: HTTP 方法数组
+- `wrapper`: 包装函数，接收方法名，返回处理请求的函数
+
+**返回:** 包含指定方法的快捷调用对象
+
+**示例:**
+
+```javascript
+const methods = createShortMethods(["get", "post"], (method) => {
+  return (url, options) => fetch(url, { ...options, method });
+});
+// 使用: methods.get('/api/users')
+```
+
+#### parseUrlOptions
+
+解析 URL 选项。
+
+**参数:**
+
+- `urlOptions`: 包含 url、options、baseURL 和 baseOptions 的对象
+
+**返回:** 处理后的 url 和 options 元组
+
+**示例:**
+
+```javascript
+const [url, options] = parseUrlOptions({
+  url: "/api/users/:id",
+  options: { params: { id: "123" } },
+  baseURL: "https://api.example.com",
+});
+// 返回: ['https://api.example.com/api/users/123', options]
+```
+
+#### mergeHeaders
+
+合并多个 Headers 对象。
+
+**参数:**
+
+- `headersList`: 要合并的 Headers 对象列表
+
+**返回:** 合并后的 Headers 对象，后面的会覆盖前面的同名 header
+
+**示例:**
+
+```javascript
+const headers1 = { "Content-Type": "application/json" };
+const headers2 = { Authorization: "Bearer token" };
+const mergedHeaders = mergeHeaders(headers1, headers2);
+```
+
+#### mergeSignals
+
+合并多个 AbortSignal 信号。
+
+**参数:**
+
+- `signals`: 要合并的 AbortSignal 数组
+- `timeout`: 可选的超时时间（毫秒）
+
+**返回:** 合并后的 AbortSignal，任意一个信号终止都会触发终止
+
+**示例:**
+
+```javascript
+const controller1 = new AbortController();
+const controller2 = new AbortController();
+const mergedSignal = mergeSignals(
+  [controller1.signal, controller2.signal],
+  5000
+);
+```
+
+#### mergeUrl
+
+合并 URL 及其相关参数。
+处理 baseURL、路径参数和查询参数，生成完整 URL。
+
+**参数:**
+
+- `url`: 原始 URL
+- `config`: 配置对象，包含查询参数、路径参数和基础 URL
+
+**返回:** 处理后的完整 URL
+
+**示例:**
+
+```javascript
+const url = mergeUrl("/api/users/:id", {
+  params: { id: "123" },
+  query: { filter: "active" },
+  baseURL: "https://api.example.com",
+});
+// 返回: 'https://api.example.com/api/users/123?filter=active'
+```
+
+#### mergeOptions
+
+合并多个选项对象。
+合并请求选项，包括 headers 和 signal 等特殊处理。
+
+**参数:**
+
+- `optionsList`: 要合并的选项对象列表
+
+**返回:** 合并后的选项对象
+
+**示例:**
+
+```javascript
+const defaultOptions = {
+  timeout: 5000,
+  headers: { "Content-Type": "application/json" },
+};
+const requestOptions = {
+  method: "POST",
+  body: JSON.stringify({ name: "John" }),
+};
+const mergedOptions = mergeOptions(defaultOptions, requestOptions);
+```
+
+#### isBodyJson
+
+判断请求体是否为 JSON 对象。
+检查 body 是否为普通对象，而不是 FormData、Blob 等特殊类型。
+
+**参数:**
+
+- `body`: 请求体
+
+**返回:** 如果是 JSON 对象返回 true，否则返回 false
+
+**示例:**
+
+```javascript
+isBodyJson({ name: "John" }); // true
+isBodyJson(new FormData()); // false
+isBodyJson("string"); // false
+```
+
+#### genRequestKey
+
+生成请求的唯一标识键。
+根据请求的 URL、方法、headers、body、查询参数等生成唯一键值，用于缓存和请求共享。
+
+**参数:**
+
+- `req`: 包含 url 和 options 的请求对象
+
+**返回:** 请求的唯一标识字符串
+
+**示例:**
+
+```javascript
+const key = genRequestKey({
+  url: "/api/users",
+  options: { method: "GET", params: { id: 1 } },
+});
+```
+
+#### raceAbort
+
+竞态处理函数。
+用于处理请求竞态，终止之前的请求。
+
+**参数:**
+
+- `abortController`: 当前请求的控制器
+- `controllers`: 已存在的控制器数组
+
+**示例:**
+
+```javascript
+const controller = new AbortController();
+const controllers = [];
+raceAbort(controller, controllers); // 终止之前的请求并添加当前控制器
+```
+
+#### createCache
+
+创建缓存实例。
+提供请求结果缓存功能，支持过期时间。
+
+**返回:** 包含 get、set、remove 方法的缓存对象
+
+**示例:**
+
+```javascript
+const cache = createCache();
+cache.set("key", { data: "value" }, Date.now() + 60000); // 缓存1分钟
+const data = cache.get("key");
+cache.remove("key");
+```
+
+#### deepSort
+
+深度排序对象键。
+递归地对对象的键进行排序，用于生成稳定的对象序列化结果。
+
+**参数:**
+
+- `obj`: 要排序的对象
+
+**返回:** 键排序后的对象
+
+**示例:**
+
+```javascript
+const obj = { b: 2, a: 1, c: { z: 3, y: 2 } };
+const sorted = deepSort(obj);
+// 返回: { a: 1, b: 2, c: { y: 2, z: 3 } }
+```
+
+#### createShare
+
+创建请求共享实例。
+用于共享相同请求，避免重复请求。
+
+**返回:** 包含 get 和 set 方法的共享对象
+
+**示例:**
+
+```javascript
+const share = createShare();
+const promise = fetch("/api/data");
+share.set("key", promise);
+const sharedPromise = share.get("key"); // 获取相同 promise
+```
+
+#### createSilentRefresh
+
+创建静默刷新实例。
+用于处理 token 过期时的静默刷新功能。
+
+**参数:**
+
+- `refresh_token_fn`: 刷新 token 的函数
+
+**返回:** 接收成功和失败回调的函数
+
+**示例:**
+
+```javascript
+const silentRefresh = createSilentRefresh(async () => {
+  // 刷新token逻辑
+  await refreshToken();
+});
+
+// 使用示例
+silentRefresh(
+  () => console.log("刷新成功"),
+  () => console.log("刷新失败")
+);
+```
+
+#### parseWithBase
+
+解析基础 URL 配置。
+处理 baseURL、headers、body 等配置项，生成最终的请求配置。
+
+**参数:**
+
+- `urlOptions`: 包含 url、options、baseURL 和 baseOptions 的对象
+
+**返回:** 处理后的 url、options、is_body_json 和 abortController
+
+**示例:**
+
+```javascript
+const result = parseWithBase({
+  url: "/api/users",
+  options: { method: "GET" },
+  baseURL: "https://api.example.com",
+});
+```
+
+#### toFormData
+
+将对象转换为 FormData。
+用于将普通对象转换为 FormData 格式，支持文件和普通值。
+
+**参数:**
+
+- `body`: 要转换的对象
+
+**返回:** 转换后的 FormData 对象
+
+**示例:**
+
+```javascript
+const formData = toFormData({
+  name: "John",
+  avatar: fileBlob,
+  age: 30,
+});
+```
+
+
 [English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)
 
 <!-- omit in toc -->

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";const 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,n=(e="")=>e.startsWith("http"),o=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.keys(e).forEach((r=>{const n=e[r];(Array.isArray(n)?n:[n]).forEach((e=>{t.push([r,e??""])}))})),t},s=(s,a)=>{const{query:i,params:c,baseURL:f}=a;let p=s.trim();e(s).forEach((e=>{c&&(p=p.replace(":"+e,""+c[e]))}));const[u,l]=p.split("?"),h=new URLSearchParams([...o(l),...o(i)]);let y=((e,o)=>{if(n(e))return e;const s=n(o)?o:r(o);return t(s)+t(r(e))})(u,f);return h.size&&(y=y+"?"+h),y},a=(...e)=>{const t=new Headers;return e.forEach((e=>{e&&new Headers(e).forEach(((e,r)=>{t.set(r,e)}))})),t};function i(e,t){const r=(e??[]).filter((e=>!!e));return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function c(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,t instanceof Int8Array||t instanceof Uint8Array||t instanceof Uint8ClampedArray||t instanceof Int16Array||t instanceof Uint16Array||t instanceof Int32Array||t instanceof Uint32Array||t instanceof Float32Array||t instanceof Float64Array||t instanceof BigInt64Array||t instanceof BigUint64Array)));var t}function f(...e){const t=Object.assign({},...e),r=a(...e.map((e=>e?.headers)));return t.headers=r,t.signal=i(e.map((e=>e?.signal)),t.timeout),t}function p(e){const{url:t,options:r,baseURL:n,baseOptions:o}=e,a=f(o,r),p=s(t,{...a,baseURL:n}),u=a?.body,l=c(u);a.body=l?JSON.stringify(u):u,l&&a.headers.append("Content-Type","application/json");const h=new AbortController;return a.signal=i([a.signal,h.signal]),{url:p,options:a,is_body_json:l,abortController:h}}const u=["get","post","put","delete","patch"];function l(e,t){const r={};return e.forEach((e=>{r[e]=t(e)})),r}function h(t){const r=(r,n,o)=>{const s=!!e(r).length;return(...e)=>{const a=[...e],{hasBody:i,hasQuery:c}=o||{},f=s?a.shift():void 0,p=c?a.shift():void 0,u=i?a.shift():void 0,l=a.shift();return t(r,n,f,p,u,l,o?.options)}},n={};return u.forEach((e=>{const t=e.toUpperCase();n[t]=t=>({Send:n=>r(t,e,{options:n}),Body:()=>({Send:n=>r(t,e,{hasBody:!0,options:n})}),Query:()=>({Send:n=>r(t,e,{hasQuery:!0,options:n}),Body:()=>({Send:n=>r(t,e,{hasBody:!0,hasQuery:!0,options:n})})})})})),n}function y(e,t){t&&(t.pop()?.abort("race abort"),t.push(e))}function d(e){if(Array.isArray(e))return e.map(d);if("object"==typeof e&&null!==e){const t={};return Object.keys(e).sort().forEach((r=>{t[r]=d(e[r])})),t}return e}function g(e){const{url:t,options:r}=e,{headers:n,method:o,body:s,query:a,params:i}=r??{},c=d(Object.fromEntries(new Headers(n).entries()??[]));return(o??"get").toLowerCase()+t+JSON.stringify(d(a)??"")+JSON.stringify(d(i)??"")+JSON.stringify(c)+("object"==typeof s&&null!=s?JSON.stringify(d(s)):s??"")}function m(){const e={},t=[];setInterval((()=>{const r=Date.now();for(let n=t.length-1;n>=0;n--)t[n].expiredTime<r&&(delete e[t[n].key],t.splice(n,1))}),6e4);const r=e=>e instanceof Response?e.clone():"function"==typeof e||e instanceof Promise?e:structuredClone(e);function n(r){delete e[r];for(let e=t.length-1;e>=0;e--)if(t[e].key===r){t.splice(e,1);break}}return{get:function(t){const o=e[t];if(void 0!==o)return o.expiredTime>Date.now()?r(o.data):void n(t)},set:function(n,o,s){e[n]={data:r(o),expiredTime:s},t.push({key:n,expiredTime:s})},remove:n}}function b(){const e={},t=t=>e[t]=void 0;return{get:t=>e[t],set:(r,n)=>{e[r]=n,n.finally((()=>t(r)))}}}exports.createCache=m,exports.createShare=b,exports.createShortApi=h,exports.createShortMethods=l,exports.createSilentRefresh=function(e){let t=[],r=!1;return(n,o)=>{t.push({success:n,fail:o}),r||(r=!0,e().then((()=>{t.forEach((e=>e.success()))})).catch((e=>{t.forEach((e=>e.fail()))})).finally((()=>{r=!1,t=[]})))}},exports.createSoon=function(e,t){const r=m(),n=b(),o=(o,s)=>new Promise(((a,i)=>{const c=p(e(o,s)),f=g(c),{abortController:u}=c,l=new AbortController;l.signal.addEventListener("abort",(()=>{i(l.signal.reason)}));const h=t({parsed:{...c,requestKey:f}});if(c.options?.share){const e=n.get(f);if(e)return a(e)}if(y(c.options.share?l:u,c.options?.aborts),c.options?.staleTime){const e=r.get(f);if(void 0!==e)return a(e)}const d=h(o,s);c.options?.share&&n.set(f,d),d.then((e=>{a(e),c.options?.staleTime&&r.set(f,e,(new Date).getTime()+c.options.staleTime)})).catch((e=>i(e)))})),s=h(((e,t,r,n,s,a,i)=>o(e,{...i,...a,method:t,params:r,query:n,body:s}))),a=l([...u,"head","options"],(e=>(t,r)=>o(t,{...r,method:e})));return{request:o,...s,...a}},exports.deepSort=d,exports.genRequestKey=g,exports.isBodyJson=c,exports.mergeHeaders=a,exports.mergeOptions=f,exports.mergeSignals=i,exports.mergeUrl=s,exports.parseUrlOptions=function(e){const{url:t,options:r}=p(e);return[t,r]},exports.parseWithBase=p,exports.raceAbort=y;
+"use strict";const 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,n=(e="")=>e.startsWith("http"),o=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.keys(e).forEach((r=>{const n=e[r];(Array.isArray(n)?n:[n]).forEach((e=>{t.push([r,e??""])}))})),t},s=(s,a)=>{const{query:i,params:c,baseURL:f}=a;let p=s.trim();e(s).forEach((e=>{c&&(p=p.replace(":"+e,""+c[e]))}));const[u,l]=p.split("?"),h=new URLSearchParams([...o(l),...o(i)]);let y=((e,o)=>{if(n(e))return e;const s=n(o)?o:r(o);return t(s)+t(r(e))})(u,f);return h.size&&(y=y+"?"+h),y},a=(...e)=>{const t=new Headers;return e.forEach((e=>{e&&new Headers(e).forEach(((e,r)=>{t.set(r,e)}))})),t};function i(e,t){const r=(e??[]).filter((e=>!!e));return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function c(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,t instanceof Int8Array||t instanceof Uint8Array||t instanceof Uint8ClampedArray||t instanceof Int16Array||t instanceof Uint16Array||t instanceof Int32Array||t instanceof Uint32Array||t instanceof Float32Array||t instanceof Float64Array||t instanceof BigInt64Array||t instanceof BigUint64Array)));var t}function f(e){const t=new FormData;return e&&"object"==typeof e&&!Array.isArray(e)&&Object.entries(e).forEach((([e,r])=>{let n;n=r instanceof Blob?r:JSON.stringify(r),t.append(e,n)})),t}function p(...e){const t=Object.assign({},...e),r=a(...e.map((e=>e?.headers)));return t.headers=r,t.signal=i(e.map((e=>e?.signal)),t.timeout),t}function u(e){const{url:t,options:r,baseURL:n,baseOptions:o}=e,a=p(o,r),f=s(t,{...a,baseURL:n}),u=a?.body,l=c(u);a.body=l?JSON.stringify(u):u,l&&a.headers.append("Content-Type","application/json");const h=new AbortController;return a.signal=i([a.signal,h.signal]),{url:f,options:a,is_body_json:l,abortController:h}}const l=["get","post","put","delete","patch"];function h(e,t){const r={};return e.forEach((e=>{r[e]=t(e)})),r}function y(t){const r=(r,n,o)=>{const s=!!e(r).length;return(...e)=>{const a=[...e],{hasBody:i,hasQuery:c,isFormData:p}=o||{},u=s?a.shift():void 0,l=c?a.shift():void 0;let h=i?a.shift():void 0;p&&(h=f(h));const y=a.shift();return t(r,n,u,l,h,y,o?.options)}},n={};return l.forEach((e=>{const t=e.toUpperCase();n[t]=t=>({Send:n=>r(t,e,{options:n}),Body:()=>({Send:n=>r(t,e,{hasBody:!0,options:n})}),FormData:()=>({Send:n=>r(t,e,{hasBody:!0,isFormData:!0,options:n})}),Query:()=>({Send:n=>r(t,e,{hasQuery:!0,options:n}),Body:()=>({Send:n=>r(t,e,{hasBody:!0,hasQuery:!0,options:n})}),FormData:()=>({Send:n=>r(t,e,{hasBody:!0,hasQuery:!0,isFormData:!0,options:n})})})})})),n}function d(e,t){t&&(t.pop()?.abort("race abort"),t.push(e))}function m(e){if(Array.isArray(e))return e.map(m);if("object"==typeof e&&null!==e){const t={};return Object.keys(e).sort().forEach((r=>{t[r]=m(e[r])})),t}return e}function g(e){const{url:t,options:r}=e,{headers:n,method:o,body:s,query:a,params:i}=r??{},c=m(Object.fromEntries(new Headers(n).entries()??[]));return(o??"get").toLowerCase()+t+JSON.stringify(m(a)??"")+JSON.stringify(m(i)??"")+JSON.stringify(c)+("object"==typeof s&&null!=s?JSON.stringify(m(s)):s??"")}function b(){const e={},t=[];setInterval((()=>{const r=Date.now();for(let n=t.length-1;n>=0;n--)t[n].expiredTime<r&&(delete e[t[n].key],t.splice(n,1))}),6e4);const r=e=>e instanceof Response?e.clone():"function"==typeof e||e instanceof Promise?e:structuredClone(e);function n(r){delete e[r];for(let e=t.length-1;e>=0;e--)if(t[e].key===r){t.splice(e,1);break}}return{get:function(t){const o=e[t];if(void 0!==o)return o.expiredTime>Date.now()?r(o.data):void n(t)},set:function(n,o,s){e[n]={data:r(o),expiredTime:s},t.push({key:n,expiredTime:s})},remove:n}}function A(){const e={},t=t=>e[t]=void 0;return{get:t=>e[t],set:(r,n)=>{e[r]=n,n.finally((()=>t(r)))}}}exports.createCache=b,exports.createShare=A,exports.createShortApi=y,exports.createShortMethods=h,exports.createSilentRefresh=function(e){let t=[],r=!1;return(n,o)=>{t.push({success:n,fail:o}),r||(r=!0,e().then((()=>{t.forEach((e=>e.success()))})).catch((e=>{t.forEach((e=>e.fail()))})).finally((()=>{r=!1,t=[]})))}},exports.createSoon=function(e,t){const r=b(),n=A(),o=(o,s)=>new Promise(((a,i)=>{const c=e(o,s),f=u({url:o,options:s,...c}),p=g(f),{abortController:l}=f,h=new AbortController;h.signal.addEventListener("abort",(()=>{i(h.signal.reason)}));const y=t({parsed:{...f,requestKey:p}});if(f.options?.share){const e=n.get(p);if(e)return a(e)}if(d(f.options.share?h:l,f.options?.aborts),f.options?.staleTime){const e=r.get(p);if(void 0!==e)return a(e)}const m=y(o,s);f.options?.share&&n.set(p,m),m.then((e=>{a(e),f.options?.staleTime&&r.set(p,e,(new Date).getTime()+f.options.staleTime)})).catch((e=>i(e)))})),s=y(((e,t,r,n,s,a,i)=>o(e,{...i,...a,method:t,params:r,query:n,body:s}))),a=h([...l,"head","options"],(e=>(t,r)=>o(t,{...r,method:e})));return{request:o,...s,...a}},exports.deepSort=m,exports.genRequestKey=g,exports.isBodyJson=c,exports.mergeHeaders=a,exports.mergeOptions=p,exports.mergeSignals=i,exports.mergeUrl=s,exports.parseUrlOptions=function(e){const{url:t,options:r}=u(e);return[t,r]},exports.parseWithBase=u,exports.raceAbort=d,exports.toFormData=f;

package/dist/index.d.ts

@@ -21,6 +21,7 @@ declare const mergeUrl: (url: string, config: {
 declare const mergeHeaders: (...headersList: (HeadersInit | undefined)[]) => Headers;
 declare function mergeSignals(signals?: (AbortSignal | null | undefined)[], timeout?: number): AbortSignal | undefined;
 declare function isBodyJson(body: any): boolean;
+declare function toFormData(body: any): FormData;
 declare function mergeOptions<Options extends SoonOptions>(...optionsList: (Options | undefined)[]): Options & {
     headers: Headers;
 };
@@ -60,11 +61,17 @@ declare function createShortApi<Wrapper extends <T>(url: string, method: string,
     Body: <Body>() => unknown extends Body ? never : {
         Send: <Res>(options?: Parameters<Wrapper>[5]) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Parameters<Wrapper>[5] | undefined]) => Promise<Res>;
     };
+    FormData: <Body>() => unknown extends Body ? never : {
+        Send: <Res>(options?: Parameters<Wrapper>[5]) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: Parameters<Wrapper>[5] | undefined]) => Promise<Res>;
+    };
     Query: <Query>() => unknown extends Query ? never : {
         Send: <Res>(options?: Parameters<Wrapper>[5]) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: Parameters<Wrapper>[5] | undefined]) => Promise<Res>;
         Body: <Body>() => unknown extends Body ? never : {
             Send: <Res>(options?: Parameters<Wrapper>[5]) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Parameters<Wrapper>[5] | undefined]) => Promise<Res>;
         };
+        FormData: <Body>() => unknown extends Body ? never : {
+            Send: <Res>(options?: Parameters<Wrapper>[5]) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: Parameters<Wrapper>[5] | undefined]) => Promise<Res>;
+        };
     };
 }>;
 type NoData<T> = Omit<T, "method" | "body" | "params" | "query">;
@@ -91,7 +98,7 @@ declare function createShare(): {
 };
 declare function createSilentRefresh(refresh_token_fn: () => Promise<void>): (success: () => void, fail: () => void) => void;
 declare function createSoon<Options extends SoonOptions>(getConfig: (url: string, options?: Options) => {
-    url: string;
+    url?: string;
     options?: Options;
     baseURL?: string;
     baseOptions?: Options;
@@ -125,11 +132,17 @@ declare function createSoon<Options extends SoonOptions>(getConfig: (url: string
         Body: <Body>() => unknown extends Body ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
         };
+        FormData: <Body>() => unknown extends Body ? never : {
+            Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+        };
         Query: <Query>() => unknown extends Query ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: NoData<Options> | undefined]) => Promise<Res>;
             Body: <Body>() => unknown extends Body ? never : {
                 Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
             };
+            FormData: <Body>() => unknown extends Body ? never : {
+                Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+            };
         };
     };
     PATCH: <Url extends string>(url: Url) => {
@@ -137,11 +150,17 @@ declare function createSoon<Options extends SoonOptions>(getConfig: (url: string
         Body: <Body>() => unknown extends Body ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
         };
+        FormData: <Body>() => unknown extends Body ? never : {
+            Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+        };
         Query: <Query>() => unknown extends Query ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: NoData<Options> | undefined]) => Promise<Res>;
             Body: <Body>() => unknown extends Body ? never : {
                 Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
             };
+            FormData: <Body>() => unknown extends Body ? never : {
+                Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+            };
         };
     };
     DELETE: <Url extends string>(url: Url) => {
@@ -149,11 +168,17 @@ declare function createSoon<Options extends SoonOptions>(getConfig: (url: string
         Body: <Body>() => unknown extends Body ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
         };
+        FormData: <Body>() => unknown extends Body ? never : {
+            Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+        };
         Query: <Query>() => unknown extends Query ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: NoData<Options> | undefined]) => Promise<Res>;
             Body: <Body>() => unknown extends Body ? never : {
                 Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
             };
+            FormData: <Body>() => unknown extends Body ? never : {
+                Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+            };
         };
     };
     PUT: <Url extends string>(url: Url) => {
@@ -161,14 +186,20 @@ declare function createSoon<Options extends SoonOptions>(getConfig: (url: string
         Body: <Body>() => unknown extends Body ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
         };
+        FormData: <Body>() => unknown extends Body ? never : {
+            Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+        };
         Query: <Query>() => unknown extends Query ? never : {
             Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, options?: NoData<Options> | undefined]) => Promise<Res>;
             Body: <Body>() => unknown extends Body ? never : {
                 Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
             };
+            FormData: <Body>() => unknown extends Body ? never : {
+                Send: <Res>(options?: NoData<Options> | undefined) => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Query>, ...OptionBody<Body>, options?: NoData<Options> | undefined]) => Promise<Res>;
+            };
         };
     };
     request: <T>(url: string, options?: Options) => Promise<T>;
 };
 
-export { type SoonOptions, createCache, createShare, createShortApi, createShortMethods, createSilentRefresh, createSoon, deepSort, genRequestKey, isBodyJson, mergeHeaders, mergeOptions, mergeSignals, mergeUrl, parseUrlOptions, parseWithBase, raceAbort };
+export { type SoonOptions, createCache, createShare, createShortApi, createShortMethods, createSilentRefresh, createSoon, deepSort, genRequestKey, isBodyJson, mergeHeaders, mergeOptions, mergeSignals, mergeUrl, parseUrlOptions, parseWithBase, raceAbort, toFormData };

package/dist/index.js

@@ -1 +1 @@
-const t=t=>{const e=[],n=t.match(/:([^:/\d]+)\/?/g);return n&&n.forEach((t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))})),e},e=(t="")=>t.endsWith("/")?t.slice(0,-1):t,n=(t="")=>t.startsWith("/")?t:"/"+t,r=(t="")=>t.startsWith("http"),o=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.keys(t).forEach((n=>{const r=t[n];(Array.isArray(r)?r:[r]).forEach((t=>{e.push([n,t??""])}))})),e},s=(s,a)=>{const{query:i,params:c,baseURL:f}=a;let u=s.trim();t(s).forEach((t=>{c&&(u=u.replace(":"+t,""+c[t]))}));const[l,p]=u.split("?"),h=new URLSearchParams([...o(p),...o(i)]);let y=((t,o)=>{if(r(t))return t;const s=r(o)?o:n(o);return e(s)+e(n(t))})(l,f);return h.size&&(y=y+"?"+h),y},a=(...t)=>{const e=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,n)=>{e.set(n,t)}))})),e};function i(t,e){const n=(t??[]).filter((t=>!!t));return e&&n.push(AbortSignal.timeout(e)),n.length?AbortSignal.any(n):void 0}function c(t){return!(!t||"object"!=typeof t||(t instanceof Blob||t instanceof ArrayBuffer||t instanceof FormData||t instanceof File||t instanceof DataView||t instanceof URLSearchParams||t instanceof ReadableStream||(e=t,e instanceof Int8Array||e instanceof Uint8Array||e instanceof Uint8ClampedArray||e instanceof Int16Array||e instanceof Uint16Array||e instanceof Int32Array||e instanceof Uint32Array||e instanceof Float32Array||e instanceof Float64Array||e instanceof BigInt64Array||e instanceof BigUint64Array)));var e}function f(...t){const e=Object.assign({},...t),n=a(...t.map((t=>t?.headers)));return e.headers=n,e.signal=i(t.map((t=>t?.signal)),e.timeout),e}function u(t){const{url:e,options:n,baseURL:r,baseOptions:o}=t,a=f(o,n),u=s(e,{...a,baseURL:r}),l=a?.body,p=c(l);a.body=p?JSON.stringify(l):l,p&&a.headers.append("Content-Type","application/json");const h=new AbortController;return a.signal=i([a.signal,h.signal]),{url:u,options:a,is_body_json:p,abortController:h}}function l(t){const{url:e,options:n}=u(t);return[e,n]}const p=["get","post","put","delete","patch"];function h(t,e){const n={};return t.forEach((t=>{n[t]=e(t)})),n}function y(e){const n=(n,r,o)=>{const s=!!t(n).length;return(...t)=>{const a=[...t],{hasBody:i,hasQuery:c}=o||{},f=s?a.shift():void 0,u=c?a.shift():void 0,l=i?a.shift():void 0,p=a.shift();return e(n,r,f,u,l,p,o?.options)}},r={};return p.forEach((t=>{const e=t.toUpperCase();r[e]=e=>({Send:r=>n(e,t,{options:r}),Body:()=>({Send:r=>n(e,t,{hasBody:!0,options:r})}),Query:()=>({Send:r=>n(e,t,{hasQuery:!0,options:r}),Body:()=>({Send:r=>n(e,t,{hasBody:!0,hasQuery:!0,options:r})})})})})),r}function d(t,e){e&&(e.pop()?.abort("race abort"),e.push(t))}function m(t){if(Array.isArray(t))return t.map(m);if("object"==typeof t&&null!==t){const e={};return Object.keys(t).sort().forEach((n=>{e[n]=m(t[n])})),e}return t}function g(t){const{url:e,options:n}=t,{headers:r,method:o,body:s,query:a,params:i}=n??{},c=m(Object.fromEntries(new Headers(r).entries()??[]));return(o??"get").toLowerCase()+e+JSON.stringify(m(a)??"")+JSON.stringify(m(i)??"")+JSON.stringify(c)+("object"==typeof s&&null!=s?JSON.stringify(m(s)):s??"")}function b(){const t={},e=[];setInterval((()=>{const n=Date.now();for(let r=e.length-1;r>=0;r--)e[r].expiredTime<n&&(delete t[e[r].key],e.splice(r,1))}),6e4);const n=t=>t instanceof Response?t.clone():"function"==typeof t||t instanceof Promise?t:structuredClone(t);function r(n){delete t[n];for(let t=e.length-1;t>=0;t--)if(e[t].key===n){e.splice(t,1);break}}return{get:function(e){const o=t[e];if(void 0!==o)return o.expiredTime>Date.now()?n(o.data):void r(e)},set:function(r,o,s){t[r]={data:n(o),expiredTime:s},e.push({key:r,expiredTime:s})},remove:r}}function A(){const t={},e=e=>t[e]=void 0;return{get:e=>t[e],set:(n,r)=>{t[n]=r,r.finally((()=>e(n)))}}}function S(t){let e=[],n=!1;return(r,o)=>{e.push({success:r,fail:o}),n||(n=!0,t().then((()=>{e.forEach((t=>t.success()))})).catch((t=>{e.forEach((t=>t.fail()))})).finally((()=>{n=!1,e=[]})))}}function w(t,e){const n=b(),r=A(),o=(o,s)=>new Promise(((a,i)=>{const c=u(t(o,s)),f=g(c),{abortController:l}=c,p=new AbortController;p.signal.addEventListener("abort",(()=>{i(p.signal.reason)}));const h=e({parsed:{...c,requestKey:f}});if(c.options?.share){const t=r.get(f);if(t)return a(t)}if(d(c.options.share?p:l,c.options?.aborts),c.options?.staleTime){const t=n.get(f);if(void 0!==t)return a(t)}const y=h(o,s);c.options?.share&&r.set(f,y),y.then((t=>{a(t),c.options?.staleTime&&n.set(f,t,(new Date).getTime()+c.options.staleTime)})).catch((t=>i(t)))})),s=y(((t,e,n,r,s,a,i)=>o(t,{...i,...a,method:e,params:n,query:r,body:s}))),a=h([...p,"head","options"],(t=>(e,n)=>o(e,{...n,method:t})));return{request:o,...s,...a}}export{b as createCache,A as createShare,y as createShortApi,h as createShortMethods,S as createSilentRefresh,w as createSoon,m as deepSort,g as genRequestKey,c as isBodyJson,a as mergeHeaders,f as mergeOptions,i as mergeSignals,s as mergeUrl,l as parseUrlOptions,u as parseWithBase,d as raceAbort};
+const t=t=>{const e=[],n=t.match(/:([^:/\d]+)\/?/g);return n&&n.forEach((t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))})),e},e=(t="")=>t.endsWith("/")?t.slice(0,-1):t,n=(t="")=>t.startsWith("/")?t:"/"+t,r=(t="")=>t.startsWith("http"),o=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.keys(t).forEach((n=>{const r=t[n];(Array.isArray(r)?r:[r]).forEach((t=>{e.push([n,t??""])}))})),e},s=(s,a)=>{const{query:i,params:c,baseURL:f}=a;let u=s.trim();t(s).forEach((t=>{c&&(u=u.replace(":"+t,""+c[t]))}));const[l,p]=u.split("?"),y=new URLSearchParams([...o(p),...o(i)]);let h=((t,o)=>{if(r(t))return t;const s=r(o)?o:n(o);return e(s)+e(n(t))})(l,f);return y.size&&(h=h+"?"+y),h},a=(...t)=>{const e=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,n)=>{e.set(n,t)}))})),e};function i(t,e){const n=(t??[]).filter((t=>!!t));return e&&n.push(AbortSignal.timeout(e)),n.length?AbortSignal.any(n):void 0}function c(t){return!(!t||"object"!=typeof t||(t instanceof Blob||t instanceof ArrayBuffer||t instanceof FormData||t instanceof File||t instanceof DataView||t instanceof URLSearchParams||t instanceof ReadableStream||(e=t,e instanceof Int8Array||e instanceof Uint8Array||e instanceof Uint8ClampedArray||e instanceof Int16Array||e instanceof Uint16Array||e instanceof Int32Array||e instanceof Uint32Array||e instanceof Float32Array||e instanceof Float64Array||e instanceof BigInt64Array||e instanceof BigUint64Array)));var e}function f(t){const e=new FormData;return t&&"object"==typeof t&&!Array.isArray(t)&&Object.entries(t).forEach((([t,n])=>{let r;r=n instanceof Blob?n:JSON.stringify(n),e.append(t,r)})),e}function u(...t){const e=Object.assign({},...t),n=a(...t.map((t=>t?.headers)));return e.headers=n,e.signal=i(t.map((t=>t?.signal)),e.timeout),e}function l(t){const{url:e,options:n,baseURL:r,baseOptions:o}=t,a=u(o,n),f=s(e,{...a,baseURL:r}),l=a?.body,p=c(l);a.body=p?JSON.stringify(l):l,p&&a.headers.append("Content-Type","application/json");const y=new AbortController;return a.signal=i([a.signal,y.signal]),{url:f,options:a,is_body_json:p,abortController:y}}function p(t){const{url:e,options:n}=l(t);return[e,n]}const y=["get","post","put","delete","patch"];function h(t,e){const n={};return t.forEach((t=>{n[t]=e(t)})),n}function d(e){const n=(n,r,o)=>{const s=!!t(n).length;return(...t)=>{const a=[...t],{hasBody:i,hasQuery:c,isFormData:u}=o||{},l=s?a.shift():void 0,p=c?a.shift():void 0;let y=i?a.shift():void 0;u&&(y=f(y));const h=a.shift();return e(n,r,l,p,y,h,o?.options)}},r={};return y.forEach((t=>{const e=t.toUpperCase();r[e]=e=>({Send:r=>n(e,t,{options:r}),Body:()=>({Send:r=>n(e,t,{hasBody:!0,options:r})}),FormData:()=>({Send:r=>n(e,t,{hasBody:!0,isFormData:!0,options:r})}),Query:()=>({Send:r=>n(e,t,{hasQuery:!0,options:r}),Body:()=>({Send:r=>n(e,t,{hasBody:!0,hasQuery:!0,options:r})}),FormData:()=>({Send:r=>n(e,t,{hasBody:!0,hasQuery:!0,isFormData:!0,options:r})})})})})),r}function m(t,e){e&&(e.pop()?.abort("race abort"),e.push(t))}function g(t){if(Array.isArray(t))return t.map(g);if("object"==typeof t&&null!==t){const e={};return Object.keys(t).sort().forEach((n=>{e[n]=g(t[n])})),e}return t}function b(t){const{url:e,options:n}=t,{headers:r,method:o,body:s,query:a,params:i}=n??{},c=g(Object.fromEntries(new Headers(r).entries()??[]));return(o??"get").toLowerCase()+e+JSON.stringify(g(a)??"")+JSON.stringify(g(i)??"")+JSON.stringify(c)+("object"==typeof s&&null!=s?JSON.stringify(g(s)):s??"")}function A(){const t={},e=[];setInterval((()=>{const n=Date.now();for(let r=e.length-1;r>=0;r--)e[r].expiredTime<n&&(delete t[e[r].key],e.splice(r,1))}),6e4);const n=t=>t instanceof Response?t.clone():"function"==typeof t||t instanceof Promise?t:structuredClone(t);function r(n){delete t[n];for(let t=e.length-1;t>=0;t--)if(e[t].key===n){e.splice(t,1);break}}return{get:function(e){const o=t[e];if(void 0!==o)return o.expiredTime>Date.now()?n(o.data):void r(e)},set:function(r,o,s){t[r]={data:n(o),expiredTime:s},e.push({key:r,expiredTime:s})},remove:r}}function S(){const t={},e=e=>t[e]=void 0;return{get:e=>t[e],set:(n,r)=>{t[n]=r,r.finally((()=>e(n)))}}}function w(t){let e=[],n=!1;return(r,o)=>{e.push({success:r,fail:o}),n||(n=!0,t().then((()=>{e.forEach((t=>t.success()))})).catch((t=>{e.forEach((t=>t.fail()))})).finally((()=>{n=!1,e=[]})))}}function E(t,e){const n=A(),r=S(),o=(o,s)=>new Promise(((a,i)=>{const c=t(o,s),f=l({url:o,options:s,...c}),u=b(f),{abortController:p}=f,y=new AbortController;y.signal.addEventListener("abort",(()=>{i(y.signal.reason)}));const h=e({parsed:{...f,requestKey:u}});if(f.options?.share){const t=r.get(u);if(t)return a(t)}if(m(f.options.share?y:p,f.options?.aborts),f.options?.staleTime){const t=n.get(u);if(void 0!==t)return a(t)}const d=h(o,s);f.options?.share&&r.set(u,d),d.then((t=>{a(t),f.options?.staleTime&&n.set(u,t,(new Date).getTime()+f.options.staleTime)})).catch((t=>i(t)))})),s=d(((t,e,n,r,s,a,i)=>o(t,{...i,...a,method:e,params:n,query:r,body:s}))),a=h([...y,"head","options"],(t=>(e,n)=>o(e,{...n,method:t})));return{request:o,...s,...a}}export{A as createCache,S as createShare,d as createShortApi,h as createShortMethods,w as createSilentRefresh,E as createSoon,g as deepSort,b as genRequestKey,c as isBodyJson,a as mergeHeaders,u as mergeOptions,i as mergeSignals,s as mergeUrl,p as parseUrlOptions,l as parseWithBase,m as raceAbort,f as toFormData};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soon-fetch",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "a 5Kb request lib alternative to axios with timeout, request reusing, race, response cache ...",
   "homepage": "https://github.com/leafio/soon-fetch",
   "main": "./dist/index.cjs.js",