kbfetch 0.0.8 → 0.0.12

package/dist/index.js

@@ -8,12 +8,12 @@ var help = {
     const fullQueryStr = [originalQueryStr, queryStr].filter(Boolean).join("&");
     return [pre, fullQueryStr].filter(Boolean).join("?");
   },
-  createTimeoutSignal: (timeout) => {
+  createTimeoutAbortController: (timeout) => {
     const abortController = new AbortController;
-    setTimeout(() => {
+    timeout && setTimeout(() => {
       abortController.abort();
     }, timeout);
-    return abortController.signal;
+    return abortController;
   },
   parseResBody: (res) => {
     const contentType = res.headers.get("content-type") || "";
@@ -36,20 +36,22 @@ var defaultKbFetch = {
   after: (res) => res.then((res2) => res2.data),
   parser: help_default.parseResBody,
   timeout: 0,
-  do: async function(url, init) {
+  do: function(url, init) {
     const _t = this;
     let { before = _t.before, ..._init } = init || {};
     _init = before(_init);
-    let { parser = _t.parser, after = _t.after, baseUrl = _t.baseUrl, timeout = _t.timeout, headers, ...requestInit } = _init;
-    timeout && Object.assign(requestInit, { signal: help_default.createTimeoutSignal(timeout) });
+    let { parser = _t.parser, after = _t.after, baseUrl = _t.baseUrl, timeout = _t.timeout, canAbort, headers, ...requestInit } = _init;
+    let abortController = null;
+    (timeout || canAbort) && (abortController = help_default.createTimeoutAbortController(timeout));
+    abortController && Object.assign(requestInit, { signal: abortController.signal });
     headers && Object.assign(requestInit, { headers: help_default.obj2header(headers) });
     if (!url.startsWith("http://") && !url.startsWith("https://"))
       url = baseUrl + url;
-    const response = fetch(url, requestInit).then(async (respnse) => {
-      respnse.data = await parser(respnse);
-      return respnse;
+    const response = fetch(url, requestInit).then(async (respnse) => Object.assign(respnse, { data: await parser(respnse) }));
+    const res = after(response);
+    return Object.assign(res, {
+      abort: () => abortController?.abort()
     });
-    return after(response);
   },
   get: function(url, params, init) {
     return this.do(help_default.synthesizeUrlWithParams(url, params), init);

package/dist/typings/help.d.ts

@@ -2,12 +2,13 @@ type Before = (init: KbFetchInit) => KbFetchInit;
 type Parser = (res: Response) => any;
 type After = <T = any>(res: Promise<Response & {
     data: T;
-}>) => any;
+}>) => Promise<T>;
 type _KbFetchInit = {
     before?: Before;
     parser?: Parser;
     after?: After;
     baseUrl?: string;
+    canAbort?: boolean;
     flags?: Record<string, any>;
 };
 export type KbFetchInit = Omit<RequestInit, 'timeout' | 'headers'> & {
@@ -16,7 +17,7 @@ export type KbFetchInit = Omit<RequestInit, 'timeout' | 'headers'> & {
 } & _KbFetchInit;
 declare const help: {
     synthesizeUrlWithParams: (url: string, params?: Record<string, any>) => string;
-    createTimeoutSignal: (timeout: number) => AbortSignal;
+    createTimeoutAbortController: (timeout: number) => AbortController;
     parseResBody: (res: Response) => Promise<any>;
     obj2header: (obj: Record<string, string>) => Headers;
 };

package/dist/typings/index.d.ts

@@ -1,106 +1,38 @@
 import { KbFetchInit } from './help';
-declare const defaultKbFetch: {
-    baseUrl: string;
-    before: (init: KbFetchInit) => KbFetchInit;
-    after: (res: Promise<Response & {
-        data: any;
-    }>) => any;
-    parser: (res: Response) => Promise<any>;
-    timeout: number;
-    do: <T = any>(url: string, init?: KbFetchInit) => Promise<any>;
-    get: <T_1 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_1>;
-    g: <T_2 = any>(url: string, init?: Omit<RequestInit, "timeout" | "headers"> & {
-        timeout?: number;
-        headers?: Record<string, string>;
-    } & {
-        before?: (init: KbFetchInit) => KbFetchInit;
-        parser?: (res: Response) => any;
-        after?: <T_3 = any>(res: Promise<Response & {
-            data: T_3;
-        }>) => any;
-        baseUrl?: string;
-        flags?: Record<string, any>;
-    } & {
-        params?: Record<string, any>;
-    }) => Promise<T_2>;
-    post: <T_4 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_4>;
+type Res<T> = Promise<T> & {
+    abort: () => void;
 };
-export declare const createKbFetch: (config: Partial<typeof defaultKbFetch>) => {
+interface DefaultKbFetch {
     baseUrl: string;
     before: (init: KbFetchInit) => KbFetchInit;
-    after: (res: Promise<Response & {
-        data: any;
-    }>) => any;
+    after: <T = any>(res: Promise<Response & {
+        data: T;
+    }>) => Promise<T>;
     parser: (res: Response) => Promise<any>;
     timeout: number;
-    do: <T = any>(url: string, init?: KbFetchInit) => Promise<any>;
-    get: <T_1 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_1>;
-    g: <T_2 = any>(url: string, init?: Omit<RequestInit, "timeout" | "headers"> & {
-        timeout?: number;
-        headers?: Record<string, string>;
-    } & {
-        before?: (init: KbFetchInit) => KbFetchInit;
-        parser?: (res: Response) => any;
-        after?: <T_3 = any>(res: Promise<Response & {
-            data: T_3;
-        }>) => any;
-        baseUrl?: string;
-        flags?: Record<string, any>;
-    } & {
+    do: <T>(url: string, init?: KbFetchInit) => Res<T>;
+    get: <T = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Res<T>;
+    g: <T = any>(url: string, init?: KbFetchInit & {
         params?: Record<string, any>;
-    }) => Promise<T_2>;
-    post: <T_4 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_4>;
-};
-declare const kbFetch: {
+    }) => Res<T>;
+    post: <T = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Res<T>;
+}
+declare const defaultKbFetch: DefaultKbFetch;
+export declare const createKbFetch: (config: Partial<typeof defaultKbFetch>) => {
     baseUrl: string;
     before: (init: KbFetchInit) => KbFetchInit;
-    after: (res: Promise<Response & {
-        data: any;
-    }>) => any;
+    after: <T = any>(res: Promise<Response & {
+        data: T;
+    }>) => Promise<T>;
     parser: (res: Response) => Promise<any>;
     timeout: number;
-    do: <T = any>(url: string, init?: KbFetchInit) => Promise<any>;
-    get: <T_1 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_1>;
-    g: <T_2 = any>(url: string, init?: Omit<RequestInit, "timeout" | "headers"> & {
-        timeout?: number;
-        headers?: Record<string, string>;
-    } & {
-        before?: (init: KbFetchInit) => KbFetchInit;
-        parser?: (res: Response) => any;
-        after?: <T_3 = any>(res: Promise<Response & {
-            data: T_3;
-        }>) => any;
-        baseUrl?: string;
-        flags?: Record<string, any>;
-    } & {
+    do: <T_1>(url: string, init?: KbFetchInit) => Res<T_1>;
+    get: <T_2 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Res<T_2>;
+    g: <T_3 = any>(url: string, init?: KbFetchInit & {
         params?: Record<string, any>;
-    }) => Promise<T_2>;
-    post: <T_4 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_4>;
+    }) => Res<T_3>;
+    post: <T_4 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Res<T_4>;
 };
+declare const kbFetch: DefaultKbFetch;
 export default kbFetch;
-export declare const afetch: {
-    baseUrl: string;
-    before: (init: KbFetchInit) => KbFetchInit;
-    after: (res: Promise<Response & {
-        data: any;
-    }>) => any;
-    parser: (res: Response) => Promise<any>;
-    timeout: number;
-    do: <T = any>(url: string, init?: KbFetchInit) => Promise<any>;
-    get: <T_1 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_1>;
-    g: <T_2 = any>(url: string, init?: Omit<RequestInit, "timeout" | "headers"> & {
-        timeout?: number;
-        headers?: Record<string, string>;
-    } & {
-        before?: (init: KbFetchInit) => KbFetchInit;
-        parser?: (res: Response) => any;
-        after?: <T_3 = any>(res: Promise<Response & {
-            data: T_3;
-        }>) => any;
-        baseUrl?: string;
-        flags?: Record<string, any>;
-    } & {
-        params?: Record<string, any>;
-    }) => Promise<T_2>;
-    post: <T_4 = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) => Promise<T_4>;
-};
+export declare const afetch: DefaultKbFetch;

package/package.json

@@ -3,7 +3,7 @@
     "main": "./dist/index.js",
     "module": "./dist/index.js",
     "type": "module",
-    "version": "0.0.8",
+    "version": "0.0.12",
     "license": "MIT",
     "types": "./dist/typings/index.d.ts",
     "files": [