@superutils/fetch 1.3.0 → 1.4.1

package/README.md

@@ -12,9 +12,9 @@ For full API reference check out the [docs page](https://alien45.github.io/super
 
 ## Table of Contents
 
-- Features
-- Installation
-- Usage
+- [Features](#features)
+- [Installation](#installation)
+- [Usage](#usage)
     - [`fetch()`](#fetch): drop-in replacement for built-in `fetch()`
     - [`PromisE Features`](#promise-features): status, early finalization etc
     - [`Method Specific Functions`](#methods)

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _superutils_promise from '@superutils/promise';
-import { RetryOptions, RetryIfFunc, DeferredAsyncOptions, IPromisE_Timeout } from '@superutils/promise';
+import { RetryOptions, RetryIfFunc, TimeoutOptions, DeferredAsyncOptions, IPromisE_Timeout } from '@superutils/promise';
 export { DeferredAsyncOptions, ResolveError, ResolveIgnored } from '@superutils/promise';
 import { ValueOrPromise } from '@superutils/core';
 
@@ -258,18 +258,16 @@ type FetchCustomOptions = {
      *
      * Default: `globalThis.fetch`
      */
-    fetchFunc?: (...args: FetchArgs) => Promise<Response>;
+    fetchFunc?: FetchFunc;
     errMsgs?: FetchErrMsgs;
     /**
      * Interceptor/transformer callback executed at different stages of the request.
      * See {@link FetchInterceptors} for more details.
      */
     interceptors?: FetchInterceptors;
-    /** Request timeout in milliseconds */
-    timeout?: number;
     /** Whether to validate URL before making the request. Default: `true` */
     validateUrl?: boolean;
-} & FetchRetryOptions;
+} & FetchRetryOptions & TimeoutOptions<[]>;
 /** Default args */
 type FetchDeferredArgs<OmitMethod extends boolean = false> = [
     url?: string | URL,
@@ -287,6 +285,7 @@ type FetchErrMsgs = {
     /** Error message to be used when request fails */
     requestFailed?: string;
 };
+type FetchFunc = (...args: FetchArgs) => Promise<Response>;
 /**
  * Fetch request options
  */
@@ -461,13 +460,17 @@ declare class FetchError extends Error {
  * 	.then(console.log, console.warn)
  * ```
  */
-declare const createClient: <FixedOpts extends FetchOptions | undefined, CommonOpts extends ExcludeOptions<FixedOpts> | undefined, FixedAs extends FetchAs | undefined = FetchAsFromOptions<FixedOpts, undefined>>(
+declare const createClient: <FixedOpts extends FetchOptions | undefined, CommonOpts extends ExcludeOptions<FixedOpts> | undefined, FixedAs extends FetchAs | undefined = FetchAsFromOptions<FixedOpts, undefined>, CommonDelay extends number = number>(
 /** Mandatory fetch options that cannot be overriden by individual request */
 fixedOptions?: FixedOpts, 
 /** Common fetch options that can be overriden by individual request */
-commonOptions?: FetchOptions & CommonOpts, commonDeferOptions?: DeferredAsyncOptions<unknown, unknown>) => {
-    <T, TOptions extends ExcludeOptions<FixedOpts> | undefined = ExcludeOptions<FixedOpts> | undefined, TAs extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions, FetchAsFromOptions<CommonOpts>>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions): _superutils_promise.IPromisE_Timeout<TReturn>;
-    deferred<ThisArg = unknown, Delay extends number = number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ExcludeOptions<FixedOpts> | undefined = ExcludeOptions<FixedOpts> | undefined>(deferOptions?: DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl, defaultOptions?: DefaultOptions): <TResult = unknown, TOptions_1 extends ExcludeOptions<FixedOpts> | undefined = ExcludeOptions<FixedOpts> | undefined, TAs_1 extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions_1, FetchAsFromOptions<CommonOpts>>, TReturn_1 = FetchResult<TResult>[TAs_1]>(...args: DefaultUrl extends undefined ? [url: FetchArgs[0], options?: TOptions_1] : [options?: TOptions_1]) => _superutils_promise.IPromisE_Timeout<TReturn_1>;
+commonOptions?: FetchOptions & CommonOpts, commonDeferOptions?: DeferredAsyncOptions<unknown, CommonDelay>) => {
+    <T = unknown, TOptions extends ExcludeOptions<FixedOpts> | undefined = ExcludeOptions<FixedOpts> | undefined, TAs extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions, FetchAsFromOptions<CommonOpts>>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+        abortCtrl: AbortController;
+    };
+    deferred<ThisArg, Delay extends CommonDelay | number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ExcludeOptions<FixedOpts> | undefined = ExcludeOptions<FixedOpts> | undefined>(deferOptions?: DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl, defaultOptions?: DefaultOptions): <TResult = unknown, TOptions_1 extends ExcludeOptions<FixedOpts> | undefined = ExcludeOptions<FixedOpts> | undefined, TAs_1 extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions_1, FetchAsFromOptions<CommonOpts>>, TReturn_1 = FetchResult<TResult>[TAs_1]>(...args: DefaultUrl extends undefined ? [url: FetchArgs[0], options?: TOptions_1] : [options?: TOptions_1]) => Omit<_superutils_promise.IPromisE_Timeout<TReturn_1>, "abortCtrl"> & {
+        abortCtrl: AbortController;
+    };
 };
 
 /**
@@ -516,13 +519,17 @@ commonOptions?: FetchOptions & CommonOpts, commonDeferOptions?: DeferredAsyncOpt
  * updateProduct({ title: 'New title 2' }) // executed
  * ```
  */
-declare const createPostClient: <FixedOpts extends PostOptions | undefined, CommonOpts extends ExcludePostOptions<FixedOpts> | undefined, FixedAs extends FetchAs | undefined = FetchAsFromOptions<FixedOpts, undefined>>(
+declare const createPostClient: <FixedOpts extends PostOptions | undefined, CommonOpts extends ExcludePostOptions<FixedOpts> | undefined, FixedAs extends FetchAs | undefined = FetchAsFromOptions<FixedOpts, undefined>, CommonDelay extends number = number>(
 /** Mandatory fetch options that cannot be overriden by individual request */
 fixedOptions?: FixedOpts, 
 /** Common fetch options that can be overriden by individual request */
-commonOptions?: PostOptions & CommonOpts, commonDeferOptions?: DeferredAsyncOptions<unknown, unknown>) => {
-    <T = unknown, TOptions extends ExcludePostOptions<FixedOpts> | undefined = ExcludePostOptions<FixedOpts> | undefined, TAs extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions, FetchAsFromOptions<CommonOpts>>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions): IPromisE_Timeout<TReturn>;
-    deferred<ThisArg, Delay extends number, DefaultUrl extends PostArgs[0] | undefined, DefaultData extends PostArgs[1] = undefined, DefaultOptions extends ExcludePostOptions<FixedOpts> | undefined = undefined>(deferOptions?: DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl, defaultData?: DefaultData, defaultOptions?: DefaultOptions): <TResult = unknown, TOptions_1 extends ExcludePostOptions<FixedOpts> | undefined = ExcludePostOptions<FixedOpts>, TAs_1 extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions_1, FetchAsFromOptions<CommonOpts>>, TReturn_1 = FetchResult<TResult>[TAs_1]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions_1>) => IPromisE_Timeout<TReturn_1>;
+commonOptions?: PostOptions & CommonOpts, commonDeferOptions?: DeferredAsyncOptions<unknown, CommonDelay>) => {
+    <T = unknown, TOptions extends ExcludePostOptions<FixedOpts> | undefined = ExcludePostOptions<FixedOpts> | undefined, TAs extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions, FetchAsFromOptions<CommonOpts>>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+        abortCtrl: AbortController;
+    };
+    deferred<ThisArg, Delay extends CommonDelay | number, DefaultOptions extends ExcludePostOptions<FixedOpts> | undefined = ExcludePostOptions<FixedOpts> | undefined, DefaultUrl extends PostArgs[0] | undefined = string | URL | undefined, DefaultData extends PostArgs[1] = PostBody | (() => PostBody) | undefined>(deferOptions?: DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl, defaultData?: DefaultData, defaultOptions?: DefaultOptions): <TResult = unknown, TOptions_1 extends ExcludePostOptions<FixedOpts> | undefined = ExcludePostOptions<FixedOpts> | undefined, TAs_1 extends FetchAs = FixedAs extends FetchAs ? FixedAs : FetchAsFromOptions<TOptions_1, FetchAsFromOptions<CommonOpts>>, TReturn_1 = FetchResult<TResult>[TAs_1]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions_1>) => Omit<_superutils_promise.IPromisE_Timeout<TReturn_1>, "abortCtrl"> & {
+        abortCtrl: AbortController;
+    };
 };
 
 /** Node.js setTimeout limit is 2147483647 (2^31-1). Larger values fire immediately. */
@@ -546,7 +553,10 @@ declare const MAX_TIMEOUT = 2147483647;
  * ```
  */
 declare const fetch: {
-    <T, TOptions extends FetchOptions = FetchOptions, TAs extends FetchAs = TOptions["as"] extends FetchAs ? TOptions["as"] : FetchAs.json, TReturn = FetchResult<T>[TAs]>(url: string | URL, options?: FetchOptions & TOptions): IPromisE_Timeout<TReturn>;
+    <T, TOptions extends FetchOptions = FetchOptions, TAs extends FetchAs = TOptions["as"] extends FetchAs ? TOptions["as"] : FetchAs.json, TReturn = FetchResult<T>[TAs]>(url: string | URL, options?: FetchOptions & TOptions): Omit<IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+        /** An `AbortController` instance to control the request.  */
+        abortCtrl: AbortController;
+    };
     /** Default fetch options */
     defaults: FetchOptionsDefault;
 };
@@ -567,19 +577,23 @@ declare const fetch: {
  * ```
  */
 declare const fetchResponse: {
-    <T = Response, TOptions extends FetchOptions = FetchOptions, TAs extends FetchAs = TOptions["as"] extends FetchAs ? TOptions["as"] : FetchAs.response, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: Parameters<typeof fetch<T, TOptions, TAs, TReturn>>[1]): IPromisE_Timeout<TReturn>;
+    <T = Response, TOptions extends FetchOptions = FetchOptions, TAs extends FetchAs = TOptions["as"] extends FetchAs ? TOptions["as"] : FetchAs.response, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: Parameters<typeof fetch<T, TOptions, TAs, TReturn>>[1]): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+        abortCtrl: AbortController;
+    };
     defaults: FetchOptionsDefault;
 };
 
 declare const methods: {
     /** Make HTTP requests with method GET */
     get: {
-        <T, TOptions extends ({
+        <T = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg = unknown, Delay extends number = number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ({
+        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
@@ -587,16 +601,20 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: DefaultUrl extends undefined ? [url: string | URL, options?: TOptions | undefined] : [options?: TOptions | undefined]) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: DefaultUrl extends undefined ? [url: string | URL, options?: TOptions | undefined] : [options?: TOptions | undefined]) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
     /** Make HTTP requests with method HEAD */
     head: {
-        <T, TOptions extends ({
+        <T = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg = unknown, Delay extends number = number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ({
+        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
@@ -604,16 +622,20 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: DefaultUrl extends undefined ? [url: string | URL, options?: TOptions | undefined] : [options?: TOptions | undefined]) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: DefaultUrl extends undefined ? [url: string | URL, options?: TOptions | undefined] : [options?: TOptions | undefined]) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
     /** Make HTTP requests with method OPTIONS */
     options: {
-        <T, TOptions extends ({
+        <T = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg = unknown, Delay extends number = number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ({
+        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: FetchArgs[0], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultUrl extends FetchArgs[0] | undefined = string | URL | undefined, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
@@ -621,7 +643,9 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: DefaultUrl extends undefined ? [url: string | URL, options?: TOptions | undefined] : [options?: TOptions | undefined]) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<FetchOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: DefaultUrl extends undefined ? [url: string | URL, options?: TOptions | undefined] : [options?: TOptions | undefined]) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
     /** Make HTTP requests with method DELETE */
     delete: {
@@ -629,14 +653,20 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg, Delay extends number, DefaultUrl extends PostArgs[0] | undefined, DefaultData extends PostArgs[1] = undefined, DefaultOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = {
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, DefaultUrl extends PostArgs[0] | undefined = string | URL | undefined, DefaultData extends PostArgs[1] = PostBody | (() => PostBody) | undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
+            headers?: HeadersInit | undefined;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
     /** Make HTTP requests with method PATCH */
     patch: {
@@ -644,14 +674,20 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg, Delay extends number, DefaultUrl extends PostArgs[0] | undefined, DefaultData extends PostArgs[1] = undefined, DefaultOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = {
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, DefaultUrl extends PostArgs[0] | undefined = string | URL | undefined, DefaultData extends PostArgs[1] = PostBody | (() => PostBody) | undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
+            headers?: HeadersInit | undefined;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
     /** Make HTTP requests with method POST */
     post: {
@@ -659,14 +695,20 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg, Delay extends number, DefaultUrl extends PostArgs[0] | undefined, DefaultData extends PostArgs[1] = undefined, DefaultOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = {
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, DefaultUrl extends PostArgs[0] | undefined = string | URL | undefined, DefaultData extends PostArgs[1] = PostBody | (() => PostBody) | undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
+            headers?: HeadersInit | undefined;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
     /** Make HTTP requests with method PUT */
     put: {
@@ -674,14 +716,20 @@ declare const methods: {
             headers?: HeadersInit | undefined;
         } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): _superutils_promise.IPromisE_Timeout<TReturn>;
-        deferred<ThisArg, Delay extends number, DefaultUrl extends PostArgs[0] | undefined, DefaultData extends PostArgs[1] = undefined, DefaultOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<T>[TAs]>(url: PostArgs[0], data?: PostArgs[1], options?: TOptions | undefined): Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
+        deferred<ThisArg, Delay extends number, DefaultOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = {
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, DefaultUrl extends PostArgs[0] | undefined = string | URL | undefined, DefaultData extends PostArgs[1] = PostBody | (() => PostBody) | undefined>(deferOptions?: _superutils_promise.DeferredAsyncOptions<ThisArg, Delay>, defaultUrl?: DefaultUrl | undefined, defaultData?: DefaultData | undefined, defaultOptions?: DefaultOptions | undefined): <TResult = unknown, TOptions extends ({
             headers?: HeadersInit | undefined;
-        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => _superutils_promise.IPromisE_Timeout<TReturn>;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined = ({
+            headers?: HeadersInit | undefined;
+        } & Omit<PostOptions, "headers" | "method"> & Partial<Record<"method", never>>) | undefined, TAs extends FetchAs = FetchAsFromOptions<TOptions, FetchAs.json>, TReturn = FetchResult<TResult>[TAs]>(...args: PostDeferredCbArgs<DefaultUrl, DefaultData, TOptions, [url: string | URL, data: PostBody | (() => PostBody), options: PostOptions]>) => Omit<_superutils_promise.IPromisE_Timeout<TReturn>, "abortCtrl"> & {
+            abortCtrl: AbortController;
+        };
     };
 };
 /**
@@ -828,21 +876,15 @@ declare const defaultFetch: typeof fetchResponse & typeof methods;
 declare const executeInterceptors: <T, TArgs extends unknown[]>(value: T, signal?: AbortSignal, interceptors?: Interceptor<T, TArgs>[], ...args: TArgs) => Promise<T>;
 
 /**
- * Add AbortController to options if not present and propagate external abort signal if provided.
- *
- * @param options The fetch options object.
+ * Executes the built-in `fetch()` (or a custom `fetchFunc` if provided) with support for automatic retries.
  *
- * @returns The AbortController instance associated with the options.
- */
-declare const getAbortCtrl: (options: Partial<FetchOptions>) => AbortController;
-
-/**
- * Execute built-in `fetch()` and retry if request fails and `options.retry > 0`.
+ * If `options.retry` is greater than 0, the request will be retried if it fails or if the response is not OK,
+ * unless overridden by `options.retryIf`.
  *
- * @param url request URL
- * @param options (optional)
+ * @param url The request URL.
+ * @param options (optional) Fetch options, including retry settings.
  *
- * @returns response
+ * @returns A promise resolving to the Response.
  */
 declare const getResponse: (url: FetchArgs[0], options?: FetchArgs[1]) => Promise<Response>;
 
@@ -864,4 +906,4 @@ declare const mergeFetchOptions: (...allOptions: FetchOptions[]) => FetchOptions
 /** Merges partial fetch options ignoring empty or undefined. Otherwise, will return the first argument. */
 declare const mergePartialOptions: (...optionsAr: (Partial<FetchOptions> | undefined)[]) => Partial<FetchOptions> | undefined;
 
-export { ContentType, type ExcludeOptions, type ExcludePostOptions, type FetchArgs, type FetchArgsInterceptor, FetchAs, type FetchAsFromOptions, type FetchCustomOptions, type FetchDeferredArgs, type FetchErrMsgs, FetchError, type FetchInterceptorError, type FetchInterceptorRequest, type FetchInterceptorResponse, type FetchInterceptorResult, type FetchInterceptors, type FetchOptions, type FetchOptionsDefault, type FetchOptionsInterceptor, type FetchResult, type FetchRetryOptions, type Interceptor, MAX_TIMEOUT, type PostArgs, type PostBody, type PostDeferredCbArgs, type PostOptions, createClient, createPostClient, defaultFetch as default, executeInterceptors, fetch, fetchResponse, getAbortCtrl, getResponse, mergeFetchOptions, mergePartialOptions };
+export { ContentType, type ExcludeOptions, type ExcludePostOptions, type FetchArgs, type FetchArgsInterceptor, FetchAs, type FetchAsFromOptions, type FetchCustomOptions, type FetchDeferredArgs, type FetchErrMsgs, FetchError, type FetchFunc, type FetchInterceptorError, type FetchInterceptorRequest, type FetchInterceptorResponse, type FetchInterceptorResult, type FetchInterceptors, type FetchOptions, type FetchOptionsDefault, type FetchOptionsInterceptor, type FetchResult, type FetchRetryOptions, type Interceptor, MAX_TIMEOUT, type PostArgs, type PostBody, type PostDeferredCbArgs, type PostOptions, createClient, createPostClient, defaultFetch as default, executeInterceptors, fetch, fetchResponse, getResponse, mergeFetchOptions, mergePartialOptions };

package/dist/index.js

@@ -4,8 +4,8 @@ import { deferredCallback } from "@superutils/promise";
 // src/fetch.ts
 import {
   fallbackIfFails as fallbackIfFails3,
+  isError,
   isFn as isFn2,
-  isPositiveNumber,
   isPromise,
   isUrlValid
 } from "@superutils/core";
@@ -29,31 +29,13 @@ var executeInterceptors = async (value, signal, 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 { retry } from "@superutils/promise";
-var getResponse = async (url, options = {}) => {
-  const { abortCtrl, fetchFunc = globalThis.fetch } = options;
-  if (!isPositiveInteger(options.retry))
-    return fetchFunc(url, options);
+var getResponse = (url, options = {}) => {
+  var _a;
+  const fetchFunc = (_a = options.fetchFunc) != null ? _a : globalThis.fetch;
+  if (!isPositiveInteger(options.retry)) return fetchFunc(url, options);
   let attemptCount = 0;
   const response = retry(
     () => {
@@ -63,14 +45,14 @@ var getResponse = async (url, options = {}) => {
     {
       ...options,
       retryIf: async (res, count, error) => {
-        var _a, _b;
-        if (abortCtrl == null ? void 0 : abortCtrl.signal.aborted) return false;
-        const failed = !!error || !(res == null ? void 0 : res.ok);
-        return !!((_b = await fallbackIfFails2(
-          (_a = options == null ? void 0 : options.retryIf) != null ? _a : failed,
+        var _a2;
+        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(
+          retryIf,
           [res, count, error],
-          failed
-        )) != null ? _b : failed);
+          void 0
+        )) != null ? _a2 : !!error || !(res == null ? void 0 : res.ok));
       }
     }
   ).catch(
@@ -201,70 +183,69 @@ import {
 var MAX_TIMEOUT = 2147483647;
 var fetch = (url, options = {}) => {
   var _a, _b, _c;
-  let errResponse;
-  const _options = mergeFetchOptions_default(fetch.defaults, options);
-  _options.abortCtrl = getAbortCtrl(_options);
-  (_a = _options.as) != null ? _a : _options.as = "json" /* json */;
-  (_b = _options.method) != null ? _b : _options.method = "get";
-  (_c = _options.signal) != null ? _c : _options.signal = _options.abortCtrl.signal;
-  _options.timeout = Math.min(
-    isPositiveNumber(_options.timeout) ? _options.timeout : fetch.defaults.timeout,
-    MAX_TIMEOUT
-  );
-  const { abortCtrl, as: parseAs, headers, timeout } = _options;
-  let contentType = headers.get("content-type");
-  if (!contentType) {
-    headers.set("content-type", ContentType.APPLICATION_JSON);
-    contentType = ContentType.APPLICATION_JSON;
-  }
-  const processErr = (err) => {
-    var _a2, _b2, _c2, _d, _e;
-    let msg = (_a2 = err == null ? void 0 : err.message) != null ? _a2 : err;
-    if ((err == null ? void 0 : err.name) === "AbortError") msg = (_c2 = (_b2 = _options.errMsgs) == null ? void 0 : _b2.aborted) != null ? _c2 : msg;
-    return executeInterceptors_default(
-      new FetchError(msg, {
-        cause: (_d = err == null ? void 0 : err.cause) != null ? _d : err,
-        response: errResponse,
-        options: _options,
-        url
-      }),
-      void 0,
-      // should execute regardless of abort status
-      (_e = _options.interceptors) == null ? void 0 : _e.error,
+  let response;
+  const opts = mergeFetchOptions_default(fetch.defaults, options);
+  opts.abortCtrl = opts.abortCtrl instanceof AbortController ? opts.abortCtrl : new AbortController();
+  (_a = opts.as) != null ? _a : opts.as = "json" /* json */;
+  (_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;
+  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;
+    }
+    return await interceptErr(
+      isError(err) ? err : new Error(err),
+      url,
+      opts,
+      response
+    );
+  };
+  opts.onTimeout = async () => {
+    const err = await fallbackIfFails3(onTimeout, [], void 0);
+    return await interceptErr(
+      err != null ? err : new Error(opts.errMsgs.timedout),
       url,
-      _options
-    ).then((err2) => Promise.reject(err2));
+      opts,
+      response
+    );
   };
-  const start = async () => {
+  return PromisE_timeout(opts, async () => {
     var _a2, _b2, _c2, _d;
     try {
+      let contentType = headers.get("content-type");
+      if (!contentType) {
+        headers.set("content-type", ContentType.APPLICATION_JSON);
+        contentType = ContentType.APPLICATION_JSON;
+      }
       url = await executeInterceptors_default(
         url,
         abortCtrl.signal,
-        (_a2 = _options.interceptors) == null ? void 0 : _a2.request,
-        _options
+        (_a2 = opts.interceptors) == null ? void 0 : _a2.request,
+        opts
       );
-      const { body, errMsgs, validateUrl = true } = _options;
-      (_b2 = _options.signal) != null ? _b2 : _options.signal = abortCtrl.signal;
+      const { body, errMsgs, validateUrl = true } = opts;
+      (_b2 = opts.signal) != null ? _b2 : opts.signal = abortCtrl.signal;
       if (validateUrl && !isUrlValid(url, false))
-        return processErr(new Error(errMsgs.invalidUrl));
+        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(
+        opts.body = JSON.stringify(
           isFn2(body) ? fallbackIfFails3(body, [], void 0) : body
         );
-      let response = await getResponse_default(url, _options);
+      response = await getResponse_default(url, opts);
       response = await executeInterceptors_default(
         response,
         abortCtrl.signal,
-        (_c2 = _options.interceptors) == null ? void 0 : _c2.response,
+        (_c2 = opts.interceptors) == null ? void 0 : _c2.response,
         url,
-        _options
+        opts
       );
-      errResponse = response;
       const { status = 0 } = response;
       const isSuccess = status >= 200 && status < 300;
       if (!isSuccess) {
@@ -293,28 +274,20 @@ var fetch = (url, options = {}) => {
       result = await executeInterceptors_default(
         result,
         abortCtrl.signal,
-        (_d = _options.interceptors) == null ? void 0 : _d.result,
+        (_d = opts.interceptors) == null ? void 0 : _d.result,
         url,
-        _options
+        opts
       );
       return result;
     } catch (_err) {
-      return processErr(_err);
+      let err = _err;
+      err = await interceptErr(_err, url, opts, response);
+      return Promise.reject(err);
     }
-  };
-  return PromisE_timeout(
-    {
-      ...options,
-      abortCtrl,
-      onAbort: () => processErr(new Error(_options.errMsgs.aborted)),
-      onTimeout: async () => processErr(new Error(_options.errMsgs.timedout)),
-      signal: _options.signal,
-      timeout
-    },
-    start
-  );
+  });
 };
 fetch.defaults = {
+  abortOnEarlyFinalize: true,
   errMsgs: {
     aborted: "Request aborted",
     invalidUrl: "Invalid URL",
@@ -333,6 +306,23 @@ fetch.defaults = {
   timeout: 3e4,
   validateUrl: true
 };
+var interceptErr = async (err, url, options, response) => {
+  var _a, _b, _c;
+  const fErr = await executeInterceptors_default(
+    new FetchError((_a = err == null ? void 0 : err.message) != null ? _a : err, {
+      cause: (_b = err == null ? void 0 : err.cause) != null ? _b : err,
+      response,
+      options,
+      url
+    }),
+    void 0,
+    // should execute regardless of abort status
+    (_c = options.interceptors) == null ? void 0 : _c.error,
+    url,
+    options
+  );
+  return fErr;
+};
 var fetch_default = fetch;
 
 // src/createClient.ts
@@ -350,20 +340,19 @@ var createClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   func.deferred = (deferOptions = {}, defaultUrl, defaultOptions) => {
     let _abortCtrl;
     const fetchCb = (...args) => {
-      var _a, _b;
-      const options = mergePartialOptions(
+      var _a, _b, _c;
+      const options = (_a = 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);
+      )) != 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));
+      _abortCtrl = new AbortController();
       const promise = fetch_default(
         defaultUrl != null ? defaultUrl : args[0],
         options
       );
-      promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
       return promise;
     };
     return deferredCallback(fetchCb, {
@@ -392,21 +381,20 @@ var createPostClient = (fixedOptions, commonOptions, commonDeferOptions) => {
   client.deferred = (deferOptions = {}, defaultUrl, defaultData, defaultOptions) => {
     let _abortCtrl;
     const postCb = (...args) => {
-      var _a, _b, _c, _d;
+      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 = mergePartialOptions(
+      const options = (_a = 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";
+      )) != 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));
+      _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);
-      promise.onEarlyFinalize.push(() => _abortCtrl == null ? void 0 : _abortCtrl.abort());
       return promise;
     };
     return deferredCallback2(postCb, {
@@ -478,7 +466,6 @@ export {
   executeInterceptors,
   fetch,
   fetchResponse,
-  getAbortCtrl,
   getResponse,
   mergeFetchOptions,
   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.8",
-		"@superutils/promise": "^1.2.0"
+		"@superutils/core": "^1.2.1",
+		"@superutils/promise": "^1.2.1"
 	},
 	"files": [
 		"dist",
@@ -25,7 +25,7 @@
 	"name": "@superutils/fetch",
 	"peerDependencies": {
 		"@superutils/core": "^1.2.0",
-		"@superutils/promise": "^1.1.7"
+		"@superutils/promise": "^1.2.0"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -45,5 +45,6 @@
 	"sideEffects": false,
 	"type": "module",
 	"types": "dist/index.d.ts",
-	"version": "1.3.0"
+	"version": "1.4.1",
+	"gitHead": "a26f4b1bb701d99d4cb71443e18680ee3ea52974"
 }