@superutils/fetch 1.4.1 → 1.5.0

package/dist/index.js

@@ -5,20 +5,18 @@ import { deferredCallback } from "@superutils/promise";
 import {
   fallbackIfFails as fallbackIfFails3,
   isError,
-  isFn as isFn2,
+  isFn as isFn4,
   isPromise,
   isUrlValid
 } from "@superutils/core";
-import {
-  timeout as PromisE_timeout
-} from "@superutils/promise";
+import { timeout as PromisE_timeout } from "@superutils/promise";
 
 // src/executeInterceptors.ts
 import { fallbackIfFails, isFn } from "@superutils/core";
 var executeInterceptors = async (value, signal, interceptors, ...args) => {
   var _a;
   for (const interceptor of [...interceptors != null ? interceptors : []].filter(isFn)) {
-    if (signal == null ? void 0 : signal.aborted) return value;
+    if (signal == null ? void 0 : signal.aborted) break;
     value = (_a = await fallbackIfFails(
       interceptor,
       [value, ...args],
@@ -30,11 +28,10 @@ var executeInterceptors = async (value, signal, interceptors, ...args) => {
 var executeInterceptors_default = executeInterceptors;
 
 // src/getResponse.ts
-import { fallbackIfFails as fallbackIfFails2, isPositiveInteger } from "@superutils/core";
+import { fallbackIfFails as fallbackIfFails2, isFn as isFn2, isPositiveInteger } from "@superutils/core";
 import { retry } from "@superutils/promise";
 var getResponse = (url, options = {}) => {
-  var _a;
-  const fetchFunc = (_a = options.fetchFunc) != null ? _a : globalThis.fetch;
+  const fetchFunc = isFn2(options.fetchFunc) ? options.fetchFunc : globalThis.fetch;
   if (!isPositiveInteger(options.retry)) return fetchFunc(url, options);
   let attemptCount = 0;
   const response = retry(
@@ -45,14 +42,14 @@ var getResponse = (url, options = {}) => {
     {
       ...options,
       retryIf: async (res, count, error) => {
-        var _a2;
+        var _a;
         const { abortCtrl, retryIf, signal } = options;
         if ((abortCtrl == null ? void 0 : abortCtrl.signal.aborted) || (signal == null ? void 0 : signal.aborted)) return false;
-        return !!((_a2 = await fallbackIfFails2(
+        return !!((_a = await fallbackIfFails2(
           retryIf,
           [res, count, error],
           void 0
-        )) != null ? _a2 : !!error || !(res == null ? void 0 : res.ok));
+        )) != null ? _a : !!error || !(res == null ? void 0 : res.ok));
       }
     }
   ).catch(
@@ -66,50 +63,46 @@ var getResponse = (url, options = {}) => {
 };
 var getResponse_default = getResponse;
 
-// src/mergeFetchOptions.ts
-import { isEmpty, isObj, objKeys } from "@superutils/core";
-var mergeFetchOptions = (...allOptions) => allOptions.reduce(
-  (merged, next) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-    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];
-    }
+// src/mergeOptions.ts
+import { isArr, isFn as isFn3, isObj, objCopy } from "@superutils/core";
+var mergeOptions = (...allOptions) => allOptions.reduce(
+  (merged, options) => {
+    var _a;
+    options = isObj(options) ? options : {};
+    const { headers, interceptors: ints1 = {} } = merged;
+    const { interceptors: ints2 = {} } = options;
+    options.headers && new Headers(options.headers).forEach(
+      (value, key) => headers.set(key, value)
+    );
     return {
       ...merged,
-      ...next,
-      errMsgs,
+      ...options,
+      errMsgs: objCopy(
+        options.errMsgs,
+        merged.errMsgs,
+        [],
+        "empty"
+      ),
       headers,
       interceptors: {
-        error: [...(_a = ints1 == null ? void 0 : ints1.error) != null ? _a : [], ...(_b = ints2 == null ? void 0 : ints2.error) != null ? _b : []],
+        error: [...toArr(ints1 == null ? void 0 : ints1.error), ...toArr(ints2 == null ? void 0 : ints2.error)],
         request: [
-          ...(_c = ints1 == null ? void 0 : ints1.request) != null ? _c : [],
-          ...(_d = ints2 == null ? void 0 : ints2.request) != null ? _d : []
+          ...toArr(ints1 == null ? void 0 : ints1.request),
+          ...toArr(ints2 == null ? void 0 : ints2.request)
         ],
         response: [
-          ...(_e = ints1 == null ? void 0 : ints1.response) != null ? _e : [],
-          ...(_f = ints2 == null ? void 0 : ints2.response) != null ? _f : []
+          ...toArr(ints1 == null ? void 0 : ints1.response),
+          ...toArr(ints2 == null ? void 0 : ints2.response)
         ],
-        result: [
-          ...(_g = ints1 == null ? void 0 : ints1.result) != null ? _g : [],
-          ...(_h = ints2 == null ? void 0 : ints2.result) != null ? _h : []
-        ]
+        result: [...toArr(ints1 == null ? void 0 : ints1.result), ...toArr(ints2 == null ? void 0 : ints2.result)]
       },
-      timeout: (_i = next.timeout) != null ? _i : merged.timeout
+      timeout: (_a = options.timeout) != null ? _a : merged.timeout
     };
   },
   { headers: new Headers() }
 );
-var mergeFetchOptions_default = mergeFetchOptions;
-var mergePartialOptions = (...optionsAr) => {
-  optionsAr = optionsAr.filter((x) => !isEmpty(x));
-  return optionsAr.length <= 1 ? optionsAr[0] : mergeFetchOptions(...optionsAr);
-};
+var mergeOptions_default = mergeOptions;
+var toArr = (x) => isArr(x) ? x : isFn3(x) ? [x] : [];
 
 // src/types/constants.ts
 var ContentType = {
@@ -173,20 +166,22 @@ var FetchError = class _FetchError extends Error {
   }
 };
 
-// src/types/options.ts
+// src/types/index.ts
 import {
   ResolveError,
-  ResolveIgnored
+  ResolveIgnored,
+  TIMEOUT_FALLBACK,
+  TIMEOUT_MAX,
+  TimeoutPromise
 } from "@superutils/promise";
 
 // src/fetch.ts
-var MAX_TIMEOUT = 2147483647;
 var fetch = (url, options = {}) => {
   var _a, _b, _c;
   let response;
-  const opts = mergeFetchOptions_default(fetch.defaults, options);
+  const opts = mergeOptions_default(fetch.defaults, options);
   opts.abortCtrl = opts.abortCtrl instanceof AbortController ? opts.abortCtrl : new AbortController();
-  (_a = opts.as) != null ? _a : opts.as = "json" /* json */;
+  (_a = opts.as) != null ? _a : opts.as = "response" /* response */;
   (_b = opts.method) != null ? _b : opts.method = "get";
   (_c = opts.signal) != null ? _c : opts.signal = opts.abortCtrl.signal;
   const { abortCtrl, as: parseAs, headers, onAbort, onTimeout } = opts;
@@ -213,7 +208,7 @@ var fetch = (url, options = {}) => {
     );
   };
   return PromisE_timeout(opts, async () => {
-    var _a2, _b2, _c2, _d;
+    var _a2, _b2, _c2, _d, _e;
     try {
       let contentType = headers.get("content-type");
       if (!contentType) {
@@ -236,7 +231,7 @@ var fetch = (url, options = {}) => {
       ].find((x) => contentType.includes(x)) && !["undefined", "string"].includes(typeof body);
       if (shouldStringifyBody)
         opts.body = JSON.stringify(
-          isFn2(body) ? fallbackIfFails3(body, [], void 0) : body
+          isFn4(body) ? fallbackIfFails3(body, [], void 0) : body
         );
       response = await getResponse_default(url, opts);
       response = await executeInterceptors_default(
@@ -246,7 +241,7 @@ var fetch = (url, options = {}) => {
         url,
         opts
       );
-      const { status = 0 } = response;
+      const status = (_d = response == null ? void 0 : response.status) != null ? _d : 0;
       const isSuccess = status >= 200 && status < 300;
       if (!isSuccess) {
         const jsonError = await fallbackIfFails3(
@@ -261,7 +256,7 @@ var fetch = (url, options = {}) => {
         );
       }
       const parseFunc = response[parseAs];
-      let result = !isFn2(parseFunc) ? response : parseFunc.bind(response)();
+      let result = !isFn4(parseFunc) ? response : parseFunc.bind(response)();
       if (isPromise(result))
         result = await result.catch(
           (err) => Promise.reject(
@@ -274,7 +269,7 @@ var fetch = (url, options = {}) => {
       result = await executeInterceptors_default(
         result,
         abortCtrl.signal,
-        (_d = opts.interceptors) == null ? void 0 : _d.result,
+        (_e = opts.interceptors) == null ? void 0 : _e.result,
         url,
         opts
       );
@@ -327,75 +322,80 @@ var fetch_default = fetch;
 
 // src/createClient.ts
 var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
-  const func = (url, options) => {
-    return fetch_default(
-      url,
-      mergePartialOptions(
-        commonOptions,
-        options,
-        fixedOptions
-      )
+  function client(url, options) {
+    var _a;
+    const mergedOptions = mergeOptions_default(
+      commonOptions,
+      options,
+      fixedOptions
+      // fixed options will always override other options
     );
-  };
-  func.deferred = (deferOptions = {}, defaultUrl, defaultOptions) => {
+    (_a = mergedOptions.as) != null ? _a : mergedOptions.as = "json" /* json */;
+    return fetch_default(url, mergedOptions);
+  }
+  client.deferred = (deferOptions, defaultUrl, defaultOptions) => {
     let _abortCtrl;
     const fetchCb = (...args) => {
       var _a, _b, _c;
-      const options = (_a = mergePartialOptions(
+      const mergedOptions = (_a = mergeOptions_default(
         commonOptions,
         defaultOptions,
         defaultUrl === void 0 ? args[1] : args[0],
         fixedOptions
+        // fixed options will always override other options
       )) != null ? _a : {};
-      ((_b = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _b.aborted) === false && ((_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl));
+      (_b = mergedOptions.as) != null ? _b : mergedOptions.as = "json" /* json */;
+      (_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl);
       _abortCtrl = new AbortController();
-      const promise = fetch_default(
+      return fetch_default(
         defaultUrl != null ? defaultUrl : args[0],
-        options
+        mergedOptions
       );
-      return promise;
     };
     return deferredCallback(fetchCb, {
       ...commonDeferOptions,
       ...deferOptions
     });
   };
-  return func;
+  return client;
 };
 var createClient_default = createClient;
 
 // src/createPostClient.ts
 import { deferredCallback as deferredCallback2 } from "@superutils/promise";
 var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
-  const client = (url, data, options) => {
-    var _a;
-    const _options = mergePartialOptions(
+  function client(url, data, options) {
+    var _a, _b;
+    const mergedOptions = mergeOptions_default(
       commonOptions,
       options,
       fixedOptions
+      // fixed options will always override other options
     );
-    _options.body = data;
-    (_a = _options.method) != null ? _a : _options.method = "post";
-    return fetch_default(url, _options);
-  };
-  client.deferred = (deferOptions = {}, defaultUrl, defaultData, defaultOptions) => {
+    (_a = mergedOptions.as) != null ? _a : mergedOptions.as = "json" /* json */;
+    mergedOptions.body = data;
+    (_b = mergedOptions.method) != null ? _b : mergedOptions.method = "post";
+    return fetch_default(url, mergedOptions);
+  }
+  client.deferred = (deferOptions, defaultUrl, defaultData, defaultOptions) => {
     let _abortCtrl;
     const postCb = (...args) => {
       var _a, _b, _c, _d, _e;
       if (defaultUrl !== void 0) args.splice(0, 0, defaultUrl);
       if (defaultData !== void 0) args.splice(1, 0, defaultData);
-      const options = (_a = mergePartialOptions(
+      const mergedOptions = (_a = mergeOptions_default(
         commonOptions,
         defaultOptions,
         args[2],
         fixedOptions
+        // fixed options will always override other options
       )) != null ? _a : {};
-      ((_b = _abortCtrl == null ? void 0 : _abortCtrl.signal) == null ? void 0 : _b.aborted) === false && ((_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl));
+      (_b = mergedOptions.as) != null ? _b : mergedOptions.as = "json" /* json */;
+      (_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl);
       _abortCtrl = new AbortController();
-      options.body = (_d = args[1]) != null ? _d : options.body;
-      (_e = options.method) != null ? _e : options.method = "post";
-      const promise = fetch_default(args[0], options);
-      return promise;
+      mergedOptions.body = (_d = args[1]) != null ? _d : mergedOptions.body;
+      (_e = mergedOptions.method) != null ? _e : mergedOptions.method = "post";
+      return fetch_default(args[0], mergedOptions);
     };
     return deferredCallback2(postCb, {
       ...commonDeferOptions,
@@ -406,25 +406,7 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
 };
 var createPostClient_default = createPostClient;
 
-// src/fetchResponse.ts
-var fetchResponse = (url, options) => {
-  var _a;
-  options != null ? options : options = {};
-  (_a = options.as) != null ? _a : options.as = "response" /* response */;
-  return fetch_default(url, options);
-};
-fetchResponse.defaults = fetch_default.defaults;
-Object.defineProperty(fetchResponse, "defaults", {
-  get() {
-    return fetch_default.defaults;
-  },
-  set(newDefaults) {
-    fetch_default.defaults = newDefaults;
-  }
-});
-var fetchResponse_default = fetchResponse;
-
-// src/defaultFetch.ts
+// src/index.ts
 var methods = {
   /** Make HTTP requests with method GET */
   get: createClient_default({ method: "get" }),
@@ -441,32 +423,28 @@ var methods = {
   /** Make HTTP requests with method PUT */
   put: createPostClient_default({ method: "put" })
 };
-var defaultFetch = fetchResponse_default;
-defaultFetch.delete = methods.delete;
-defaultFetch.get = methods.get;
-defaultFetch.head = methods.head;
-defaultFetch.options = methods.options;
-defaultFetch.patch = methods.patch;
-defaultFetch.post = methods.post;
-defaultFetch.put = methods.put;
-var defaultFetch_default = defaultFetch;
-
-// src/index.ts
-var index_default = defaultFetch_default;
+var fetch2 = fetch_default;
+fetch2.delete = methods.delete;
+fetch2.get = methods.get;
+fetch2.head = methods.head;
+fetch2.options = methods.options;
+fetch2.patch = methods.patch;
+fetch2.post = methods.post;
+fetch2.put = methods.put;
+var index_default = fetch2;
 export {
   ContentType,
   FetchAs,
   FetchError,
-  MAX_TIMEOUT,
   ResolveError,
   ResolveIgnored,
+  TIMEOUT_FALLBACK,
+  TIMEOUT_MAX,
+  TimeoutPromise,
   createClient,
   createPostClient,
   index_default as default,
   executeInterceptors,
-  fetch,
-  fetchResponse,
-  getResponse,
-  mergeFetchOptions,
-  mergePartialOptions
+  fetch2 as fetch,
+  mergeOptions
 };

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.2.1",
-		"@superutils/promise": "^1.2.1"
+		"@superutils/core": "^1.2.2",
+		"@superutils/promise": "^1.3.0"
 	},
 	"files": [
 		"dist",
@@ -21,7 +21,6 @@
 		"typescript"
 	],
 	"license": "MIT",
-	"main": "dist/index.js",
 	"name": "@superutils/fetch",
 	"peerDependencies": {
 		"@superutils/core": "^1.2.0",
@@ -37,14 +36,23 @@
 	"scripts": {
 		"_build": "tsc -p tsconfig.json",
 		"_watch": "tsc -p tsconfig.json --watch",
-		"build": "tsup src/index.ts --format esm --dts --clean --config ../../tsup.config.js",
+		"build": "tsup --config ../../tsup.config.js",
 		"dev": "npm run build -- --watch",
 		"start": "npm run build -- --watch",
 		"test": "cd ../../ && npm run test fetch"
 	},
 	"sideEffects": false,
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"import": "./dist/index.js",
+			"require": "./dist/index.cjs"
+		}
+	},
+	"main": "./dist/index.cjs",
+	"module": "./dist/index.js",
 	"type": "module",
-	"types": "dist/index.d.ts",
-	"version": "1.4.1",
-	"gitHead": "a26f4b1bb701d99d4cb71443e18680ee3ea52974"
+	"types": "./dist/index.d.ts",
+	"version": "1.5.0",
+	"gitHead": "382c9c3b6be8e7aad67ef7f89a0b43a4c6c2fb90"
 }