@zayne-labs/callapi 1.8.20 → 1.8.22

package/dist/esm/index.d.ts

@@ -1,30 +1,30 @@
-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, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamsFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginInitContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, Writeable } from "./common-Vd9i_nPc.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, HTTPError, Hooks, HooksOrHooksArray, InferInitURL, InferParamsFromRoute, InferSchemaResult, PluginExtraOptions, PluginHooks, PluginHooksWithMoreOptions, PluginInitContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeUnion, ResultModeUnion, RetryOptions, SuccessContext, ThrowOnErrorUnion, URLOptions, ValidationError, Writeable } from "./common-C-kIzPcz.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"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, 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 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<{
+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;
-  "get/"?: CallApiSchema | undefined;
-  "patch/"?: CallApiSchema | undefined;
-  "post/"?: CallApiSchema | undefined;
-  "put/"?: CallApiSchema | undefined;
+  "@delete/"?: CallApiSchema | undefined;
+  "@get/"?: CallApiSchema | undefined;
+  "@patch/"?: CallApiSchema | undefined;
+  "@post/"?: CallApiSchema | undefined;
+  "@put/"?: CallApiSchema | undefined;
 }, TCurrentRouteSchemaKey>, const TPluginArray extends CallApiPlugin[] = DefaultPluginArray>(initURL: TInitURL, config?: CallApiConfig<InferSchemaResult<TSchema["data"], TData>, InferSchemaResult<TSchema["errorData"], TErrorData>, TResultMode, TThrowOnError, TResponseType, {
   [x: AnyString]: CallApiSchema | undefined;
-  "delete/"?: CallApiSchema | undefined;
-  "get/"?: CallApiSchema | undefined;
-  "patch/"?: CallApiSchema | undefined;
-  "post/"?: CallApiSchema | undefined;
-  "put/"?: 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>;
 //#endregion
 //#region src/defineHelpers.d.ts
 declare const defineSchema: <const TBaseSchemaRoutes extends BaseCallApiSchemaRoutes, const TSchemaConfig extends CallApiSchemaConfig>(routes: TBaseSchemaRoutes, config?: TSchemaConfig) => {
-  config: TSchemaConfig | undefined;
-  routes: Writeable<typeof routes, "deep">;
+  config: Writeable<TSchemaConfig, "deep"> & {};
+  routes: Writeable<TBaseSchemaRoutes, "deep">;
 };
-declare const defineSchemaConfig: <const TConfig extends CallApiExtraOptions["schemaConfig"]>(config: TConfig) => Writeable<typeof config, "deep">;
+declare const defineSchemaConfig: <const TConfig extends CallApiExtraOptions["schemaConfig"]>(config: TConfig) => NonNullable<Writeable<typeof config, "deep">>;
 declare const defineSchemaRoutes: <const TBaseSchemaRoutes extends BaseCallApiSchemaRoutes>(routes: TBaseSchemaRoutes) => Writeable<typeof routes, "deep">;
 declare const definePlugin: <const TPlugin extends CallApiPlugin | AnyFunction<CallApiPlugin>>(plugin: TPlugin) => Writeable<TPlugin, "deep">;
 declare const defineBaseConfig: <const TBaseConfig extends BaseCallApiConfig>(baseConfig: TBaseConfig) => Writeable<typeof baseConfig, "deep">;

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-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-C4H57FX_.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-DZe23qYR.js";
 
 //#region src/result.ts
 const getResponseType = (response, parser) => ({
@@ -107,13 +107,13 @@ const hookRegistries = {
 	onSuccess: /* @__PURE__ */ new Set(),
 	onValidationError: /* @__PURE__ */ new Set()
 };
-const composeAllHooks = (hooksArray, mergedHooksExecutionMode) => {
+const composeAllHooks = (hooksArray, hooksExecutionMode) => {
 	const mergedHook = async (ctx) => {
-		if (mergedHooksExecutionMode === "sequential") {
+		if (hooksExecutionMode === "sequential") {
 			for (const hook of hooksArray) await hook?.(ctx);
 			return;
 		}
-		if (mergedHooksExecutionMode === "parallel") await Promise.all(hooksArray.map((uniqueHook) => uniqueHook?.(ctx)));
+		if (hooksExecutionMode === "parallel") await Promise.all(hooksArray.map((uniqueHook) => uniqueHook?.(ctx)));
 	};
 	return mergedHook;
 };
@@ -241,21 +241,22 @@ const toStreamableResponse = async (context) => {
 
 //#endregion
 //#region src/dedupe.ts
-const getAbortErrorMessage = (dedupeKey, fullURL) => {
-	return dedupeKey ? `Duplicate request detected - Aborted previous request with key '${dedupeKey}' as a new request was initiated` : `Duplicate request detected - Aborted previous request to '${fullURL}' as a new request with identical options was initiated`;
-};
 const createDedupeStrategy = async (context) => {
 	const { $GlobalRequestInfoCache: $GlobalRequestInfoCache$1, $LocalRequestInfoCache, baseConfig, config, newFetchController, options: globalOptions, request: globalRequest } = context;
 	const dedupeStrategy = globalOptions.dedupeStrategy ?? dedupeDefaults.dedupeStrategy;
-	const generateDedupeKey = () => {
+	const getDedupeKey = () => {
 		const shouldHaveDedupeKey = dedupeStrategy === "cancel" || dedupeStrategy === "defer";
 		if (!shouldHaveDedupeKey) return null;
+		if (globalOptions.dedupeKey) {
+			const resolvedDedupeKey = isFunction(globalOptions.dedupeKey) ? globalOptions.dedupeKey(context) : globalOptions.dedupeKey;
+			return resolvedDedupeKey;
+		}
 		return `${globalOptions.fullURL}-${deterministicHashFn({
 			options: globalOptions,
 			request: globalRequest
 		})}`;
 	};
-	const dedupeKey = globalOptions.dedupeKey ?? generateDedupeKey();
+	const dedupeKey = getDedupeKey();
 	const dedupeCacheScope = globalOptions.dedupeCacheScope ?? dedupeDefaults.dedupeCacheScope;
 	const dedupeCacheScopeKey = globalOptions.dedupeCacheScopeKey ?? dedupeDefaults.dedupeCacheScopeKey;
 	if (dedupeCacheScope === "global" && !$GlobalRequestInfoCache$1.has(dedupeCacheScopeKey)) $GlobalRequestInfoCache$1.set(dedupeCacheScopeKey, /* @__PURE__ */ new Map());
@@ -267,10 +268,14 @@ const createDedupeStrategy = async (context) => {
 	******/
 	if (dedupeKey !== null) await waitFor(.1);
 	const prevRequestInfo = $RequestInfoCacheOrNull?.get(dedupeKey);
+	const getAbortErrorMessage = () => {
+		if (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`;
+	};
 	const handleRequestCancelStrategy = () => {
 		const shouldCancelRequest = prevRequestInfo && dedupeStrategy === "cancel";
 		if (!shouldCancelRequest) return;
-		const message = getAbortErrorMessage(globalOptions.dedupeKey, globalOptions.fullURL);
+		const message = getAbortErrorMessage();
 		const reason = new DOMException(message, "AbortError");
 		prevRequestInfo.controller.abort(reason);
 		return Promise.resolve();
@@ -302,6 +307,7 @@ const createDedupeStrategy = async (context) => {
 	};
 	return {
 		dedupeStrategy,
+		getAbortErrorMessage,
 		handleRequestCancelStrategy,
 		handleRequestDeferStrategy,
 		removeDedupeKeyFromCache
@@ -486,8 +492,8 @@ const initializePlugins = async (context) => {
 			clonedHookRegistries[key].add(pluginHook);
 		}
 	};
-	const mergedHooksExecutionOrder = options.mergedHooksExecutionOrder ?? hookDefaults.mergedHooksExecutionOrder;
-	if (mergedHooksExecutionOrder === "mainHooksBeforePlugins") addMainHooks();
+	const hookRegistrationOrder = options.hooksRegistrationOrder ?? hookDefaults.hooksRegistrationOrder;
+	if (hookRegistrationOrder === "mainFirst") addMainHooks();
 	const { currentRouteSchemaKey, mainInitURL } = getCurrentRouteSchemaKeyAndMainInitURL({
 		baseExtraOptions: baseConfig,
 		extraOptions: config,
@@ -529,14 +535,14 @@ const initializePlugins = async (context) => {
 		if (!plugin.hooks) continue;
 		addPluginHooks(plugin.hooks);
 	}
-	if (mergedHooksExecutionOrder === "mainHooksAfterPlugins") addMainHooks();
+	if (hookRegistrationOrder === "pluginsFirst") addMainHooks();
 	const resolvedHooks = {};
 	for (const [key, hookRegistry] of Object.entries(clonedHookRegistries)) {
 		if (hookRegistry.size === 0) continue;
 		const flattenedHookArray = [...hookRegistry].flat();
 		if (flattenedHookArray.length === 0) continue;
-		const mergedHooksExecutionMode = options.mergedHooksExecutionMode ?? hookDefaults.mergedHooksExecutionMode;
-		const composedHook = composeAllHooks(flattenedHookArray, mergedHooksExecutionMode);
+		const hooksExecutionMode = options.hooksExecutionMode ?? hookDefaults.hooksExecutionMode;
+		const composedHook = composeAllHooks(flattenedHookArray, hooksExecutionMode);
 		resolvedHooks[key] = composedHook;
 	}
 	return {
@@ -623,14 +629,39 @@ const mergeUrlWithQuery = (url, query) => {
 	return `${url}${questionMark}${queryString}`;
 };
 /**
-* @description
-* Extracts the method from the URL if it is a schema modifier.
+* @description Extracts the HTTP method from method-prefixed route patterns.
+*
+* Analyzes URLs that start with method modifiers (e.g., "@get/", "@post/") and extracts
+* the HTTP method for use in API requests. This enables method specification directly
+* in route definitions.
+*
+* @param initURL - The URL string to analyze for method modifiers
+* @returns The extracted HTTP method (lowercase) if found, otherwise undefined
+*
+* @example
+* ```typescript
+* // Method extraction from prefixed routes
+* extractMethodFromURL("@get/users");        // Returns: "get"
+* extractMethodFromURL("@post/users");       // Returns: "post"
+* extractMethodFromURL("@put/users/:id");    // Returns: "put"
+* extractMethodFromURL("@delete/users/:id"); // Returns: "delete"
+* extractMethodFromURL("@patch/users/:id");  // Returns: "patch"
+*
+* // No method modifier
+* extractMethodFromURL("/users");            // Returns: undefined
+* extractMethodFromURL("users");             // Returns: undefined
+*
+* // Invalid or unsupported methods
+* extractMethodFromURL("@invalid/users");    // Returns: undefined
+* extractMethodFromURL("@/users");           // Returns: undefined
 *
-* @param initURL - The URL to extract the method from.
-* @returns The method if it is a schema modifier, otherwise undefined.
+* // Edge cases
+* extractMethodFromURL(undefined);           // Returns: undefined
+* extractMethodFromURL("");                  // Returns: undefined
+* ```
 */
 const extractMethodFromURL = (initURL) => {
-	if (!initURL?.startsWith("@")) return;
+	if (!initURL || initURL.startsWith("@")) return;
 	const method = initURL.split("@")[1]?.split("/")[0];
 	if (!method || !routeKeyMethods.includes(method)) return;
 	return method;
@@ -646,7 +677,7 @@ const normalizeURL = (initURL) => {
 	const normalizedURL = initURL.replace(`@${methodFromURL}/`, "/");
 	return normalizedURL;
 };
-const getFullURL = (options) => {
+const getFullAndNormalizedURL = (options) => {
 	const { baseURL, initURL, params, query } = options;
 	const normalizedInitURL = normalizeURL(initURL);
 	const urlWithMergedParams = mergeUrlWithParams(normalizedInitURL, params);
@@ -693,7 +724,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 			options: mergedExtraOptions,
 			request: mergedRequestOptions
 		});
-		const { fullURL, normalizedInitURL } = getFullURL({
+		const { fullURL, normalizedInitURL } = getFullAndNormalizedURL({
 			baseURL: resolvedOptions.baseURL,
 			initURL: resolvedInitURL,
 			params: resolvedOptions.params,
@@ -713,7 +744,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 			...resolvedRequestOptions,
 			signal: combinedSignal
 		};
-		const { dedupeStrategy, handleRequestCancelStrategy, handleRequestDeferStrategy, removeDedupeKeyFromCache } = await createDedupeStrategy({
+		const { dedupeStrategy, getAbortErrorMessage, handleRequestCancelStrategy, handleRequestDeferStrategy, removeDedupeKeyFromCache } = await createDedupeStrategy({
 			$GlobalRequestInfoCache,
 			$LocalRequestInfoCache,
 			baseConfig,
@@ -864,7 +895,7 @@ const createFetchClient = (initBaseConfig = {}) => {
 			}
 			let message = error?.message;
 			if (error instanceof DOMException && error.name === "AbortError") {
-				message = getAbortErrorMessage(options.dedupeKey, options.fullURL);
+				message = getAbortErrorMessage();
 				!shouldThrowOnError && console.error(`${error.name}:`, message);
 			}
 			if (error instanceof DOMException && error.name === "TimeoutError") {
@@ -885,8 +916,8 @@ const callApi = createFetchClient();
 //#region src/defineHelpers.ts
 const defineSchema = (routes, config) => {
 	return {
-		config,
-		routes
+		config: defineSchemaConfig(config),
+		routes: defineSchemaRoutes(routes)
 	};
 };
 const defineSchemaConfig = (config) => {