soon-fetch 1.0.0 → 2.0.0

package/README.md

@@ -10,7 +10,7 @@
 > - ⭐ rapid define a request api
 > - ⌛ timeout disconnect
 > - 🔤 automatic parse or serialization of JSON
-> - 📏 .min size less than **2K**, smaller after zip
+> - 📏 .min size less than **3K**, smaller after zip
 > - 💡 smart type tips with Typescript
 
 - [Example](#example)
@@ -20,10 +20,6 @@
   - [Restful Url Params](#restful-url-params)
   - [Timeout](#timeout)
   - [Rapid Define APIs](#rapid-define-apis)
-- [API Reference](#api-reference)
-  - [Create Instance](#create-instance)
-  - [Request](#request)
-  - [Response](#response)
 - [Support Me](#support-me)
 
 ### Example
@@ -32,18 +28,30 @@
 > [github: soon-admin-react-nextjs ](https://github.com/leafio/soon-admin-react-nextjs)
 
 ```typescript
-export const soon = createSoon({
-  baseURL: "/",
-  options: () => ({
-    timeout: 20 * 1000,
-    headers: new Headers({
-      Authorization: localStorage.getItem("token") ?? "",
-    }),
-  }),
-  fetching(url, options) {
-    return fetch(url, options).then((res) => res.json());
-  },
-});
+import { createSoon, parseUrlOptions, type SoonOptions } from "soon-fetch";
+
+const request = (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") ?? "" },
+    },
+  });
+
+  return fetch(_url, _options).then((res) => res.json());
+};
+
+const soon = createSoon(request);
 
 /** GET */
 soon.get("/user?id=123");
@@ -117,106 +125,13 @@ soon.get(url, { timeout: 1000 * 20 });
   })
 ```
 
-### API Reference
-
-##### Create Instance
-
-```typescript
-import { createSoon } from "soon";
-
-declare function createSoon<Options extends SoonOptions = SoonOptions>(
-  soonInit?: SoonInit<Options>
-);
-
-// options would overwritten by request level options ,but the headers will be merged
-export type SoonInit<Options> = {
-  //**url prefix */
-  baseURL?: string;
-  /**the fetch http options */
-  options?: () => Options;
-  /** can use return a new fetch request instead*/
-  fetching?: (
-    url: string,
-    options: Options & { headers: Headers }
-  ) => Promise<any>;
-};
-```
-
-##### Request
-
-```typescript
-soon.request(url[,options])
-```
-
-Request data can choose `query` `params` `body` for easy specification
-
-```typescript
-type SoonOptions = {
-  /** url search params like  `api/info?name=yes`  {name:"yes"} passed here*/
-  query?:
-    | Record<
-        string,
-        string | number | boolean | string[] | number[] | null | undefined
-      >
-    | URLSearchParams;
-  /** url rest params like `api/info/:id`  {id:1} passed here*/
-  params?: Record<string, string | number>;
-  /** unit ms */
-  timeout?: number;
-  /*****   vanilla fetch props  *****/
-  //body can pass json without stringified
-  body?: any;
-  signal?: AbortSignal;
-  method?:
-    | "get"
-    | "GET"
-    | "delete"
-    | "DELETE"
-    | "head"
-    | "HEAD"
-    | "options"
-    | "OPTIONS"
-    | "post"
-    | "POST"
-    | "put"
-    | "PUT"
-    | "patch"
-    | "PATCH"
-    | "purge"
-    | "PURGE"
-    | "link"
-    | "LINK"
-    | "unlink"
-    | "UNLINK";
-  mode?: "cors" | "no-cors" | "same-origin";
-  cache?: "default" | "no-cache" | "reload" | "force-cache" | "only-if-cached";
-  credentials?: "include" | "same-origin" | "omit";
-  headers?: Headers;
-  redirect?: "manual" | "follow" | "error";
-  referrerPolicy?:
-    | "no-referrer"
-    | "no-referrer-when-downgrade"
-    | "origin"
-    | "origin-when-cross-origin"
-    | "same-origin"
-    | "strict-origin"
-    | "strict-origin-when-cross-origin"
-    | "unsafe-url";
-  integrity?: string;
-};
-```
-
-##### Response
-
-Default : return raw fetch Response , you can customize it in `fetching` params of `createSoon`
-
 ### 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 in Shanghai , hope someone could find a offer for me. 
-Email: leafnote@outlook.com
+> 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)
 
@@ -224,13 +139,13 @@ Email: leafnote@outlook.com
 
 #### soon-fetch
 
-**极轻量的请求库，不到 2K**
+**极轻量的请求库，不到 3K**
 
 > - 🌐 自动解析 rest Url 的参数
 > - ⭐ 快捷定义请求 api
 > - ⌛ 超时断开
 > - 🔤 自动处理 JSON
-> - 📏 不到 **2K** , zip 后会更小
+> - 📏 不到 **3K** , zip 后会更小
 > - 💡 用 typescript 有智能类型提醒
 
 - [示例](#示例)
@@ -240,11 +155,6 @@ Email: leafnote@outlook.com
   - [Restful Url 参数自动处理](#restful-url-参数自动处理)
   - [超时](#超时)
   - [快速定义 API](#快速定义-api)
-- [API 参考](#api参考)
-
-  - [创建实例](#创建实例)
-  - [请求](#请求)
-  - [响应](#响应)
 
 - [支持一下](#支持一下)
 
@@ -254,18 +164,28 @@ Email: leafnote@outlook.com
 > [github: soon-admin-react-nextjs ](https://github.com/leafio/soon-admin-react-nextjs)
 
 ```typescript
-export const soon = createSoon<SoonOptions>({
-  baseURL: "/",
-  options: () => ({
-    timeout: 20 * 1000,
-    headers: new Headers({
-      Authorization: localStorage.getItem("token") ?? "",
-    }),
-  }),
-  fetching(url, options) {
-    return fetch(url, options).then((res) => res.json());
-  },
-});
+const request = (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") ?? "" },
+    },
+  });
+
+  return fetch(_url, _options).then((res) => res.json());
+};
+
+const soon = createSoon(request);
 
 /** GET */
 soon.get("/user?id=123");
@@ -338,105 +258,12 @@ soon.get(url, { timeout: 1000 * 20 });
   })
 ```
 
-### API 参考
-
-##### 创建实例
-
-```typescript
-import { createSoon } from "soon";
-
-declare function createSoon<Options extends SoonOptions = SoonOptions>(
-  soonInit?: SoonInit<Options>
-);
-
-// 实例级options会被请求级options覆盖，但headers仅同key的被覆盖，其他合并
-export type SoonInit<Options> = {
-  baseURL?: string;
-  //默认的options
-  options?: () => Options;
-  //可返回自定义的fetch请求
-  fetching?: (
-    url: string,
-    options: Options & { headers: Headers }
-  ) => Promise<any>;
-};
-```
-
-##### 请求
-
-```typescript
-soon.request(url[,options])
-```
-
-请求数据可以选择 _`query`_ _`params`_ _`body`_ ，易于传递。
-
-```typescript
-type SoonOptions = {
-  /** url ？后的参数  `api/info?name=yes` 传递 {name:"yes"}*/
-  query?:
-    | Record<
-        string,
-        string | number | boolean | string[] | number[] | null | undefined
-      >
-    | URLSearchParams;
-  /** rest风格url的请求参数 `api/info/:id` 传递 {id:1}*/
-  params?: Record<string, string | number>;
-  /** unit 毫秒 */
-  timeout?: number;
-
-  /*** 原生fetch 参数*/
-  //可直接传递JSON而不必stringified
-  body?: any;
-  signal?: AbortSignal;
-  method?:
-    | "get"
-    | "GET"
-    | "delete"
-    | "DELETE"
-    | "head"
-    | "HEAD"
-    | "options"
-    | "OPTIONS"
-    | "post"
-    | "POST"
-    | "put"
-    | "PUT"
-    | "patch"
-    | "PATCH"
-    | "purge"
-    | "PURGE"
-    | "link"
-    | "LINK"
-    | "unlink"
-    | "UNLINK";
-  mode?: "cors" | "no-cors" | "same-origin";
-  cache?: "default" | "no-cache" | "reload" | "force-cache" | "only-if-cached";
-  credentials?: "include" | "same-origin" | "omit";
-  headers?: Headers;
-  redirect?: "manual" | "follow" | "error";
-  referrerPolicy?:
-    | "no-referrer"
-    | "no-referrer-when-downgrade"
-    | "origin"
-    | "origin-when-cross-origin"
-    | "same-origin"
-    | "strict-origin"
-    | "strict-origin-when-cross-origin"
-    | "unsafe-url";
-  integrity?: string;
-};
-```
-
-##### 响应
-
-默认为原生 fetch 的 Response ，可在 `createSoon` 的 `fetching` 里自定义返回结果
-
 ### 支持一下
 
 喜欢 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=>{var e;const s=[];return null===(e=t.match(/\:([^:\/\d]+)\/?/g))||void 0===e||e.forEach((t=>{s.push(t.replace(/\//g,"").replace(/:/g,""))})),s},e=(e,s)=>{const{query:n,params:r,baseURL:a}=s;let o=e.trim();t(e).forEach((t=>{r&&(o=o.replace(":"+t,""+r[t]))}));const c="http",i=t=>(null==t?void 0:t.endsWith("/"))?t.slice(0,-1):null!=t?t:"",h=t=>{let e=null!=t?t:"";return t&&(e=i(e),t.startsWith("/")||(e="/"+e)),e},[l,u]=o.split("?"),p=new URLSearchParams(u);let f;const d=[];n&&Object.keys(n).forEach((t=>{const e=n[t];(Array.isArray(e)?e:[e]).forEach((e=>{d.push([t,null!=e?e:""])}))})),f=new URLSearchParams([...Array.from(p.entries()),...d]);let g=l;return o.startsWith(c)||(g=i(a)+h(l),g.startsWith(c)||(g=h(g))),f.size&&(g=g+"?"+f),g},s=(...t)=>{const e=new Headers;return t.forEach((t=>{t&&t.forEach(((t,s)=>{e.set(s,t)}))})),e};exports.createSoon=function(n={}){const r={};r.baseInit=n;const a=(t,n)=>function(t,n,r){const{options:a,fetching:o,baseURL:c}=r||{},i=a?a():{},{headers:h}=i,{headers:l}=n||{};let u=s(h,l),p=Object.assign({},i,n,{headers:u}),f=p.timeout;const d=[];f&&d.push(AbortSignal.timeout(f));const g=p.signal;g&&d.push(g),p.signal=AbortSignal.any(d);let b=e(t,Object.assign({},p,{baseURL:c})),y=!1;const m=p.body;return m&&(m instanceof Blob||m instanceof ArrayBuffer||m instanceof FormData||"string"==typeof m||(y=!0,p.body=JSON.stringify(m))),y&&p.headers.set("Content-Type","application/json"),o?o(b,p):fetch(b,p)}(t,n,r.baseInit),o=["get","post","put","delete","patch"];return[...o,"head","options"].forEach((t=>{r[t]=(e,s)=>a(e,Object.assign({},s,{method:t}))})),r.request=a,r.API=(e,s)=>{const n={},r=!!t(e).length;return o.forEach((t=>{const o=t.toUpperCase();n[o]=()=>(...n)=>{let[o,c]=n;const i="get"===t?"query":"body";return a(e,Object.assign({},s,{method:t,params:r?o:void 0,[i]:r?c:o}))}})),n},r};
+"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=[];return t&&e.push(AbortSignal.timeout(t)),r&&e.push(r),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.mergeSignal=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;

package/dist/index.d.ts

@@ -1,45 +1,46 @@
-type SoonOptions = {
-    query?: Record<string, string | number | boolean | string[] | number[] | null | undefined> | URLSearchParams;
-    params?: Record<string, string | number>;
-    timeout?: number;
-    signal?: AbortSignal;
-    method?: "get" | "GET" | "delete" | "DELETE" | "head" | "HEAD" | "options" | "OPTIONS" | "post" | "POST" | "put" | "PUT" | "patch" | "PATCH" | "purge" | "PURGE" | "link" | "LINK" | "unlink" | "UNLINK";
-    mode?: "cors" | "no-cors" | "same-origin";
-    cache?: "default" | "no-cache" | "reload" | "force-cache" | "only-if-cached";
-    credentials?: "include" | "same-origin" | "omit";
-    headers?: Headers;
-    redirect?: "manual" | "follow" | "error";
-    referrerPolicy?: "no-referrer" | "no-referrer-when-downgrade" | "origin" | "origin-when-cross-origin" | "same-origin" | "strict-origin" | "strict-origin-when-cross-origin" | "unsafe-url";
-    body?: any;
-    integrity?: string;
-};
-type SoonInit<Options> = {
-    baseURL?: string;
-    options?: () => Options;
-    fetching?: (url: string, options: Options & {
-        headers: Headers;
-    }) => Promise<any>;
-};
-declare function createSoon<Options extends SoonOptions = SoonOptions>(soonInit?: SoonInit<Options>): {
-    request: <T = any>(url: string, options?: Options) => Promise<T>;
-    get: <T = any>(url: string, options?: Options) => Promise<T>;
-    post: <T = any>(url: string, options?: Options) => Promise<T>;
-    put: <T = any>(url: string, options?: Options) => Promise<T>;
-    patch: <T = any>(url: string, options?: Options) => Promise<T>;
-    delete: <T = any>(url: string, options?: Options) => Promise<T>;
-    head: <T = any>(url: string, options?: Options) => Promise<T>;
-    options: <T = any>(url: string, options?: Options) => Promise<T>;
-    API: <Url extends string>(url: Url, options?: Options) => {
-        GET: <Req = undefined, Res = any>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionQuery<Req>]) => Promise<Res>;
-        POST: <Req = undefined, Res = any>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res>;
-        PATCH: <Req = undefined, Res = any>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res>;
-        DELETE: <Req = undefined, Res = any>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res>;
-        PUT: <Req = undefined, Res = any>() => (...arg: [...OptionParams<{ [key in GetUrlKey<Url>]: string | number; }>, ...OptionBody<Req>]) => Promise<Res>;
-    };
-};
-type GetUrlKey<Url> = Url extends `${string}/:${infer Key}/${infer Right}` ? `${Key}` | GetUrlKey<`/${Right}`> : Url extends `${string}/:${infer Key}` ? `${Key}` : never;
-type OptionParams<Args> = Args extends undefined ? [] : keyof Args extends never ? [] : Partial<Args> extends Args ? [params?: Args] : NonNullable<Args> | undefined extends Args ? [params?: Args] : [params: Args];
-type OptionQuery<Args> = Args extends undefined ? [] : keyof Args extends never ? [] : Partial<Args> extends Args ? [query?: Args] : NonNullable<Args> | undefined extends Args ? [query?: Args] : [query: Args];
-type OptionBody<Args> = Args extends undefined ? [] : keyof Args extends never ? [] : Partial<Args> extends Args ? [body?: Args] : NonNullable<Args> | undefined extends Args ? [body?: Args] : [body: Args];
-
-export { type SoonInit, type SoonOptions, createSoon };
+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;
+type TupleLast<T> = Required<T> extends [infer First, ...infer Rest] ? Rest : never;
+type TupleFirst<T> = Required<T> extends [...infer Rest, infer Last] ? Rest : 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 mergeSignal: (timeout?: number, signal?: AbortSignal | null) => 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 extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    get: T extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    post: T extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    put: T extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    delete: T extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    patch: T extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    head: T extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never;
+    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 extends (...args: infer P) => infer R ? (...args: [...TupleFirst<P>, ...Partial<TupleLast<P>>]) => R : never>;
+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, mergeSignal, mergeUrl, parseUrlOptions, stringifyBody };

package/dist/index.js

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

package/package.json

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