refactor(callapi): further improve type simplification in a few core areas

- Add GetMergedCallApiContext type for better context merging
- Simplify Hooks interface by removing redundant generic params
- Update Middlewares interface to support context types
- Remove type-preserving overload from toFormData utility
- Reorganize imports in test files

Author: ryan-zayne

.changeset/warm-rockets-marry.md

@@ -0,0 +1,11 @@
+---
+"@zayne-labs/callapi": patch
+---
+
+refactor(callapi): further improve type simplification in a few core areas
+
+- Add GetMergedCallApiContext type for better context merging
+- Simplify Hooks interface by removing redundant generic params
+- Update Middlewares interface to support context types
+- Remove type-preserving overload from toFormData utility
+- Reorganize imports in test files

apps/dev/package.json

@@ -20,6 +20,6 @@
 		"@zayne-labs/tsconfig": "0.11.5",
 		"tsx": "^4.20.6",
 		"typescript": "5.9.3",
-		"vite": "npm:rolldown-vite@7.1.19"
+		"vite": "npm:rolldown-vite@7.2.8"
 	}
 }

apps/docs/package.json

@@ -26,12 +26,12 @@
 		"@zayne-labs/ui-react": "^0.10.37",
 		"ai": "^5.0.104",
 		"clsx": "^2.1.1",
-		"fumadocs-core": "16.1.0",
+		"fumadocs-core": "16.2.0",
 		"fumadocs-docgen": "3.0.4",
-		"fumadocs-mdx": "14.0.3",
+		"fumadocs-mdx": "14.0.4",
 		"fumadocs-twoslash": "3.1.10",
 		"fumadocs-typescript": "4.0.13",
-		"fumadocs-ui": "16.1.0",
+		"fumadocs-ui": "16.2.0",
 		"geist": "^1.5.1",
 		"hast-util-to-jsx-runtime": "^2.3.6",
 		"lucide-react": "^0.555.0",
@@ -40,7 +40,7 @@
 		"radix-ui": "^1.4.3",
 		"react": "19.2.0",
 		"react-dom": "19.2.0",
-		"react-remove-scroll": "^2.7.1",
+		"react-remove-scroll": "^2.7.2",
 		"remark": "^15.0.1",
 		"remark-gfm": "^4.0.1",
 		"remark-mdx": "^3.1.1",

package.json

@@ -18,6 +18,7 @@
 		"dev:callapi-plugins": "turbo run --filter=./packages/callapi-plugins dev",
 		"dev:dev": "turbo run --filter=./apps/dev dev",
 		"dev:docs": "turbo run --filter=./apps/docs dev",
+		"dev:packages": "turbo run --filter=./packages/* dev",
 		"inspect:eslint-config": "pnpx @eslint/config-inspector@latest",
 		"lint:attw": "turbo run --filter=./packages/* lint:attw",
 		"lint:eslint": "turbo run --filter=./packages/* lint:eslint",
@@ -56,7 +57,7 @@
 		"eslint-plugin-react-you-might-not-need-an-effect": "^0.7.0",
 		"husky": "9.1.7",
 		"lint-staged": "16.2.7",
-		"prettier": "3.6.2",
+		"prettier": "3.7.2",
 		"tailwindcss": "^4.1.17",
 		"turbo": "^2.6.1",
 		"typescript": "^5.9.3"

packages/callapi/src/createFetchClient.ts

@@ -29,6 +29,7 @@ import type {
 	CallApiResult,
 	GetBaseSchemaConfig,
 	GetBaseSchemaRoutes,
+	GetMergedCallApiContext,
 } from "./types/common";
 import type {
 	GetCurrentRouteSchema,
@@ -83,6 +84,10 @@ export const createFetchClientWithContext = <
 		TBaseResponseType extends ResponseTypeType = ResponseTypeType,
 		const TBaseSchemaAndConfig extends BaseCallApiSchemaAndConfig = BaseCallApiSchemaAndConfig,
 		const TBasePluginArray extends CallApiPlugin[] = DefaultPluginArray,
+		TComputedBaseCallApiContext extends CallApiContext = GetMergedCallApiContext<
+			TBaseCallApiContext,
+			{ Data: TBaseData; ErrorData: TBaseErrorData; ResultMode: TBaseResultMode }
+		>,
 		TComputedBaseSchemaConfig extends CallApiSchemaConfig = GetBaseSchemaConfig<TBaseSchemaAndConfig>,
 		TComputedBaseSchemaRoutes extends
 			BaseCallApiSchemaRoutes = GetBaseSchemaRoutes<TBaseSchemaAndConfig>,
@@ -104,7 +109,10 @@ export const createFetchClientWithContext = <
 			TData = TBaseData,
 			TErrorData = TBaseErrorData,
 			TResultMode extends ResultModeType = TBaseResultMode,
-			TCallApiContext extends CallApiContext = TBaseCallApiContext,
+			TCallApiContext extends CallApiContext = GetMergedCallApiContext<
+				TComputedBaseCallApiContext,
+				{ Data: TData; ErrorData: TErrorData; ResultMode: TResultMode }
+			>,
 			TThrowOnError extends ThrowOnErrorUnion = TBaseThrowOnError,
 			TResponseType extends ResponseTypeType = TBaseResponseType,
 			const TSchemaConfig extends CallApiSchemaConfig = TComputedBaseSchemaConfig,

packages/callapi/src/hooks.ts

@@ -19,14 +19,7 @@ import type {
 import type { DefaultCallApiContext } from "./types/default-types";
 import type { AnyFunction, Awaitable, Prettify, UnmaskType } from "./types/type-helpers";
 
-export interface Hooks<
-	TCallApiContext extends Pick<
-		CallApiContext,
-		"Data" | "ErrorData" | "InferredPluginOptions" | "Meta"
-	> = DefaultCallApiContext,
-	TData = TCallApiContext["Data"],
-	TErrorData = TCallApiContext["ErrorData"],
-> {
+export interface Hooks<TCallApiContext extends CallApiContext = DefaultCallApiContext> {
 	/**
 	 * Hook called when any error occurs within the request/response lifecycle.
 	 *
@@ -37,7 +30,7 @@ export interface Hooks<
 	 * @param context - Error context containing error details, request info, and response (if available)
 	 * @returns Promise or void - Hook can be async or sync
 	 */
-	onError?: (context: ErrorContext<TCallApiContext, TErrorData>) => Awaitable<unknown>;
+	onError?: (context: ErrorContext<TCallApiContext>) => Awaitable<unknown>;
 
 	/**
 	 * Hook called before the HTTP request is sent and before any internal processing of the request object begins.
@@ -94,7 +87,7 @@ export interface Hooks<
 	 * @returns Promise or void - Hook can be async or sync
 	 *
 	 */
-	onResponse?: (context: ResponseContext<TCallApiContext, TData, TErrorData>) => Awaitable<unknown>;
+	onResponse?: (context: ResponseContext<TCallApiContext>) => Awaitable<unknown>;
 
 	/**
 	 * Hook called when an HTTP error response (4xx, 5xx) is received from the API.
@@ -106,7 +99,7 @@ export interface Hooks<
 	 * @param context - Response error context with HTTP error details and response
 	 * @returns Promise or void - Hook can be async or sync
 	 */
-	onResponseError?: (context: ResponseErrorContext<TCallApiContext, TErrorData>) => Awaitable<unknown>;
+	onResponseError?: (context: ResponseErrorContext<TCallApiContext>) => Awaitable<unknown>;
 
 	/**
 	 * Hook called during download stream progress tracking.
@@ -132,7 +125,7 @@ export interface Hooks<
 	 * @returns Promise or void - Hook can be async or sync
 	 *
 	 */
-	onRetry?: (response: RetryContext<TCallApiContext, TErrorData>) => Awaitable<unknown>;
+	onRetry?: (response: RetryContext<TCallApiContext>) => Awaitable<unknown>;
 
 	/**
 	 * Hook called when a successful response (2xx status) is received from the API.
@@ -145,7 +138,7 @@ export interface Hooks<
 	 * @returns Promise or void - Hook can be async or sync
 	 *
 	 */
-	onSuccess?: (context: SuccessContext<TCallApiContext, TData>) => Awaitable<unknown>;
+	onSuccess?: (context: SuccessContext<TCallApiContext>) => Awaitable<unknown>;
 
 	/**
 	 * Hook called when a validation error occurs.
@@ -161,15 +154,11 @@ export interface Hooks<
 	onValidationError?: (context: ValidationErrorContext<TCallApiContext>) => Awaitable<unknown>;
 }
 
-export type HooksOrHooksArray<
-	TCallApiContext extends CallApiContext = DefaultCallApiContext,
-	TData = TCallApiContext["Data"],
-	TErrorData = TCallApiContext["ErrorData"],
-> = {
-	[Key in keyof Hooks<TCallApiContext, TData, TErrorData>]:
-		| Hooks<TCallApiContext, TData, TErrorData>[Key]
+export type HooksOrHooksArray<TCallApiContext extends CallApiContext = DefaultCallApiContext> = {
+	[Key in keyof Hooks<TCallApiContext>]:
+		| Hooks<TCallApiContext>[Key]
 		// eslint-disable-next-line perfectionist/sort-union-types -- I need arrays to be last
-		| Array<Hooks<TCallApiContext, TData, TErrorData>[Key]>;
+		| Array<Hooks<TCallApiContext>[Key]>;
 };
 
 export interface HookConfigOptions {
@@ -238,10 +227,9 @@ export type SuccessContext<
 		CallApiContext,
 		"Data" | "InferredPluginOptions" | "Meta"
 	> = DefaultCallApiContext,
-	TData = TCallApiContext["Data"],
 > = UnmaskType<
 	RequestContext<TCallApiContext> & {
-		data: NoInfer<TData>;
+		data: NoInfer<TCallApiContext["Data"]>;
 		response: Response;
 	}
 >;
@@ -251,14 +239,15 @@ export type ResponseContext<
 		CallApiContext,
 		"Data" | "ErrorData" | "InferredPluginOptions" | "Meta"
 	> = DefaultCallApiContext,
-	TData = TCallApiContext["Data"],
-	TErrorData = TCallApiContext["ErrorData"],
 > = UnmaskType<
 	RequestContext<TCallApiContext>
 		& (
-			| Prettify<CallApiResultSuccessVariant<TData>>
+			| Prettify<CallApiResultSuccessVariant<TCallApiContext["Data"]>>
 			| Prettify<
-					Extract<CallApiResultErrorVariant<TErrorData>, { error: PossibleHTTPError<TErrorData> }>
+					Extract<
+						CallApiResultErrorVariant<TCallApiContext["ErrorData"]>,
+						{ error: PossibleHTTPError<TCallApiContext["ErrorData"]> }
+					>
 			  >
 		)
 >;
@@ -275,12 +264,11 @@ export type ErrorContext<
 		CallApiContext,
 		"ErrorData" | "InferredPluginOptions" | "Meta"
 	> = DefaultCallApiContext,
-	TErrorData = TCallApiContext["ErrorData"],
 > = UnmaskType<
 	RequestContext<TCallApiContext>
 		& (
 			| {
-					error: PossibleHTTPError<TErrorData>;
+					error: PossibleHTTPError<TCallApiContext["ErrorData"]>;
 					response: Response;
 			  }
 			| {
@@ -295,9 +283,8 @@ export type ResponseErrorContext<
 		CallApiContext,
 		"ErrorData" | "InferredPluginOptions" | "Meta"
 	> = DefaultCallApiContext,
-	TErrorData = TCallApiContext["ErrorData"],
 > = UnmaskType<
-	Extract<ErrorContext<TCallApiContext, TErrorData>, { error: PossibleHTTPError<TErrorData> }>
+	Extract<ErrorContext<TCallApiContext>, { error: PossibleHTTPError<TCallApiContext["ErrorData"]> }>
 		& RequestContext<TCallApiContext>
 >;
 
@@ -306,9 +293,8 @@ export type RetryContext<
 		CallApiContext,
 		"ErrorData" | "InferredPluginOptions" | "Meta"
 	> = DefaultCallApiContext,
-	TErrorData = TCallApiContext["ErrorData"],
 > = UnmaskType<
-	ErrorContext<TCallApiContext, TErrorData> & {
+	ErrorContext<TCallApiContext> & {
 		retryAttemptCount: number;
 	}
 >;

packages/callapi/src/middlewares.ts

@@ -1,11 +1,13 @@
 import type { RequestContext } from "./hooks";
+import type { CallApiContext } from "./types/common";
+import type { DefaultCallApiContext } from "./types/default-types";
 import type { UnmaskType } from "./types/type-helpers";
 
 export type FetchImpl = UnmaskType<
 	(input: string | Request | URL, init?: RequestInit) => Promise<Response>
 >;
 
-export interface Middlewares {
+export interface Middlewares<TCallApiContext extends CallApiContext = DefaultCallApiContext> {
 	/**
 	 * Wraps the fetch implementation to intercept requests at the network layer.
 	 *
@@ -37,7 +39,7 @@ export interface Middlewares {
 	 * }
 	 * ```
 	 */
-	fetchMiddleware?: (context: RequestContext & { fetchImpl: FetchImpl }) => FetchImpl;
+	fetchMiddleware?: (context: RequestContext<TCallApiContext> & { fetchImpl: FetchImpl }) => FetchImpl;
 }
 
 type MiddlewareRegistries = Required<{

packages/callapi/src/plugins.ts

@@ -11,8 +11,13 @@ import {
 	getMiddlewareRegistriesAndKeys,
 	type Middlewares,
 } from "./middlewares";
-import type { CallApiContext, CallApiRequestOptions, CallApiRequestOptionsForHooks } from "./types/common";
-import type { DefaultCallApiContext } from "./types/default-types";
+import type {
+	CallApiContext,
+	CallApiRequestOptions,
+	CallApiRequestOptionsForHooks,
+	GetMergedCallApiContext,
+} from "./types/common";
+import type { DefaultCallApiContext, DefaultDataType } from "./types/default-types";
 import type { Awaitable } from "./types/type-helpers";
 import type { InitURLOrURLObject } from "./url";
 import { isArray, isFunction, isPlainObject, isString } from "./utils/guards";
@@ -21,22 +26,26 @@ import { type BaseCallApiSchemaAndConfig, getCurrentRouteSchemaKeyAndMainInitURL
 export type PluginSetupContext<TCallApiContext extends CallApiContext = DefaultCallApiContext> =
 	RequestContext<TCallApiContext> & { initURL: string };
 
-export type PluginInitResult = Partial<
-	Omit<PluginSetupContext, "initURL" | "request"> & {
+export type PluginInitResult<TCallApiContext extends CallApiContext = DefaultCallApiContext> = Partial<
+	Omit<PluginSetupContext<TCallApiContext>, "initURL" | "request"> & {
 		initURL: InitURLOrURLObject;
 		request: CallApiRequestOptions;
 	}
 >;
 
-export type PluginHooks<
-	TCallApiContext extends CallApiContext = DefaultCallApiContext,
-	TData = unknown extends TCallApiContext["Data"] ? never : TCallApiContext["Data"],
-	TErrorData = unknown extends TCallApiContext["ErrorData"] ? never : TCallApiContext["ErrorData"],
-> = HooksOrHooksArray<TCallApiContext, TData, TErrorData>;
-
-export type PluginMiddlewares = Middlewares;
-
-export interface CallApiPlugin {
+export type PluginHooks<TCallApiContext extends CallApiContext = DefaultCallApiContext> =
+	HooksOrHooksArray<
+		GetMergedCallApiContext<
+			TCallApiContext,
+			{
+				Data: DefaultDataType extends TCallApiContext["Data"] ? never : TCallApiContext["Data"];
+				ErrorData: DefaultDataType extends TCallApiContext["ErrorData"] ? never
+				:	TCallApiContext["ErrorData"];
+			}
+		>
+	>;
+
+export interface CallApiPlugin<TCallApiContext extends CallApiContext = DefaultCallApiContext> {
 	/**
 	 * Defines additional options that can be passed to callApi
 	 */
@@ -50,7 +59,9 @@ export interface CallApiPlugin {
 	/**
 	 * Hooks for the plugin
 	 */
-	hooks?: PluginHooks | ((context: PluginSetupContext) => Awaitable<PluginHooks>);
+	hooks?:
+		| PluginHooks<TCallApiContext>
+		| ((context: PluginSetupContext<TCallApiContext>) => Awaitable<PluginHooks<TCallApiContext>>);
 
 	/**
 	 *  A unique id for the plugin
@@ -60,7 +71,9 @@ export interface CallApiPlugin {
 	/**
 	 * Middlewares that for the plugin
 	 */
-	middlewares?: Middlewares | ((context: PluginSetupContext) => Awaitable<Middlewares>);
+	middlewares?:
+		| Middlewares<TCallApiContext>
+		| ((context: PluginSetupContext<TCallApiContext>) => Awaitable<Middlewares<TCallApiContext>>);
 
 	/**
 	 * A name for the plugin
@@ -75,7 +88,9 @@ export interface CallApiPlugin {
 	/**
 	 * A function that will be called when the plugin is initialized. This will be called before the any of the other internal functions.
 	 */
-	setup?: (context: PluginSetupContext) => Awaitable<PluginInitResult> | Awaitable<void>;
+	setup?: (
+		context: PluginSetupContext<TCallApiContext>
+	) => Awaitable<PluginInitResult<TCallApiContext>> | Awaitable<void>;
 
 	/**
 	 *  A version for the plugin
@@ -224,7 +239,7 @@ const setupHooksAndMiddlewares = (
 		}
 	};
 
-	const addPluginMiddlewares = (pluginMiddlewares: PluginMiddlewares) => {
+	const addPluginMiddlewares = (pluginMiddlewares: Middlewares) => {
 		for (const middlewareName of middlewareRegistryKeys) {
 			const pluginMiddleware = pluginMiddlewares[middlewareName];
 

packages/callapi/src/types/common.ts

@@ -52,6 +52,11 @@ export type CallApiContext = {
 	ResultMode?: ResultModeType;
 };
 
+export type GetMergedCallApiContext<
+	TFullCallApiContext extends CallApiContext,
+	TOverrideCallApiContext extends CallApiContext,
+> = Omit<TFullCallApiContext, keyof TOverrideCallApiContext> & TOverrideCallApiContext;
+
 type FetchSpecificKeysUnion = Exclude<(typeof fetchSpecificKeys)[number], "body" | "headers" | "method">;
 
 export type ModifiedRequestInit = RequestInit & { duplex?: "half" };
@@ -87,17 +92,18 @@ type SharedExtraOptions<
 	TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError,
 	TResponseType extends ResponseTypeType = ResponseTypeType,
 	TPluginArray extends CallApiPlugin[] = DefaultPluginArray,
-	TComputedPluginOptions = InferPluginOptions<TPluginArray> & TCallApiContext["InferredPluginOptions"],
-	TComputedInferredPluginOptions extends Pick<Required<CallApiContext>, "InferredPluginOptions"> = {
-		InferredPluginOptions: TComputedPluginOptions;
-	},
+	TComputedMergedPluginOptions = Partial<
+		InferPluginOptions<TPluginArray> & TCallApiContext["InferredPluginOptions"]
+	>,
 > = DedupeOptions
 	& HookConfigOptions
-	& HooksOrHooksArray<TComputedInferredPluginOptions, TData, TErrorData>
+	& HooksOrHooksArray<
+		GetMergedCallApiContext<TCallApiContext, { InferredPluginOptions: TComputedMergedPluginOptions }>
+	>
 	& Middlewares
-	& Partial<TComputedInferredPluginOptions["InferredPluginOptions"]>
 	& ResultModeOption<TErrorData, TResultMode>
 	& RetryOptions<TErrorData>
+	& TComputedMergedPluginOptions
 	& ThrowOnErrorOption<TErrorData, TThrowOnError>
 	& URLOptions & {
 		/**