@superutils/fetch 1.5.1 → 1.5.3

package/dist/index.cjs

@@ -23,11 +23,11 @@ __export(index_exports, {
   ContentType: () => ContentType,
   FetchAs: () => FetchAs,
   FetchError: () => FetchError,
-  ResolveError: () => import_promise2.ResolveError,
-  ResolveIgnored: () => import_promise2.ResolveIgnored,
-  TIMEOUT_FALLBACK: () => import_promise2.TIMEOUT_FALLBACK,
-  TIMEOUT_MAX: () => import_promise2.TIMEOUT_MAX,
-  TimeoutPromise: () => import_promise2.TimeoutPromise,
+  ResolveError: () => import_promise5.ResolveError,
+  ResolveIgnored: () => import_promise5.ResolveIgnored,
+  TIMEOUT_FALLBACK: () => import_promise5.TIMEOUT_FALLBACK,
+  TIMEOUT_MAX: () => import_promise5.TIMEOUT_MAX,
+  TimeoutPromise: () => import_promise5.TimeoutPromise,
   createClient: () => createClient,
   createPostClient: () => createPostClient,
   default: () => index_default,
@@ -36,13 +36,14 @@ __export(index_exports, {
   mergeOptions: () => mergeOptions
 });
 module.exports = __toCommonJS(index_exports);
+var import_promise5 = require("@superutils/promise");
 
 // src/createClient.ts
-var import_promise4 = require("@superutils/promise");
+var import_promise3 = require("@superutils/promise");
 
 // src/fetch.ts
 var import_core4 = require("@superutils/core");
-var import_promise3 = require("@superutils/promise");
+var import_promise2 = require("@superutils/promise");
 
 // src/executeInterceptors.ts
 var import_core = require("@superutils/core");
@@ -199,14 +200,25 @@ var FetchError = class _FetchError extends Error {
   }
 };
 
-// src/types/index.ts
-var import_promise2 = require("@superutils/promise");
-
 // src/fetch.ts
 var fetch = (url, options = {}) => {
   var _a, _b, _c;
+  if (!(0, import_core4.isObj)(options)) options = {};
+  let fromPostClient = false;
+  if (options.fromPostClient) {
+    delete options.fromPostClient;
+    fromPostClient = true;
+  }
   let response;
-  const opts = mergeOptions_default(fetch.defaults, options);
+  const opts = mergeOptions_default(
+    {
+      abortOnEarlyFinalize: fetch.defaults.abortOnEarlyFinalize,
+      errMsgs: fetch.defaults.errMsgs,
+      timeout: import_promise2.TIMEOUT_MAX,
+      validateUrl: false
+    },
+    options
+  );
   opts.abortCtrl = opts.abortCtrl instanceof AbortController ? opts.abortCtrl : new AbortController();
   (_a = opts.as) != null ? _a : opts.as = "response" /* response */;
   (_b = opts.method) != null ? _b : opts.method = "get";
@@ -234,32 +246,35 @@ var fetch = (url, options = {}) => {
       response
     );
   };
-  return (0, import_promise3.timeout)(opts, async () => {
+  return (0, import_promise2.timeout)(opts, async () => {
     var _a2, _b2, _c2, _d, _e;
     try {
-      let contentType = headers.get("content-type");
-      if (!contentType) {
-        headers.set("content-type", ContentType.APPLICATION_JSON);
-        contentType = ContentType.APPLICATION_JSON;
-      }
+      opts.body = await (0, import_core4.fallbackIfFails)(
+        opts.body,
+        [],
+        (err) => Promise.reject(err)
+      );
       url = await executeInterceptors_default(
         url,
         abortCtrl.signal,
         (_a2 = opts.interceptors) == null ? void 0 : _a2.request,
         opts
       );
-      const { body, errMsgs, validateUrl = true } = opts;
+      const { body, errMsgs, validateUrl = false } = opts;
       (_b2 = opts.signal) != null ? _b2 : opts.signal = abortCtrl.signal;
       if (validateUrl && !(0, import_core4.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)
-        opts.body = JSON.stringify(
-          (0, import_core4.isFn)(body) ? (0, import_core4.fallbackIfFails)(body, [], void 0) : body
-        );
+      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) && (0, import_core4.isObj)(body, true) && contentType === ContentType.APPLICATION_JSON;
+        if (shouldStringifyBody) opts.body = JSON.stringify(opts.body);
+      }
       response = await getResponse_default(url, opts);
       response = await executeInterceptors_default(
         response,
@@ -325,8 +340,8 @@ fetch.defaults = {
     response: [],
     result: []
   },
-  timeout: 3e4,
-  validateUrl: true
+  timeout: 6e4,
+  validateUrl: false
 };
 var interceptErr = async (err, url, options, response) => {
   var _a, _b, _c;
@@ -352,6 +367,7 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   function client(url, options) {
     var _a;
     const mergedOptions = mergeOptions_default(
+      fetch_default.defaults,
       commonOptions,
       options,
       fixedOptions
@@ -365,6 +381,7 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
     const fetchCb = (...args) => {
       var _a, _b, _c;
       const mergedOptions = (_a = mergeOptions_default(
+        fetch_default.defaults,
         commonOptions,
         defaultOptions,
         defaultUrl === void 0 ? args[1] : args[0],
@@ -379,7 +396,7 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
         mergedOptions
       );
     };
-    return (0, import_promise4.deferredCallback)(fetchCb, {
+    return (0, import_promise3.deferredCallback)(fetchCb, {
       ...commonDeferOptions,
       ...deferOptions
     });
@@ -389,19 +406,21 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
 var createClient_default = createClient;
 
 // src/createPostClient.ts
-var import_promise5 = require("@superutils/promise");
+var import_promise4 = require("@superutils/promise");
 var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   function client(url, data, options) {
     var _a, _b;
     const mergedOptions = mergeOptions_default(
+      fetch_default.defaults,
       commonOptions,
       options,
       fixedOptions
       // fixed options will always override other options
     );
     (_a = mergedOptions.as) != null ? _a : mergedOptions.as = "json" /* json */;
-    mergedOptions.body = data;
+    mergedOptions.body = data != null ? data : mergedOptions.body;
     (_b = mergedOptions.method) != null ? _b : mergedOptions.method = "post";
+    mergedOptions.fromPostClient = true;
     return fetch_default(url, mergedOptions);
   }
   client.deferred = (deferOptions, defaultUrl, defaultData, defaultOptions) => {
@@ -411,6 +430,7 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
       if (defaultUrl !== void 0) args.splice(0, 0, defaultUrl);
       if (defaultData !== void 0) args.splice(1, 0, defaultData);
       const mergedOptions = (_a = mergeOptions_default(
+        fetch_default.defaults,
         commonOptions,
         defaultOptions,
         args[2],
@@ -422,9 +442,10 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
       _abortCtrl = new AbortController();
       mergedOptions.body = (_d = args[1]) != null ? _d : mergedOptions.body;
       (_e = mergedOptions.method) != null ? _e : mergedOptions.method = "post";
+      mergedOptions.fromPostClient = true;
       return fetch_default(args[0], mergedOptions);
     };
-    return (0, import_promise5.deferredCallback)(postCb, {
+    return (0, import_promise4.deferredCallback)(postCb, {
       ...commonDeferOptions,
       ...deferOptions
     });