fix(callapi): Fix snd refactor types

ryan-zayne · ryan-zayne · commit d49f07d5ebfd · 2025-12-01T01:21:51.000+01:00
- refactor(types): Rename `GetCallApiResult` to `InferCallApiResult`
- refactor(core): Improve `SharedExtraOptions` to support context overriding
- fix(stream): Add default generic to `ReadableStream` augmentation
- docs(middlewares): Fix caching plugin usage and enable twoslash
- ci(workflows): Update pnpm version to 10.24.0
- chore(deps): Update lockfile
diff --git a/.changeset/dark-ducks-unite.md b/.changeset/dark-ducks-unite.md
@@ -0,0 +1,12 @@
+---
+"@zayne-labs/callapi": patch
+---
+
+fix(callapi): Fix snd refactor types
+
+- refactor(types): Rename `GetCallApiResult` to `InferCallApiResult`
+- refactor(core): Improve `SharedExtraOptions` to support context overriding
+- fix(stream): Add default generic to `ReadableStream` augmentation
+- docs(middlewares): Fix caching plugin usage and enable twoslash
+- ci(workflows): Update pnpm version to 10.24.0
+- chore(deps): Update lockfile
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
@@ -21,7 +21,7 @@ jobs:
          - name: Setup pnpm
            uses: pnpm/action-setup@v4
            with:
-              version: 10.19.0
+              version: 10.24.0
 
          - name: Setup Node.js
            uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
diff --git a/.github/workflows/lint-type-test.yml b/.github/workflows/lint-type-test.yml
@@ -21,7 +21,7 @@ jobs:
          - name: Setup pnpm
            uses: pnpm/action-setup@v4
            with:
-              version: 10.19.0
+              version: 10.24.0
 
          - name: Setup Node.js
            uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
diff --git a/.github/workflows/release-and-publish(changeset).yml b/.github/workflows/release-and-publish(changeset).yml
@@ -28,7 +28,7 @@ jobs:
          - name: Setup pnpm
            uses: pnpm/action-setup@v4
            with:
-              version: 10.19.0
+              version: 10.24.0
 
          - name: Setup Node.js 20.x
            uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
diff --git a/.github/workflows/release-and-publish(pkg.pr.new).yml b/.github/workflows/release-and-publish(pkg.pr.new).yml
@@ -26,7 +26,7 @@ jobs:
          - name: Setup pnpm
            uses: pnpm/action-setup@v4
            with:
-              version: 10.19.0
+              version: 10.24.0
 
          - name: Setup Node.js 20.x
            uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml
@@ -21,7 +21,7 @@ jobs:
          - name: Setup pnpm
            uses: pnpm/action-setup@v4
            with:
-              version: 10.19.0
+              version: 10.24.0
 
          - name: Setup Node.js
            uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
diff --git a/apps/dev/package.json b/apps/dev/package.json
@@ -18,7 +18,7 @@
 	"devDependencies": {
 		"@types/node": "^24.10.1",
 		"@zayne-labs/tsconfig": "0.11.5",
-		"tsx": "^4.20.6",
+		"tsx": "^4.21.0",
 		"typescript": "5.9.3",
 		"vite": "npm:rolldown-vite@7.2.8"
 	}
diff --git a/apps/dev/src/client.ts b/apps/dev/src/client.ts
@@ -82,7 +82,7 @@ const pluginTwo = definePlugin({
 
 const apiSchema = defineSchema(
 	{
-		".": {
+		"@default": {
 			// data: z.object({ random: z.number() }),
 			// params: z.object({ per_page: z.number() }).optional(),
 		},
diff --git a/apps/docs/content/docs/middlewares.mdx b/apps/docs/content/docs/middlewares.mdx
@@ -116,7 +116,7 @@ This reverse composition means the last middleware added gets the first chance t
 
 ### Response Caching
 
-```ts title="caching-plugin.ts"
+```ts twoslash title="caching-plugin.ts"
 import type { PluginSetupContext } from "@zayne-labs/callapi";
 import { definePlugin } from "@zayne-labs/callapi/utils";
 import { z } from "zod";
@@ -137,7 +137,7 @@ export const cachingPlugin = () => {
 
 		defineExtraOptions: () => CacheOptionsSchema,
 
-		middlewares: ({ options }: PluginSetupContext<CacheOptions>) => {
+		middlewares: ({ options }: PluginSetupContext<{ InferredExtraOptions: CacheOptions }>) => {
 			const { cacheLifetime = 60_000, cachePolicy = "cache-first" } = options;
 
 			return {
@@ -184,7 +184,7 @@ import { createFetchClient } from "@zayne-labs/callapi";
 
 const callBackendApi = createFetchClient({
 	baseURL: "https://api.example.com",
-	plugins: [cachingPlugin],
+	plugins: [cachingPlugin()],
 	cachePolicy: "cache-first",
 	cacheLifetime: 2 * 60 * 1000, // 2 minutes
 });
diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -26,17 +26,17 @@
 		"@zayne-labs/ui-react": "^0.10.37",
 		"ai": "^5.0.104",
 		"clsx": "^2.1.1",
-		"fumadocs-core": "16.2.0",
+		"fumadocs-core": "16.2.1",
 		"fumadocs-docgen": "3.0.4",
 		"fumadocs-mdx": "14.0.4",
 		"fumadocs-twoslash": "3.1.10",
 		"fumadocs-typescript": "4.0.13",
-		"fumadocs-ui": "16.2.0",
+		"fumadocs-ui": "16.2.1",
 		"geist": "^1.5.1",
 		"hast-util-to-jsx-runtime": "^2.3.6",
 		"lucide-react": "^0.555.0",
 		"motion": "^12.23.24",
-		"next": "16.0.5",
+		"next": "16.0.6",
 		"radix-ui": "^1.4.3",
 		"react": "19.2.0",
 		"react-dom": "19.2.0",
@@ -52,10 +52,10 @@
 		"tailwind-variants": "^3.2.2",
 		"unist-util-visit": "^5.0.0",
 		"zod": "^4.1.13",
-		"zustand": "^5.0.8"
+		"zustand": "^5.0.9"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "^16.0.5",
+		"@next/bundle-analyzer": "^16.0.6",
 		"@tailwindcss/postcss": "^4.1.17",
 		"@types/hast": "^3.0.4",
 		"@types/mdx": "^2.0.13",
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "@zayne-labs/callapi-root",
 	"type": "module",
 	"version": "0.0.0",
-	"packageManager": "pnpm@10.19.0",
+	"packageManager": "pnpm@10.24.0",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
@@ -45,7 +45,7 @@
 	"devDependencies": {
 		"@changesets/cli": "2.29.8",
 		"@eslint-react/eslint-plugin": "^2.3.9",
-		"@next/eslint-plugin-next": "^16.0.5",
+		"@next/eslint-plugin-next": "^16.0.6",
 		"@types/node": "^24.10.1",
 		"@zayne-labs/eslint-config": "0.11.5",
 		"@zayne-labs/prettier-config": "0.11.5",
@@ -57,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.3",
 		"tailwindcss": "^4.1.17",
 		"turbo": "^2.6.1",
 		"typescript": "^5.9.3"
diff --git a/packages/callapi-plugins/package.json b/packages/callapi-plugins/package.json
@@ -55,7 +55,7 @@
 		"cross-env": "^10.1.0",
 		"publint": "^0.3.15",
 		"size-limit": "12.0.0",
-		"tsdown": "0.15.9",
+		"tsdown": "0.17.0-beta.4",
 		"typescript": "5.9.3",
 		"vitest": "^4.0.14"
 	},
diff --git a/packages/callapi-plugins/tsdown.config.ts b/packages/callapi-plugins/tsdown.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig, type Options } from "tsdown";
+import { defineConfig, type UserConfig } from "tsdown";
 
 const isDevMode = process.env.NODE_ENV === "development";
 
@@ -7,17 +7,17 @@ const commonOptions = {
 	dts: { newContext: true },
 	entry: ["src/index.ts", "src/plugins/*/index.ts"],
 	ignoreWatch: [".turbo"],
-	platform: "browser",
+	platform: "neutral",
 	sourcemap: !isDevMode,
 	target: "esnext",
 	treeshake: true,
 	tsconfig: "tsconfig.json",
-} satisfies Options;
+} satisfies UserConfig;
 
 export default defineConfig([
 	{
 		...commonOptions,
-		format: ["es"],
+		format: ["esm"],
 		// outDir: "./dist/esm",
 	},
 ]);
diff --git a/packages/callapi/package.json b/packages/callapi/package.json
@@ -69,7 +69,7 @@
 		"playwright": "^1.57.0",
 		"publint": "^0.3.15",
 		"size-limit": "12.0.0",
-		"tsdown": "0.15.9",
+		"tsdown": "0.17.0-beta.4",
 		"typescript": "5.9.3",
 		"vitest": "^4.0.14",
 		"zod": "^4.1.13"
diff --git a/packages/callapi/src/createFetchClient.ts b/packages/callapi/src/createFetchClient.ts
@@ -29,7 +29,6 @@ import type {
 	CallApiResult,
 	GetBaseSchemaConfig,
 	GetBaseSchemaRoutes,
-	GetMergedCallApiContext,
 } from "./types/common";
 import type {
 	GetCurrentRouteSchema,
@@ -84,13 +83,11 @@ 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>,
+		TComputedBaseSchemaRoutes extends BaseCallApiSchemaRoutes =
+			GetBaseSchemaRoutes<TBaseSchemaAndConfig>,
+		// TComputedBaseData = GetResponseType<TBaseData, TBaseResponseType>,
+		// TComputedBaseErrorData = GetResponseType<TBaseErrorData, TBaseResponseType>,
 	>(
 		initBaseConfig: BaseCallApiConfig<
 			TBaseCallApiContext,
@@ -109,39 +106,33 @@ export const createFetchClientWithContext = <
 			TData = TBaseData,
 			TErrorData = TBaseErrorData,
 			TResultMode extends ResultModeType = TBaseResultMode,
-			TCallApiContext extends CallApiContext = GetMergedCallApiContext<
-				TComputedBaseCallApiContext,
-				{ Data: TData; ErrorData: TErrorData; ResultMode: TResultMode }
-			>,
+			TCallApiContext extends CallApiContext = TBaseCallApiContext,
 			TThrowOnError extends ThrowOnErrorUnion = TBaseThrowOnError,
 			TResponseType extends ResponseTypeType = TBaseResponseType,
 			const TSchemaConfig extends CallApiSchemaConfig = TComputedBaseSchemaConfig,
 			TInitURL extends InferInitURL<TComputedBaseSchemaRoutes, TSchemaConfig> = InferInitURL<
 				TComputedBaseSchemaRoutes,
 				TSchemaConfig
 			>,
-			TCurrentRouteSchemaKey extends GetCurrentRouteSchemaKey<
-				TSchemaConfig,
-				TInitURL
-			> = GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL>,
+			TCurrentRouteSchemaKey extends GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL> =
+				GetCurrentRouteSchemaKey<TSchemaConfig, TInitURL>,
 			const TSchema extends CallApiSchema = GetCurrentRouteSchema<
 				TComputedBaseSchemaRoutes,
 				TCurrentRouteSchemaKey
 			>,
 			const TPluginArray extends CallApiPlugin[] = TBasePluginArray,
-			TComputedResult = CallApiResult<
-				InferSchemaOutput<TSchema["data"], TData>,
-				InferSchemaOutput<TSchema["errorData"], TErrorData>,
-				TResultMode,
-				TThrowOnError,
-				TResponseType
+			TComputedData = InferSchemaOutput<TSchema["data"], GetResponseType<TData, TResponseType>>,
+			TComputedErrorData = InferSchemaOutput<
+				TSchema["errorData"],
+				GetResponseType<TErrorData, TResponseType>
 			>,
+			TComputedResult = CallApiResult<TComputedData, TComputedErrorData, TResultMode, TThrowOnError>,
 		>(
 			initURL: TInitURL,
 			initConfig: CallApiConfig<
 				TCallApiContext,
-				InferSchemaOutput<TSchema["data"], GetResponseType<TData, TResponseType>>,
-				InferSchemaOutput<TSchema["errorData"], GetResponseType<TErrorData, TResponseType>>,
+				TComputedData,
+				TComputedErrorData,
 				TResultMode,
 				TThrowOnError,
 				TResponseType,
@@ -166,7 +157,7 @@ export const createFetchClientWithContext = <
 					})
 				:	initBaseConfig;
 
-			const baseConfig = resolvedBaseConfig as BaseCallApiConfig;
+			const baseConfig = resolvedBaseConfig as Exclude<BaseCallApiConfig, AnyFunction>;
 			const config = initConfig as CallApiConfig;
 
 			const [baseFetchOptions, baseExtraOptions] = splitBaseConfig(baseConfig);
diff --git a/packages/callapi/src/middlewares.ts b/packages/callapi/src/middlewares.ts
@@ -21,6 +21,7 @@ export interface Middlewares<TCallApiContext extends CallApiContext = DefaultCal
 	 * ```ts
 	 * // Cache responses
 	 * const cache = new Map();
+	 *
 	 * fetchMiddleware: (ctx) => async (input, init) => {
 	 *   const key = input.toString();
 	 *   if (cache.has(key)) return cache.get(key).clone();
diff --git a/packages/callapi/src/plugins.ts b/packages/callapi/src/plugins.ts
@@ -15,7 +15,7 @@ import type {
 	CallApiContext,
 	CallApiRequestOptions,
 	CallApiRequestOptionsForHooks,
-	GetMergedCallApiContext,
+	OverrideCallApiContext,
 } from "./types/common";
 import type { DefaultCallApiContext, DefaultDataType } from "./types/default-types";
 import type { Awaitable } from "./types/type-helpers";
@@ -35,7 +35,7 @@ export type PluginInitResult<TCallApiContext extends CallApiContext = DefaultCal
 
 export type PluginHooks<TCallApiContext extends CallApiContext = DefaultCallApiContext> =
 	HooksOrHooksArray<
-		GetMergedCallApiContext<
+		OverrideCallApiContext<
 			TCallApiContext,
 			{
 				Data: DefaultDataType extends TCallApiContext["Data"] ? never : TCallApiContext["Data"];
diff --git a/packages/callapi/src/result.ts b/packages/callapi/src/result.ts
@@ -134,13 +134,10 @@ export type CallApiSuccessOrErrorVariant<TData, TError> =
 export type ResultModeMapWithoutException<
 	TData,
 	TErrorData,
-	TResponseType extends ResponseTypeType,
-	TComputedData = GetResponseType<TData, TResponseType>,
-	TComputedErrorData = GetResponseType<TErrorData, TResponseType>,
-	TComputedResult extends CallApiSuccessOrErrorVariant<
-		TComputedData,
-		TComputedErrorData
-	> = CallApiSuccessOrErrorVariant<TComputedData, TComputedErrorData>,
+	TComputedResult extends CallApiSuccessOrErrorVariant<TData, TErrorData> = CallApiSuccessOrErrorVariant<
+		TData,
+		TErrorData
+	>,
 > = UnmaskType<{
 	all: TComputedResult;
 	onlyData: TComputedResult["data"];
@@ -150,10 +147,7 @@ export type ResultModeMapWithoutException<
 
 type ResultModeMapWithException<
 	TData,
-	TResponseType extends ResponseTypeType,
-	TComputedData = GetResponseType<TData, TResponseType>,
-	TComputedResult extends
-		CallApiResultSuccessVariant<TComputedData> = CallApiResultSuccessVariant<TComputedData>,
+	TComputedResult extends CallApiResultSuccessVariant<TData> = CallApiResultSuccessVariant<TData>,
 > = {
 	all: TComputedResult;
 	onlyData: TComputedResult["data"];
@@ -164,11 +158,10 @@ type ResultModeMapWithException<
 export type ResultModeMap<
 	TData = DefaultDataType,
 	TErrorData = DefaultDataType,
-	TResponseType extends ResponseTypeType = ResponseTypeType,
 	TThrowOnError extends ThrowOnErrorUnion = DefaultThrowOnError,
 > =
-	TThrowOnError extends true ? ResultModeMapWithException<TData, TResponseType>
-	:	ResultModeMapWithoutException<TData, TErrorData, TResponseType>;
+	TThrowOnError extends true ? ResultModeMapWithException<TData>
+	:	ResultModeMapWithoutException<TData, TErrorData>;
 
 type ResultModePlaceholder = null;
 
@@ -179,22 +172,18 @@ type ResultModeUnion = keyof ResultModeMap;
 
 export type ResultModeType = ResultModePlaceholder | ResultModeUnion;
 
-export type GetCallApiResult<
+export type InferCallApiResult<
 	TData,
 	TErrorData,
 	TResultMode extends ResultModeType,
 	TThrowOnError extends ThrowOnErrorUnion,
-	TResponseType extends ResponseTypeType,
-	TComputedResultModeMapWithException extends ResultModeMapWithException<
-		TData,
-		TResponseType
-	> = ResultModeMapWithException<TData, TResponseType>,
-	TComputedResultModeMap extends ResultModeMap<
+	TComputedResultModeMapWithException extends ResultModeMapWithException<TData> =
+		ResultModeMapWithException<TData>,
+	TComputedResultModeMap extends ResultModeMap<TData, TErrorData, TThrowOnError> = ResultModeMap<
 		TData,
 		TErrorData,
-		TResponseType,
 		TThrowOnError
-	> = ResultModeMap<TData, TErrorData, TResponseType, TThrowOnError>,
+	>,
 > =
 	TErrorData extends false ? TComputedResultModeMapWithException["onlyData"]
 	: TErrorData extends false | undefined ? TComputedResultModeMapWithException["onlyData"]
diff --git a/packages/callapi/src/stream.ts b/packages/callapi/src/stream.ts
diff --git a/packages/callapi/src/types/common.ts b/packages/callapi/src/types/common.ts
diff --git a/packages/callapi/tsdown.config.ts b/packages/callapi/tsdown.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"devDependencies": {`
`19`	`19`	`"@types/node": "^24.10.1",`
`20`	`20`	`"@zayne-labs/tsconfig": "0.11.5",`
`21`		`- "tsx": "^4.20.6",`
	`21`	`+ "tsx": "^4.21.0",`
`22`	`22`	`"typescript": "5.9.3",`
`23`	`23`	`"vite": "npm:rolldown-vite@7.2.8"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ const pluginTwo = definePlugin({`
`82`	`82`
`83`	`83`	`const apiSchema = defineSchema(`
`84`	`84`	`{`
`85`		`- ".": {`
	`85`	`+ "@default": {`
`86`	`86`	`// data: z.object({ random: z.number() }),`
`87`	`87`	`// params: z.object({ per_page: z.number() }).optional(),`
`88`	`88`	`},`