@zayne-labs/callapi 1.8.9 → 1.8.10

package/README.md

@@ -7,8 +7,8 @@
 <p align="center">
    <!-- <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/call-api/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/call-api/graphs/commit-activity"><img src="https://img.shields.io/github/commit-activity/m/zayne-labs/call-api?style=flat&color=EFBA5F" alt="commit activity"></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>
 </p>
 
@@ -52,6 +52,6 @@ To do this, you first need to set your `script`'s type to `module`, then import
 
 <!-- Locked to a specific version -->
 <script type="module">
-	import { callApi } from "https://esm.run/@zayne-labs/callapi@0.3.2";
+	import { callApi } from "https://esm.run/@zayne-labs/callapi@1.8.9";
 </script>
 ```

package/dist/esm/{common-4wwVi8vR.d.ts → common-CmLbOQH8.d.ts}

@@ -175,8 +175,7 @@ declare namespace StandardSchemaV1 {
 }
 //#endregion
 //#region src/error.d.ts
-type HTTPErrorDetails<TErrorData> = {
-  defaultErrorMessage: CallApiExtraOptions["defaultErrorMessage"];
+type HTTPErrorDetails<TErrorData> = Pick<CallApiExtraOptions, "defaultHTTPErrorMessage"> & {
   errorData: TErrorData;
   response: Response;
 };
@@ -236,6 +235,8 @@ interface URLOptions {
   readonly initURLNormalized?: string;
   /**
    * Parameters to be appended to the URL (i.e: /:id)
+   *
+   * If url is defined as `/path/:id`, params will be `{ id: string }`
    */
   params?: Params;
   /**
@@ -245,7 +246,7 @@ interface URLOptions {
 }
 //#endregion
 //#region src/validation.d.ts
-type InferSchemaResult<TSchema, TFallbackResult = NonNullable<unknown>> = undefined extends TSchema ? TFallbackResult : TSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TSchema> : TSchema extends AnyFunction<infer TResult> ? Awaited<TResult> : TFallbackResult;
+type InferSchemaResult<TSchema, TFallbackResult = unknown> = undefined extends TSchema ? TFallbackResult : TSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<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 fetch instance.
@@ -263,13 +264,13 @@ interface CallApiSchemaConfig {
    */
   disableValidationOutputApplication?: boolean;
   /**
-   * Controls the inference of the method option based on the route modifiers (`@get/`, `@post/`, `@put/`, `@patch/`, `@delete/`).
+   *Determines the inference or requirement of the method option based on the route modifiers (`@get/`, `@post/`, `@put/`, `@patch/`, `@delete/`).
    *
    * - When `true`, the method option is made required on the type level and is not automatically added to the request options.
    * - When `false` or `undefined` (default), the method option is not required on the type level, and is automatically added to the request options.
    *
    */
-  requireHttpMethodProvision?: boolean;
+  requireMethodProvision?: boolean;
   /**
    * Controls the strictness of API route validation.
    *
@@ -282,7 +283,6 @@ interface CallApiSchemaConfig {
    * - All routes will be allowed, whether they are defined in the schema or not
    * - Provides more flexibility but less type safety
    *
-   * @default false
    */
   strict?: boolean;
 }
@@ -529,15 +529,9 @@ type SuccessContext<TData> = UnmaskType<RequestContext & {
   data: TData;
   response: Response;
 }>;
-type ResponseContext<TData, TErrorData> = UnmaskType<RequestContext & ({
-  data: NoInfer<TData>;
-  error: null;
-  response: Response;
-} | {
-  data: null;
+type ResponseContext<TData, TErrorData> = UnmaskType<RequestContext & (Prettify<CallApiResultSuccessVariant<TData>> | Prettify<Extract<CallApiResultErrorVariant<TErrorData>, {
   error: PossibleHTTPError<TErrorData>;
-  response: Response;
-})>;
+}>>)>;
 type RequestErrorContext = RequestContext & {
   error: PossibleJavaScriptOrValidationError;
   response: null;
@@ -642,37 +636,38 @@ interface RetryOptions<TErrorData> {
 //#endregion
 //#region src/types/conditional-types.d.ts
 /**
- * @description Makes a type required if the output type of TSchema contains undefined, otherwise keeps it as is
+ * @description Makes a type partial if the output type of TSchema contains undefined, otherwise makes it required
  */
-type MakeSchemaOptionRequired<TSchema extends CallApiSchema[keyof CallApiSchema], TObject> = undefined extends InferSchemaResult<TSchema, undefined> ? TObject : Required<TObject>;
+type MakeSchemaOptionPartialOrRequired<TSchemaOption extends CallApiSchema[keyof CallApiSchema], TObject> = undefined extends InferSchemaResult<TSchemaOption> ? Partial<TObject> : Required<TObject>;
 type ApplyURLBasedConfig<TSchemaConfig extends CallApiSchemaConfig, TCurrentRouteKeys extends string> = TSchemaConfig["baseURL"] extends string ? `${TSchemaConfig["baseURL"]}${TCurrentRouteKeys}` : TCurrentRouteKeys;
 type ApplyStrictConfig<TSchemaConfig extends CallApiSchemaConfig, TCurrentRouteKeys extends string> = TSchemaConfig["strict"] extends true ? TCurrentRouteKeys : TCurrentRouteKeys | AnyString;
 type ApplySchemaConfiguration<TSchemaConfig extends CallApiSchemaConfig, TCurrentRouteKeys extends string> = ApplyStrictConfig<TSchemaConfig, ApplyURLBasedConfig<TSchemaConfig, TCurrentRouteKeys>>;
 type InferAllRouteKeys<TBaseSchema extends BaseCallApiSchema, TSchemaConfig extends CallApiSchemaConfig> = ApplySchemaConfiguration<TSchemaConfig, keyof TBaseSchema extends string ? keyof TBaseSchema : never>;
 type InferInitURL<TBaseSchema extends BaseCallApiSchema, TSchemaConfig extends CallApiSchemaConfig> = InferAllRouteKeys<TBaseSchema, TSchemaConfig> | URL;
 type GetCurrentRouteKey<TSchemaConfig extends CallApiSchemaConfig, TPath> = TSchemaConfig["baseURL"] extends string ? TPath extends `${TSchemaConfig["baseURL"]}${infer TCurrentRoute}` ? TCurrentRoute extends string ? TCurrentRoute : string : string : TPath extends URL ? string : TPath;
+type GetCurrentRouteSchema<TBaseSchema extends BaseCallApiSchema, TCurrentRouteKey extends string> = NonNullable<Writeable<TBaseSchema[TCurrentRouteKey], "deep">>;
 type JsonPrimitive = boolean | number | string | null | undefined;
 type SerializableObject = Record<keyof object, unknown>;
 type SerializableArray = Array<JsonPrimitive | SerializableArray | SerializableObject> | ReadonlyArray<JsonPrimitive | SerializableArray | SerializableObject>;
 type Body = UnmaskType<RequestInit["body"] | SerializableArray | SerializableObject>;
-type InferBodyOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequired<TSchema["body"], {
+type InferBodyOption<TSchema extends CallApiSchema> = MakeSchemaOptionPartialOrRequired<TSchema["body"], {
   /**
    * Body of the request, can be a object or any other supported body type.
    */
   body?: InferSchemaResult<TSchema["body"], Body>;
 }>;
 type MethodUnion = UnmaskType<"CONNECT" | "DELETE" | "GET" | "HEAD" | "OPTIONS" | "PATCH" | "POST" | "PUT" | "TRACE" | AnyString>;
-type InferMethodFromURL<TInitURL> = TInitURL extends `@${infer TMethod extends RouteKeyMethods}/${string}` ? Uppercase<TMethod> : MethodUnion;
-type MakeMethodOptionRequired<TInitURL, TSchemaConfig extends CallApiSchemaConfig, TObject> = undefined extends TSchemaConfig ? TObject : TInitURL extends `@${string}/${string}` ? TSchemaConfig["requireHttpMethodProvision"] extends true ? Required<TObject> : TObject : TObject;
-type InferMethodOption<TSchema extends CallApiSchema, TSchemaConfig extends CallApiSchemaConfig, TInitURL> = MakeSchemaOptionRequired<TSchema["method"], MakeMethodOptionRequired<TInitURL, TSchemaConfig, {
+type InferMethodFromURL<TInitURL> = string extends TInitURL ? MethodUnion : TInitURL extends `@${infer TMethod extends RouteKeyMethods}/${string}` ? Uppercase<TMethod> : MethodUnion;
+type MakeMethodOptionRequired<TMethodSchemaOption extends CallApiSchema["method"], TInitURL, TSchemaConfig extends CallApiSchemaConfig, TObject> = MakeSchemaOptionPartialOrRequired<TMethodSchemaOption, undefined extends TSchemaConfig ? TObject : TInitURL extends `@${string}/${string}` ? TSchemaConfig["requireMethodProvision"] extends true ? Required<TObject> : TObject : TObject>;
+type InferMethodOption<TSchema extends CallApiSchema, TSchemaConfig extends CallApiSchemaConfig, TInitURL> = MakeMethodOptionRequired<TSchema["method"], TInitURL, TSchemaConfig, {
   /**
    * HTTP method for the request.
    * @default "GET"
    */
   method?: InferSchemaResult<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> = MakeSchemaOptionRequired<TSchema["headers"], {
+type InferHeadersOption<TSchema extends CallApiSchema> = MakeSchemaOptionPartialOrRequired<TSchema["headers"], {
   /**
    * Headers to be used in the request.
    */
@@ -685,25 +680,49 @@ interface Register {}
 type GlobalMeta = Register extends {
   meta?: infer TMeta extends Record<string, unknown>;
 } ? TMeta : never;
-type InferMetaOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequired<TSchema["meta"], {
+type InferMetaOption<TSchema extends CallApiSchema> = MakeSchemaOptionPartialOrRequired<TSchema["meta"], {
+  /**
+   * - An optional field you can fill with additional information,
+   * to associate with the request, typically used for logging or tracing.
+   *
+   * - A good use case for this, would be to use the info to handle specific cases in any of the shared interceptors.
+   *
+   * @example
+   * ```ts
+   * const callMainApi = callApi.create({
+   * 	baseURL: "https://main-api.com",
+   * 	onResponseError: ({ response, options }) => {
+   * 		if (options.meta?.userId) {
+   * 			console.error(`User ${options.meta.userId} made an error`);
+   * 		}
+   * 	},
+   * });
+   *
+   * const response = await callMainApi({
+   * 	url: "https://example.com/api/data",
+   * 	meta: { userId: "123" },
+   * });
+   * ```
+   */
   meta?: InferSchemaResult<TSchema["meta"], GlobalMeta>;
 }>;
-type InferQueryOption<TSchema extends CallApiSchema> = MakeSchemaOptionRequired<TSchema["query"], {
+type InferQueryOption<TSchema extends CallApiSchema> = MakeSchemaOptionPartialOrRequired<TSchema["query"], {
   /**
    * Parameters to be appended to the URL (i.e: /:id)
    */
   query?: InferSchemaResult<TSchema["query"], Query>;
 }>;
 type EmptyString = "";
-type InferParamFromRoute<TRoute> = TRoute extends `${infer IgnoredPrefix}:${infer TCurrentParam}/${infer TRemainingPath}` ? TCurrentParam extends EmptyString ? InferParamFromRoute<TRemainingPath> : Prettify<Record<TCurrentParam | (Params extends InferParamFromRoute<TRemainingPath> ? never : keyof Extract<InferParamFromRoute<TRemainingPath>, Record<string, unknown>>), AllowedQueryParamValues>> | [AllowedQueryParamValues, ...(Params extends InferParamFromRoute<TRemainingPath> ? [] : Extract<InferParamFromRoute<TRemainingPath>, unknown[]>)] : TRoute extends `${infer IgnoredPrefix}:${infer TCurrentParam}` ? TCurrentParam extends EmptyString ? Params : Prettify<Record<TCurrentParam, AllowedQueryParamValues>> | [AllowedQueryParamValues] : Params;
-type InferParamsOption<TSchema extends CallApiSchema, TCurrentRouteKey> = MakeSchemaOptionRequired<TSchema["params"], {
+type InferParamFromRoute<TCurrentRoute> = TCurrentRoute extends `${infer IgnoredPrefix}:${infer TCurrentParam}/${infer TRemainingPath}` ? TCurrentParam extends EmptyString ? InferParamFromRoute<TRemainingPath> : Prettify<Record<TCurrentParam | (Params extends InferParamFromRoute<TRemainingPath> ? never : keyof Extract<InferParamFromRoute<TRemainingPath>, Record<string, unknown>>), AllowedQueryParamValues>> | [AllowedQueryParamValues, ...(Params extends InferParamFromRoute<TRemainingPath> ? [] : Extract<InferParamFromRoute<TRemainingPath>, unknown[]>)] : TCurrentRoute extends `${infer IgnoredPrefix}:${infer TCurrentParam}` ? TCurrentParam extends EmptyString ? Params : Prettify<Record<TCurrentParam, AllowedQueryParamValues>> | [AllowedQueryParamValues] : Params;
+type MakeParamsOptionRequired<TParamsSchemaOption extends CallApiSchema["params"], TBaseSchema extends BaseCallApiSchema, TCurrentRouteKey extends string, TObject> = MakeSchemaOptionPartialOrRequired<TParamsSchemaOption, TCurrentRouteKey extends `${string}:${string}${"" | "/"}${"" | AnyString}` ? TCurrentRouteKey extends Extract<keyof TBaseSchema, TCurrentRouteKey> ? Required<TObject> : TObject : TObject>;
+type InferParamsOption<TSchema extends CallApiSchema, TBaseSchema extends BaseCallApiSchema, TCurrentRouteKey extends string> = MakeParamsOptionRequired<TSchema["params"], TBaseSchema, TCurrentRouteKey, {
   /**
    * Parameters to be appended to the URL (i.e: /:id)
    */
   params?: InferSchemaResult<TSchema["params"], InferParamFromRoute<TCurrentRouteKey>>;
 }>;
-type InferExtraOptions<TSchema extends CallApiSchema, TCurrentRouteKey> = InferMetaOption<TSchema> & InferParamsOption<TSchema, TCurrentRouteKey> & InferQueryOption<TSchema>;
-type InferPluginOptions<TPluginArray extends CallApiPlugin[]> = UnionToIntersection<TPluginArray extends Array<infer TPlugin> ? TPlugin extends CallApiPlugin ? TPlugin["defineExtraOptions"] extends AnyFunction<infer TResult> ? InferSchemaResult<TResult> : never : never : never>;
+type InferExtraOptions<TSchema extends CallApiSchema, TBaseSchema extends BaseCallApiSchema, TCurrentRouteKey extends string> = InferMetaOption<TSchema> & InferParamsOption<TSchema, TBaseSchema, TCurrentRouteKey> & 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 ExtractKeys<TUnion, TSelectedUnion extends TUnion> = Extract<TUnion, TSelectedUnion>;
 type ResultModeOption<TErrorData, TResultMode extends ResultModeUnion> = TErrorData extends false ? {
   resultMode: "onlySuccessWithException";
@@ -773,10 +792,10 @@ type SharedExtraOptions<TData = DefaultDataType, TErrorData = DefaultDataType, T
    */
   customFetchImpl?: FetchImpl;
   /**
-   * Default error message to use if none is provided from a response.
+   * Default HTTP error message to use if none is provided from a response.
    * @default "Failed to fetch data from server!"
    */
-  defaultErrorMessage?: string;
+  defaultHTTPErrorMessage?: string | ((context: Pick<HTTPError<TErrorData>, "errorData" | "response">) => string);
   /**
    * If true, forces the calculation of the total byte size from the request or response body, in case the content-length header is not present or is incorrect.
    * @default false
@@ -894,7 +913,7 @@ type CallApiExtraOptions<TData = DefaultDataType, TErrorData = DefaultDataType,
    */
   schema?: Writeable<TSchema, "deep"> | ((context: {
     baseSchema: Writeable<TBaseSchema, "deep">;
-    currentRouteSchema: NonNullable<Writeable<TBaseSchema[TCurrentRouteKey], "deep">>;
+    currentRouteSchema: GetCurrentRouteSchema<TBaseSchema, TCurrentRouteKey>;
   }) => Writeable<TSchema, "deep">);
   /**
    * Schema config for the callapi instance
@@ -909,9 +928,9 @@ type BaseCallApiConfig<TBaseData = DefaultDataType, TBaseErrorData = DefaultData
   options: CallApiExtraOptions;
   request: CallApiRequestOptions;
 }) => CallApiRequestOptions & BaseCallApiExtraOptions<TBaseData, TBaseErrorData, TBaseResultMode, TBaseThrowOnError, TBaseResponseType, TBasePluginArray, TBaseSchema, TBaseSchemaConfig>);
-type CallApiConfig<TData = DefaultDataType, TErrorData = DefaultDataType, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, TBaseSchema extends BaseCallApiSchema = BaseCallApiSchema, TSchema extends CallApiSchema = CallApiSchema, TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<BaseCallApiSchema, TSchemaConfig> = InferInitURL<BaseCallApiSchema, TSchemaConfig>, TCurrentRouteKey extends string = string, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TPluginArray extends CallApiPlugin[] = DefaultPluginArray> = InferExtraOptions<TSchema, TCurrentRouteKey> & InferRequestOptions<TSchema, TSchemaConfig, TInitURL> & Omit<CallApiExtraOptions<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBasePluginArray, TPluginArray, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TCurrentRouteKey>, keyof InferExtraOptions<CallApiSchema, string>> & Omit<CallApiRequestOptions, keyof InferRequestOptions<CallApiSchema, CallApiSchemaConfig, string>>;
+type CallApiConfig<TData = DefaultDataType, TErrorData = DefaultDataType, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, TBaseSchema extends BaseCallApiSchema = BaseCallApiSchema, TSchema extends CallApiSchema = CallApiSchema, TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<BaseCallApiSchema, TSchemaConfig> = InferInitURL<BaseCallApiSchema, TSchemaConfig>, TCurrentRouteKey extends string = string, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TPluginArray extends CallApiPlugin[] = DefaultPluginArray> = InferExtraOptions<TSchema, TBaseSchema, TCurrentRouteKey> & InferRequestOptions<TSchema, TSchemaConfig, TInitURL> & Omit<CallApiExtraOptions<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBasePluginArray, TPluginArray, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TCurrentRouteKey>, keyof InferExtraOptions<CallApiSchema, BaseCallApiSchema, string>> & Omit<CallApiRequestOptions, keyof InferRequestOptions<CallApiSchema, CallApiSchemaConfig, string>>;
 type CallApiParameters<TData = DefaultDataType, TErrorData = DefaultDataType, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, TBaseSchema extends BaseCallApiSchema = BaseCallApiSchema, TSchema extends CallApiSchema = CallApiSchema, TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<BaseCallApiSchema, TSchemaConfig> = InferInitURL<BaseCallApiSchema, TSchemaConfig>, TCurrentRouteKey extends string = string, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TPluginArray extends CallApiPlugin[] = DefaultPluginArray> = [initURL: TInitURL, config?: CallApiConfig<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, TBasePluginArray, TPluginArray>];
 type CallApiResult<TData, TErrorData, TResultMode extends ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion, TResponseType extends ResponseTypeUnion> = Promise<GetCallApiResult<TData, TErrorData, TResultMode, TThrowOnError, TResponseType>>;
 //#endregion
-export { AnyString, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchema, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteKey, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginInitContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, definePlugin, defineSchema };
-//# sourceMappingURL=common-4wwVi8vR.d.ts.map
+export { AnyString, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchema, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteKey, GetCurrentRouteSchema, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginInitContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, definePlugin, defineSchema };
+//# sourceMappingURL=common-CmLbOQH8.d.ts.map

package/dist/esm/index.d.ts

@@ -1,9 +1,9 @@
-import { AnyString, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchema, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteKey, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginInitContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, definePlugin, defineSchema } from "./common-4wwVi8vR.js";
+import { AnyString, BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchema, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultDataType, DefaultPluginArray, DefaultThrowOnError, ErrorContext, GetCurrentRouteKey, GetCurrentRouteSchema, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginInitContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, definePlugin, defineSchema } from "./common-CmLbOQH8.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 TBaseSchema extends BaseCallApiSchema = BaseCallApiSchema, const TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray>(initBaseConfig?: BaseCallApiConfig<TBaseData, TBaseErrorData, TBaseResultMode, TBaseThrowOnError, TBaseResponseType, TBaseSchema, TBaseSchemaConfig, TBasePluginArray>) => <TData = TBaseData, TErrorData = TBaseErrorData, TResultMode extends ResultModeUnion = TBaseResultMode, TThrowOnError extends ThrowOnErrorUnion = TBaseThrowOnError, TResponseType extends ResponseTypeUnion = TBaseResponseType, TSchemaConfig extends CallApiSchemaConfig = TBaseSchemaConfig, TInitURL extends InferInitURL<TBaseSchema, TSchemaConfig> = InferInitURL<TBaseSchema, TSchemaConfig>, TCurrentRouteKey extends GetCurrentRouteKey<TSchemaConfig, TInitURL> = GetCurrentRouteKey<TSchemaConfig, TInitURL>, TSchema extends CallApiSchema = NonNullable<TBaseSchema[TCurrentRouteKey]>, TPluginArray extends CallApiPlugin[] = TBasePluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, TBasePluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<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, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TSchemaConfig> = InferInitURL<Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TSchemaConfig>, TCurrentRouteKey extends GetCurrentRouteKey<TSchemaConfig, TInitURL> = GetCurrentRouteKey<TSchemaConfig, TInitURL>, TSchema extends CallApiSchema = NonNullable<Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>[TCurrentRouteKey]>, TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType, Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TSchema, CallApiSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, DefaultPluginArray, 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 TBaseSchema extends BaseCallApiSchema = BaseCallApiSchema, const TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray>(initBaseConfig?: BaseCallApiConfig<TBaseData, TBaseErrorData, TBaseResultMode, TBaseThrowOnError, TBaseResponseType, TBaseSchema, TBaseSchemaConfig, TBasePluginArray>) => <TData = TBaseData, TErrorData = TBaseErrorData, TResultMode extends ResultModeUnion = TBaseResultMode, TThrowOnError extends ThrowOnErrorUnion = TBaseThrowOnError, TResponseType extends ResponseTypeUnion = TBaseResponseType, TSchemaConfig extends CallApiSchemaConfig = TBaseSchemaConfig, TInitURL extends InferInitURL<TBaseSchema, TSchemaConfig> = InferInitURL<TBaseSchema, TSchemaConfig>, TCurrentRouteKey extends GetCurrentRouteKey<TSchemaConfig, TInitURL> = GetCurrentRouteKey<TSchemaConfig, TInitURL>, TSchema extends CallApiSchema = GetCurrentRouteSchema<TBaseSchema, TCurrentRouteKey>, TPluginArray extends CallApiPlugin[] = TBasePluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, TBasePluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<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, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TSchemaConfig> = InferInitURL<Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TSchemaConfig>, TCurrentRouteKey extends GetCurrentRouteKey<TSchemaConfig, TInitURL> = GetCurrentRouteKey<TSchemaConfig, TInitURL>, TSchema extends CallApiSchema = GetCurrentRouteSchema<Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TCurrentRouteKey>, TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType, Partial<Record<"@delete/" | "@get/" | "@patch/" | "@post/" | "@put/" | AnyString, CallApiSchema>>, TSchema, CallApiSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, DefaultPluginArray, TPluginArray> | undefined) => CallApiResult<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType>;
 //#endregion
 //#region src/defineParameters.d.ts
 declare const defineParameters: <TData = DefaultDataType, TErrorData = DefaultDataType, TResultMode extends ResultModeUnion = ResultModeUnion, TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType extends ResponseTypeUnion = ResponseTypeUnion, TBaseSchema extends BaseCallApiSchema = BaseCallApiSchema, TSchema extends CallApiSchema = CallApiSchema, TBaseSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TSchemaConfig extends CallApiSchemaConfig = CallApiSchemaConfig, TInitURL extends InferInitURL<BaseCallApiSchema, TSchemaConfig> = InferInitURL<BaseCallApiSchema, TSchemaConfig>, TCurrentRouteKey extends string = string, TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray, TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(...parameters: CallApiParameters<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, TBasePluginArray, TPluginArray>) => CallApiParameters<TData, TErrorData, TResultMode, TThrowOnError, TResponseType, TBaseSchema, TSchema, TBaseSchemaConfig, TSchemaConfig, TInitURL, TCurrentRouteKey, TBasePluginArray, TPluginArray>;

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { HTTPError, ValidationError, commonDefaults, createCombinedSignal, createTimeoutSignal, dedupeDefaults, defineEnum, getBody, getFetchImpl, getHeaders, hookDefaults, isArray, isFunction, isHTTPErrorInstance, isObject, isPlainObject, isReadableStream, isString, isValidationErrorInstance, requestOptionDefaults, responseDefaults, retryDefaults, splitBaseConfig, splitConfig, toQueryString, waitFor } from "./utils-BbmhntpS.js";
+import { HTTPError, ValidationError, createCombinedSignal, createTimeoutSignal, dedupeDefaults, defineEnum, deterministicHashFn, getBody, getFetchImpl, getHeaders, hookDefaults, isArray, isFunction, isHTTPErrorInstance, isObject, isPlainObject, isReadableStream, isString, isValidationErrorInstance, requestOptionDefaults, responseDefaults, retryDefaults, splitBaseConfig, splitConfig, toQueryString, waitFor } from "./utils-BMQYfuNI.js";
 
 //#region src/result.ts
 const getResponseType = (response, parser) => ({
@@ -40,7 +40,7 @@ const resolveSuccessResult = (data, info) => {
 	return successResult;
 };
 const resolveErrorResult = (error, info) => {
-	const { cloneResponse, defaultErrorMessage, message: customErrorMessage, resultMode } = info;
+	const { cloneResponse, message: customErrorMessage, resultMode } = info;
 	let details = {
 		data: null,
 		error: {
@@ -65,8 +65,7 @@ const resolveErrorResult = (error, info) => {
 		};
 	}
 	if (isHTTPErrorInstance(error)) {
-		const selectedDefaultErrorMessage = defaultErrorMessage ?? commonDefaults.defaultErrorMessage;
-		const { errorData, message = selectedDefaultErrorMessage, name, response } = error;
+		const { errorData, message, name, response } = error;
 		details = {
 			data: null,
 			error: {
@@ -151,47 +150,52 @@ const calculateTotalBytesFromBody = async (requestBody, existingTotalBytes) => {
 	return totalBytes;
 };
 const toStreamableRequest = async (context) => {
-	const { baseConfig, config, options, request, requestInstance } = context;
-	if (!options.onRequestStream || !requestInstance.body) return;
-	const contentLength = requestInstance.headers.get("content-length") ?? new Headers(request.headers).get("content-length") ?? request.body?.size;
+	const { baseConfig, config, options, request } = context;
+	if (!options.onRequestStream || !isReadableStream(request.body)) return request;
+	const requestInstance = new Request(options.fullURL, {
+		...request,
+		duplex: "half"
+	});
+	const contentLength = requestInstance.headers.get("content-length");
 	let totalBytes = Number(contentLength ?? 0);
 	const shouldForcefullyCalcStreamSize = isObject(options.forcefullyCalculateStreamSize) ? options.forcefullyCalculateStreamSize.request : options.forcefullyCalculateStreamSize;
 	if (!contentLength && shouldForcefullyCalcStreamSize) totalBytes = await calculateTotalBytesFromBody(requestInstance.clone().body, totalBytes);
 	let transferredBytes = 0;
-	await executeHooksInTryBlock(options.onRequestStream({
-		baseConfig,
-		config,
-		event: createProgressEvent({
-			chunk: new Uint8Array(),
-			totalBytes,
-			transferredBytes
-		}),
-		options,
-		request,
-		requestInstance
-	}));
-	const body = requestInstance.body;
-	new ReadableStream({ start: async (controller) => {
+	const stream = new ReadableStream({ start: async (controller) => {
+		const body = requestInstance.body;
 		if (!body) return;
+		const requestStreamContext = {
+			baseConfig,
+			config,
+			event: createProgressEvent({
+				chunk: new Uint8Array(),
+				totalBytes,
+				transferredBytes
+			}),
+			options,
+			request,
+			requestInstance
+		};
+		await executeHooksInTryBlock(options.onRequestStream?.(requestStreamContext));
 		for await (const chunk of body) {
 			transferredBytes += chunk.byteLength;
 			totalBytes = Math.max(totalBytes, transferredBytes);
 			await executeHooksInTryBlock(options.onRequestStream?.({
-				baseConfig,
-				config,
+				...requestStreamContext,
 				event: createProgressEvent({
 					chunk,
 					totalBytes,
 					transferredBytes
-				}),
-				options,
-				request,
-				requestInstance
+				})
 			}));
 			controller.enqueue(chunk);
 		}
 		controller.close();
 	} });
+	return new Request(requestInstance, {
+		body: stream,
+		duplex: "half"
+	});
 };
 const toStreamableResponse = async (context) => {
 	const { baseConfig, config, options, request, response } = context;
@@ -201,35 +205,32 @@ const toStreamableResponse = async (context) => {
 	const shouldForceContentLengthCalc = isObject(options.forcefullyCalculateStreamSize) ? options.forcefullyCalculateStreamSize.response : options.forcefullyCalculateStreamSize;
 	if (!contentLength && shouldForceContentLengthCalc) totalBytes = await calculateTotalBytesFromBody(response.clone().body, totalBytes);
 	let transferredBytes = 0;
-	await executeHooksInTryBlock(options.onResponseStream({
-		baseConfig,
-		config,
-		event: createProgressEvent({
-			chunk: new Uint8Array(),
-			totalBytes,
-			transferredBytes
-		}),
-		options,
-		request,
-		response
-	}));
-	const body = response.body;
 	const stream = new ReadableStream({ start: async (controller) => {
+		const body = response.body;
 		if (!body) return;
+		const responseStreamContext = {
+			baseConfig,
+			config,
+			event: createProgressEvent({
+				chunk: new Uint8Array(),
+				totalBytes,
+				transferredBytes
+			}),
+			options,
+			request,
+			response
+		};
+		await executeHooksInTryBlock(options.onResponseStream?.(responseStreamContext));
 		for await (const chunk of body) {
 			transferredBytes += chunk.byteLength;
 			totalBytes = Math.max(totalBytes, transferredBytes);
 			await executeHooksInTryBlock(options.onResponseStream?.({
-				baseConfig,
-				config,
+				...responseStreamContext,
 				event: createProgressEvent({
 					chunk,
 					totalBytes,
 					transferredBytes
-				}),
-				options,
-				request,
-				response
+				})
 			}));
 			controller.enqueue(chunk);
 		}
@@ -249,7 +250,7 @@ const createDedupeStrategy = async (context) => {
 	const generateDedupeKey = () => {
 		const shouldHaveDedupeKey = dedupeStrategy === "cancel" || dedupeStrategy === "defer";
 		if (!shouldHaveDedupeKey) return null;
-		return `${globalOptions.fullURL}-${JSON.stringify({
+		return `${globalOptions.fullURL}-${deterministicHashFn({
 			options: globalOptions,
 			request: globalRequest
 		})}`;
@@ -279,32 +280,20 @@ const createDedupeStrategy = async (context) => {
 		const { options: localOptions, request: localRequest } = deferContext;
 		const fetchApi = getFetchImpl(localOptions.customFetchImpl);
 		const shouldUsePromiseFromCache = prevRequestInfo && dedupeStrategy === "defer";
-		const requestObjectForStream = isReadableStream(localRequest.body) ? {
-			...localRequest,
-			duplex: localRequest.duplex ?? "half"
-		} : localRequest;
-		const requestInstance = new Request(localOptions.fullURL, requestObjectForStream);
-		await toStreamableRequest({
+		const streamableContext = {
 			baseConfig,
 			config,
 			options: localOptions,
-			request: localRequest,
-			requestInstance: requestInstance.clone()
-		});
-		const getFetchApiPromise = () => {
-			if (isReadableStream(localRequest.body)) return fetchApi(requestInstance.clone());
-			return fetchApi(localOptions.fullURL, localRequest);
+			request: localRequest
 		};
-		const responsePromise = shouldUsePromiseFromCache ? prevRequestInfo.responsePromise : getFetchApiPromise();
+		const streamableRequest = await toStreamableRequest(streamableContext);
+		const responsePromise = shouldUsePromiseFromCache ? prevRequestInfo.responsePromise : fetchApi(localOptions.fullURL, streamableRequest);
 		$RequestInfoCacheOrNull?.set(dedupeKey, {
 			controller: newFetchController,
 			responsePromise
 		});
 		const streamableResponse = toStreamableResponse({
-			baseConfig,
-			config,
-			options: localOptions,
-			request: localRequest,
+			...streamableContext,
 			response: await responsePromise
 		});
 		return streamableResponse;
@@ -325,19 +314,14 @@ const createDedupeStrategy = async (context) => {
 const definePlugin = (plugin) => {
 	return plugin;
 };
-const resolvePluginArray = (plugins, basePlugins) => {
-	if (!plugins) return [];
-	if (isFunction(plugins)) return plugins({ basePlugins: basePlugins ?? [] });
-	return plugins;
-};
 const initializePlugins = async (context) => {
 	const { baseConfig, config, initURL, options, request } = context;
 	const clonedHookRegistries = structuredClone(hookRegistries);
 	const addMainHooks = () => {
 		for (const key of Object.keys(clonedHookRegistries)) {
-			const baseHook = baseConfig;
-			const instanceHook = config[key];
 			const overriddenHook = options[key];
+			const baseHook = baseConfig[key];
+			const instanceHook = config[key];
 			const mainHook = isArray(baseHook) && Boolean(instanceHook) ? [baseHook, instanceHook].flat() : overriddenHook;
 			if (!mainHook) continue;
 			clonedHookRegistries[key].add(mainHook);
@@ -352,7 +336,7 @@ const initializePlugins = async (context) => {
 	};
 	const mergedHooksExecutionOrder = options.mergedHooksExecutionOrder ?? hookDefaults.mergedHooksExecutionOrder;
 	if (mergedHooksExecutionOrder === "mainHooksBeforePlugins") addMainHooks();
-	const resolvedPlugins = resolvePluginArray(options.plugins, baseConfig.plugins);
+	const resolvedPlugins = isFunction(options.plugins) ? options.plugins({ basePlugins: baseConfig.plugins ?? [] }) : options.plugins ?? [];
 	let resolvedInitURL = initURL;
 	let resolvedOptions = options;
 	let resolvedRequestOptions = request;
@@ -427,7 +411,7 @@ const createRetryStrategy = (ctx) => {
 		if (!baseShouldRetry) return false;
 		const retryMethods = new Set(options.retryMethods ?? options.retry?.methods ?? retryDefaults.methods);
 		const resolvedMethod = ctx.request.method ?? requestOptionDefaults.method;
-		const includesMethod = Boolean(resolvedMethod) && retryMethods.has(resolvedMethod);
+		const includesMethod = retryMethods.has(resolvedMethod);
 		const retryStatusCodes = new Set(options.retryStatusCodes ?? options.retry?.statusCodes ?? []);
 		const includesStatusCodes = Boolean(ctx.response?.status) && (retryStatusCodes.size > 0 ? retryStatusCodes.has(ctx.response.status) : true);
 		const shouldRetry = includesMethod && includesStatusCodes;
@@ -587,7 +571,7 @@ const extractMethodFromURL = (initURL) => {
 };
 const getMethod = (options) => {
 	const { initURL, method, schemaConfig } = options;
-	if (schemaConfig?.requireHttpMethodProvision === true) return method?.toUpperCase() ?? requestOptionDefaults.method;
+	if (schemaConfig?.requireMethodProvision === true) return method?.toUpperCase() ?? requestOptionDefaults.method;
 	return method?.toUpperCase() ?? extractMethodFromURL(initURL)?.toUpperCase() ?? requestOptionDefaults.method;
 };
 const normalizeURL = (initURL) => {
@@ -621,13 +605,16 @@ const createFetchClient = (initBaseConfig = {}) => {
 		const baseConfig = resolvedBaseConfig;
 		const config = initConfig;
 		const [baseFetchOptions, baseExtraOptions] = splitBaseConfig(baseConfig);
+		const shouldSkipAutoMergeForOptions = baseExtraOptions.skipAutoMergeFor === "all" || baseExtraOptions.skipAutoMergeFor === "options";
+		const shouldSkipAutoMergeForRequest = baseExtraOptions.skipAutoMergeFor === "all" || baseExtraOptions.skipAutoMergeFor === "request";
 		const mergedExtraOptions = {
 			...baseExtraOptions,
-			...baseExtraOptions.skipAutoMergeFor !== "all" && baseExtraOptions.skipAutoMergeFor !== "options" && extraOptions
+			...!shouldSkipAutoMergeForOptions && extraOptions
 		};
 		const mergedRequestOptions = {
+			headers: {},
 			...baseFetchOptions,
-			...baseExtraOptions.skipAutoMergeFor !== "all" && baseExtraOptions.skipAutoMergeFor !== "request" && fetchOptions
+			...!shouldSkipAutoMergeForRequest && fetchOptions
 		};
 		const { resolvedHooks, resolvedInitURL, resolvedOptions, resolvedRequestOptions } = await initializePlugins({
 			baseConfig,
@@ -661,7 +648,6 @@ const createFetchClient = (initBaseConfig = {}) => {
 		const combinedSignal = createCombinedSignal(resolvedRequestOptions.signal, timeoutSignal, newFetchController.signal);
 		let request = {
 			...resolvedRequestOptions,
-			headers: resolvedRequestOptions.headers ?? {},
 			signal: combinedSignal
 		};
 		const { dedupeStrategy, handleRequestCancelStrategy, handleRequestDeferStrategy, removeDedupeKeyFromCache } = await createDedupeStrategy({
@@ -727,7 +713,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 					schemaConfig: resolvedSchemaConfig
 				});
 				throw new HTTPError({
-					defaultErrorMessage: options.defaultErrorMessage,
+					defaultHTTPErrorMessage: options.defaultHTTPErrorMessage,
 					errorData: validErrorData,
 					response
 				}, { cause: validErrorData });
@@ -758,7 +744,6 @@ const createFetchClient = (initBaseConfig = {}) => {
 		} catch (error) {
 			const errorInfo = {
 				cloneResponse: options.cloneResponse,
-				defaultErrorMessage: options.defaultErrorMessage,
 				resultMode: options.resultMode
 			};
 			const generalErrorResult = resolveErrorResult(error, errorInfo);