@superutils/fetch 1.1.6 → 1.1.8

package/dist/index.d.ts

@@ -274,7 +274,7 @@ type FetchRetryOptions = Omit<Partial<RetryOptions>, 'retry' | 'retryIf'> & {
 /**
  * Generic fetch interceptor type
  */
-type Interceptor<T, TArgs extends unknown[], TArgsCb extends unknown[] = [value: T, ...TArgs]> = (...args: TArgsCb) => ValueOrPromise<void> | ValueOrPromise<T>;
+type Interceptor<T, TArgs extends unknown[]> = (...args: [value: T, ...TArgs]) => ValueOrPromise<void> | ValueOrPromise<T>;
 type PostBody = Record<string, unknown> | BodyInit | null;
 type PostArgs<OmitMethod = false> = [
     url: string | URL,

package/dist/index.js

@@ -16,7 +16,7 @@ var executeInterceptors = async (value, interceptors, ...args) => {
   for (const interceptor of interceptors.filter(isFn)) {
     value = (_a = await fallbackIfFails(
       interceptor,
-      [value, args],
+      [value, ...args],
       void 0
     )) != null ? _a : value;
   }
@@ -28,27 +28,22 @@ var executeInterceptors_default = executeInterceptors;
 import PromisE from "@superutils/promise";
 import { isPositiveInteger } from "@superutils/core";
 var getResponse = async (...[url, options = {}]) => {
+  const fetchFunc = globalThis.fetch;
+  if (!isPositiveInteger(options.retry)) return fetchFunc(url, options);
   let attemptCount = 0;
-  const doFetch = async () => {
-    attemptCount++;
-    return globalThis.fetch(url, options).catch(
-      (err) => err.message === "Failed to fetch" ? (
-        // catch network errors to allow retries
-        new Response(null, {
-          status: 0,
-          statusText: "Network Error"
-        })
-      ) : Promise.reject(err)
-    );
-  };
-  if (!isPositiveInteger(options.retry)) return doFetch();
-  const response = PromisE.retry(doFetch, {
-    ...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;
+  const response = PromisE.retry(
+    () => {
+      attemptCount++;
+      return fetchFunc(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;
+      }
     }
-  }).catch(
+  ).catch(
     (err) => Promise.reject(
       new Error(`Request failed after attempt #${attemptCount}`, {
         cause: err
@@ -237,6 +232,7 @@ fetch.defaults = {
     response: [],
     result: []
   },
+  /** Request timeout duration in milliseconds. Default: `0` */
   timeout: 0
 };
 var fetch_default = fetch;
@@ -269,16 +265,12 @@ import PromisE4 from "@superutils/promise";
 // src/post.ts
 import { isFn as isFn3, isStr } from "@superutils/core";
 function post(...[url = "", data, options = {}]) {
-  return fetch_default(
-    url,
-    mergeFetchOptions_default(
-      {
-        method: "post",
-        body: isStr(data) ? data : JSON.stringify(isFn3(data) ? data() : 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

package/package.json

@@ -45,5 +45,5 @@
 	"sideEffects": false,
 	"type": "module",
 	"types": "dist/index.d.ts",
-	"version": "1.1.6"
+	"version": "1.1.8"
 }