@zayne-labs/callapi 1.11.0 → 1.11.2

package/dist/esm/{common-CPTdKchS.d.ts → common-DBLyu1c5.d.ts}

@@ -16,6 +16,7 @@ type UnionToIntersection<TUnion> = (TUnion extends unknown ? (param: TUnion) =>
 type UnmaskType<TValue> = {
   _: TValue;
 }["_"];
+type RemovePrefix<TPrefix extends "dedupe" | "retry", TKey extends string> = TKey extends `${TPrefix}${infer TRest}` ? Uncapitalize<TRest> : TKey;
 type Awaitable<TValue> = Promise<TValue> | TValue;
 type CommonRequestHeaders = "Access-Control-Allow-Credentials" | "Access-Control-Allow-Headers" | "Access-Control-Allow-Methods" | "Access-Control-Allow-Origin" | "Access-Control-Expose-Headers" | "Access-Control-Max-Age" | "Age" | "Allow" | "Cache-Control" | "Clear-Site-Data" | "Content-Disposition" | "Content-Encoding" | "Content-Language" | "Content-Length" | "Content-Location" | "Content-Range" | "Content-Security-Policy-Report-Only" | "Content-Security-Policy" | "Cookie" | "Cross-Origin-Embedder-Policy" | "Cross-Origin-Opener-Policy" | "Cross-Origin-Resource-Policy" | "Date" | "ETag" | "Expires" | "Last-Modified" | "Location" | "Permissions-Policy" | "Pragma" | "Retry-After" | "Save-Data" | "Sec-CH-Prefers-Color-Scheme" | "Sec-CH-Prefers-Reduced-Motion" | "Sec-CH-UA-Arch" | "Sec-CH-UA-Bitness" | "Sec-CH-UA-Form-Factor" | "Sec-CH-UA-Full-Version-List" | "Sec-CH-UA-Full-Version" | "Sec-CH-UA-Mobile" | "Sec-CH-UA-Model" | "Sec-CH-UA-Platform-Version" | "Sec-CH-UA-Platform" | "Sec-CH-UA-WoW64" | "Sec-CH-UA" | "Sec-Fetch-Dest" | "Sec-Fetch-Mode" | "Sec-Fetch-Site" | "Sec-Fetch-User" | "Sec-GPC" | "Server-Timing" | "Server" | "Service-Worker-Navigation-Preload" | "Set-Cookie" | "Strict-Transport-Security" | "Timing-Allow-Origin" | "Trailer" | "Transfer-Encoding" | "Upgrade" | "Vary" | "Warning" | "WWW-Authenticate" | "X-Content-Type-Options" | "X-DNS-Prefetch-Control" | "X-Frame-Options" | "X-Permitted-Cross-Domain-Policies" | "X-Powered-By" | "X-Robots-Tag" | "X-XSS-Protection" | AnyString;
 type CommonAuthorizationHeaders = `${"Basic" | "Bearer" | "Token"} ${string}`;
@@ -61,7 +62,7 @@ type CustomAuth = {
 type Auth = PossibleAuthValueOrGetter | BearerOrTokenAuth | BasicAuth | CustomAuth;
 //#endregion
 //#region src/constants/common.d.ts
-declare const fetchSpecificKeys: (keyof RequestInit | "duplex")[];
+declare const fetchSpecificKeys: readonly (keyof RequestInit | "duplex")[];
 //#endregion
 //#region src/types/standard-schema.d.ts
 /**
@@ -356,7 +357,7 @@ interface CallApiSchema {
    */
   query?: StandardSchemaV1<Query | undefined> | ((query: Query) => Awaitable<Query | undefined>);
 }
-declare const routeKeyMethods: ["delete", "get", "patch", "post", "put"];
+declare const routeKeyMethods: readonly ["delete", "get", "patch", "post", "put"];
 type RouteKeyMethods = (typeof routeKeyMethods)[number];
 type RouteKeyMethodsURLUnion = `@${RouteKeyMethods}/`;
 type BaseCallApiSchemaRoutes = Partial<Record<AnyString | RouteKeyMethodsURLUnion, CallApiSchema>>;
@@ -423,9 +424,9 @@ interface Middlewares {
   /**
    * Wraps the fetch implementation to intercept requests at the network layer.
    *
-   * Takes the current fetch function and returns a new one. Use it to cache responses,
-   * add logging, handle offline mode, or short-circuit requests etc. Multiple middleware
-   * compose in order: plugins → base config → per-request.
+   * Takes a context object containing the current fetch function and returns a new fetch function.
+   * Use it to cache responses, add logging, handle offline mode, or short-circuit requests etc.
+   * Multiple middleware compose in order: plugins → base config → per-request.
    *
    * Unlike `customFetchImpl`, middleware can call through to the original fetch.
    *
@@ -433,25 +434,27 @@ interface Middlewares {
    * ```ts
    * // Cache responses
    * const cache = new Map();
-   * fetchMiddleware: (fetchImpl) => async (input, init) => {
+   * fetchMiddleware: (ctx) => async (input, init) => {
    *   const key = input.toString();
    *   if (cache.has(key)) return cache.get(key).clone();
    *
-   *   const response = await fetchImpl(input, init);
+   *   const response = await ctx.fetchImpl(input, init);
    *   cache.set(key, response.clone());
    *   return response;
    * }
    *
    * // Handle offline
-   * fetchMiddleware: (fetchImpl) => async (input, init) => {
+   * fetchMiddleware: (ctx) => async (input, init) => {
    *   if (!navigator.onLine) {
    *     return new Response('{"error": "offline"}', { status: 503 });
    *   }
-   *   return fetchImpl(input, init);
+   *   return ctx.fetchImpl(input, init);
    * }
    * ```
    */
-  fetchMiddleware?: (fetchImpl: FetchImpl) => FetchImpl;
+  fetchMiddleware?: (context: RequestContext & {
+    fetchImpl: FetchImpl;
+  }) => FetchImpl;
 }
 //#endregion
 //#region src/plugins.d.ts
@@ -862,7 +865,13 @@ type ResponseStreamContext = UnmaskType<RequestContext & {
 //#endregion
 //#region src/dedupe.d.ts
 type DedupeStrategyUnion = UnmaskType<"cancel" | "defer" | "none">;
+type DedupeOptionKeys = Exclude<keyof DedupeOptions, "dedupe">;
+type InnerDedupeOptions = { [Key in DedupeOptionKeys as RemovePrefix<"dedupe", Key>]?: DedupeOptions[Key] };
 type DedupeOptions = {
+  /**
+   * All dedupe options in a single object instead of separate properties
+   */
+  dedupe?: InnerDedupeOptions;
   /**
    * Controls the scope of request deduplication caching.
    *
@@ -1071,7 +1080,7 @@ type DedupeOptions = {
 };
 //#endregion
 //#region src/retry.d.ts
-declare const defaultRetryStatusCodesLookup: () => {
+declare const defaultRetryStatusCodesLookup: () => Readonly<{
   408: "Request Timeout";
   409: "Conflict";
   425: "Too Early";
@@ -1080,13 +1089,11 @@ declare const defaultRetryStatusCodesLookup: () => {
   502: "Bad Gateway";
   503: "Service Unavailable";
   504: "Gateway Timeout";
-};
+}>;
 type RetryStatusCodes = UnmaskType<AnyNumber | keyof ReturnType<typeof defaultRetryStatusCodesLookup>>;
 type RetryCondition<TErrorData> = (context: ErrorContext<TErrorData>) => Awaitable<boolean>;
-type InnerRetryKeys<TErrorData> = Exclude<keyof RetryOptions<TErrorData>, "~retryAttemptCount" | "retry">;
-type InnerRetryOptions<TErrorData> = { [Key in InnerRetryKeys<TErrorData> as Key extends `retry${infer TRest}` ? Uncapitalize<TRest> extends "attempts" ? never : Uncapitalize<TRest> : Key]?: RetryOptions<TErrorData>[Key] } & {
-  attempts: NonNullable<RetryOptions<TErrorData>["retryAttempts"]>;
-};
+type RetryOptionKeys<TErrorData> = Exclude<keyof RetryOptions<TErrorData>, "~retryAttemptCount" | "retry">;
+type InnerRetryOptions<TErrorData> = { [Key in RetryOptionKeys<TErrorData> as RemovePrefix<"retry", Key>]?: RetryOptions<TErrorData>[Key] };
 interface RetryOptions<TErrorData> {
   /**
    * Keeps track of the number of times the request has already been retried
@@ -1789,4 +1796,4 @@ type CallApiParameters<TData = DefaultDataType, TErrorData = DefaultDataType, TR
 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, 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-CPTdKchS.d.ts.map
+//# sourceMappingURL=common-DBLyu1c5.d.ts.map

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-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-CPTdKchS.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-DBLyu1c5.js";
 
 //#region src/createFetchClient.d.ts
 

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { HTTPError, ValidationError, createCombinedSignal, createTimeoutSignal, deterministicHashFn, extraOptionDefaults, fallBackRouteSchemaKey, getBody, getCurrentRouteSchemaKeyAndMainInitURL, getFetchImpl, getFullAndNormalizedURL, getHeaders, getMethod, handleConfigValidation, handleSchemaValidation, isArray, isBoolean, isFunction, isHTTPErrorInstance, isObject, isPlainObject, isReadableStream, isString, isValidationErrorInstance, splitBaseConfig, splitConfig, waitFor } from "./common-CEcqiR7c.js";
+import { HTTPError, ValidationError, createCombinedSignal, createTimeoutSignal, deterministicHashFn, extraOptionDefaults, fallBackRouteSchemaKey, getBody, getCurrentRouteSchemaKeyAndMainInitURL, getFetchImpl, getFullAndNormalizedURL, getHeaders, getMethod, handleConfigValidation, handleSchemaValidation, isArray, isBoolean, isFunction, isHTTPErrorInstance, isObject, isPlainObject, isReadableStream, isString, isValidationErrorInstance, splitBaseConfig, splitConfig, waitFor } from "./common-CNM4LjFu.js";
 
 //#region src/result.ts
 const getResponseType = (response, parser) => ({
@@ -20,14 +20,14 @@ const textTypes = new Set([
 const JSON_REGEX = /^application\/(?:[\w!#$%&*.^`~-]*\+)?json(;.+)?$/i;
 const detectResponseType = (response) => {
 	const initContentType = response.headers.get("content-type");
-	if (!initContentType) return extraOptionDefaults().responseType;
+	if (!initContentType) return extraOptionDefaults.responseType;
 	const contentType = initContentType.split(";")[0] ?? "";
 	if (JSON_REGEX.test(contentType)) return "json";
 	if (textTypes.has(contentType) || contentType.startsWith("text/")) return "text";
 	return "blob";
 };
 const resolveResponseData = (response, responseType, parser) => {
-	const selectedParser = parser ?? extraOptionDefaults().responseParser;
+	const selectedParser = parser ?? extraOptionDefaults.responseParser;
 	const selectedResponseType = responseType ?? detectResponseType(response);
 	const RESPONSE_TYPE_LOOKUP = getResponseType(response, selectedParser);
 	if (!Object.hasOwn(RESPONSE_TYPE_LOOKUP, selectedResponseType)) throw new Error(`Invalid response type: ${responseType}`);
@@ -125,7 +125,7 @@ const getHookRegistriesAndKeys = () => {
 		hookRegistryKeys: Object.keys(hookRegistries)
 	};
 };
-const composeAllHooks = (hooksArray, hooksExecutionMode) => {
+const composeHooksFromArray = (hooksArray, hooksExecutionMode) => {
 	const composedHook = async (ctx) => {
 		switch (hooksExecutionMode) {
 			case "parallel":
@@ -265,19 +265,20 @@ const toStreamableResponse = async (context) => {
 //#region src/dedupe.ts
 const createDedupeStrategy = async (context) => {
 	const { $GlobalRequestInfoCache: $GlobalRequestInfoCache$1, $LocalRequestInfoCache, baseConfig, config, newFetchController, options: globalOptions, request: globalRequest } = context;
-	const dedupeStrategy = globalOptions.dedupeStrategy ?? extraOptionDefaults().dedupeStrategy;
+	const dedupeStrategy = globalOptions.dedupeStrategy ?? globalOptions.dedupe?.strategy ?? extraOptionDefaults.dedupeStrategy;
 	const resolvedDedupeStrategy = isFunction(dedupeStrategy) ? dedupeStrategy(context) : dedupeStrategy;
 	const getDedupeKey = () => {
 		if (!(resolvedDedupeStrategy === "cancel" || resolvedDedupeStrategy === "defer")) return null;
-		if (globalOptions.dedupeKey) return isFunction(globalOptions.dedupeKey) ? globalOptions.dedupeKey(context) : globalOptions.dedupeKey;
+		const dedupeKey$1 = globalOptions.dedupeKey ?? globalOptions.dedupe?.key;
+		if (dedupeKey$1) return isFunction(dedupeKey$1) ? dedupeKey$1(context) : dedupeKey$1;
 		return `${globalOptions.fullURL}-${deterministicHashFn({
 			options: globalOptions,
 			request: globalRequest
 		})}`;
 	};
 	const dedupeKey = getDedupeKey();
-	const dedupeCacheScope = globalOptions.dedupeCacheScope ?? extraOptionDefaults().dedupeCacheScope;
-	const dedupeCacheScopeKey = globalOptions.dedupeCacheScopeKey ?? extraOptionDefaults().dedupeCacheScopeKey;
+	const dedupeCacheScope = globalOptions.dedupeCacheScope ?? globalOptions.dedupe?.cacheScope ?? extraOptionDefaults.dedupeCacheScope;
+	const dedupeCacheScopeKey = globalOptions.dedupeCacheScopeKey ?? globalOptions.dedupe?.cacheScopeKey ?? extraOptionDefaults.dedupeCacheScopeKey;
 	if (dedupeCacheScope === "global" && !$GlobalRequestInfoCache$1.has(dedupeCacheScopeKey)) $GlobalRequestInfoCache$1.set(dedupeCacheScopeKey, /* @__PURE__ */ new Map());
 	const $RequestInfoCache = dedupeCacheScope === "global" ? $GlobalRequestInfoCache$1.get(dedupeCacheScopeKey) : $LocalRequestInfoCache;
 	const $RequestInfoCacheOrNull = dedupeKey !== null ? $RequestInfoCache : null;
@@ -288,8 +289,8 @@ const createDedupeStrategy = async (context) => {
 	if (dedupeKey !== null) await waitFor(.1);
 	const prevRequestInfo = $RequestInfoCacheOrNull?.get(dedupeKey);
 	const getAbortErrorMessage = () => {
-		if (globalOptions.dedupeKey) return `Duplicate request detected - Aborted previous request with key '${dedupeKey}' as a new request was initiated`;
-		return `Duplicate request detected - Aborted previous request to '${globalOptions.fullURL}' as a new request with identical options was initiated`;
+		if (globalOptions.dedupeKey) return `Duplicate request detected - Aborted previous request with key '${dedupeKey}'`;
+		return `Duplicate request aborted - Aborted previous request to '${globalOptions.fullURL}'`;
 	};
 	const handleRequestCancelStrategy = () => {
 		if (!(prevRequestInfo && resolvedDedupeStrategy === "cancel")) return;
@@ -339,12 +340,22 @@ const getMiddlewareRegistriesAndKeys = () => {
 		middlewareRegistryKeys: Object.keys(middlewareRegistries)
 	};
 };
-const composeAllMiddlewares = (middlewareArray) => {
+const composeMiddlewaresFromArray = (middlewareArray) => {
 	let composedMiddleware;
 	for (const currentMiddleware of middlewareArray) {
 		if (!currentMiddleware) continue;
 		const previousMiddleware = composedMiddleware;
-		composedMiddleware = previousMiddleware ? (fetchImpl) => currentMiddleware(previousMiddleware(fetchImpl)) : currentMiddleware;
+		if (!previousMiddleware) {
+			composedMiddleware = currentMiddleware;
+			continue;
+		}
+		composedMiddleware = (context) => {
+			const prevFetchImpl = previousMiddleware(context);
+			return currentMiddleware({
+				...context,
+				fetchImpl: prevFetchImpl
+			});
+		};
 	}
 	return composedMiddleware;
 };
@@ -460,7 +471,7 @@ const setupHooksAndMiddlewares = (context) => {
 			if (hookRegistry.size === 0) continue;
 			const flattenedHookArray = [...hookRegistry].flat();
 			if (flattenedHookArray.length === 0) continue;
-			resolvedHooks[hookName] = composeAllHooks(flattenedHookArray, options.hooksExecutionMode ?? extraOptionDefaults().hooksExecutionMode);
+			resolvedHooks[hookName] = composeHooksFromArray(flattenedHookArray, options.hooksExecutionMode ?? extraOptionDefaults.hooksExecutionMode);
 		}
 		return resolvedHooks;
 	};
@@ -470,7 +481,7 @@ const setupHooksAndMiddlewares = (context) => {
 			if (middlewareRegistry.size === 0) continue;
 			const middlewareArray = [...middlewareRegistry];
 			if (middlewareArray.length === 0) continue;
-			resolvedMiddlewares[middlewareName] = composeAllMiddlewares(middlewareArray);
+			resolvedMiddlewares[middlewareName] = composeMiddlewaresFromArray(middlewareArray);
 		}
 		return resolvedMiddlewares;
 	};
@@ -488,19 +499,19 @@ const setupHooksAndMiddlewares = (context) => {
 //#region src/retry.ts
 const getLinearDelay = (currentAttemptCount, options) => {
 	const retryDelay = options.retryDelay ?? options.retry?.delay;
-	return (isFunction(retryDelay) ? retryDelay(currentAttemptCount) : retryDelay) ?? extraOptionDefaults().retryDelay;
+	return (isFunction(retryDelay) ? retryDelay(currentAttemptCount) : retryDelay) ?? extraOptionDefaults.retryDelay;
 };
 const getExponentialDelay = (currentAttemptCount, options) => {
-	const retryDelay = options.retryDelay ?? options.retry?.delay ?? extraOptionDefaults().retryDelay;
+	const retryDelay = options.retryDelay ?? options.retry?.delay ?? extraOptionDefaults.retryDelay;
 	const resolvedRetryDelay = isFunction(retryDelay) ? retryDelay(currentAttemptCount) : retryDelay;
-	const maxDelay = options.retryMaxDelay ?? options.retry?.maxDelay ?? extraOptionDefaults().retryMaxDelay;
+	const maxDelay = options.retryMaxDelay ?? options.retry?.maxDelay ?? extraOptionDefaults.retryMaxDelay;
 	const exponentialDelay = resolvedRetryDelay * 2 ** currentAttemptCount;
 	return Math.min(exponentialDelay, maxDelay);
 };
 const createRetryStrategy = (ctx) => {
 	const { options, request } = ctx;
 	const currentAttemptCount = options["~retryAttemptCount"] ?? 1;
-	const retryStrategy = options.retryStrategy ?? options.retry?.strategy ?? extraOptionDefaults().retryStrategy;
+	const retryStrategy = options.retryStrategy ?? options.retry?.strategy ?? extraOptionDefaults.retryStrategy;
 	const getDelay = () => {
 		switch (retryStrategy) {
 			case "exponential": return getExponentialDelay(currentAttemptCount, options);
@@ -510,13 +521,13 @@ const createRetryStrategy = (ctx) => {
 	};
 	const shouldAttemptRetry = async () => {
 		if (isBoolean(request.signal) && request.signal.aborted) return false;
-		const retryCondition = options.retryCondition ?? options.retry?.condition ?? extraOptionDefaults().retryCondition;
-		const maximumRetryAttempts = options.retryAttempts ?? options.retry?.attempts ?? extraOptionDefaults().retryAttempts;
+		const retryCondition = options.retryCondition ?? options.retry?.condition ?? extraOptionDefaults.retryCondition;
+		const maximumRetryAttempts = options.retryAttempts ?? options.retry?.attempts ?? extraOptionDefaults.retryAttempts;
 		const customRetryCondition = await retryCondition(ctx);
 		if (!(currentAttemptCount <= maximumRetryAttempts && customRetryCondition)) return false;
-		const retryMethods = new Set(options.retryMethods ?? options.retry?.methods ?? extraOptionDefaults().retryMethods);
+		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 retryStatusCodes = new Set(options.retryStatusCodes ?? options.retry?.statusCodes ?? extraOptionDefaults.retryStatusCodes);
 		const includesStatusCodes = ctx.response != null && retryStatusCodes.size > 0 ? retryStatusCodes.has(ctx.response.status) : true;
 		return includesMethod && includesStatusCodes;
 	};
@@ -566,7 +577,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 			params: resolvedOptions.params,
 			query: resolvedOptions.query
 		});
-		let options = {
+		const options = {
 			...resolvedOptions,
 			...resolvedHooks,
 			...resolvedMiddlewares,
@@ -581,7 +592,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 			initURL: resolvedInitURL,
 			method: resolvedRequestOptions.method
 		});
-		let request = {
+		const request = {
 			...resolvedRequestOptions,
 			method: initMethod,
 			signal: combinedSignal
@@ -610,10 +621,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 				options,
 				requestOptions: request
 			});
-			if (shouldApplySchemaOutput) options = {
-				...options,
-				...extraOptionsValidationResult
-			};
+			if (shouldApplySchemaOutput) Object.assign(options, extraOptionsValidationResult);
 			const validMethod = getMethod({
 				initURL: resolvedInitURL,
 				method: shouldApplySchemaOutput ? requestOptionsValidationResult?.method : request.method
@@ -628,20 +636,24 @@ const createFetchClient = (initBaseConfig = {}) => {
 				body: validBody,
 				headers: shouldApplySchemaOutput ? requestOptionsValidationResult?.headers : resolvedHeaders
 			});
-			request = {
-				...request,
-				...Boolean(validBody) && { body: validBody },
-				...Boolean(validHeaders) && { headers: validHeaders },
-				...Boolean(validMethod) && { method: validMethod }
-			};
-			await executeHooks(options.onRequestReady?.({
+			Object.assign(request, {
+				...validBody && { body: validBody },
+				...validHeaders && { headers: validHeaders },
+				...validMethod && { method: validMethod }
+			});
+			const readyRequestContext = {
 				baseConfig,
 				config,
 				options,
 				request
-			}));
+			};
+			await executeHooks(options.onRequestReady?.(readyRequestContext));
 			const response = await handleRequestDeferStrategy({
-				fetchApi: getFetchImpl(options.customFetchImpl, options.fetchMiddleware),
+				fetchApi: getFetchImpl({
+					customFetchImpl: options.customFetchImpl,
+					fetchMiddleware: options.fetchMiddleware,
+					requestContext: readyRequestContext
+				}),
 				options,
 				request
 			});