@zayne-labs/callapi 1.10.0 → 1.10.1

package/README.md

@@ -11,8 +11,8 @@
    <!-- <a href="https://deno.bundlejs.com/badge?q=@zayne-labs/callapi,@zayne-labs/callapi&treeshake=%5B*%5D,%5B%7B+createFetchClient+%7D%5D&config=%7B%22compression%22:%7B%22type%22:%22brotli%22,%22quality%22:11%7D%7D"><img src="https://deno.bundlejs.com/badge?q=@zayne-labs/callapi,@zayne-labs/callapi&treeshake=%5B*%5D,%5B%7B+createFetchClient+%7D%5D&config=%7B%22compression%22:%7B%22type%22:%22brotli%22,%22quality%22:11%7D%7D" alt="bundle size"></a> -->
    <a href="https://www.npmjs.com/package/@zayne-labs/callapi"><img src="https://img.shields.io/npm/v/@zayne-labs/callapi?style=flat&color=EFBA5F" alt="npm version"></a>
    <a href="https://github.com/zayne-labs/callapi/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/@zayne-labs/callapi?style=flat&color=EFBA5F" alt="license"></a>
-   <a href="https://github.com/zayne-labs/callapi/graphs/commit-activity"><img src="https://img.shields.io/github/commit-activity/m/zayne-labs/callapi?style=flat&color=EFBA5F" alt="commit activity"></a>
    <a href="https://www.npmjs.com/package/@zayne-labs/callapi"><img src="https://img.shields.io/npm/dm/@zayne-labs/callapi?style=flat&color=EFBA5F" alt="downloads per month"></a>
+   <a href="https://github.com/zayne-labs/callapi/graphs/commit-activity"><img src="https://img.shields.io/github/commit-activity/m/zayne-labs/callapi?style=flat&color=EFBA5F" alt="commit activity"></a>
  <a href="https://deepwiki.com/zayne-labs/callapi"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
    <a href="https://code2tutorial.com/tutorial/02b6c57c-4847-4e76-b91e-d64dde370609/index.md"><img src="https://img.shields.io/badge/Code2Tutorial-blue?color=blue&logo=victoriametrics" alt="Code2Tutorial"></a>
  </p>

package/dist/esm/{common-DzOcclPA.d.ts → common-CO8LGZIl.d.ts}

@@ -58,7 +58,7 @@ type CustomAuth = {
   prefix: PossibleAuthValueOrGetter;
   value: PossibleAuthValueOrGetter;
 };
-type Auth = BearerOrTokenAuth | BasicAuth | CustomAuth;
+type Auth = PossibleAuthValueOrGetter | BearerOrTokenAuth | BasicAuth | CustomAuth;
 //#endregion
 //#region src/constants/common.d.ts
 declare const fetchSpecificKeys: (keyof RequestInit | "duplex")[];
@@ -170,8 +170,7 @@ type HTTPErrorDetails<TErrorData> = Pick<CallApiExtraOptions, "defaultHTTPErrorM
 };
 declare class HTTPError<TErrorData = Record<string, unknown>> extends Error {
   errorData: HTTPErrorDetails<TErrorData>["errorData"];
-  httpErrorSymbol: symbol;
-  isHTTPError: boolean;
+  readonly httpErrorSymbol: symbol;
   name: "HTTPError";
   response: HTTPErrorDetails<TErrorData>["response"];
   constructor(errorDetails: HTTPErrorDetails<TErrorData>, errorOptions?: ErrorOptions);
@@ -188,14 +187,14 @@ type ValidationErrorDetails = {
 };
 declare class ValidationError extends Error {
   errorData: ValidationErrorDetails["issues"];
-  name: string;
+  name: "ValidationError";
   response: ValidationErrorDetails["response"];
-  validationErrorSymbol: symbol;
+  readonly validationErrorSymbol: symbol;
   constructor(details: ValidationErrorDetails, errorOptions?: ErrorOptions);
   /**
-   * @description Checks if the given error is an instance of HTTPError
+   * @description Checks if the given error is an instance of ValidationError
    * @param error - The error to check
-   * @returns true if the error is an instance of HTTPError, false otherwise
+   * @returns true if the error is an instance of ValidationError, false otherwise
    */
   static isError(error: unknown): error is ValidationError;
 }
@@ -321,7 +320,8 @@ interface URLOptions {
 }
 //#endregion
 //#region src/validation.d.ts
-type InferSchemaResult<TSchema, TFallbackResult = unknown> = undefined extends TSchema ? TFallbackResult : TSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TSchema> : TSchema extends AnyFunction<infer TResult> ? Awaited<TResult> : TFallbackResult;
+type InferSchemaOutputResult<TSchema, TFallbackResult = unknown> = undefined extends TSchema ? TFallbackResult : TSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TSchema> : TSchema extends AnyFunction<infer TResult> ? Awaited<TResult> : TFallbackResult;
+type InferSchemaInputResult<TSchema, TFallbackResult = unknown> = undefined extends TSchema ? TFallbackResult : TSchema extends StandardSchemaV1 ? StandardSchemaV1.InferInput<TSchema> : TSchema extends AnyFunction<infer TResult> ? Awaited<TResult> : TFallbackResult;
 interface CallApiSchemaConfig {
   /**
    * The base url of the schema. By default it's the baseURL of the callApi instance.
@@ -1130,7 +1130,7 @@ interface RetryOptions<TErrorData> {
 /**
  * @description Makes a type partial if the output type of TSchema is not provided or has undefined in the union, otherwise makes it required
  */
-type MakeSchemaOptionRequiredIfDefined<TSchemaOption extends CallApiSchema[keyof CallApiSchema], TObject> = undefined extends InferSchemaResult<TSchemaOption, undefined> ? TObject : Required<TObject>;
+type MakeSchemaOptionRequiredIfDefined<TSchemaOption extends CallApiSchema[keyof CallApiSchema], TObject> = undefined extends InferSchemaInputResult<TSchemaOption, undefined> ? TObject : Required<TObject>;
 type ApplyURLBasedConfig<TSchemaConfig extends CallApiSchemaConfig, TSchemaRouteKeys extends string> = TSchemaConfig["prefix"] extends string ? `${TSchemaConfig["prefix"]}${TSchemaRouteKeys}` : TSchemaConfig["baseURL"] extends string ? `${TSchemaConfig["baseURL"]}${TSchemaRouteKeys}` : TSchemaRouteKeys;
 type ApplyStrictConfig<TSchemaConfig extends CallApiSchemaConfig, TSchemaRouteKeys extends string> = TSchemaConfig["strict"] extends true ? TSchemaRouteKeys :
 // eslint-disable-next-line perfectionist/sort-union-types -- Don't sort union types
@@ -1148,7 +1148,7 @@ type InferBodyOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequiredIf
   /**
    * Body of the request, can be a object or any other supported body type.
    */
-  body?: InferSchemaResult<TSchema["body"], Body>;
+  body?: InferSchemaInputResult<TSchema["body"], Body>;
 }>;
 type MethodUnion = UnmaskType<"CONNECT" | "DELETE" | "GET" | "HEAD" | "OPTIONS" | "PATCH" | "POST" | "PUT" | "TRACE" | AnyString>;
 type InferMethodFromURL<TInitURL> = string extends TInitURL ? MethodUnion : TInitURL extends `@${infer TMethod extends RouteKeyMethods}/${string}` ? Uppercase<TMethod> : MethodUnion;
@@ -1157,16 +1157,16 @@ type InferMethodOption<TSchema extends CallApiSchema, TInitURL> = MakeSchemaOpti
    * HTTP method for the request.
    * @default "GET"
    */
-  method?: InferSchemaResult<TSchema["method"], InferMethodFromURL<TInitURL>>;
+  method?: InferSchemaInputResult<TSchema["method"], InferMethodFromURL<TInitURL>>;
 }>;
 type HeadersOption = UnmaskType<Record<"Authorization", CommonAuthorizationHeaders | undefined> | Record<"Content-Type", CommonContentTypes | undefined> | Record<CommonRequestHeaders, string | undefined> | Record<string, string | undefined> | Array<[string, string]>>;
 type InferHeadersOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequiredIfDefined<TSchema["headers"], {
   /**
    * Headers to be used in the request.
    */
-  headers?: InferSchemaResult<TSchema["headers"], HeadersOption> | ((context: {
+  headers?: InferSchemaInputResult<TSchema["headers"], HeadersOption> | ((context: {
     baseHeaders: NonNullable<HeadersOption>;
-  }) => InferSchemaResult<TSchema["headers"], HeadersOption>);
+  }) => InferSchemaInputResult<TSchema["headers"], HeadersOption>);
 }>;
 type InferRequestOptions<TSchema extends CallApiSchema, TInitURL extends InferInitURL<BaseCallApiSchemaRoutes, CallApiSchemaConfig>> = InferBodyOption<TSchema> & InferHeadersOption<TSchema> & InferMethodOption<TSchema, TInitURL>;
 interface Register {}
@@ -1197,13 +1197,13 @@ type InferMetaOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequiredIf
    * });
    * ```
    */
-  meta?: InferSchemaResult<TSchema["meta"], GlobalMeta>;
+  meta?: InferSchemaInputResult<TSchema["meta"], GlobalMeta>;
 }>;
 type InferQueryOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequiredIfDefined<TSchema["query"], {
   /**
    * Parameters to be appended to the URL (i.e: /:id)
    */
-  query?: InferSchemaResult<TSchema["query"], Query>;
+  query?: InferSchemaInputResult<TSchema["query"], Query>;
 }>;
 type EmptyString = "";
 type EmptyTuple = readonly [];
@@ -1213,15 +1213,15 @@ type ExtractRouteParamNames<TCurrentRoute, TParamNamesAccumulator extends String
 type ConvertParamNamesToRecord<TParamNames extends StringTuple> = Prettify<TParamNames extends (readonly [infer TFirstParamName extends string, ...infer TRemainingParamNames extends StringTuple]) ? Record<TFirstParamName, AllowedQueryParamValues> & ConvertParamNamesToRecord<TRemainingParamNames> : NonNullable<unknown>>;
 type ConvertParamNamesToTuple<TParamNames extends StringTuple> = TParamNames extends readonly [string, ...infer TRemainingParamNames extends StringTuple] ? [AllowedQueryParamValues, ...ConvertParamNamesToTuple<TRemainingParamNames>] : [];
 type InferParamsFromRoute<TCurrentRoute> = ExtractRouteParamNames<TCurrentRoute> extends StringTuple ? ExtractRouteParamNames<TCurrentRoute> extends EmptyTuple ? Params : ConvertParamNamesToRecord<ExtractRouteParamNames<TCurrentRoute>> | ConvertParamNamesToTuple<ExtractRouteParamNames<TCurrentRoute>> : Params;
-type MakeParamsOptionRequired<TParamsSchemaOption extends CallApiSchema["params"], TBaseSchemaRoutes extends BaseCallApiSchemaRoutes, TCurrentRouteSchemaKey extends string, TObject> = MakeSchemaOptionRequiredIfDefined<TParamsSchemaOption, Params extends InferParamsFromRoute<TCurrentRouteSchemaKey> ? TObject : TCurrentRouteSchemaKey extends Extract<keyof TBaseSchemaRoutes, TCurrentRouteSchemaKey> ? undefined extends InferSchemaResult<TParamsSchemaOption, null> ? TObject : Required<TObject> : TObject>;
+type MakeParamsOptionRequired<TParamsSchemaOption extends CallApiSchema["params"], TBaseSchemaRoutes extends BaseCallApiSchemaRoutes, TCurrentRouteSchemaKey extends string, TObject> = MakeSchemaOptionRequiredIfDefined<TParamsSchemaOption, Params extends InferParamsFromRoute<TCurrentRouteSchemaKey> ? TObject : TCurrentRouteSchemaKey extends Extract<keyof TBaseSchemaRoutes, TCurrentRouteSchemaKey> ? undefined extends InferSchemaInputResult<TParamsSchemaOption, null> ? TObject : Required<TObject> : TObject>;
 type InferParamsOption<TSchema extends CallApiSchema, TBaseSchemaRoutes extends BaseCallApiSchemaRoutes, TCurrentRouteSchemaKey extends string> = MakeParamsOptionRequired<TSchema["params"], TBaseSchemaRoutes, TCurrentRouteSchemaKey, {
   /**
    * Parameters to be appended to the URL (i.e: /:id)
    */
-  params?: InferSchemaResult<TSchema["params"], InferParamsFromRoute<TCurrentRouteSchemaKey>>;
+  params?: InferSchemaInputResult<TSchema["params"], InferParamsFromRoute<TCurrentRouteSchemaKey>>;
 }>;
 type InferExtraOptions<TSchema extends CallApiSchema, TBaseSchemaRoutes extends BaseCallApiSchemaRoutes, TCurrentRouteSchemaKey extends string> = InferMetaOption<TSchema> & InferParamsOption<TSchema, TBaseSchemaRoutes, TCurrentRouteSchemaKey> & InferQueryOption<TSchema>;
-type InferPluginOptions<TPluginArray extends CallApiPlugin[]> = UnionToIntersection<TPluginArray extends Array<infer TPlugin> ? TPlugin extends CallApiPlugin ? TPlugin["defineExtraOptions"] extends AnyFunction<infer TReturnedSchema> ? InferSchemaResult<TReturnedSchema> : never : never : never>;
+type InferPluginOptions<TPluginArray extends CallApiPlugin[]> = UnionToIntersection<TPluginArray extends Array<infer TPlugin> ? TPlugin extends CallApiPlugin ? TPlugin["defineExtraOptions"] extends AnyFunction<infer TReturnedSchema> ? InferSchemaOutputResult<TReturnedSchema> : never : never : never>;
 type ExtractKeys<TUnion, TSelectedUnion extends TUnion> = Extract<TUnion, TSelectedUnion>;
 type ResultModeOption<TErrorData, TResultMode extends ResultModeUnion> = TErrorData extends false ? {
   resultMode: "onlySuccessWithException";
@@ -1272,27 +1272,10 @@ type SharedExtraOptions<TData = DefaultDataType, TErrorData = DefaultDataType, T
    * Supports multiple authentication patterns:
    * - String: Direct authorization header value
    * - Auth object: Structured authentication configuration
-   * - null: Explicitly removes authorization
-   *
-   * @example
-   * ```ts
-   * // Bearer token authentication
-   * auth: "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."
-   *
-   * // Basic authentication
-   * auth: "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
-   *
-   * // Using Auth object for dynamic authentication
-   * auth: {
-   *   type: "bearer",
-   *   token: () => getAccessToken()
-   * }
    *
-   * // Remove inherited auth from base config
-   * auth: null
    * ```
    */
-  auth?: string | Auth | null;
+  auth?: Auth;
   /**
    * Custom function to serialize request body objects into strings.
    *
@@ -1797,5 +1780,5 @@ type CallApiConfig<TData = DefaultDataType, TErrorData = DefaultDataType, TResul
 type CallApiParameters<TData = DefaultDataType, TErrorData = DefaultDataType, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, TBaseSchemaRoutes extends BaseCallApiSchemaRoutes = BaseCallApiSchemaRoutes, TSchema extends CallApiSchema = CallApiSchema, TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InitURLOrURLObject = InitURLOrURLObject, TCurrentRouteSchemaKey extends string = string, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TPluginArray extends CallApiPlugin[] = DefaultPluginArray> = [initURL: TInitURL, config?: CallApiConfig<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBaseSchemaRoutes, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, TBasePluginArray, TPluginArray>];
 type CallApiResult<TData, TErrorData, TResultMode extends ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion, TResponseType extends ResponseTypeUnion> = Promise<GetCallApiResult<TData, TErrorData, TResultMode, TThrowOnError, TResponseType>>;
 //#endregion
-export { AnyFunction, AnyString, ApplyStrictConfig, ApplyURLBasedConfig, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaAndConfig, BaseCallApiSchemaRoutes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteSchema, GetCurrentRouteSchemaKey, GetResponseType, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamsFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeMap, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, Writeable, fallBackRouteSchemaKey };
-//# sourceMappingURL=common-DzOcclPA.d.ts.map
+export { AnyFunction, AnyString, ApplyStrictConfig, ApplyURLBasedConfig, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaAndConfig, BaseCallApiSchemaRoutes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteSchema, GetCurrentRouteSchemaKey, GetResponseType, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamsFromRoute, InferSchemaOutputResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeMap, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, Writeable, fallBackRouteSchemaKey };
+//# sourceMappingURL=common-CO8LGZIl.d.ts.map

package/dist/esm/index.d.ts

@@ -1,8 +1,8 @@
-import { AnyFunction, AnyString, ApplyStrictConfig, ApplyURLBasedConfig, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaAndConfig, BaseCallApiSchemaRoutes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteSchema, GetCurrentRouteSchemaKey, GetResponseType, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamsFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeMap, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, Writeable, fallBackRouteSchemaKey } from "./common-DzOcclPA.js";
+import { AnyFunction, AnyString, ApplyStrictConfig, ApplyURLBasedConfig, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaAndConfig, BaseCallApiSchemaRoutes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteSchema, GetCurrentRouteSchemaKey, GetResponseType, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamsFromRoute, InferSchemaOutputResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeMap, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, Writeable, fallBackRouteSchemaKey } from "./common-CO8LGZIl.js";
 
 //#region src/createFetchClient.d.ts
 
-declare const createFetchClient: <TBaseData = DefaultDataType, TBaseErrorData = DefaultDataType, TBaseResultMode extends ResultModeUnion = ResultModeUnion, TBaseThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TBaseResponseType extends ResponseTypeUnion = ResponseTypeUnion, const TBaseSchemaAndConfig extends BaseCallApiSchemaAndConfig = BaseCallApiSchemaAndConfig, const TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TComputedBaseSchemaConfig extends CallApiSchemaConfig = NonNullable<Writeable<TBaseSchemaAndConfig["config"], "deep">>, TComputedBaseSchemaRoutes extends BaseCallApiSchemaRoutes = Writeable<TBaseSchemaAndConfig["routes"], "deep">>(initBaseConfig?: BaseCallApiConfig<TBaseData, TBaseErrorData, TBaseResultMode, TBaseThrowOnError, TBaseResponseType, TBaseSchemaAndConfig, TBasePluginArray>) => <TData = TBaseData, TErrorData = TBaseErrorData, TResultMode extends ResultModeUnion = TBaseResultMode, TThrowOnError extends ThrowOnErrorUnion = TBaseThrowOnError, TResponseType extends ResponseTypeUnion = TBaseResponseType, const TSchemaConfig extends CallApiSchemaConfig = TComputedBaseSchemaConfig, TInitURL extends InferInitURL<TComputedBaseSchemaRoutes, TSchemaConfig> = InferInitURL<TComputedBaseSchemaRoutes, TSchemaConfig>, TCurrentRouteSchemaKey extends GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL> = GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL>, const TSchema extends CallApiSchema = GetCurrentRouteSchema<TComputedBaseSchemaRoutes, TCurrentRouteSchemaKey>, const TPluginArray extends CallApiPlugin[] = TBasePluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], GetResponseType<TData, TResponseType>>, InferSchemaResult<TSchema["errorData"], GetResponseType<TErrorData, TResponseType>>, TResultMode, TThrowOnError, TResponseType, TComputedBaseSchemaRoutes, TSchema, TComputedBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, TBasePluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType>;
+declare const createFetchClient: <TBaseData = DefaultDataType, TBaseErrorData = DefaultDataType, TBaseResultMode extends ResultModeUnion = ResultModeUnion, TBaseThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TBaseResponseType extends ResponseTypeUnion = ResponseTypeUnion, const TBaseSchemaAndConfig extends BaseCallApiSchemaAndConfig = BaseCallApiSchemaAndConfig, const TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TComputedBaseSchemaConfig extends CallApiSchemaConfig = NonNullable<Writeable<TBaseSchemaAndConfig["config"], "deep">>, TComputedBaseSchemaRoutes extends BaseCallApiSchemaRoutes = Writeable<TBaseSchemaAndConfig["routes"], "deep">>(initBaseConfig?: BaseCallApiConfig<TBaseData, TBaseErrorData, TBaseResultMode, TBaseThrowOnError, TBaseResponseType, TBaseSchemaAndConfig, TBasePluginArray>) => <TData = TBaseData, TErrorData = TBaseErrorData, TResultMode extends ResultModeUnion = TBaseResultMode, TThrowOnError extends ThrowOnErrorUnion = TBaseThrowOnError, TResponseType extends ResponseTypeUnion = TBaseResponseType, const TSchemaConfig extends CallApiSchemaConfig = TComputedBaseSchemaConfig, TInitURL extends InferInitURL<TComputedBaseSchemaRoutes, TSchemaConfig> = InferInitURL<TComputedBaseSchemaRoutes, TSchemaConfig>, TCurrentRouteSchemaKey extends GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL> = GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL>, const TSchema extends CallApiSchema = GetCurrentRouteSchema<TComputedBaseSchemaRoutes, TCurrentRouteSchemaKey>, const TPluginArray extends CallApiPlugin[] = TBasePluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaOutputResult<TSchema["data"], GetResponseType<TData, TResponseType>>, InferSchemaOutputResult<TSchema["errorData"], GetResponseType<TErrorData, TResponseType>>, TResultMode, TThrowOnError, TResponseType, TComputedBaseSchemaRoutes, TSchema, TComputedBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, TBasePluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaOutputResult<TSchema["data"], TData>, InferSchemaOutputResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType>;
 declare const callApi: <TData = unknown, TErrorData = unknown, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = boolean, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, const TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends ApplyStrictConfig<TSchemaConfig, ApplyURLBasedConfig<TSchemaConfig, AnyString | "@delete/" | "@get/" | "@patch/" | "@post/" | "@put/">> = ApplyStrictConfig<TSchemaConfig, ApplyURLBasedConfig<TSchemaConfig, AnyString | "@delete/" | "@get/" | "@patch/" | "@post/" | "@put/">>, TCurrentRouteSchemaKey extends GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL> = GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL>, const TSchema extends CallApiSchema = GetCurrentRouteSchema<{
   [x: AnyString]: CallApiSchema | undefined;
   "@delete/"?: CallApiSchema | undefined;
@@ -38,14 +38,14 @@ declare const callApi: <TData = unknown, TErrorData = unknown, TResultMode exten
   "@patch/"?: CallApiSchema | undefined;
   "@post/"?: CallApiSchema | undefined;
   "@put/"?: CallApiSchema | undefined;
-}[TCurrentRouteSchemaKey], "deep">>>, const TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], GetResponseType<TData, TResponseType, ResponseTypeMap<TData>>>, InferSchemaResult<TSchema["errorData"], GetResponseType<TErrorData, TResponseType, ResponseTypeMap<TErrorData>>>, TResultMode, TThrowOnError, TResponseType, {
+}[TCurrentRouteSchemaKey], "deep">>>, const TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaOutputResult<TSchema["data"], GetResponseType<TData, TResponseType, ResponseTypeMap<TData>>>, InferSchemaOutputResult<TSchema["errorData"], GetResponseType<TErrorData, TResponseType, ResponseTypeMap<TErrorData>>>, TResultMode, TThrowOnError, TResponseType, {
   [x: AnyString]: CallApiSchema | undefined;
   "@delete/"?: CallApiSchema | undefined;
   "@get/"?: CallApiSchema | undefined;
   "@patch/"?: CallApiSchema | undefined;
   "@post/"?: CallApiSchema | undefined;
   "@put/"?: CallApiSchema | undefined;
-}, TSchema, CallApiSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, DefaultPluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType>;
+}, TSchema, CallApiSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, DefaultPluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaOutputResult<TSchema["data"], TData>, InferSchemaOutputResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType>;
 //#endregion
 //#region src/defineHelpers.d.ts
 declare const defineSchema: <const TBaseSchemaRoutes extends BaseCallApiSchemaRoutes, const TSchemaConfig extends CallApiSchemaConfig>(routes: TBaseSchemaRoutes, config?: TSchemaConfig) => {
@@ -58,5 +58,5 @@ declare const definePlugin: <const TPlugin extends CallApiPlugin | AnyFunction<C
 declare const defineBaseConfig: <const TBaseConfig extends BaseCallApiConfig>(baseConfig: TBaseConfig) => Writeable<typeof baseConfig, "deep">;
 declare const defineParameters: <TData = DefaultDataType, TErrorData = DefaultDataType, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, TBaseSchemaRoutes extends BaseCallApiSchemaRoutes = BaseCallApiSchemaRoutes, TSchema extends CallApiSchema = CallApiSchema, TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<BaseCallApiSchemaRoutes, TSchemaConfig> = InferInitURL<BaseCallApiSchemaRoutes, TSchemaConfig>, TCurrentRouteSchemaKey extends string = string, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(...parameters: CallApiParameters<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBaseSchemaRoutes, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, TBasePluginArray, TPluginArray>) => CallApiParameters<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBaseSchemaRoutes, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteSchemaKey, TBasePluginArray, TPluginArray>;
 //#endregion
-export { type BaseCallApiConfig, type BaseCallApiExtraOptions, type BaseCallApiSchemaRoutes, type CallApiConfig, type CallApiExtraOptions, type CallApiExtraOptionsForHooks, type CallApiParameters, type CallApiPlugin, type CallApiRequestOptions, type CallApiRequestOptionsForHooks, type CallApiResult, type CallApiResultErrorVariant, type CallApiResultSuccessVariant, type CallApiSchema, type CallApiSchemaConfig, type DedupeOptions, type ErrorContext, HTTPError, type Hooks, type HooksOrHooksArray, type InferParamsFromRoute, type InferSchemaResult, type PluginExtraOptions, type PluginHooks, type PluginHooksWithMoreOptions, type PluginSetupContext, type PossibleHTTPError, type PossibleJavaScriptError, type PossibleJavaScriptOrValidationError, type PossibleValidationError, type Register, type RequestContext, type RequestStreamContext, type ResponseContext, type ResponseErrorContext, type ResponseStreamContext, type ResponseTypeUnion, type ResultModeUnion, type RetryOptions, type SuccessContext, type URLOptions, ValidationError, callApi, createFetchClient, defineBaseConfig, defineParameters, definePlugin, defineSchema, defineSchemaConfig, defineSchemaRoutes, fallBackRouteSchemaKey };
+export { type BaseCallApiConfig, type BaseCallApiExtraOptions, type BaseCallApiSchemaRoutes, type CallApiConfig, type CallApiExtraOptions, type CallApiExtraOptionsForHooks, type CallApiParameters, type CallApiPlugin, type CallApiRequestOptions, type CallApiRequestOptionsForHooks, type CallApiResult, type CallApiResultErrorVariant, type CallApiResultSuccessVariant, type CallApiSchema, type CallApiSchemaConfig, type DedupeOptions, type ErrorContext, HTTPError, type Hooks, type HooksOrHooksArray, type InferParamsFromRoute, type InferSchemaOutputResult, type PluginExtraOptions, type PluginHooks, type PluginHooksWithMoreOptions, type PluginSetupContext, type PossibleHTTPError, type PossibleJavaScriptError, type PossibleJavaScriptOrValidationError, type PossibleValidationError, type Register, type RequestContext, type RequestStreamContext, type ResponseContext, type ResponseErrorContext, type ResponseStreamContext, type ResponseTypeUnion, type ResultModeUnion, type RetryOptions, type SuccessContext, type URLOptions, ValidationError, callApi, createFetchClient, defineBaseConfig, defineParameters, definePlugin, defineSchema, defineSchemaConfig, defineSchemaRoutes, fallBackRouteSchemaKey };
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { HTTPError, ValidationError, createCombinedSignal, createTimeoutSignal, defineEnum, deterministicHashFn, extraOptionDefaults, getBody, getFetchImpl, getHeaders, isArray, isBoolean, isFunction, isHTTPErrorInstance, isObject, isPlainObject, isReadableStream, isString, isValidationErrorInstance, requestOptionDefaults, splitBaseConfig, splitConfig, toArray, toQueryString, waitFor } from "./utils-B5rSU71M.js";
+import { HTTPError, ValidationError, createCombinedSignal, createTimeoutSignal, defineEnum, deterministicHashFn, extraOptionDefaults, getBody, getFetchImpl, getHeaders, isArray, isBoolean, isFunction, isHTTPErrorInstance, isObject, isPlainObject, isReadableStream, isString, isValidationErrorInstance, requestOptionDefaults, splitBaseConfig, splitConfig, toArray, toQueryString, waitFor } from "./utils-zvYT8TK8.js";
 
 //#region src/result.ts
 const getResponseType = (response, parser) => ({
@@ -45,14 +45,11 @@ const getResultModeMap = (details) => {
 };
 const resolveSuccessResult = (data, info) => {
 	const { response, resultMode } = info;
-	const details = {
+	return getResultModeMap({
 		data,
 		error: null,
 		response
-	};
-	const resultModeMap = getResultModeMap(details);
-	const successResult = resultModeMap[resultMode ?? "all"]();
-	return successResult;
+	})[resultMode ?? "all"]();
 };
 const resolveErrorResult = (error, info) => {
 	const { cloneResponse, message: customErrorMessage, resultMode } = info;
@@ -92,8 +89,7 @@ const resolveErrorResult = (error, info) => {
 			response: cloneResponse ? response.clone() : response
 		};
 	}
-	const resultModeMap = getResultModeMap(errorDetails);
-	const generalErrorResult = resultModeMap[resultMode ?? "all"]();
+	const generalErrorResult = getResultModeMap(errorDetails)[resultMode ?? "all"]();
 	return {
 		errorDetails,
 		generalErrorResult
@@ -270,12 +266,8 @@ const createDedupeStrategy = async (context) => {
 	const dedupeStrategy = globalOptions.dedupeStrategy ?? extraOptionDefaults().dedupeStrategy;
 	const resolvedDedupeStrategy = isFunction(dedupeStrategy) ? dedupeStrategy(context) : dedupeStrategy;
 	const getDedupeKey = () => {
-		const shouldHaveDedupeKey = resolvedDedupeStrategy === "cancel" || resolvedDedupeStrategy === "defer";
-		if (!shouldHaveDedupeKey) return null;
-		if (globalOptions.dedupeKey) {
-			const resolvedDedupeKey = isFunction(globalOptions.dedupeKey) ? globalOptions.dedupeKey(context) : globalOptions.dedupeKey;
-			return resolvedDedupeKey;
-		}
+		if (!(resolvedDedupeStrategy === "cancel" || resolvedDedupeStrategy === "defer")) return null;
+		if (globalOptions.dedupeKey) return isFunction(globalOptions.dedupeKey) ? globalOptions.dedupeKey(context) : globalOptions.dedupeKey;
 		return `${globalOptions.fullURL}-${deterministicHashFn({
 			options: globalOptions,
 			request: globalRequest
@@ -298,8 +290,7 @@ const createDedupeStrategy = async (context) => {
 		return `Duplicate request detected - Aborted previous request to '${globalOptions.fullURL}' as a new request with identical options was initiated`;
 	};
 	const handleRequestCancelStrategy = () => {
-		const shouldCancelRequest = prevRequestInfo && resolvedDedupeStrategy === "cancel";
-		if (!shouldCancelRequest) return;
+		if (!(prevRequestInfo && resolvedDedupeStrategy === "cancel")) return;
 		const message = getAbortErrorMessage();
 		const reason = new DOMException(message, "AbortError");
 		prevRequestInfo.controller.abort(reason);
@@ -321,11 +312,10 @@ const createDedupeStrategy = async (context) => {
 			controller: newFetchController,
 			responsePromise
 		});
-		const streamableResponse = toStreamableResponse({
+		return toStreamableResponse({
 			...streamableContext,
 			response: await responsePromise
 		});
-		return streamableResponse;
 	};
 	const removeDedupeKeyFromCache = () => {
 		$RequestInfoCacheOrNull?.delete(dedupeKey);
@@ -343,10 +333,9 @@ const createDedupeStrategy = async (context) => {
 //#region src/validation.ts
 const handleValidatorFunction = async (validator, inputData) => {
 	try {
-		const result = await validator(inputData);
 		return {
 			issues: void 0,
-			value: result
+			value: await validator(inputData)
 		};
 	} catch (error) {
 		return {
@@ -373,8 +362,7 @@ const routeKeyMethods = defineEnum([
 const handleSchemaValidation = async (schema, validationOptions) => {
 	const { inputValue, response, schemaConfig } = validationOptions;
 	if (!schema || schemaConfig?.disableRuntimeValidation) return inputValue;
-	const validResult = await standardSchemaParser(schema, inputValue, response);
-	return validResult;
+	return await standardSchemaParser(schema, inputValue, response);
 };
 const extraOptionsToBeValidated = [
 	"meta",
@@ -474,8 +462,7 @@ const getResolvedSchema = (context) => {
 };
 const getResolvedSchemaConfig = (context) => {
 	const { baseExtraOptions, extraOptions } = context;
-	const resolvedSchemaConfig = isFunction(extraOptions.schemaConfig) ? extraOptions.schemaConfig({ baseSchemaConfig: baseExtraOptions.schema?.config ?? {} }) : extraOptions.schemaConfig ?? baseExtraOptions.schema?.config;
-	return resolvedSchemaConfig;
+	return isFunction(extraOptions.schemaConfig) ? extraOptions.schemaConfig({ baseSchemaConfig: baseExtraOptions.schema?.config ?? {} }) : extraOptions.schemaConfig ?? baseExtraOptions.schema?.config;
 };
 const getCurrentRouteSchemaKeyAndMainInitURL = (context) => {
 	const { baseExtraOptions, extraOptions, initURL } = context;
@@ -500,8 +487,7 @@ const getCurrentRouteSchemaKeyAndMainInitURL = (context) => {
 //#region src/plugins.ts
 const getResolvedPlugins = (context) => {
 	const { baseConfig, options } = context;
-	const resolvedPlugins = isFunction(options.plugins) ? options.plugins({ basePlugins: baseConfig.plugins ?? [] }) : options.plugins ?? [];
-	return resolvedPlugins;
+	return isFunction(options.plugins) ? options.plugins({ basePlugins: baseConfig.plugins ?? [] }) : options.plugins ?? [];
 };
 const initializePlugins = async (context) => {
 	const { baseConfig, config, initURL, options, request } = context;
@@ -574,8 +560,7 @@ const initializePlugins = async (context) => {
 		const flattenedHookArray = [...hookRegistry].flat();
 		if (flattenedHookArray.length === 0) continue;
 		const hooksExecutionMode = options.hooksExecutionMode ?? extraOptionDefaults().hooksExecutionMode;
-		const composedHook = composeAllHooks(flattenedHookArray, hooksExecutionMode);
-		resolvedHooks[key] = composedHook;
+		resolvedHooks[key] = composeAllHooks(flattenedHookArray, hooksExecutionMode);
 	}
 	return {
 		resolvedCurrentRouteSchemaKey,
@@ -590,8 +575,7 @@ const initializePlugins = async (context) => {
 //#region src/retry.ts
 const getLinearDelay = (currentAttemptCount, options) => {
 	const retryDelay = options.retryDelay ?? options.retry?.delay;
-	const resolveRetryDelay = (isFunction(retryDelay) ? retryDelay(currentAttemptCount) : retryDelay) ?? extraOptionDefaults().retryDelay;
-	return resolveRetryDelay;
+	return (isFunction(retryDelay) ? retryDelay(currentAttemptCount) : retryDelay) ?? extraOptionDefaults().retryDelay;
 };
 const getExponentialDelay = (currentAttemptCount, options) => {
 	const retryDelay = options.retryDelay ?? options.retry?.delay ?? extraOptionDefaults().retryDelay;
@@ -616,14 +600,12 @@ const createRetryStrategy = (ctx) => {
 		const retryCondition = options.retryCondition ?? options.retry?.condition ?? extraOptionDefaults().retryCondition;
 		const maximumRetryAttempts = options.retryAttempts ?? options.retry?.attempts ?? extraOptionDefaults().retryAttempts;
 		const customRetryCondition = await retryCondition(ctx);
-		const baseShouldRetry = currentAttemptCount <= maximumRetryAttempts && customRetryCondition;
-		if (!baseShouldRetry) return false;
+		if (!(currentAttemptCount <= maximumRetryAttempts && customRetryCondition)) return false;
 		const retryMethods = new Set(options.retryMethods ?? options.retry?.methods ?? extraOptionDefaults().retryMethods);
 		const includesMethod = isString(ctx.request.method) && retryMethods.size > 0 ? retryMethods.has(ctx.request.method) : true;
 		const retryStatusCodes = new Set(options.retryStatusCodes ?? options.retry?.statusCodes ?? extraOptionDefaults().retryStatusCodes);
 		const includesStatusCodes = Boolean(ctx.response) && retryStatusCodes.size > 0 ? retryStatusCodes.has(ctx.response.status) : true;
-		const shouldRetry = includesMethod && includesStatusCodes;
-		return shouldRetry;
+		return includesMethod && includesStatusCodes;
 	};
 	return {
 		currentAttemptCount,
@@ -642,8 +624,7 @@ const mergeUrlWithParams = (url, params) => {
 	if (!params) return url;
 	let newUrl = url;
 	if (isArray(params)) {
-		const urlParts = newUrl.split(slash);
-		const matchedParamsArray = urlParts.filter((part) => part.startsWith(colon) || part.startsWith(openBrace) && part.endsWith(closeBrace));
+		const matchedParamsArray = newUrl.split(slash).filter((part) => part.startsWith(colon) || part.startsWith(openBrace) && part.endsWith(closeBrace));
 		for (const [paramIndex, matchedParam] of matchedParamsArray.entries()) {
 			const stringParamValue = String(params[paramIndex]);
 			newUrl = newUrl.replace(matchedParam, stringParamValue);
@@ -714,18 +695,15 @@ const getMethod = (ctx) => {
 const normalizeURL = (initURL) => {
 	const methodFromURL = extractMethodFromURL(initURL);
 	if (!methodFromURL) return initURL;
-	const normalizedURL = initURL.replace(`@${methodFromURL}/`, "/");
-	return normalizedURL;
+	return initURL.replace(`@${methodFromURL}/`, "/");
 };
 const getFullAndNormalizedURL = (options) => {
 	const { baseURL, initURL, params, query } = options;
 	const normalizedInitURL = normalizeURL(initURL);
 	const urlWithMergedParams = mergeUrlWithParams(normalizedInitURL, params);
 	const urlWithMergedQueryAndParams = mergeUrlWithQuery(urlWithMergedParams, query);
-	const shouldPrependBaseURL = !urlWithMergedQueryAndParams.startsWith("http") && baseURL;
-	const fullURL = shouldPrependBaseURL ? `${baseURL}${urlWithMergedQueryAndParams}` : urlWithMergedQueryAndParams;
 	return {
-		fullURL,
+		fullURL: !urlWithMergedQueryAndParams.startsWith("http") && baseURL ? `${baseURL}${urlWithMergedQueryAndParams}` : urlWithMergedQueryAndParams,
 		normalizedInitURL
 	};
 };
@@ -738,12 +716,11 @@ const createFetchClient = (initBaseConfig = {}) => {
 	const callApi$1 = async (...parameters) => {
 		const [initURLOrURLObject, initConfig = {}] = parameters;
 		const [fetchOptions, extraOptions] = splitConfig(initConfig);
-		const resolvedBaseConfig = isFunction(initBaseConfig) ? initBaseConfig({
+		const baseConfig = isFunction(initBaseConfig) ? initBaseConfig({
 			initURL: initURLOrURLObject.toString(),
 			options: extraOptions,
 			request: fetchOptions
 		}) : initBaseConfig;
-		const baseConfig = resolvedBaseConfig;
 		const config = initConfig;
 		const [baseFetchOptions, baseExtraOptions] = splitBaseConfig(baseConfig);
 		const shouldSkipAutoMergeForOptions = baseExtraOptions.skipAutoMergeFor === "all" || baseExtraOptions.skipAutoMergeFor === "options";
@@ -870,11 +847,10 @@ const createFetchClient = (initBaseConfig = {}) => {
 				...successContext,
 				error: null
 			}));
-			const successResult = resolveSuccessResult(successContext.data, {
+			return resolveSuccessResult(successContext.data, {
 				response: successContext.response,
 				resultMode: options.resultMode
 			});
-			return successResult;
 		} catch (error) {
 			const errorInfo = {
 				cloneResponse: options.cloneResponse,
@@ -896,14 +872,13 @@ const createFetchClient = (initBaseConfig = {}) => {
 			};
 			const handleRetryOrGetErrorResult = async () => {
 				const { currentAttemptCount, getDelay, shouldAttemptRetry } = createRetryStrategy(errorContext);
-				const shouldRetry = await shouldAttemptRetry();
-				if (shouldRetry) {
+				if (await shouldAttemptRetry()) {
 					const retryContext = {
 						...errorContext,
 						retryAttemptCount: currentAttemptCount
 					};
-					const hookError$1 = await executeHooksInCatchBlock([options.onRetry?.(retryContext)], hookInfo);
-					if (hookError$1) return hookError$1;
+					const hookError = await executeHooksInCatchBlock([options.onRetry?.(retryContext)], hookInfo);
+					if (hookError) return hookError;
 					const delay = getDelay();
 					await waitFor(delay);
 					const updatedOptions = {
@@ -915,25 +890,19 @@ const createFetchClient = (initBaseConfig = {}) => {
 				if (shouldThrowOnError) throw error;
 				return generalErrorResult;
 			};
-			if (isValidationErrorInstance(error)) {
-				const hookError$1 = await executeHooksInCatchBlock([
-					options.onValidationError?.(errorContext),
-					options.onRequestError?.(errorContext),
-					options.onError?.(errorContext)
-				], hookInfo);
-				return hookError$1 ?? await handleRetryOrGetErrorResult();
-			}
-			if (isHTTPErrorInstance(error)) {
-				const hookError$1 = await executeHooksInCatchBlock([
-					options.onResponseError?.(errorContext),
-					options.onError?.(errorContext),
-					options.onResponse?.({
-						...errorContext,
-						data: null
-					})
-				], hookInfo);
-				return hookError$1 ?? await handleRetryOrGetErrorResult();
-			}
+			if (isValidationErrorInstance(error)) return await executeHooksInCatchBlock([
+				options.onValidationError?.(errorContext),
+				options.onRequestError?.(errorContext),
+				options.onError?.(errorContext)
+			], hookInfo) ?? await handleRetryOrGetErrorResult();
+			if (isHTTPErrorInstance(error)) return await executeHooksInCatchBlock([
+				options.onResponseError?.(errorContext),
+				options.onError?.(errorContext),
+				options.onResponse?.({
+					...errorContext,
+					data: null
+				})
+			], hookInfo) ?? await handleRetryOrGetErrorResult();
 			let message = error?.message;
 			if (error instanceof DOMException && error.name === "AbortError") {
 				message = getAbortErrorMessage();
@@ -943,8 +912,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 				message = `Request timed out after ${options.timeout}ms`;
 				!shouldThrowOnError && console.error(`${error.name}:`, message);
 			}
-			const hookError = await executeHooksInCatchBlock([options.onRequestError?.(errorContext), options.onError?.(errorContext)], hookInfo);
-			return hookError ?? getCustomizedErrorResult(await handleRetryOrGetErrorResult(), { message });
+			return await executeHooksInCatchBlock([options.onRequestError?.(errorContext), options.onError?.(errorContext)], hookInfo) ?? getCustomizedErrorResult(await handleRetryOrGetErrorResult(), { message });
 		} finally {
 			removeDedupeKeyFromCache();
 		}