soon-fetch 2.0.1 → 2.1.1

package/README.md

@@ -20,6 +20,7 @@
   - [Restful Url Params](#restful-url-params)
   - [Timeout](#timeout)
   - [Rapid Define APIs](#rapid-define-apis)
+- [API](#api)
 - [Support Me](#support-me)
 
 ### Example
@@ -31,19 +32,12 @@
 import { createSoon, parseUrlOptions, type SoonOptions } from "soon-fetch";
 
 const request = <T>(url: string, options?: SoonOptions) => {
-  // _url : url handled with baseURL , options.query , options.params
-  // _options: 1. merge baseOptions and options,
-  //           2. transfer merged options from SoonOptions to raw fetch options
-  //           3. json object body would be auto stringified and add  header { "Content-Type": "application/json" }
   const [_url, _options] = parseUrlOptions({
     url,
     options,
     baseURL: "/api",
     baseOptions: {
-      // would override by options.timeout
       timeout: 20 * 1000,
-      // would merged with options.headers
-      // the same-key header would  override by  options.headers
       headers: { Authorization: localStorage.getItem("token") ?? "" },
     },
   });
@@ -125,12 +119,81 @@ soon.get(url, { timeout: 1000 * 20 });
   })
 ```
 
+### API
+
+#### SoonOptions
+
+```ts
+// function fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>
+// RequestInit  is fetch's init options
+type SoonOptions = Omit<RequestInit, "body"> & {
+  query?:
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | null
+        | undefined
+        | (string | number | boolean | null | undefined)[]
+      >
+    | URLSearchParams;
+  params?: Record<string, string | number>;
+  timeout?: number;
+  body?: RequestInit["body"] | object;
+};
+```
+
+#### parseUrlOptions
+
+`parseUrlOptions` source code:
+
+```ts
+function parseUrlOptions<Options extends SoonOptions>(urlOptions: {
+  url: string;
+  options?: Options;
+  baseURL?: string;
+  baseOptions?: Options;
+}) {
+  const { url, options, baseURL, baseOptions } = urlOptions;
+  //override baseOptions
+  const _options = { ...baseOptions, ...options };
+
+  //signal  merge signals by AbortSignal.any
+  _options.signal = mergeSignals(
+    [baseOptions?.signal, options?.signal],
+    _options.timeout
+  );
+
+  //url  handled with baseURL , options.query , options.params
+  const _url = mergeUrl(url, { ..._options, baseURL });
+
+  //body  auto stringify json body
+  let _body = options?.body;
+  let is_body_json = isBodyJson(_body);
+  _options.body = is_body_json ? JSON.stringify(_body) : _body;
+
+  //headers  merge headers , the same-key header would be override by options.headers
+  //if body is json ,then add header "Content-Type": "application/json" }
+  const headers = mergeHeaders(
+    baseOptions?.headers,
+    options?.headers,
+    is_body_json ? { "Content-Type": "application/json" } : undefined
+  );
+  _options.headers = headers;
+
+  return [_url, _options as Options & { headers: Headers }] as const;
+}
+```
+
+You can customize your own parse function with the functions exported below:
+`mergeHeaders`, `mergeSignals`, `mergeUrl`, `isBodyJson`
+
 ### Support Me
 
 If you like this library , you can give a **star** on github.  
 GitHub: https://github.com/leafio/soon-fetch
 
-> I'm looking for a frontend job , expecting an offer or chance for me .
 > Email: leafnote@outlook.com
 
 [English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)
@@ -151,11 +214,13 @@ GitHub: https://github.com/leafio/soon-fetch
 - [示例](#示例)
 
 - [特别功能](#特别功能)
+
   - [快捷方法](#快捷方法)
   - [Restful Url 参数自动处理](#restful-url-参数自动处理)
   - [超时](#超时)
   - [快速定义 API](#快速定义-api)
 
+- [API](#api-1)
 - [支持一下](#支持一下)
 
 ### 示例
@@ -165,19 +230,12 @@ GitHub: https://github.com/leafio/soon-fetch
 
 ```typescript
 const request = <T>(url: string, options?: SoonOptions) => {
-  // _url : url 根据 baseURL , options.query , options.params 进行拼接
-  // _options: 1. 合并 baseOptions 和 options
-  //           2. 合并结果 从 SoonOptions 转换至 原生 fetch options
-  //           3. json object 会自动 stringified , 并且添加  header { "Content-Type": "application/json" }
   const [_url, _options] = parseUrlOptions({
     url,
     options,
     baseURL: "/api",
     baseOptions: {
-      // 会被 options.timeout 覆盖
       timeout: 20 * 1000,
-      // 将与  options.headers 合并
-      // 相同key的 header 会被options.headers覆盖
       headers: { Authorization: localStorage.getItem("token") ?? "" },
     },
   });
@@ -258,12 +316,81 @@ soon.get(url, { timeout: 1000 * 20 });
   })
 ```
 
+### API
+
+#### SoonOptions
+
+```ts
+// function fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>
+// RequestInit  为原生 fetch 的 init 选项
+type SoonOptions = Omit<RequestInit, "body"> & {
+  query?:
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | null
+        | undefined
+        | (string | number | boolean | null | undefined)[]
+      >
+    | URLSearchParams;
+  params?: Record<string, string | number>;
+  timeout?: number;
+  body?: RequestInit["body"] | object;
+};
+```
+#### parseUrlOptions
+
+`parseUrlOptions` 源码如下:
+
+```ts
+function parseUrlOptions<Options extends SoonOptions>(urlOptions: {
+  url: string;
+  options?: Options;
+  baseURL?: string;
+  baseOptions?: Options;
+}) {
+  const { url, options, baseURL, baseOptions } = urlOptions;
+  // 覆盖 baseOptions
+  const _options = { ...baseOptions, ...options };
+
+  // 以 AbortSignal.any 的方式合并 baseOptions.signal 、 options.signal 、
+  // 以及 AbortSignal.timeout( _options.timeout)
+  _options.signal = mergeSignals(
+    [baseOptions?.signal, options?.signal],
+    _options.timeout
+  );
+
+  //根据 baseURL , options.query , options.params 解析出完整的url
+  const _url = mergeUrl(url, { ..._options, baseURL });
+
+  // 自动stringify json-object类的body
+  let _body = options?.body;
+  let is_body_json = isBodyJson(_body);
+  _options.body = is_body_json ? JSON.stringify(_body) : _body;
+
+  //合并headers, 相同key值的header会被options.headers覆盖
+  //当body 为 json ,自动添加 header "Content-Type": "application/json" }
+  const headers = mergeHeaders(
+    baseOptions?.headers,
+    options?.headers,
+    is_body_json ? { "Content-Type": "application/json" } : undefined
+  );
+  _options.headers = headers;
+
+  return [_url, _options as Options & { headers: Headers }] as const;
+}
+```
+
+如有特殊需要，可以根据下方的函数定制你自己的解析函数来替代 `parseUrlOptions`:
+`mergeHeaders`, `mergeSignals`, `mergeUrl`, `isBodyJson`
+
 ### 支持一下
 
 喜欢 soon-fetch 的话 , 在 github 上给个 **star** 吧.
 GitHub: https://github.com/leafio/soon-fetch
 
-> 我目前在找前端的工作，有岗位机会的话，可以联系我。
 > Email: leafnote@outlook.com
 
 [English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";const t=t=>{const r=[],e=t.match(/:([^:/\d]+)\/?/g);return e&&e.forEach((t=>{r.push(t.replace(/\//g,"").replace(/:/g,""))})),r},r=(t="")=>t.startsWith("http"),e=(t="")=>r(t)?t:((t="")=>{let r=t;return t&&(r=((t="")=>t.endsWith("/")?t.slice(0,-1):t)(r),t.startsWith("/")||(r="/"+r)),r})(t),n=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const r=[];return Object.keys(t).forEach((e=>{const n=t[e];(Array.isArray(n)?n:[n]).forEach((t=>{r.push([e,t??""])}))})),r},a=(a,o)=>{const{query:s,params:i,baseURL:c}=o;let f=a.trim();t(a).forEach((t=>{i&&(f=f.replace(":"+t,""+i[t]))}));const[p,u]=f.split("?"),h=new URLSearchParams([...n(u),...n(s)]);let y=((t,n)=>{let a=e(t);return r(a)||(a=e(n)+a),a})(p,c);return h.size&&(y=y+"?"+h),y},o=(...t)=>{const r=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,e)=>{r.set(e,t)}))})),r},s=(t,r)=>{const e=(r??[]).filter((t=>!!t));return t&&e.push(AbortSignal.timeout(t)),e.length?AbortSignal.any(e):void 0};function i(t){let r=!1,e=t;var n;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||(n=e,n instanceof Int8Array||n instanceof Uint8Array||n instanceof Uint8ClampedArray||n instanceof Int16Array||n instanceof Uint16Array||n instanceof Int32Array||n instanceof Uint32Array||n instanceof Float32Array||n instanceof Float64Array||n instanceof BigInt64Array||n instanceof BigUint64Array))&&(r=!0,e=JSON.stringify(e)),[e,r]}const c=["get","post","put","delete","patch"];function f(t,r){const e={};return t.forEach((t=>{e[t]=(e,n)=>r(e,{...n,method:t})})),e}function p(r){return(e,n)=>{const a={},o=!!t(e).length;return c.forEach((t=>{const s=t.toUpperCase();a[s]=()=>(...a)=>{const[s,i]=a,c="get"===t?"query":"body";return r(e,{...n,method:t,params:o?s:void 0,[c]:o?i:s})}})),a}}exports.createShortAPI=p,exports.createShortMethods=f,exports.createSoon=function(t){const r=t;return{request:r,API:p(r),...f([...c,"head","options"],r)}},exports.mergeHeaders=o,exports.mergeSignals=s,exports.mergeUrl=a,exports.parseUrlOptions=function(t){const{url:r,options:e,baseURL:n,baseOptions:c}=t,f={...c,...e};f.signal=s(f.timeout,[f.signal]);const p=a(r,{...f,baseURL:n}),[u,h]=i(f.body);f.body=u;const y=o(c?.headers,e?.headers,h?{"Content-Type":"application/json"}:void 0);return f.headers=y,[p,f]},exports.stringifyBody=i;
+"use strict";const t=t=>{const r=[],e=t.match(/:([^:/\d]+)\/?/g);return e&&e.forEach((t=>{r.push(t.replace(/\//g,"").replace(/:/g,""))})),r},r=(t="")=>t.endsWith("/")?t.slice(0,-1):t,e=(t="")=>t.startsWith("/")?t:"/"+t,n=(t="")=>t.startsWith("http"),a=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const r=[];return Object.keys(t).forEach((e=>{const n=t[e];(Array.isArray(n)?n:[n]).forEach((t=>{r.push([e,t??""])}))})),r},o=(o,s)=>{const{query:i,params:c,baseURL:f}=s;let p=o.trim();t(o).forEach((t=>{c&&(p=p.replace(":"+t,""+c[t]))}));const[u,h]=p.split("?"),y=new URLSearchParams([...a(h),...a(i)]);let l=((t,a)=>{if(n(t))return t;const o=n(a)?a:e(a);return r(o)+r(e(t))})(u,f);return y.size&&(l=l+"?"+y),l},s=(...t)=>{const r=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,e)=>{r.set(e,t)}))})),r};function i(t,r){const e=(t??[]).filter((t=>!!t));return r&&e.push(AbortSignal.timeout(r)),e.length?AbortSignal.any(e):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||(r=t,r instanceof Int8Array||r instanceof Uint8Array||r instanceof Uint8ClampedArray||r instanceof Int16Array||r instanceof Uint16Array||r instanceof Int32Array||r instanceof Uint32Array||r instanceof Float32Array||r instanceof Float64Array||r instanceof BigInt64Array||r instanceof BigUint64Array)));var r}const f=["get","post","put","delete","patch"];function p(t,r){const e={};return t.forEach((t=>{e[t]=(e,n)=>r(e,{...n,method:t})})),e}function u(r){return(e,n)=>{const a={},o=!!t(e).length;return f.forEach((t=>{const s=t.toUpperCase();a[s]=()=>(...a)=>{const[s,i]=a,c="get"===t?"query":"body";return r(e,{...n,method:t,params:o?s:void 0,[c]:o?i:s})}})),a}}exports.createShortAPI=u,exports.createShortMethods=p,exports.createSoon=function(t){const r=t;return{request:r,API:u(r),...p([...f,"head","options"],r)}},exports.isBodyJson=c,exports.mergeHeaders=s,exports.mergeSignals=i,exports.mergeUrl=o,exports.parseUrlOptions=function(t){const{url:r,options:e,baseURL:n,baseOptions:a}=t,f={...a,...e};f.signal=i([a?.signal,e?.signal],f.timeout);const p=o(r,{...f,baseURL:n});let u=e?.body,h=c(u);f.body=h?JSON.stringify(u):u;const y=s(a?.headers,e?.headers,h?{"Content-Type":"application/json"}:void 0);return f.headers=y,[p,f]};

package/dist/index.d.ts

@@ -1,44 +1,46 @@
-type SoonOptions = RequestInit & {
-    query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
-    params?: Record<string, string | number>;
-    timeout?: number;
-};
-type GetUrlKey<Url> = Url extends `${string}/:${infer Key}/${infer Right}` ? `${Key}` | GetUrlKey<`/${Right}`> : Url extends `${string}/:${infer Key}` ? `${Key}` : never;
-type OptionParams<Args> = NonNullable<Args> extends never ? [] : keyof NonNullable<Args> extends never ? [] : Exclude<Args, NonNullable<Args>> extends never ? [params: Args] : [params?: Args];
-type OptionQuery<Args> = NonNullable<Args> extends never ? [] : keyof NonNullable<Args> extends never ? [] : Exclude<Args, NonNullable<Args>> extends never ? Partial<Args> extends Args ? [query?: Args] : [query: Args] : [query?: Args];
-type OptionBody<Args> = NonNullable<Args> extends never ? [] : Exclude<Args, NonNullable<Args>> extends never ? [body: Args] : [body?: Args];
-type Tuple2Union<T> = T extends [infer T1, infer T2, ...infer R] ? T1 | T2 | Tuple2Union<R> : T extends [infer T_Only] ? T_Only : never;
-
-declare const mergeUrl: (url: string, config: {
-    query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
-    params?: Record<string, string | number>;
-    baseURL?: string;
-}) => string;
-declare const mergeHeaders: (...headersList: (HeadersInit | undefined)[]) => Headers;
-declare const mergeSignals: (timeout?: number, signals?: (AbortSignal | null | undefined)[]) => AbortSignal | undefined;
-declare function stringifyBody(body?: any): [body: any, isBodyJson: boolean];
-declare function parseUrlOptions<Options extends SoonOptions>(urlOptions: {
-    url: string;
-    options?: Options;
-    baseURL?: string;
-    baseOptions?: Options;
-}): readonly [string, Options & {
-    headers: Headers;
-}];
-declare function createSoon<T extends (url: string, options?: SoonOptions) => Promise<any>>(requestFun: T): {
-    options: T;
-    get: T;
-    post: T;
-    put: T;
-    delete: T;
-    patch: T;
-    head: T;
-    request: T;
-    API: <Url extends string>(url: Url, options?: Parameters<T>[1] | undefined) => Record<"GET", <Req = undefined, Res = Awaited<ReturnType<T>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Req>]) => Promise<Res>> & Record<"POST" | "PATCH" | "DELETE" | "PUT", <Req = undefined, Res_1 = Awaited<ReturnType<T>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res_1>>;
-};
-declare function createShortMethods<Methods extends string[], RequestFun extends <T>(url: string, options?: {
-    method?: string;
-}) => Promise<any>>(methods: Methods, requestFun: RequestFun): Record<Tuple2Union<Methods>, typeof requestFun>;
-declare function createShortAPI<requestFun extends <T>(url: string, options?: SoonOptions) => Promise<any>>(requestFun: requestFun): <Url extends string>(url: Url, options?: Parameters<requestFun>[1]) => Record<"GET", <Req = undefined, Res = Awaited<ReturnType<requestFun>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Req>]) => Promise<Res>> & Record<"POST" | "PATCH" | "DELETE" | "PUT", <Req = undefined, Res_1 = Awaited<ReturnType<requestFun>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res_1>>;
-
-export { type SoonOptions, createShortAPI, createShortMethods, createSoon, mergeHeaders, mergeSignals, mergeUrl, parseUrlOptions, stringifyBody };
+type SoonOptions = Omit<RequestInit, "body"> & {
+    query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
+    params?: Record<string, string | number>;
+    timeout?: number;
+    body?: RequestInit["body"] | object;
+};
+type GetUrlKey<Url> = Url extends `${string}/:${infer Key}/${infer Right}` ? `${Key}` | GetUrlKey<`/${Right}`> : Url extends `${string}/:${infer Key}` ? `${Key}` : never;
+type OptionParams<Args> = NonNullable<Args> extends never ? [] : keyof NonNullable<Args> extends never ? [] : Exclude<Args, NonNullable<Args>> extends never ? [params: Args] : [params?: Args];
+type OptionQuery<Args> = NonNullable<Args> extends never ? [] : keyof NonNullable<Args> extends never ? [] : Exclude<Args, NonNullable<Args>> extends never ? Partial<Args> extends Args ? [query?: Args] : [query: Args] : [query?: Args];
+type OptionBody<Args> = NonNullable<Args> extends never ? [] : Exclude<Args, NonNullable<Args>> extends never ? [body: Args] : [body?: Args];
+type Tuple2Union<T> = T extends [infer T1, infer T2, ...infer R] ? T1 | T2 | Tuple2Union<R> : T extends [infer T_Only] ? T_Only : never;
+
+declare const mergeUrl: (url: string, config: {
+    query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | null | undefined)[]> | URLSearchParams;
+    params?: Record<string, string | number>;
+    baseURL?: string;
+}) => string;
+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 parseUrlOptions<Options extends SoonOptions>(urlOptions: {
+    url: string;
+    options?: Options;
+    baseURL?: string;
+    baseOptions?: Options;
+}): readonly [string, Options & {
+    headers: Headers;
+    body?: BodyInit | null;
+}];
+declare function createSoon<T extends (url: string, options?: SoonOptions) => Promise<any>>(requestFun: T): {
+    options: T;
+    get: T;
+    post: T;
+    put: T;
+    delete: T;
+    patch: T;
+    head: T;
+    request: T;
+    API: <Url extends string>(url: Url, options?: Parameters<T>[1] | undefined) => Record<"GET", <Req = undefined, Res = Awaited<ReturnType<T>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Req>]) => Promise<Res>> & Record<"POST" | "PATCH" | "DELETE" | "PUT", <Req = undefined, Res = Awaited<ReturnType<T>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res>>;
+};
+declare function createShortMethods<Methods extends string[], RequestFun extends <T>(url: string, options?: {
+    method?: string;
+}) => Promise<any>>(methods: Methods, requestFun: RequestFun): Record<Tuple2Union<Methods>, typeof requestFun>;
+declare function createShortAPI<requestFun extends <T>(url: string, options?: SoonOptions) => Promise<any>>(requestFun: requestFun): <Url extends string>(url: Url, options?: Parameters<requestFun>[1]) => Record<"GET", <Req = undefined, Res = Awaited<ReturnType<requestFun>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Req>]) => Promise<Res>> & Record<"POST" | "PATCH" | "DELETE" | "PUT", <Req = undefined, Res = Awaited<ReturnType<requestFun>>>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res>>;
+
+export { type SoonOptions, createShortAPI, createShortMethods, createSoon, isBodyJson, mergeHeaders, mergeSignals, mergeUrl, parseUrlOptions };

package/dist/index.js

@@ -1 +1 @@
-const t=t=>{const n=[],r=t.match(/:([^:/\d]+)\/?/g);return r&&r.forEach((t=>{n.push(t.replace(/\//g,"").replace(/:/g,""))})),n},n=(t="")=>t.startsWith("http"),r=(t="")=>n(t)?t:((t="")=>{let n=t;return t&&(n=((t="")=>t.endsWith("/")?t.slice(0,-1):t)(n),t.startsWith("/")||(n="/"+n)),n})(t),e=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const n=[];return Object.keys(t).forEach((r=>{const e=t[r];(Array.isArray(e)?e:[e]).forEach((t=>{n.push([r,t??""])}))})),n},a=(a,o)=>{const{query:s,params:i,baseURL:c}=o;let f=a.trim();t(a).forEach((t=>{i&&(f=f.replace(":"+t,""+i[t]))}));const[u,h]=f.split("?"),y=new URLSearchParams([...e(h),...e(s)]);let l=((t,e)=>{let a=r(t);return n(a)||(a=r(e)+a),a})(u,c);return y.size&&(l=l+"?"+y),l},o=(...t)=>{const n=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,r)=>{n.set(r,t)}))})),n},s=(t,n)=>{const r=(n??[]).filter((t=>!!t));return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0};function i(t){let n=!1,r=t;var e;return r&&"object"==typeof r&&!(r instanceof Blob||r instanceof ArrayBuffer||r instanceof FormData||r instanceof File||r instanceof DataView||r instanceof URLSearchParams||r instanceof ReadableStream||(e=r,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))&&(n=!0,r=JSON.stringify(r)),[r,n]}function c(t){const{url:n,options:r,baseURL:e,baseOptions:c}=t,f={...c,...r};f.signal=s(f.timeout,[f.signal]);const u=a(n,{...f,baseURL:e}),[h,y]=i(f.body);f.body=h;const l=o(c?.headers,r?.headers,y?{"Content-Type":"application/json"}:void 0);return f.headers=l,[u,f]}const f=["get","post","put","delete","patch"];function u(t){const n=t;return{request:n,API:y(n),...h([...f,"head","options"],n)}}function h(t,n){const r={};return t.forEach((t=>{r[t]=(r,e)=>n(r,{...e,method:t})})),r}function y(n){return(r,e)=>{const a={},o=!!t(r).length;return f.forEach((t=>{const s=t.toUpperCase();a[s]=()=>(...a)=>{const[s,i]=a,c="get"===t?"query":"body";return n(r,{...e,method:t,params:o?s:void 0,[c]:o?i:s})}})),a}}export{y as createShortAPI,h as createShortMethods,u as createSoon,o as mergeHeaders,s as mergeSignals,a as mergeUrl,c as parseUrlOptions,i as stringifyBody};
+const t=t=>{const n=[],r=t.match(/:([^:/\d]+)\/?/g);return r&&r.forEach((t=>{n.push(t.replace(/\//g,"").replace(/:/g,""))})),n},n=(t="")=>t.endsWith("/")?t.slice(0,-1):t,r=(t="")=>t.startsWith("/")?t:"/"+t,e=(t="")=>t.startsWith("http"),a=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const n=[];return Object.keys(t).forEach((r=>{const e=t[r];(Array.isArray(e)?e:[e]).forEach((t=>{n.push([r,t??""])}))})),n},o=(o,s)=>{const{query:i,params:c,baseURL:f}=s;let u=o.trim();t(o).forEach((t=>{c&&(u=u.replace(":"+t,""+c[t]))}));const[h,y]=u.split("?"),l=new URLSearchParams([...a(y),...a(i)]);let p=((t,a)=>{if(e(t))return t;const o=e(a)?a:r(a);return n(o)+n(r(t))})(h,f);return l.size&&(p=p+"?"+l),p},s=(...t)=>{const n=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,r)=>{n.set(r,t)}))})),n};function i(t,n){const r=(t??[]).filter((t=>!!t));return n&&r.push(AbortSignal.timeout(n)),r.length?AbortSignal.any(r):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||(n=t,n instanceof Int8Array||n instanceof Uint8Array||n instanceof Uint8ClampedArray||n instanceof Int16Array||n instanceof Uint16Array||n instanceof Int32Array||n instanceof Uint32Array||n instanceof Float32Array||n instanceof Float64Array||n instanceof BigInt64Array||n instanceof BigUint64Array)));var n}function f(t){const{url:n,options:r,baseURL:e,baseOptions:a}=t,f={...a,...r};f.signal=i([a?.signal,r?.signal],f.timeout);const u=o(n,{...f,baseURL:e});let h=r?.body,y=c(h);f.body=y?JSON.stringify(h):h;const l=s(a?.headers,r?.headers,y?{"Content-Type":"application/json"}:void 0);return f.headers=l,[u,f]}const u=["get","post","put","delete","patch"];function h(t){const n=t;return{request:n,API:l(n),...y([...u,"head","options"],n)}}function y(t,n){const r={};return t.forEach((t=>{r[t]=(r,e)=>n(r,{...e,method:t})})),r}function l(n){return(r,e)=>{const a={},o=!!t(r).length;return u.forEach((t=>{const s=t.toUpperCase();a[s]=()=>(...a)=>{const[s,i]=a,c="get"===t?"query":"body";return n(r,{...e,method:t,params:o?s:void 0,[c]:o?i:s})}})),a}}export{l as createShortAPI,y as createShortMethods,h as createSoon,c as isBodyJson,s as mergeHeaders,i as mergeSignals,o as mergeUrl,f as parseUrlOptions};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soon-fetch",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "a 3Kb request lib alternative to axios",
   "homepage": "https://github.com/leafio/soon-fetch",
   "main": "./dist/index.cjs.js",