@superutils/fetch 1.2.1 → 1.2.3

package/dist/index.js

@@ -1,6 +1,9 @@
+// src/createClient.ts
+import PromisE3 from "@superutils/promise";
+
 // src/fetch.ts
 import {
-  fallbackIfFails as fallbackIfFails2,
+  fallbackIfFails as fallbackIfFails3,
   isFn as isFn2,
   isPositiveNumber,
   isPromise,
@@ -12,7 +15,7 @@ import PromisE2 from "@superutils/promise";
 import { fallbackIfFails, isFn } from "@superutils/core";
 var executeInterceptors = async (value, interceptors, ...args) => {
   var _a;
-  for (const interceptor of interceptors.filter(isFn)) {
+  for (const interceptor of [...interceptors != null ? interceptors : []].filter(isFn)) {
     value = (_a = await fallbackIfFails(
       interceptor,
       [value, ...args],
@@ -23,12 +26,31 @@ var executeInterceptors = async (value, interceptors, ...args) => {
 };
 var executeInterceptors_default = executeInterceptors;
 
+// src/getAbortCtrl.ts
+var getAbortCtrl = (options) => {
+  options != null ? options : options = {};
+  if (!(options.abortCtrl instanceof AbortController))
+    options.abortCtrl = new AbortController();
+  const { abortCtrl, signal } = options;
+  if (signal instanceof AbortSignal && !signal.aborted) {
+    const handleAbort = () => abortCtrl.abort();
+    signal.addEventListener("abort", handleAbort, { once: true });
+    abortCtrl.signal.addEventListener(
+      "abort",
+      () => signal.removeEventListener("abort", handleAbort),
+      { once: true }
+    );
+  }
+  return abortCtrl;
+};
+
 // src/getResponse.ts
+import { fallbackIfFails as fallbackIfFails2, isPositiveInteger } from "@superutils/core";
 import PromisE from "@superutils/promise";
-import { isPositiveInteger } from "@superutils/core";
-var getResponse = async (...[url, options = {}]) => {
+var getResponse = async (url, options = {}) => {
   const fetchFunc = globalThis.fetch;
-  if (!isPositiveInteger(options.retry)) return fetchFunc(url, options);
+  if (!isPositiveInteger(options.retry))
+    return fetchFunc(url, options);
   let attemptCount = 0;
   const response = PromisE.retry(
     () => {
@@ -37,9 +59,14 @@ var getResponse = async (...[url, options = {}]) => {
     },
     {
       ...options,
-      retryIf: async (res, count) => {
-        var _a;
-        return (res == null ? void 0 : res.ok) === false || await ((_a = options == null ? void 0 : options.retryIf) == null ? void 0 : _a.call(options, res, count)) === true;
+      retryIf: async (res, count, error) => {
+        var _a, _b;
+        const failed = !!error || !(res == null ? void 0 : res.ok);
+        return !!((_b = await fallbackIfFails2(
+          (_a = options == null ? void 0 : options.retryIf) != null ? _a : failed,
+          [res, count, error],
+          failed
+        )) != null ? _b : failed);
       }
     }
   ).catch(
@@ -54,21 +81,22 @@ var getResponse = async (...[url, options = {}]) => {
 var getResponse_default = getResponse;
 
 // src/mergeFetchOptions.ts
-import { isEmpty, objKeys } from "@superutils/core";
+import { isEmpty, isObj, objKeys } from "@superutils/core";
 var mergeFetchOptions = (...allOptions) => allOptions.reduce(
-  (o1, o2) => {
+  (merged, next) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-    const { errMsgs = {}, headers, interceptors: ints1 = {} } = o1;
-    const { errMsgs: msgs2 = {}, interceptors: ints2 = {} } = o2;
-    o2.headers && new Headers(o2.headers).forEach((value, key) => {
+    next = isObj(next) ? next : {};
+    const { errMsgs = {}, headers, interceptors: ints1 = {} } = merged;
+    const { errMsgs: msgs2 = {}, interceptors: ints2 = {} } = next;
+    next.headers && new Headers(next.headers).forEach((value, key) => {
       headers && headers.set(key, value);
     });
     for (const key of objKeys(msgs2)) {
       if (!isEmpty(msgs2[key])) errMsgs[key] = msgs2[key];
     }
     return {
-      ...o1,
-      ...o2,
+      ...merged,
+      ...next,
       errMsgs,
       headers,
       interceptors: {
@@ -86,18 +114,37 @@ var mergeFetchOptions = (...allOptions) => allOptions.reduce(
           ...(_h = ints2 == null ? void 0 : ints2.result) != null ? _h : []
         ]
       },
-      timeout: (_j = (_i = o2.timeout) != null ? _i : o1.timeout) != null ? _j : 0
+      timeout: (_j = (_i = next.timeout) != null ? _i : merged.timeout) != null ? _j : 0
     };
   },
   { headers: new Headers() }
 );
 var mergeFetchOptions_default = mergeFetchOptions;
+var mergePartialOptions = (...optionsAr) => {
+  optionsAr = optionsAr.filter((x) => !isEmpty(x));
+  return optionsAr.length <= 1 ? optionsAr[0] : mergeFetchOptions(...optionsAr);
+};
 
 // src/types.ts
 import {
   ResolveError,
   ResolveIgnored
 } from "@superutils/promise";
+var ContentType = {
+  APPLICATION_JAVASCRIPT: "application/javascript",
+  APPLICATION_JSON: "application/json",
+  APPLICATION_OCTET_STREAM: "application/octet-stream",
+  APPLICATION_PDF: "application/pdf",
+  APPLICATION_X_WWW_FORM_URLENCODED: "application/x-www-form-urlencoded",
+  APPLICATION_XML: "application/xml",
+  APPLICATION_ZIP: "application/zip",
+  AUDIO_MPEG: "audio/mpeg",
+  MULTIPART_FORM_DATA: "multipart/form-data",
+  TEXT_CSS: "text/css",
+  TEXT_HTML: "text/html",
+  TEXT_PLAIN: "text/plain",
+  VIDEO_MP4: "video/mp4"
+};
 var FetchAs = /* @__PURE__ */ ((FetchAs2) => {
   FetchAs2["arrayBuffer"] = "arrayBuffer";
   FetchAs2["blob"] = "blob";
@@ -126,44 +173,59 @@ var FetchError = class _FetchError extends Error {
 
 // src/fetch.ts
 var fetch = (url, options = {}) => {
-  let abortCtrl;
   let timeoutId;
+  const abortCtrl = getAbortCtrl(options);
   const promise = new PromisE2(async (resolve, reject) => {
-    var _a, _b, _c, _d;
-    const _options2 = mergeFetchOptions_default(fetch.defaults, options);
-    (_a = _options2.as) != null ? _a : _options2.as = "json" /* json */;
-    (_b = _options2.method) != null ? _b : _options2.method = "get";
-    const errorInterceptors = [..._options2.interceptors.error];
-    const requestInterceptors = [..._options2.interceptors.request];
-    const responseInterceptors = [..._options2.interceptors.response];
-    const resultInterceptors = [..._options2.interceptors.result];
-    url = await executeInterceptors_default(url, requestInterceptors, _options2);
-    const { as: parseAs, errMsgs, timeout } = _options2;
+    var _a, _b, _c;
+    let errResponse;
+    const _options = mergeFetchOptions_default(fetch.defaults, options);
+    (_a = _options.as) != null ? _a : _options.as = "json" /* json */;
+    (_b = _options.method) != null ? _b : _options.method = "get";
+    let contentType = _options.headers.get("content-type");
+    if (!contentType) {
+      _options.headers.set("content-type", ContentType.APPLICATION_JSON);
+      contentType = ContentType.APPLICATION_JSON;
+    }
+    url = await executeInterceptors_default(
+      url,
+      _options.interceptors.request,
+      _options
+    );
+    const {
+      as: parseAs,
+      body,
+      errMsgs,
+      timeout,
+      validateUrl = true
+    } = _options;
     if (isPositiveNumber(timeout)) {
-      (_c = _options2.abortCtrl) != null ? _c : _options2.abortCtrl = new AbortController();
-      timeoutId = setTimeout(() => {
-        var _a2;
-        return (_a2 = _options2.abortCtrl) == null ? void 0 : _a2.abort();
-      }, timeout);
+      timeoutId = setTimeout(() => abortCtrl.abort(), timeout);
     }
-    abortCtrl = _options2.abortCtrl;
-    if (_options2.abortCtrl) _options2.signal = _options2.abortCtrl.signal;
-    let errResponse;
+    if (_options.abortCtrl) _options.signal = _options.abortCtrl.signal;
     try {
-      if (!isUrlValid(url, false)) throw new Error(errMsgs.invalidUrl);
-      let response = await getResponse_default(url, _options2);
+      if (validateUrl && !isUrlValid(url, false))
+        throw new Error(errMsgs.invalidUrl);
+      const shouldStringifyBody = [
+        ContentType.APPLICATION_JSON,
+        ContentType.APPLICATION_X_WWW_FORM_URLENCODED
+      ].find((x) => contentType.includes(x)) && !["undefined", "string"].includes(typeof body);
+      if (shouldStringifyBody)
+        _options.body = JSON.stringify(
+          isFn2(body) ? fallbackIfFails3(body, [], void 0) : body
+        );
+      let response = await getResponse_default(url, _options);
       response = await executeInterceptors_default(
         response,
-        responseInterceptors,
+        _options.interceptors.response,
         url,
-        _options2
+        _options
       );
       errResponse = response;
       const { status = 0 } = response;
       const isSuccess = status >= 200 && status < 300;
       if (!isSuccess) {
         const fallbackMsg = `${errMsgs.requestFailed} ${status}`;
-        const jsonError = await fallbackIfFails2(
+        const jsonError = await fallbackIfFails3(
           // try to parse error response as json first
           () => response.json(),
           [],
@@ -189,31 +251,31 @@ var fetch = (url, options = {}) => {
       }
       result = await executeInterceptors_default(
         result,
-        resultInterceptors,
+        _options.interceptors.result,
         url,
-        _options2
+        _options
       );
       resolve(result);
     } catch (err) {
       const errX = err;
       const msg = (errX == null ? void 0 : errX.name) === "AbortError" ? errMsgs.reqTimedout : err == null ? void 0 : err.message;
       let error = new FetchError(msg, {
-        cause: (_d = errX == null ? void 0 : errX.cause) != null ? _d : err,
+        cause: (_c = errX == null ? void 0 : errX.cause) != null ? _c : err,
         response: errResponse,
-        options: _options2,
+        options: _options,
         url
       });
       error = await executeInterceptors_default(
         error,
-        errorInterceptors,
+        _options.interceptors.error,
         url,
-        _options2
+        _options
       );
       reject(error);
     }
     timeoutId && clearTimeout(timeoutId);
   });
-  promise.onEarlyFinalize.push(() => abortCtrl == null ? void 0 : abortCtrl.abort());
+  promise.onEarlyFinalize.push(() => abortCtrl.abort());
   return promise;
 };
 fetch.defaults = {
@@ -224,7 +286,7 @@ fetch.defaults = {
     requestFailed: "Request failed with status code:"
   },
   // all error messages must be defined here
-  headers: new Headers([["content-type", "application/json"]]),
+  headers: new Headers(),
   /** Global interceptors for fetch requests */
   interceptors: {
     /**
@@ -238,119 +300,122 @@ fetch.defaults = {
     result: []
   },
   /** Request timeout duration in milliseconds. Default: `0` */
-  timeout: 0
+  timeout: 0,
+  validateUrl: true
 };
 var fetch_default = fetch;
 
-// src/fetchDeferred.ts
-import PromisE3 from "@superutils/promise";
-function fetchDeferred(deferOptions = {}, defaultUrl, defaultOptions) {
-  let _abortCtrl;
-  const fetchCallback = (...args) => {
-    var _a, _b, _c;
-    let options = (_a = defaultUrl === void 0 ? args[1] : args[0]) != null ? _a : {};
-    if (defaultOptions) options = mergeFetchOptions_default(defaultOptions, options);
-    (_b = options.abortCtrl) != null ? _b : options.abortCtrl = new AbortController();
-    (_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl);
-    _abortCtrl = options.abortCtrl;
-    const promise = fetch_default(
-      defaultUrl != null ? defaultUrl : args[0],
-      options
+// src/createClient.ts
+var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
+  const func = (url, options) => {
+    return fetch_default(
+      url,
+      mergePartialOptions(
+        commonOptions,
+        options,
+        fixedOptions
+      )
     );
-    promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
-    return promise;
-  };
-  return PromisE3.deferredCallback(fetchCallback, deferOptions);
-}
-var fetchDeferred_default = fetchDeferred;
-
-// src/createFetchMethodFunc.ts
-var createFetchMethodFunc = (method = "get") => {
-  const methodFunc = (...args) => {
-    var _a;
-    (_a = args[1]) != null ? _a : args[1] = {};
-    args[1].method = method;
-    return fetch_default(...args);
   };
-  methodFunc.deferred = (...args) => {
-    var _a;
-    (_a = args[2]) != null ? _a : args[2] = {};
-    args[2].method = method;
-    return fetchDeferred_default(...args);
+  func.deferred = (deferOptions = {}, defaultUrl, defaultOptions) => {
+    let _abortCtrl;
+    const fetchCb = (...args) => {
+      var _a, _b;
+      const options = mergePartialOptions(
+        commonOptions,
+        defaultOptions,
+        defaultUrl === void 0 ? args[1] : args[0],
+        fixedOptions
+      );
+      ((_a = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _a.aborted) === false && ((_b = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _b.call(_abortCtrl));
+      _abortCtrl = getAbortCtrl(options);
+      const promise = fetch_default(
+        defaultUrl != null ? defaultUrl : args[0],
+        options
+      );
+      promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
+      return promise;
+    };
+    return PromisE3.deferredCallback(fetchCb, {
+      ...commonDeferOptions,
+      ...deferOptions
+    });
   };
-  return methodFunc;
+  return func;
 };
-var createFetchMethodFunc_default = createFetchMethodFunc;
+var createClient_default = createClient;
 
-// src/post.ts
-import { isFn as isFn3, isStr } from "@superutils/core";
-function post(...[url = "", data, options = {}]) {
-  var _a;
-  (_a = options.method) != null ? _a : options.method = "post";
-  return fetch_default(url, {
-    ...options,
-    body: isStr(data) ? data : JSON.stringify(isFn3(data) ? data() : data)
-  });
-}
-
-// src/postDeferred.ts
+// src/createPostClient.ts
 import PromisE4 from "@superutils/promise";
-function postDeferred(deferOptions = {}, defaultUrl, defaultData, defaultOptions) {
-  let _abortCtrl;
-  const doPost = (...args) => {
-    var _a, _b, _c;
-    if (defaultUrl !== void 0) args.splice(0, 0, defaultUrl);
-    if (defaultData !== void 0) args.splice(1, 0, defaultData);
-    const options = mergeFetchOptions_default(defaultOptions != null ? defaultOptions : {}, (_a = args[2]) != null ? _a : {});
-    (_b = options.abortCtrl) != null ? _b : options.abortCtrl = new AbortController();
-    (_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl);
-    _abortCtrl = options.abortCtrl;
-    const promise = post(
-      args[0],
-      args[1],
-      options
+var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
+  const client2 = (url, data, options) => {
+    var _a;
+    const _options = mergePartialOptions(
+      commonOptions,
+      options,
+      fixedOptions
     );
-    promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
-    return promise;
-  };
-  return PromisE4.deferredCallback(doPost, deferOptions);
-}
-var postDeferred_default = postDeferred;
-
-// src/createPostMethodFunc.ts
-var createPostMethodFunc = (method = "post") => {
-  const methodFunc = (url, data, options) => {
-    options != null ? options : options = {};
-    options.method = method;
-    return post(url, data, options);
+    _options.body = data;
+    (_a = _options.method) != null ? _a : _options.method = "post";
+    return fetch_default(url, _options);
   };
-  methodFunc.deferred = (...args) => {
-    var _a;
-    (_a = args[3]) != null ? _a : args[3] = {};
-    args[3].method = method;
-    return postDeferred_default(...args);
+  client2.deferred = (deferOptions = {}, defaultUrl, defaultData, defaultOptions) => {
+    let _abortCtrl;
+    const postCb = (...args) => {
+      var _a, _b, _c, _d;
+      if (defaultUrl !== void 0) args.splice(0, 0, defaultUrl);
+      if (defaultData !== void 0) args.splice(1, 0, defaultData);
+      const options = mergePartialOptions(
+        commonOptions,
+        defaultOptions,
+        args[2],
+        fixedOptions
+      );
+      ((_a = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _a.aborted) === false && ((_b = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _b.call(_abortCtrl));
+      _abortCtrl = getAbortCtrl(options);
+      options.body = (_c = args[1]) != null ? _c : options.body;
+      (_d = options.method) != null ? _d : options.method = "post";
+      const promise = fetch_default(args[0], options);
+      promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
+      return promise;
+    };
+    return PromisE4.deferredCallback(postCb, {
+      ...commonDeferOptions,
+      ...deferOptions
+    });
   };
-  return methodFunc;
+  return client2;
 };
-var createPostMethodFunc_default = createPostMethodFunc;
+var createPostClient_default = createPostClient;
+var client = createPostClient();
+client.deferred();
 
 // src/fetchResponse.ts
-var fetchResponse = (...args) => {
-  var _a, _b, _c;
-  (_a = args[1]) != null ? _a : args[1] = {};
-  (_c = (_b = args[1]).as) != null ? _c : _b.as = "response" /* response */;
-  return fetch_default(...args);
+var fetchResponse = (url, options) => {
+  var _a;
+  options != null ? options : options = {};
+  (_a = options.as) != null ? _a : options.as = "response" /* response */;
+  return fetch_default(url, options);
 };
 var fetchResponse_default = fetchResponse;
 
 // src/fetchDefault.ts
-var _get = createFetchMethodFunc_default("get");
-var _head = createFetchMethodFunc_default("head");
-var _options = createFetchMethodFunc_default("options");
-var _delete = createPostMethodFunc_default("delete");
-var _patch = createPostMethodFunc_default("patch");
-var _post = createPostMethodFunc_default("post");
-var _put = createPostMethodFunc_default("put");
+var methods = {
+  /** Make HTTP requests with method GET */
+  get: createClient_default({ method: "get" }),
+  /** Make HTTP requests with method HEAD */
+  head: createClient_default({ method: "head" }),
+  /** Make HTTP requests with method OPTIONS */
+  options: createClient_default({ method: "options" }),
+  /** Make HTTP requests with method DELETE */
+  delete: createPostClient_default({ method: "delete" }),
+  /** Make HTTP requests with method PATCH */
+  patch: createPostClient_default({ method: "patch" }),
+  /** Make HTTP requests with method POST */
+  post: createPostClient_default({ method: "post" }),
+  /** Make HTTP requests with method PUT */
+  put: createPostClient_default({ method: "put" })
+};
 var fetchDefault = fetchResponse_default;
 Object.defineProperty(fetchDefault, "defaults", {
   get() {
@@ -360,28 +425,32 @@ Object.defineProperty(fetchDefault, "defaults", {
     fetch_default.defaults = newDefaults;
   }
 });
-fetchDefault.delete = _delete;
-fetchDefault.get = _get;
-fetchDefault.head = _head;
-fetchDefault.options = _options;
-fetchDefault.patch = _patch;
-fetchDefault.post = _post;
-fetchDefault.put = _put;
+fetchDefault.delete = methods.delete;
+fetchDefault.get = methods.get;
+fetchDefault.head = methods.head;
+fetchDefault.options = methods.options;
+fetchDefault.patch = methods.patch;
+fetchDefault.post = methods.post;
+fetchDefault.put = methods.put;
 var fetchDefault_default = fetchDefault;
 
 // src/index.ts
 var index_default = fetchDefault_default;
+fetchDefault_default.get;
 export {
+  ContentType,
   FetchAs,
   FetchError,
   ResolveError,
   ResolveIgnored,
-  createFetchMethodFunc,
-  createPostMethodFunc,
+  createClient,
+  createPostClient,
   index_default as default,
+  executeInterceptors,
   fetch,
-  fetchDeferred,
   fetchResponse,
+  getAbortCtrl,
+  getResponse,
   mergeFetchOptions,
-  postDeferred
+  mergePartialOptions
 };

package/package.json

@@ -5,8 +5,8 @@
 	},
 	"description": "A lightweight `fetch` wrapper for browsers and Node.js, designed to simplify data fetching and reduce boilerplate.",
 	"dependencies": {
-		"@superutils/core": "^1.1.5",
-		"@superutils/promise": "^1.1.5"
+		"@superutils/core": "^1.1.6",
+		"@superutils/promise": "^1.1.6"
 	},
 	"files": [
 		"dist",
@@ -24,8 +24,8 @@
 	"main": "dist/index.js",
 	"name": "@superutils/fetch",
 	"peerDependencies": {
-		"@superutils/core": "^1.1.5",
-		"@superutils/promise": "^1.1.5"
+		"@superutils/core": "^1.1.6",
+		"@superutils/promise": "^1.1.6"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -45,5 +45,5 @@
 	"sideEffects": false,
 	"type": "module",
 	"types": "dist/index.d.ts",
-	"version": "1.2.1"
+	"version": "1.2.3"
 }