@superutils/fetch 1.5.4 → 1.5.5

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   ResolveError,
   ResolveIgnored,
   TIMEOUT_FALLBACK,
-  TIMEOUT_MAX as TIMEOUT_MAX2,
+  TIMEOUT_MAX,
   TimeoutPromise
 } from "@superutils/promise";
 
@@ -19,7 +19,7 @@ import {
   isPromise,
   isUrlValid
 } from "@superutils/core";
-import { timeout as PromisE_timeout, TIMEOUT_MAX } from "@superutils/promise";
+import { timeout as PromisE_timeout } from "@superutils/promise";
 
 // src/executeInterceptors.ts
 import { fallbackIfFails, isFn } from "@superutils/core";
@@ -52,14 +52,14 @@ var getResponse = (url, options = {}) => {
     {
       ...options,
       retryIf: async (res, count, error) => {
-        var _a;
+        var _a, _b;
         const { abortCtrl, retryIf, signal } = options;
-        if ((abortCtrl == null ? void 0 : abortCtrl.signal.aborted) || (signal == null ? void 0 : signal.aborted)) return false;
-        return !!((_a = await fallbackIfFails2(
+        if (((_a = abortCtrl == null ? void 0 : abortCtrl.signal) == null ? void 0 : _a.aborted) || (signal == null ? void 0 : signal.aborted)) return false;
+        return !!((_b = await fallbackIfFails2(
           retryIf,
           [res, count, error],
           void 0
-        )) != null ? _a : !!error || !(res == null ? void 0 : res.ok));
+        )) != null ? _b : !!error || !(res == null ? void 0 : res.ok));
       }
     }
   ).catch(
@@ -177,22 +177,20 @@ var FetchError = class _FetchError extends Error {
 };
 
 // src/fetch.ts
+var defaultErrorMsgs = Object.freeze({
+  aborted: "Request aborted",
+  invalidUrl: "Invalid URL",
+  parseFailed: "Failed to parse response as",
+  timedout: "Request timed out",
+  requestFailed: "Request failed with status code:"
+});
 var fetch = (url, options = {}) => {
   var _a, _b, _c;
   if (!isObj2(options)) options = {};
-  let fromPostClient = false;
-  if (options.fromPostClient) {
-    delete options.fromPostClient;
-    fromPostClient = true;
-  }
   let response;
   const opts = mergeOptions_default(
-    {
-      abortOnEarlyFinalize: fetch.defaults.abortOnEarlyFinalize,
-      errMsgs: fetch.defaults.errMsgs,
-      timeout: TIMEOUT_MAX,
-      validateUrl: false
-    },
+    { errMsgs: defaultErrorMsgs },
+    fetch.defaults,
     options
   );
   opts.abortCtrl = opts.abortCtrl instanceof AbortController ? opts.abortCtrl : new AbortController();
@@ -201,11 +199,7 @@ var fetch = (url, options = {}) => {
   (_c = opts.signal) != null ? _c : opts.signal = opts.abortCtrl.signal;
   const { abortCtrl, as: parseAs, headers, onAbort, onTimeout } = opts;
   opts.onAbort = async () => {
-    var _a2, _b2, _c2, _d, _e, _f;
-    const err = (_f = (_e = (_c2 = await fallbackIfFails3(onAbort, [], void 0)) != null ? _c2 : (_b2 = (_a2 = opts.abortCtrl) == null ? void 0 : _a2.signal) == null ? void 0 : _b2.reason) != null ? _e : (_d = opts.signal) == null ? void 0 : _d.reason) != null ? _f : opts.errMsgs.aborted;
-    if (isError(err) && err.name === "AbortError") {
-      err.message = ["This operation was aborted"].includes(err.message) ? opts.errMsgs.aborted : err.message;
-    }
+    const err = await fallbackIfFails3(onAbort, [], void 0);
     return await interceptErr(
       isError(err) ? err : new Error(err),
       url,
@@ -223,7 +217,7 @@ var fetch = (url, options = {}) => {
     );
   };
   return PromisE_timeout(opts, async () => {
-    var _a2, _b2, _c2, _d, _e;
+    var _a2, _b2, _c2, _d;
     try {
       opts.body = await fallbackIfFails3(
         opts.body,
@@ -240,17 +234,10 @@ var fetch = (url, options = {}) => {
       (_b2 = opts.signal) != null ? _b2 : opts.signal = abortCtrl.signal;
       if (validateUrl && !isUrlValid(url, false))
         throw new Error(errMsgs.invalidUrl);
-      if (fromPostClient) {
-        let contentType = headers.get("content-type");
-        if (!contentType) {
-          headers.set("content-type", ContentType.APPLICATION_JSON);
-          contentType = ContentType.APPLICATION_JSON;
-        }
-        const shouldStringifyBody = ["delete", "patch", "post", "put"].includes(
-          `${opts.method}`.toLowerCase()
-        ) && !["undefined", "string"].includes(typeof body) && isObj2(body, true) && contentType === ContentType.APPLICATION_JSON;
-        if (shouldStringifyBody) opts.body = JSON.stringify(opts.body);
-      }
+      const stringify = ["delete", "patch", "post", "put"].includes(
+        `${opts.method}`.toLowerCase()
+      ) && !["undefined", "string"].includes(typeof body) && isObj2(body, true) && headers.get("content-type") === ContentType.APPLICATION_JSON;
+      if (stringify) opts.body = JSON.stringify(opts.body);
       response = await getResponse_default(url, opts);
       response = await executeInterceptors_default(
         response,
@@ -259,7 +246,7 @@ var fetch = (url, options = {}) => {
         url,
         opts
       );
-      const status = (_d = response == null ? void 0 : response.status) != null ? _d : 0;
+      const status = response == null ? void 0 : response.status;
       const isSuccess = status >= 200 && status < 300;
       if (!isSuccess) {
         const jsonError = await fallbackIfFails3(
@@ -287,7 +274,7 @@ var fetch = (url, options = {}) => {
       result = await executeInterceptors_default(
         result,
         abortCtrl.signal,
-        (_e = opts.interceptors) == null ? void 0 : _e.result,
+        (_d = opts.interceptors) == null ? void 0 : _d.result,
         url,
         opts
       );
@@ -301,13 +288,7 @@ var fetch = (url, options = {}) => {
 };
 fetch.defaults = {
   abortOnEarlyFinalize: true,
-  errMsgs: {
-    aborted: "Request aborted",
-    invalidUrl: "Invalid URL",
-    parseFailed: "Failed to parse response as",
-    timedout: "Request timed out",
-    requestFailed: "Request failed with status code:"
-  },
+  errMsgs: { ...defaultErrorMsgs },
   // all error messages must be defined here
   headers: new Headers(),
   interceptors: {
@@ -355,17 +336,17 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   client.deferred = (deferOptions, defaultUrl, defaultOptions) => {
     let _abortCtrl;
     const fetchCb = (...args) => {
-      var _a, _b, _c;
-      const mergedOptions = (_a = mergeOptions_default(
+      var _a, _b;
+      const mergedOptions = mergeOptions_default(
         fetch_default.defaults,
         commonOptions,
         defaultOptions,
         defaultUrl === void 0 ? args[1] : args[0],
         fixedOptions
         // fixed options will always override other options
-      )) != null ? _a : {};
-      (_b = mergedOptions.as) != null ? _b : mergedOptions.as = "json" /* json */;
-      (_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl);
+      );
+      (_a = mergedOptions.as) != null ? _a : mergedOptions.as = "json" /* json */;
+      (_b = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _b.call(_abortCtrl);
       _abortCtrl = new AbortController();
       return fetch_default(
         defaultUrl != null ? defaultUrl : args[0],
@@ -387,7 +368,6 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   function client(url, data, options) {
     var _a, _b;
     const mergedOptions = mergeOptions_default(
-      fetch_default.defaults,
       commonOptions,
       options,
       fixedOptions
@@ -396,29 +376,35 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
     (_a = mergedOptions.as) != null ? _a : mergedOptions.as = "json" /* json */;
     mergedOptions.body = data != null ? data : mergedOptions.body;
     (_b = mergedOptions.method) != null ? _b : mergedOptions.method = "post";
-    mergedOptions.fromPostClient = true;
+    const headers = mergedOptions.headers;
+    if (!headers.get("content-type")) {
+      headers.set("content-type", ContentType.APPLICATION_JSON);
+    }
     return fetch_default(url, mergedOptions);
   }
   client.deferred = (deferOptions, defaultUrl, defaultData, defaultOptions) => {
     let _abortCtrl;
     const postCb = (...args) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
       if (defaultUrl !== void 0) args.splice(0, 0, defaultUrl);
       if (defaultData !== void 0) args.splice(1, 0, defaultData);
-      const mergedOptions = (_a = mergeOptions_default(
+      const mergedOptions = mergeOptions_default(
         fetch_default.defaults,
         commonOptions,
         defaultOptions,
         args[2],
         fixedOptions
         // fixed options will always override other options
-      )) != null ? _a : {};
-      (_b = mergedOptions.as) != null ? _b : mergedOptions.as = "json" /* json */;
-      (_c = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _c.call(_abortCtrl);
+      );
+      (_a = mergedOptions.as) != null ? _a : mergedOptions.as = "json" /* json */;
+      (_b = _abortCtrl == null ? void 0 : _abortCtrl.abort) == null ? void 0 : _b.call(_abortCtrl);
       _abortCtrl = new AbortController();
-      mergedOptions.body = (_d = args[1]) != null ? _d : mergedOptions.body;
-      (_e = mergedOptions.method) != null ? _e : mergedOptions.method = "post";
-      mergedOptions.fromPostClient = true;
+      mergedOptions.body = (_c = args[1]) != null ? _c : mergedOptions.body;
+      (_d = mergedOptions.method) != null ? _d : mergedOptions.method = "post";
+      const headers = mergedOptions.headers;
+      if (!headers.get("content-type")) {
+        headers.set("content-type", ContentType.APPLICATION_JSON);
+      }
       return fetch_default(args[0], mergedOptions);
     };
     return deferredCallback2(postCb, {
@@ -463,7 +449,7 @@ export {
   ResolveError,
   ResolveIgnored,
   TIMEOUT_FALLBACK,
-  TIMEOUT_MAX2 as TIMEOUT_MAX,
+  TIMEOUT_MAX,
   TimeoutPromise,
   createClient,
   createPostClient,

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.6",
-		"@superutils/promise": "^1.3.4"
+		"@superutils/core": "^1.2.7",
+		"@superutils/promise": "^1.3.5"
 	},
 	"files": [
 		"dist",
@@ -53,6 +53,6 @@
 	"module": "./dist/index.js",
 	"type": "module",
 	"types": "./dist/index.d.ts",
-	"version": "1.5.4",
-	"gitHead": "3635cab194aaa64c633839fdaab5b243a07d0f66"
+	"version": "1.5.5",
+	"gitHead": "758f9934f4b137321d1b8f3def412622ddb71ea5"
 }