@zayne-labs/callapi 1.12.0 → 1.12.1

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { A as GetCallApiContext, B as DedupeOptions, C as CallApiExtraOptions, D as CallApiResultLoose, G as HooksOrHooksArray, H as CallApiRequestOptionsForHooks, J as ResponseContext, K as RequestContext, L as FetchImpl, N as InstanceContext, P as Register, Q as RetryOptions, R as FetchMiddlewareContext, T as CallApiRequestOptions, U as ErrorContext, V as CallApiExtraOptionsForHooks, W as Hooks, X as ResponseStreamContext, Y as ResponseErrorContext, Z as SuccessContext, _ as ResponseTypeType, a as PluginHooks, at as InferInitURL, b as BaseCallApiExtraOptions, c as CallApiResultErrorVariant, ct as URLOptions, dt as BaseSchemaRouteKeyPrefixes, ft as CallApiSchema, gt as InferSchemaOutput, h as PossibleValidationError, ht as InferSchemaInput, i as CallApiPlugin, it as InferAllMainRoutes, j as GetCallApiContextRequired, l as CallApiResultSuccessOrErrorVariant, m as PossibleJavaScriptError, nt as GetCurrentRouteSchemaKey, o as PluginMiddlewares, ot as InferParamsFromRoute, p as PossibleHTTPError, pt as CallApiSchemaConfig, q as RequestStreamContext, rt as InferAllMainRouteKeys, s as PluginSetupContext, t as DefaultCallApiContext, u as CallApiResultSuccessVariant, ut as BaseCallApiSchemaRoutes, v as ResultModeType, w as CallApiParameters, x as CallApiConfig, y as BaseCallApiConfig, z as Middlewares } from "./default-types-BUYTny8V.js";
-import { n as createFetchClient, r as createFetchClientWithContext, t as callApi } from "./index-D67wXPS1.js";
-export { BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaRoutes, BaseSchemaRouteKeyPrefixes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResultLoose as CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessOrErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultCallApiContext, ErrorContext, FetchImpl, FetchMiddlewareContext, GetCallApiContext, GetCallApiContextRequired, GetCurrentRouteSchemaKey, Hooks, HooksOrHooksArray, InferAllMainRouteKeys, InferAllMainRoutes, InferInitURL, InferParamsFromRoute, InferSchemaInput, InferSchemaOutput, InstanceContext, Middlewares, PluginHooks, PluginMiddlewares, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeType, ResultModeType, RetryOptions, SuccessContext, URLOptions, callApi, createFetchClient, createFetchClientWithContext };
+import { $ as RetryOptions, A as GetCallApiContext, B as DedupeOptions, C as CallApiExtraOptions, D as CallApiResultLoose, G as HooksOrHooksArray, H as CallApiRequestOptionsForHooks, J as ResponseContext, K as RequestContext, L as FetchImpl, N as InstanceContext, P as Register, Q as RefetchOptions, R as FetchMiddlewareContext, T as CallApiRequestOptions, U as ErrorContext, V as CallApiExtraOptionsForHooks, W as Hooks, X as ResponseStreamContext, Y as ResponseErrorContext, Z as SuccessContext, _ as ResponseTypeType, _t as InferSchemaOutput, a as PluginHooks, at as InferAllMainRoutes, b as BaseCallApiExtraOptions, c as CallApiResultErrorVariant, dt as BaseCallApiSchemaRoutes, ft as BaseSchemaRouteKeyPrefixes, gt as InferSchemaInput, h as PossibleValidationError, i as CallApiPlugin, it as InferAllMainRouteKeys, j as GetCallApiContextRequired, l as CallApiResultSuccessOrErrorVariant, lt as URLOptions, m as PossibleJavaScriptError, mt as CallApiSchemaConfig, o as PluginMiddlewares, ot as InferInitURL, p as PossibleHTTPError, pt as CallApiSchema, q as RequestStreamContext, rt as GetCurrentRouteSchemaKey, s as PluginSetupContext, st as InferParamsFromRoute, t as DefaultCallApiContext, u as CallApiResultSuccessVariant, v as ResultModeType, w as CallApiParameters, x as CallApiConfig, y as BaseCallApiConfig, z as Middlewares } from "./default-types-BvfiXmWZ.js";
+import { n as createFetchClient, r as createFetchClientWithContext, t as callApi } from "./index-BHNZSrAS.js";
+export { BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaRoutes, BaseSchemaRouteKeyPrefixes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResultLoose as CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessOrErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultCallApiContext, ErrorContext, FetchImpl, FetchMiddlewareContext, GetCallApiContext, GetCallApiContextRequired, GetCurrentRouteSchemaKey, Hooks, HooksOrHooksArray, InferAllMainRouteKeys, InferAllMainRoutes, InferInitURL, InferParamsFromRoute, InferSchemaInput, InferSchemaOutput, InstanceContext, Middlewares, PluginHooks, PluginMiddlewares, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleValidationError, RefetchOptions, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeType, ResultModeType, RetryOptions, SuccessContext, URLOptions, callApi, createFetchClient, createFetchClientWithContext };

package/dist/index.js

@@ -1,6 +1,4 @@
-import { C as isArray, E as isFunction, O as isReadableStream, T as isBoolean, _ as handleConfigValidation, a as getBody, c as getMethod, d as splitBaseConfig, f as splitConfig, h as getCurrentRouteSchemaKeyAndMainInitURL, i as createTimeoutSignal, k as isString, l as getResolvedHeaders, m as getFullAndNormalizedURL, o as getFetchImpl, p as waitFor, r as createCombinedSignal, s as getHeaders, t as extraOptionDefaults, u as omitKeys, v as handleSchemaValidation, y as HTTPError } from "./defaults-gB08KAp_.js";
-import { a as isValidationErrorInstance, n as isHTTPErrorInstance } from "./guards-D7k3EcVD.js";
-
+import { A as getFullAndNormalizedURL, B as isFunction, H as isString, M as handleConfigValidation, N as handleSchemaValidation, P as HTTPError, R as isArray, V as isReadableStream, a as getBody, c as getMethod, d as splitBaseConfig, f as splitConfig, g as isHTTPErrorInstance, i as createTimeoutSignal, j as getCurrentRouteSchemaKeyAndMainInitURL, l as getResolvedHeaders, o as getFetchImpl, p as waitUntil, r as createCombinedSignal, s as getHeaders, t as extraOptionDefaults, u as omitKeys, y as isValidationErrorInstance, z as isBoolean } from "./defaults-B0Zvy-uW.js";
 //#region src/result.ts
 const getResponseType = (response, responseParser) => ({
 	arrayBuffer: () => response.arrayBuffer(),
@@ -109,7 +107,6 @@ const getCustomizedErrorResult = (errorResult, customErrorInfo) => {
 		}
 	};
 };
-
 //#endregion
 //#region src/hooks.ts
 const getHookRegistriesAndKeys = () => {
@@ -159,7 +156,6 @@ const executeHooksInCatchBlock = async (hookResultsOrPromise, hookInfo) => {
 		return errorResult;
 	}
 };
-
 //#endregion
 //#region src/stream.ts
 const createProgressEvent = (options) => {
@@ -263,7 +259,6 @@ const toStreamableResponse = (context) => {
 	} });
 	return new Response(stream, response);
 };
-
 //#endregion
 //#region src/dedupe.ts
 const createDedupeStrategy = async (context) => {
@@ -284,8 +279,7 @@ const createDedupeStrategy = async (context) => {
 		if (!dedupeKey) return;
 		const dedupeCacheScope = globalOptions.dedupeCacheScope ?? extraOptionDefaults.dedupeCacheScope;
 		const dedupeCacheScopeKey = getDedupeCacheScopeKey();
-		if (dedupeCacheScope === "global" && !$GlobalRequestInfoCache.has(dedupeCacheScopeKey)) $GlobalRequestInfoCache.set(dedupeCacheScopeKey, /* @__PURE__ */ new Map());
-		const $RequestInfoCache = dedupeCacheScope === "global" ? $GlobalRequestInfoCache.get(dedupeCacheScopeKey) : $LocalRequestInfoCache;
+		const $RequestInfoCache = dedupeCacheScope === "global" ? $GlobalRequestInfoCache.get(dedupeCacheScopeKey) ?? $GlobalRequestInfoCache.set(dedupeCacheScopeKey, /* @__PURE__ */ new Map()).get(dedupeCacheScopeKey) : $LocalRequestInfoCache;
 		return {
 			delete: () => $RequestInfoCache?.delete(dedupeKey),
 			get: () => $RequestInfoCache?.get(dedupeKey),
@@ -317,7 +311,7 @@ const createDedupeStrategy = async (context) => {
 	* simultaneously (same problem as microtasks). Any non-zero value (even 0.0000000001) forces
 	* proper sequential task queue scheduling, ensuring each request gets its own task slot.
 	*/
-	if (dedupeKey !== null) await waitFor(.001);
+	if (dedupeKey !== null) await waitUntil(.01);
 	const prevRequestInfo = $RequestInfoCache?.get();
 	const getAbortErrorMessage = () => {
 		if (globalOptions.dedupeKey) return `Duplicate request detected - Aborted previous request with key '${dedupeKey}'`;
@@ -360,7 +354,6 @@ const createDedupeStrategy = async (context) => {
 		resolvedDedupeStrategy
 	};
 };
-
 //#endregion
 //#region src/middlewares.ts
 const getMiddlewareRegistriesAndKeys = () => {
@@ -389,7 +382,6 @@ const composeMiddlewaresFromArray = (middlewareArray) => {
 	}
 	return composedMiddleware;
 };
-
 //#endregion
 //#region src/plugins.ts
 const getResolvedPlugins = (context) => {
@@ -397,30 +389,16 @@ const getResolvedPlugins = (context) => {
 	return isFunction(options.plugins) ? options.plugins({ basePlugins: baseConfig.plugins ?? [] }) : options.plugins ?? [];
 };
 const initializePlugins = async (setupContext) => {
-	const { baseConfig, config, initURL, options, request } = setupContext;
+	const { baseConfig, config, currentRouteSchemaKey, mainInitURL, options, request } = setupContext;
 	const { addMainHooks, addMainMiddlewares, addPluginHooks, addPluginMiddlewares, getResolvedHooks, getResolvedMiddlewares } = setupHooksAndMiddlewares({
 		baseConfig,
 		config,
 		options
 	});
-	const initURLResult = getCurrentRouteSchemaKeyAndMainInitURL({
-		baseExtraOptions: baseConfig,
-		extraOptions: config,
-		initURL
-	});
-	let resolvedCurrentRouteSchemaKey = initURLResult.currentRouteSchemaKey;
-	let resolvedInitURL = initURLResult.mainInitURL;
+	let resolvedCurrentRouteSchemaKey = currentRouteSchemaKey;
+	let resolvedInitURL = mainInitURL;
 	const resolvedOptions = options;
-	const resolvedRequest = Object.assign(request, {
-		headers: getResolvedHeaders({
-			baseHeaders: baseConfig.headers,
-			headers: config.headers
-		}),
-		method: getMethod({
-			initURL: resolvedInitURL,
-			method: request.method
-		})
-	});
+	const resolvedRequest = request;
 	const executePluginSetupFn = async (pluginSetup) => {
 		if (!pluginSetup) return;
 		const initResult = await pluginSetup(setupContext);
@@ -527,18 +505,17 @@ const setupHooksAndMiddlewares = (context) => {
 		getResolvedMiddlewares
 	};
 };
-
 //#endregion
 //#region src/refetch.ts
 const createRefetchManager = (ctx) => {
 	const { callApi, callApiArgs, options } = ctx;
 	const currentRefetchCount = options["~refetchCount"] ?? 1;
-	const refetch = (refetchOptionOverrides) => {
+	const refetch = async (refetchOptionOverrides) => {
 		const maxRefetchAttempts = refetchOptionOverrides?.refetchAttempts ?? options.refetchAttempts ?? extraOptionDefaults.refetchAttempts;
 		if (!(currentRefetchCount <= maxRefetchAttempts)) {
 			const message = `Maximum refetch attempts (${maxRefetchAttempts}) exceeded. This prevents infinite loops. Increase 'maxRefetchAttempts' if needed.`;
 			console.error(message);
-			return Promise.resolve(null);
+			return null;
 		}
 		const updatedConfig = {
 			...callApiArgs.config,
@@ -549,7 +526,6 @@ const createRefetchManager = (ctx) => {
 	};
 	return { refetch };
 };
-
 //#endregion
 //#region src/retry.ts
 const getLinearDelay = (currentAttemptCount, options) => {
@@ -594,7 +570,7 @@ const createRetryManager = (ctx) => {
 		};
 		const hookError = await executeHooksInCatchBlock([options.onRetry?.(retryContext)], hookInfo);
 		if (hookError) return hookError;
-		await waitFor(getDelay());
+		await waitUntil(getDelay());
 		const updatedConfig = {
 			...callApiArgs.config,
 			"~retryAttemptCount": currentAttemptCount + 1
@@ -608,7 +584,6 @@ const createRetryManager = (ctx) => {
 	};
 	return { handleRetryOrGetErrorResult };
 };
-
 //#endregion
 //#region src/createFetchClient.ts
 const $GlobalRequestInfoCache = /* @__PURE__ */ new Map();
@@ -634,12 +609,27 @@ const createFetchClientWithContext = () => {
 				...baseFetchOptions,
 				...!shouldSkipAutoMergeForRequest && fetchOptions
 			};
+			const initURLResult = getCurrentRouteSchemaKeyAndMainInitURL({
+				baseExtraOptions: baseConfig,
+				extraOptions: config,
+				initURL: initURL.toString()
+			});
 			const { resolvedCurrentRouteSchemaKey, resolvedHooks, resolvedInitURL, resolvedMiddlewares, resolvedOptions, resolvedRequest } = await initializePlugins({
 				baseConfig,
 				config,
-				initURL: initURL.toString(),
+				...initURLResult,
 				options: mergedExtraOptions,
-				request: mergedRequestOptions
+				request: {
+					...mergedRequestOptions,
+					headers: getResolvedHeaders({
+						baseHeaders: baseConfig.headers,
+						headers: config.headers
+					}),
+					method: getMethod({
+						initURL: initURLResult.initURL,
+						method: mergedRequestOptions.method
+					})
+				}
 			});
 			const { fullURL, normalizedInitURL } = getFullAndNormalizedURL({
 				baseURL: resolvedOptions.baseURL,
@@ -647,7 +637,7 @@ const createFetchClientWithContext = () => {
 				params: resolvedOptions.params,
 				query: resolvedOptions.query
 			});
-			const options = {
+			const initOptions = {
 				...resolvedOptions,
 				...resolvedHooks,
 				...resolvedMiddlewares,
@@ -661,9 +651,12 @@ const createFetchClientWithContext = () => {
 					config,
 					initURL
 				},
-				options
+				options: initOptions
 			});
-			options.refetch = refetch;
+			const options = {
+				...initOptions,
+				refetch
+			};
 			const newFetchController = new AbortController();
 			const combinedSignal = createCombinedSignal(createTimeoutSignal(options.timeout), resolvedRequest.signal, newFetchController.signal);
 			const request = {
@@ -695,7 +688,7 @@ const createFetchClientWithContext = () => {
 					request
 				});
 				Object.assign(options, extraOptionsValidationResult);
-				Object.assign(request, {
+				const modifiedRequestOptionsValidationResult = {
 					body: getBody({
 						body: requestOptionsValidationResult.body,
 						bodySerializer: options.bodySerializer,
@@ -710,7 +703,8 @@ const createFetchClientWithContext = () => {
 						initURL: resolvedInitURL,
 						method: requestOptionsValidationResult.method
 					})
-				});
+				};
+				Object.assign(request, modifiedRequestOptionsValidationResult);
 				const readyRequestContext = {
 					baseConfig,
 					config,
@@ -835,7 +829,7 @@ const createFetchClientWithContext = () => {
 };
 const createFetchClient = createFetchClientWithContext();
 const callApi = createFetchClient();
-
 //#endregion
 export { callApi, createFetchClient, createFetchClientWithContext };
+
 //# sourceMappingURL=index.js.map