soon-fetch 0.0.2 → 1.1.0

package/README.md

@@ -1,8 +1,10 @@
-[English](#soon-fetch-is-a-lightweight-http-request-library-based-on-vanilla-fetch-with-typescript) | [中文](#soon-fetch-是用-ts-对原生-fetch-的轻量封装) | [Installation](#安装-installation)
+[English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)
 
 <!-- omit in toc -->
 
-##### `soon-fetch` is a lightweight http request library based on vanilla fetch with Typescript
+### `soon-fetch`
+
+**A lightweight http request lib , alternative to axios**
 
 > - 🌐 automatic parse restful api url parameters
 > - ⭐ rapid define a request api
@@ -26,58 +28,28 @@
 
 ### Example
 
-> [github: soon-admin-vue3 ](https://github.com/leafio/soon-admin-vue3)
+> [github: soon-admin-vue3 ](https://github.com/leafio/soon-admin-vue3)  
+> [github: soon-admin-react-nextjs ](https://github.com/leafio/soon-admin-react-nextjs)
 
 ```typescript
-export const soon = createSoon<SoonOptions>({
+export const soon = createSoon({
   baseURL: "/api",
-  defaultOptions: () => ({
+  baseOptions: () => ({
     timeout: 20 * 1000,
-    headers: new Headers({
-      Authorization: localStorage.getItem("token") ?? "",
-    }),
+    headers: { Authorization: localStorage.getItem("token") ?? "" },
   }),
-  afterResponse: async (result, resolve, reject) => {
-    const res = result.response;
-    if (res) {
-      if (res.ok) {
-        if (res.headers.get("content-type")?.includes("json")) {
-          const body = await res.json();
-          if (body.code === 0) {
-            resolve(body.data);
-          } else {
-            toast.error(body.err ?? "Invalid JSON Response");
-            reject(body.err);
-          }
-        } else {
-          resolve(res);
-        }
-      } else if (res.status === 401) {
-        localStorage.removeItem("token");
-        location.href = "/login";
-      } else {
-        toast.error(res.statusText);
-        reject(res.statusText);
-      }
-    } else if (result.isTimeout) {
-      toast.error(t("tip.requestTimeout"));
-    } else if (result.error) {
-      toast.error(result.error);
-    }
-    reject(result.error);
+  fetching(url, options) {
+    return fetch(url, options).then((res) => res.json());
   },
 });
 
 /** GET */
-soon.get("/user?id=123").then((data) => console.log(data));
-soon.get("/user", { query: { id: 123 } }).then((data) => console.log(data));
-soon
-  .get("/user/:id", { params: { id: 123 } })
-  .then((data) => console.log(data));
+soon.get("/user?id=123");
+soon.get("/user", { query: { id: 123 } });
+soon.get("/user/:id", { params: { id: 123 } });
+
 /** POST */
-soon
-  .post("/login", { body: { username: "admin", password: "123456" } })
-  .then((data) => console.log(data));
+soon.post("/login", { body: { username: "admin", password: "123456" } });
 
 /**Define API */
 export const login = soon
@@ -131,9 +103,8 @@ soon.get(url, { timeout: 1000 * 20 });
   //define an api
  export const getUserInfo=soon.API('/user/:id').GET()
   //then use in any where
-  getUserInfo({id:2})
-    .then(res=>console.log(res))
-    .catch(err=>console.log(err))
+  getUserInfo({id:2}).then(res=>console.log(res))
+
 
   //with typescript,
  export const login=soon.API('/user/login')
@@ -152,23 +123,32 @@ soon.get(url, { timeout: 1000 * 20 });
 import { createSoon } from "soon";
 
 declare function createSoon<Options extends SoonOptions = SoonOptions>(
-  soonInit?: SoonInit<Options>
+  soonInit?: NoInfer<SoonInit<Options>>
 );
 
-// options would overwrite by order : defaultOptions ,request(url,options),beforeRequest(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 */
-  defaultOptions?: () => Options;
-  /** can modify the fetch options before been handled*/
-  beforeRequest?: (options: Options & { headers: Headers }) => void;
-  /** can modify the response after fetched and promise resolved */
-  afterResponse?: (
-    result: SoonResult<Options>,
-    resolve: (value: any) => void,
-    reject: (reason?: any) => void
-  ) => Promise<void>;
+  baseOptions?: () => Options;
+  /** can use return a new fetch request instead*/
+  fetching?: (
+    //parsed url with query and params
+    url: string,
+    //parsed options with timeout signal,headers,JSON stringified body
+    options: Options & {
+      headers: Headers;
+    },
+    raw: {
+      // raw base info defined above
+      baseURL?: string;
+      baseOptions?: () => Options;
+      // raw url,options passed from request
+      url: string;
+      options?: Options;
+    }
+  ) => Promise<any>;
 };
 ```
 
@@ -179,8 +159,11 @@ soon.request(url[,options])
 ```
 
 Request data can choose `query` `params` `body` for easy specification
+`body` can pass json without stringified
 
 ```typescript
+//fetch(input: RequestInfo | URL, init?: RequestInit)
+//RequestInit is the init params type of fetch
 type SoonOptions = {
   /** url search params like  `api/info?name=yes`  {name:"yes"} passed here*/
   query?:
@@ -193,65 +176,28 @@ type SoonOptions = {
   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 afterResponse params of createSoon
+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 **start** on github.  
-Email: leafnote@outlook.com
+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.
+> I'm looking for a frontend job , expecting an offer or chance for me .
+> Email: leafnote@outlook.com
 
-[English](#soon-fetch-is-a-lightweight-http-request-library-based-on-vanilla-fetch-with-typescript) | [中文](#soon-fetch-是用-ts-对原生-fetch-的轻量封装) | [Installation](#安装-installation)
+[English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)
 
 <!-- omit in toc -->
 
-##### soon-fetch 是用 ts 对原生 fetch 的轻量封装
+#### soon-fetch
+
+**极轻量的请求库，不到 3K**
 
 > - 🌐 自动解析 rest Url 的参数
 > - ⭐ 快捷定义请求 api
@@ -277,58 +223,28 @@ Email: leafnote@outlook.com
 
 ### 示例
 
-> [github: soon-admin-vue3 ](https://github.com/leafio/soon-admin-vue3)
+> [github: soon-admin-vue3 ](https://github.com/leafio/soon-admin-vue3)  
+> [github: soon-admin-react-nextjs ](https://github.com/leafio/soon-admin-react-nextjs)
 
 ```typescript
-export const soon = createSoon<SoonOptions>({
+export const soon = createSoon({
   baseURL: "/api",
-  defaultOptions: () => ({
+  baseOptions: () => ({
     timeout: 20 * 1000,
-    headers: new Headers({
-      Authorization: localStorage.getItem("token") ?? "",
-    }),
+    headers: { Authorization: localStorage.getItem("token") ?? "" },
   }),
-  afterResponse: async (result, resolve, reject) => {
-    const res = result.response;
-    if (res) {
-      if (res.ok) {
-        if (res.headers.get("content-type")?.includes("json")) {
-          const body = await res.json();
-          if (body.code === 0) {
-            resolve(body.data);
-          } else {
-            toast.error(body.err ?? "Invalid JSON Response");
-            reject(body.err);
-          }
-        } else {
-          resolve(res);
-        }
-      } else if (res.status === 401) {
-        localStorage.removeItem("token");
-        location.href = "/login";
-      } else {
-        toast.error(res.statusText);
-        reject(res.statusText);
-      }
-    } else if (result.isTimeout) {
-      toast.error(t("tip.requestTimeout"));
-    } else if (result.error) {
-      toast.error(result.error);
-    }
-    reject(result.error);
+  fetching(url, options) {
+    return fetch(url, options).then((res) => res.json());
   },
 });
 
 /** GET */
-soon.get("/user?id=123").then((data) => console.log(data));
-soon.get("/user", { query: { id: 123 } }).then((data) => console.log(data));
-soon
-  .get("/user/:id", { params: { id: 123 } })
-  .then((data) => console.log(data));
+soon.get("/user?id=123");
+soon.get("/user", { query: { id: 123 } });
+soon.get("/user/:id", { params: { id: 123 } });
+
 /** POST */
-soon
-  .post("/login", { body: { username: "admin", password: "123456" } })
-  .then((data) => console.log(data));
+soon.post("/login", { body: { username: "admin", password: "123456" } });
 
 /**定义 API */
 export const login = soon
@@ -382,9 +298,7 @@ soon.get(url, { timeout: 1000 * 20 });
   //定义一个api
  export const getUserInfo=soon.API('/user/:id').GET()
   //使用
-  getUserInfo({id:2})
-    .then(res=>console.log(res))
-    .catch(err=>console.log(err))
+  getUserInfo({id:2}).then(res=>console.log(res))
 
   //用typescript,
  export const login=soon.API('/user/login')
@@ -403,32 +317,31 @@ soon.get(url, { timeout: 1000 * 20 });
 import { createSoon } from "soon";
 
 declare function createSoon<Options extends SoonOptions = SoonOptions>(
-  soonInit?: SoonInit<Options>
+  soonInit?: NoInfer<SoonInit<Options>>
 );
 
-// options 依次被覆盖 defaultOptions ,request(url,options),beforeRequest(options)
+// 实例级options会被请求级options覆盖，但headers仅同key的被覆盖，其他合并
 export type SoonInit<Options> = {
   baseURL?: string;
   //默认的options
-  defaultOptions?: () => Options;
-  //在请求前对options的处理
-  beforeRequest?: (options: Options & { headers: Headers }) => void;
-  //在请求后对Response的处理
-  afterResponse?: (
-    result: SoonResult<Options>,
-    resolve: (value: any) => void,
-    reject: (reason?: any) => void
-  ) => Promise<void>;
-};
-```
-
-```typescript
-export type SoonResult<Options> = {
-  isTimeout: boolean;
-  request: Request; //原生fetch的Request
-  error?: any;
-  response?: Response; //原生fetch的Response
-  options: Options; //请求传递来的options
+  baseOptions?: () => Options;
+  //可返回自定义的fetch请求
+  fetching?: (
+    //根据 baseURL query params 解析后的url
+    url: string,
+    //包含超时signal,传来的JSON类型body已被stringified,并包含content-type json 的 headers
+    options: Options & {
+      headers: Headers;
+    },
+    raw: {
+      // 上方定义的　baseURL　baseOptions
+      baseURL?: string;
+      baseOptions?: () => Options;
+      //　请求时传来的　url　　options
+      url: string;
+      options?: Options;
+    }
+  ) => Promise<any>;
 };
 ```
 
@@ -439,9 +352,12 @@ soon.request(url[,options])
 ```
 
 请求数据可以选择 _`query`_ _`params`_ _`body`_ ，易于传递。
+`body` 可直接传递 JSON 而不必 stringified
 
 ```typescript
-type SoonOptions = {
+//fetch(input: RequestInfo | URL, init?: RequestInit)
+//RequestInit 为原生 fetch 的选项类型
+type SoonOptions = RequestInit & {
   /** url ？后的参数  `api/info?name=yes` 传递 {name:"yes"}*/
   query?:
     | Record<
@@ -453,62 +369,22 @@ type SoonOptions = {
   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 的 afterResponse 里自定义处理 Response
+默认为原生 fetch 的 Response ，可在 `createSoon` 的 `fetching` 里自定义返回结果
 
 ### 支持一下
 
 喜欢 soon-fetch 的话 , 在 github 上给个 **star** 吧.
-Email: leafnote@outlook.com
+GitHub: https://github.com/leafio/soon-fetch
 
-> 我目前在找前端的工作，位置上海。有岗位机会的话，可以联系我。
+> 我目前在找前端的工作，有岗位机会的话，可以联系我。
+> Email: leafnote@outlook.com
 
-[English](#soon-fetch-is-a-lightweight-http-request-library-based-on-vanilla-fetch-with-typescript) | [中文](#soon-fetch-是用-ts-对原生-fetch-的轻量封装)
+[English](#soon-fetch) | [中文](#soon-fetch-1) | [Installation](#安装-installation)
 
 <!-- omit in toc -->
 

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";function e(e,t,n,s){return new(n||(n=Promise))((function(o,r){function a(e){try{c(s.next(e))}catch(e){r(e)}}function i(e){try{c(s.throw(e))}catch(e){r(e)}}function c(e){var t;e.done?o(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(a,i)}c((s=s.apply(e,t||[])).next())}))}"function"==typeof SuppressedError&&SuppressedError;const t=e=>{var t;const n=[];return null===(t=e.match(/\:([^:\/\d]+)\/?/g))||void 0===t||t.forEach((e=>{n.push(e.replace(/\//g,"").replace(/:/g,""))})),n},n=(e,n)=>{const{query:s,params:o,baseURL:r}=n;let a=e.trim();let i,c;t(e).forEach((e=>{o&&(a=a.replace(":"+e,""+o[e]))}));const u="http",l=e=>(null==e?void 0:e.endsWith("/"))?e.slice(0,-1):null!=e?e:"",d=e=>{let t=null!=e?e:"";return e&&(t=l(t),e.startsWith("/")||(t="/"+t)),t};let f,h=a;if(0!==a.indexOf(u)){let e=l(r);0!==(null==r?void 0:r.indexOf(u))&&(c=!0,e=`${u}://t.c`+d(r)),h=e+d(a)}i=new URL(h);const p=[];s&&Object.keys(s).forEach((e=>{const t=s[e];(Array.isArray(t)?t:[t]).forEach((t=>{p.push([e,null!=t?t:""])}))})),f=new URLSearchParams([...Array.from(i.searchParams.entries()),...p]);let b=(c?"":i.origin)+i.pathname;return f.size&&(b=b+"?"+f),b},s=(...e)=>{const t=new Headers;return e.forEach((e=>{e&&e.forEach(((e,n)=>{t.set(n,e)}))})),t};exports.createSoon=function(o={}){const r={};r.baseInit=o;const a=(t,o)=>function(t,o,r){const a=null==r?void 0:r.defaultOptions,i=a?a():void 0;let c=s(null==i?void 0:i.headers,null==o?void 0:o.headers),u=Object.assign({},i,o,{headers:c});const{beforeRequest:l,afterResponse:d}=r||{};l&&l(u);let f=u.timeout;const h=[];f&&h.push(AbortSignal.timeout(f));const p=u.signal;p&&h.push(p),u.signal=AbortSignal.any(h);const b=(t,n,s)=>e(this,void 0,void 0,(function*(){d&&(yield d(t,n,s));const e=t.response;e&&n(e),s(t)}));return new Promise(((s,o)=>e(this,void 0,void 0,(function*(){let e=n(t,Object.assign(Object.assign({},u),{baseURL:null==r?void 0:r.baseURL})),a=!1;const i=u.body;i&&(i instanceof Blob||i instanceof ArrayBuffer||i instanceof FormData||"string"==typeof i||(a=!0,u.body=JSON.stringify(i))),a&&u.headers.set("Content-Type","application/json");const c=new Request(e,u);let l={request:c,options:u};try{const e=yield fetch(c);l.response=e,b(l,s,o)}catch(e){"TimeoutError"===(null==e?void 0:e.name)&&(l.isTimeout=!0),b(Object.assign(Object.assign({},l),{error:e}),s,o)}}))))}(t,o,r.baseInit),i=["get","post","put","delete","patch"];return[...i,"head","options"].forEach((e=>{r[e]=(t,n)=>a(t,Object.assign({method:e},n))})),r.request=a,r.API=(e,n)=>{const s={},o=!!t(e).length;return i.forEach((t=>{const r=t.toUpperCase();s[r]=()=>(...s)=>{let[r,i]=s;const c="get"===t?"query":"body";return a(e,Object.assign(Object.assign({method:t},n),{params:o?r:void 0,[c]:o?i:r}))}})),s},r};
+"use strict";const t=t=>{const e=[],s=t.match(/\:([^:\/\d]+)\/?/g);return s&&s.forEach((t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))})),e},e=(t="")=>t.startsWith("http"),s=(t="")=>e(t)?t:((t="")=>{let e=t;return t&&(e=((t="")=>t.endsWith("/")?t.slice(0,-1):t)(e),t.startsWith("/")||(e="/"+e)),e})(t),r=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((s=>{const r=t[s];(Array.isArray(r)?r:[r]).forEach((t=>{e.push([s,null!=t?t:""])}))})),e},n=(n,a)=>{const{query:o,params:c,baseURL:i}=a;let h=n.trim();t(n).forEach((t=>{c&&(h=h.replace(":"+t,""+c[t]))}));const[u,p]=h.split("?");let f=new URLSearchParams([...r(p),...r(o)]),l=((t,r)=>{let n=s(t);return e(n)||(n=s(r)+n),n})(u,i);return f.size&&(l=l+"?"+f),l},a=(...t)=>{const e=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,s)=>{e.set(s,t)}))})),e};function o(t,e,s){const{baseURL:r,fetching:o}=s||{};let c;s&&(c=s.baseOptions?s.baseOptions:s.options);const i={url:t,options:e,baseURL:r,baseOptions:c},[h,u]=function(t){const{url:e,options:s,baseURL:r,baseOptions:o}=t,c=o?o():{},{headers:i}=c,h=s||{},{headers:u}=h;let p=a(i,u),f=Object.assign({},c,s,{headers:p}),l=f.timeout;const b=[];l&&b.push(AbortSignal.timeout(l));const g=f.signal;g&&b.push(g),f.signal=AbortSignal.any(b);let y=n(e,Object.assign({},f,{baseURL:r})),d=!1;const m=f.body;return m&&(m instanceof Blob||m instanceof ArrayBuffer||m instanceof FormData||"string"==typeof m||(d=!0,f.body=JSON.stringify(m))),d&&f.headers.set("Content-Type","application/json"),[y,f]}(i);return o?o(h,u,i):fetch(h,u)}exports.createSoon=function(e={}){const s={};s.baseInit=e;const r=(t,e)=>o(t,e,s.baseInit),n=["get","post","put","delete","patch"];return[...n,"head","options"].forEach((t=>{s[t]=(e,s)=>r(e,Object.assign({},s,{method:t}))})),s.request=r,s.API=(e,s)=>{const a={},o=!!t(e).length;return n.forEach((t=>{const n=t.toUpperCase();a[n]=()=>(...n)=>{let[a,c]=n;const i="get"===t?"query":"body";return r(e,Object.assign({},s,{method:t,params:o?a:void 0,[i]:o?c:a}))}})),a},s};

package/dist/index.d.ts

@@ -1,34 +1,22 @@
-type SoonOptions = {
-    query?: Record<string, string | number | boolean | string[] | number[] | null | undefined> | URLSearchParams;
+type SoonOptions = RequestInit & {
+    query?: Record<string, string | number | boolean | null | undefined | (string | number | boolean | 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 SoonResult<Options> = {
-    isTimeout?: boolean;
-    request: Request;
-    error?: any;
-    response?: Response;
-    options: Options;
 };
 type SoonInit<Options> = {
     baseURL?: string;
-    defaultOptions?: () => Options;
-    beforeRequest?: (options: Options & {
+    options?: () => Options;
+    baseOptions?: () => Options;
+    fetching?: (url: string, options: Options & {
         headers: Headers;
-    }) => void;
-    afterResponse?: (result: SoonResult<Options>, resolve: (value: any) => void, reject: (reason?: any) => void) => Promise<void>;
+    }, raw: {
+        url: string;
+        baseURL?: string;
+        options?: Options;
+        baseOptions?: () => Options;
+    }) => Promise<any>;
 };
-declare function createSoon<Options extends SoonOptions = SoonOptions>(soonInit?: SoonInit<Options>): {
+declare function createSoon<Options extends SoonOptions = SoonOptions>(soonInit?: NoInfer<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>;
@@ -50,4 +38,4 @@ type OptionParams<Args> = Args extends undefined ? [] : keyof Args extends never
 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 { SoonInit, SoonOptions, SoonResult, createSoon };
+export { type SoonInit, type SoonOptions, createSoon };

package/dist/index.js

@@ -1 +1 @@
-function e(e,t,n,s){return new(n||(n=Promise))((function(o,r){function a(e){try{c(s.next(e))}catch(e){r(e)}}function i(e){try{c(s.throw(e))}catch(e){r(e)}}function c(e){var t;e.done?o(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(a,i)}c((s=s.apply(e,t||[])).next())}))}"function"==typeof SuppressedError&&SuppressedError;const t=e=>{var t;const n=[];return null===(t=e.match(/\:([^:\/\d]+)\/?/g))||void 0===t||t.forEach((e=>{n.push(e.replace(/\//g,"").replace(/:/g,""))})),n},n=(e,n)=>{const{query:s,params:o,baseURL:r}=n;let a=e.trim();let i,c;t(e).forEach((e=>{o&&(a=a.replace(":"+e,""+o[e]))}));const u="http",l=e=>(null==e?void 0:e.endsWith("/"))?e.slice(0,-1):null!=e?e:"",d=e=>{let t=null!=e?e:"";return e&&(t=l(t),e.startsWith("/")||(t="/"+t)),t};let f,h=a;if(0!==a.indexOf(u)){let e=l(r);0!==(null==r?void 0:r.indexOf(u))&&(c=!0,e=`${u}://t.c`+d(r)),h=e+d(a)}i=new URL(h);const p=[];s&&Object.keys(s).forEach((e=>{const t=s[e];(Array.isArray(t)?t:[t]).forEach((t=>{p.push([e,null!=t?t:""])}))})),f=new URLSearchParams([...Array.from(i.searchParams.entries()),...p]);let b=(c?"":i.origin)+i.pathname;return f.size&&(b=b+"?"+f),b},s=(...e)=>{const t=new Headers;return e.forEach((e=>{e&&e.forEach(((e,n)=>{t.set(n,e)}))})),t};function o(o={}){const r={};r.baseInit=o;const a=(t,o)=>function(t,o,r){const a=null==r?void 0:r.defaultOptions,i=a?a():void 0;let c=s(null==i?void 0:i.headers,null==o?void 0:o.headers),u=Object.assign({},i,o,{headers:c});const{beforeRequest:l,afterResponse:d}=r||{};l&&l(u);let f=u.timeout;const h=[];f&&h.push(AbortSignal.timeout(f));const p=u.signal;p&&h.push(p),u.signal=AbortSignal.any(h);const b=(t,n,s)=>e(this,void 0,void 0,(function*(){d&&(yield d(t,n,s));const e=t.response;e&&n(e),s(t)}));return new Promise(((s,o)=>e(this,void 0,void 0,(function*(){let e=n(t,Object.assign(Object.assign({},u),{baseURL:null==r?void 0:r.baseURL})),a=!1;const i=u.body;i&&(i instanceof Blob||i instanceof ArrayBuffer||i instanceof FormData||"string"==typeof i||(a=!0,u.body=JSON.stringify(i))),a&&u.headers.set("Content-Type","application/json");const c=new Request(e,u);let l={request:c,options:u};try{const e=yield fetch(c);l.response=e,b(l,s,o)}catch(e){"TimeoutError"===(null==e?void 0:e.name)&&(l.isTimeout=!0),b(Object.assign(Object.assign({},l),{error:e}),s,o)}}))))}(t,o,r.baseInit),i=["get","post","put","delete","patch"];return[...i,"head","options"].forEach((e=>{r[e]=(t,n)=>a(t,Object.assign({method:e},n))})),r.request=a,r.API=(e,n)=>{const s={},o=!!t(e).length;return i.forEach((t=>{const r=t.toUpperCase();s[r]=()=>(...s)=>{let[r,i]=s;const c="get"===t?"query":"body";return a(e,Object.assign(Object.assign({method:t},n),{params:o?r:void 0,[c]:o?i:r}))}})),s},r}export{o as createSoon};
+const t=t=>{const e=[],s=t.match(/\:([^:\/\d]+)\/?/g);return s&&s.forEach((t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))})),e},e=(t="")=>t.startsWith("http"),s=(t="")=>e(t)?t:((t="")=>{let e=t;return t&&(e=((t="")=>t.endsWith("/")?t.slice(0,-1):t)(e),t.startsWith("/")||(e="/"+e)),e})(t),r=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((s=>{const r=t[s];(Array.isArray(r)?r:[r]).forEach((t=>{e.push([s,null!=t?t:""])}))})),e},n=(n,a)=>{const{query:o,params:c,baseURL:i}=a;let h=n.trim();t(n).forEach((t=>{c&&(h=h.replace(":"+t,""+c[t]))}));const[p,u]=h.split("?");let f=new URLSearchParams([...r(u),...r(o)]),l=((t,r)=>{let n=s(t);return e(n)||(n=s(r)+n),n})(p,i);return f.size&&(l=l+"?"+f),l},a=(...t)=>{const e=new Headers;return t.forEach((t=>{t&&new Headers(t).forEach(((t,s)=>{e.set(s,t)}))})),e};function o(t,e,s){const{baseURL:r,fetching:o}=s||{};let c;s&&(c=s.baseOptions?s.baseOptions:s.options);const i={url:t,options:e,baseURL:r,baseOptions:c},[h,p]=function(t){const{url:e,options:s,baseURL:r,baseOptions:o}=t,c=o?o():{},{headers:i}=c,h=s||{},{headers:p}=h;let u=a(i,p),f=Object.assign({},c,s,{headers:u}),l=f.timeout;const b=[];l&&b.push(AbortSignal.timeout(l));const g=f.signal;g&&b.push(g),f.signal=AbortSignal.any(b);let y=n(e,Object.assign({},f,{baseURL:r})),d=!1;const m=f.body;return m&&(m instanceof Blob||m instanceof ArrayBuffer||m instanceof FormData||"string"==typeof m||(d=!0,f.body=JSON.stringify(m))),d&&f.headers.set("Content-Type","application/json"),[y,f]}(i);return o?o(h,p,i):fetch(h,p)}function c(e={}){const s={};s.baseInit=e;const r=(t,e)=>o(t,e,s.baseInit),n=["get","post","put","delete","patch"];return[...n,"head","options"].forEach((t=>{s[t]=(e,s)=>r(e,Object.assign({},s,{method:t}))})),s.request=r,s.API=(e,s)=>{const a={},o=!!t(e).length;return n.forEach((t=>{const n=t.toUpperCase();a[n]=()=>(...n)=>{let[a,c]=n;const i="get"===t?"query":"body";return r(e,Object.assign({},s,{method:t,params:o?a:void 0,[i]:o?c:a}))}})),a},s}export{c as createSoon};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soon-fetch",
-  "version": "0.0.2",
-  "description": "a lightweight request library based on fetch with TS prompt",
+  "version": "1.1.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",
@@ -25,17 +25,17 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.22.9",
-    "@babel/preset-env": "^7.22.9",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.4",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
-    "rollup": "^3.26.3",
+    "rollup": "^4.22.0",
     "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-dts": "^5.3.0",
+    "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-typescript": "^1.0.1",
-    "tslib": "^2.6.0",
-    "typescript": "^5.1.6"
+    "tslib": "^2.7.0",
+    "typescript": "^5.6.2"
   },
   "dependencies": {}
-}
+}