kitcn 0.12.15 → 0.12.17

package/dist/auth/nextjs/index.d.ts

@@ -1,4 +1,4 @@
-import { I as ConvexContext, R as LazyCaller } from "../../procedure-caller-DtxLmGwA.js";
+import { I as ConvexContext, R as LazyCaller } from "../../procedure-caller-C15h5Iel.js";
 import { GetTokenOptions } from "@convex-dev/better-auth/utils";
 
 //#region src/auth-nextjs/index.d.ts

package/dist/{backend-core-DA9iT-To.mjs → backend-core-Rv9NorIW.mjs}

@@ -2197,6 +2197,7 @@ const highlighter = {
 
 //#endregion
 //#region src/cli/utils/project-jiti.ts
+const require$2 = createRequire(import.meta.url);
 const JITI_EXPORT_CONDITION_PRIORITY = [
 	"bun",
 	"import",
@@ -2354,11 +2355,42 @@ const ensureServerParserShim = (cwd) => {
 	if (!fs.existsSync(shimPath) || fs.readFileSync(shimPath, "utf8") !== SERVER_PARSER_SHIM_SOURCE) fs.writeFileSync(shimPath, SERVER_PARSER_SHIM_SOURCE, "utf8");
 	return shimPath;
 };
+const trimTsconfigWildcardSuffix = (value) => value.endsWith("/*") ? value.slice(0, -2) : value;
+const loadTypeScript$1 = () => {
+	try {
+		return require$2("typescript");
+	} catch {
+		return null;
+	}
+};
+const buildTsconfigPathAliases = (cwd) => {
+	const typescript = loadTypeScript$1();
+	if (!typescript) return {};
+	const configPath = typescript.findConfigFile(cwd, fs.existsSync, "tsconfig.json");
+	if (!configPath) return {};
+	const readResult = typescript.readConfigFile(configPath, typescript.sys.readFile);
+	if (readResult.error) return {};
+	const parsedConfig = typescript.parseJsonConfigFileContent(readResult.config, typescript.sys, path.dirname(configPath));
+	const baseUrl = typeof parsedConfig.options.baseUrl === "string" && parsedConfig.options.baseUrl.length > 0 ? parsedConfig.options.baseUrl : path.dirname(configPath);
+	const paths = parsedConfig.options.paths;
+	if (!paths) return {};
+	const aliases = {};
+	for (const [specifier, targets] of Object.entries(paths)) {
+		const firstTarget = targets[0];
+		if (!firstTarget) continue;
+		const aliasKey = trimTsconfigWildcardSuffix(specifier);
+		const aliasTarget = trimTsconfigWildcardSuffix(firstTarget);
+		if (!aliasKey || aliasKey === "*") continue;
+		aliases[aliasKey] = path.resolve(baseUrl, aliasTarget);
+	}
+	return aliases;
+};
 const getProjectServerParserShimPath = (cwd = process.cwd()) => ensureServerParserShim(cwd);
 const createProjectJiti = (cwd = process.cwd()) => createJiti(cwd, {
 	interopDefault: true,
 	moduleCache: false,
 	alias: {
+		...buildTsconfigPathAliases(cwd),
 		...buildLocalPackageExportAliases(cwd, "kitcn"),
 		...buildLocalPackageExportAliases(cwd, "convex"),
 		"kitcn/server": getProjectServerParserShimPath(cwd)
@@ -12637,11 +12669,33 @@ function resolveRemoteConvexDeploymentKey(env) {
 	if (selfHostedUrl) return `self-hosted-env:${selfHostedUrl}`;
 	return "remote-env";
 }
-async function withLocalConvexEnv(sharedDir, fn) {
+function getLocalParseEnvVars(sharedDir, backend) {
+	const { functionsDir } = getConvexConfig(sharedDir);
+	const rootEnvPath = join(process.cwd(), ".env");
+	const backendEnvPath = join(functionsDir, "..", ".env");
+	const envPaths = backend === "concave" ? [backendEnvPath, rootEnvPath] : [rootEnvPath, backendEnvPath];
+	const mergedEnv = {};
+	for (const envPath of envPaths) {
+		if (!fs.existsSync(envPath)) continue;
+		Object.assign(mergedEnv, parse(fs.readFileSync(envPath, "utf8")));
+	}
+	return mergedEnv;
+}
+function getLocalBackendEnvVars(sharedDir, backend) {
 	const { functionsDir } = getConvexConfig(sharedDir);
-	const envPath = join(functionsDir, "..", ".env");
-	if (!fs.existsSync(envPath)) return fn();
-	const envVars = parse(fs.readFileSync(envPath, "utf8"));
+	const rootEnvPath = join(process.cwd(), ".env");
+	const backendEnvPath = join(functionsDir, "..", ".env");
+	const envPaths = backend === "concave" ? [backendEnvPath, rootEnvPath] : [backendEnvPath];
+	const mergedEnv = {};
+	for (const envPath of envPaths) {
+		if (!fs.existsSync(envPath)) continue;
+		Object.assign(mergedEnv, parse(fs.readFileSync(envPath, "utf8")));
+	}
+	return mergedEnv;
+}
+async function withLocalCodegenEnv(sharedDir, backend, fn) {
+	const envVars = getLocalParseEnvVars(sharedDir, backend);
+	if (Object.keys(envVars).length === 0) return fn();
 	const previousValues = /* @__PURE__ */ new Map();
 	for (const [key, value] of Object.entries(envVars)) {
 		previousValues.set(key, process.env[key]);
@@ -12654,12 +12708,6 @@ async function withLocalConvexEnv(sharedDir, fn) {
 		else process.env[key] = value;
 	}
 }
-function getLocalConvexEnvVars(sharedDir) {
-	const { functionsDir } = getConvexConfig(sharedDir);
-	const envPath = join(functionsDir, "..", ".env");
-	if (!fs.existsSync(envPath)) return {};
-	return parse(fs.readFileSync(envPath, "utf8"));
-}
 function parseInitCommandArgs(args) {
 	let yes = false;
 	let json = false;
@@ -14155,7 +14203,7 @@ async function runConfiguredCodegenDetailed(params) {
 		realConcavePath: params.realConcavePath
 	});
 	const targetArgs = extractBackendRunTargetArgs(resolvedRuntimeAdapter.publicName, convexCodegenArgs);
-	const localConvexEnv = getLocalConvexEnvVars(sharedDir);
+	const localBackendEnv = getLocalBackendEnvVars(sharedDir, resolvedRuntimeAdapter.publicName);
 	const authEnvState = autoSyncLocalAuthEnv && resolvedRuntimeAdapter.publicName === "convex" && getAggregateBackfillDeploymentKey(targetArgs) === "local" ? resolveAuthEnvState({
 		cwd: process.cwd(),
 		sharedDir
@@ -14169,7 +14217,7 @@ async function runConfiguredCodegenDetailed(params) {
 			targetArgs
 		});
 	} catch {}
-	await withLocalConvexEnv(sharedDir, async () => {
+	await withLocalCodegenEnv(sharedDir, resolvedRuntimeAdapter.publicName, async () => {
 		await generateMetaFn(sharedDir, {
 			debug,
 			scope: scope ?? "all",
@@ -14184,7 +14232,7 @@ async function runConfiguredCodegenDetailed(params) {
 		stdio,
 		cwd: process.cwd(),
 		env: createBackendCommandEnv({
-			...localConvexEnv,
+			...localBackendEnv,
 			...env
 		}),
 		reject: false
@@ -14309,7 +14357,7 @@ async function stopPersistentBootstrapProcess(process) {
 	}
 }
 async function runLocalConvexBootstrapForInit(params) {
-	const localConvexEnv = getLocalConvexEnvVars(params.sharedDir);
+	const localConvexEnv = getLocalBackendEnvVars(params.sharedDir, params.runtimeAdapter.publicName);
 	const bootstrapProcess = params.execaFn(params.runtimeAdapter.command, [...params.runtimeAdapter.argsPrefix, ...params.args], {
 		cwd: process.cwd(),
 		env: createBackendCommandEnv({
@@ -14434,7 +14482,7 @@ async function runInitializationCodegen(params) {
 			});
 			try {
 				if (bootstrap.exitCode !== 0) throw new Error(formatInitCodegenFailure(`${codegen.stdout}\n${codegen.stderr}\n${bootstrap.stdout}\n${bootstrap.stderr}`));
-				await withLocalConvexEnv(params.sharedDir, async () => {
+				await withLocalCodegenEnv(params.sharedDir, runtimeAdapter.publicName, async () => {
 					await params.generateMetaFn(params.sharedDir, {
 						debug: params.debug,
 						scope: params.config.codegen.scope ?? "all",
@@ -15205,4 +15253,4 @@ function isEntryPoint(entry, filename) {
 }
 
 //#endregion
-export { resolvePluginPreset as $, resolveConfiguredBackend as A, runConvexInitIfNeeded as B, isInitialized as C, getConvexConfig as Ct, readPackageVersions as D, parseInitCommandArgs as E, runAfterScaffoldScript as F, trackProcess as G, runInitCommandFlow as H, runAggregateBackfillFlow as I, collectPluginScaffoldTemplates as J, withWorkingDirectory as K, runAggregatePruneFlow as L, resolveInitProjectDir as M, resolveMigrationConfig as N, resolveBackfillConfig as O, resolveRunDeps as P, resolveAddTemplateDefaults as Q, runBackendFunction as R, isEntryPoint as S, generateMeta as St, parseBackendRunJson as T, highlighter as Tt, runMigrationCreate as U, runDevSchemaBackfillIfNeeded as V, runMigrationFlow as W, promptForPluginSelection as X, filterScaffoldTemplatePathMap as Y, promptForScaffoldTemplateSelection as Z, formatInfoOutput as _, inspectPluginDependencyInstall as _t, cleanup as a, isSupportedPluginKey as at, hasRemoteConvexDeploymentEnv as b, serializeEnvValue as bt, createCommandEnv as c, assertSchemaFileExists as ct, extractBackfillCliOptions as d, getSchemaFilePath as dt, resolvePresetScaffoldTemplates as et, extractConcaveRunTargetArgs as f, readPluginLockfile as ft, formatDocsOutput as g, applyPluginDependencyInstall as gt, extractResetCliOptions as h, applyPlanningDependencyInstall as ht, buildInitializationPlan as i, getSupportedPluginKeys as it, resolveDocTopic as j, resolveCodegenTrimSegments as k, ensureConvexGitignoreEntry as l, collectInstalledPluginKeys as lt, extractMigrationDownOptions as m, applyDependencyHintsInstall as mt, applyPluginInstallPlanFiles as n, resolveTemplatesByIdOrThrow as nt, createBackendAdapter as o, buildPluginInstallPlan as ot, extractMigrationCliOptions as p, resolveSchemaInstalledPlugins as pt, createSpinner as q, assertNoRemovedDevPreRunFlag as r, getPluginCatalogEntry as rt, createBackendCommandEnv as s, resolvePluginScaffoldRoots as st, applyDependencyInstallPlan as t, resolveTemplateSelectionSource as tt, extractBackendRunTargetArgs as u, getPluginLockfilePath as ut, getAggregateBackfillDeploymentKey as v, resolveProjectScaffoldContext as vt, parseArgs as w, logger as wt, isConvexDevPreRunConflictFlag as x, stripConvexCommandNoise as xt, getDevAggregateBackfillStatePath as y, resolveAuthEnvState as yt, runConfiguredCodegen as z };
+export { resolveAddTemplateDefaults as $, resolveConfiguredBackend as A, runConvexInitIfNeeded as B, isInitialized as C, generateMeta as Ct, readPackageVersions as D, parseInitCommandArgs as E, highlighter as Et, runAfterScaffoldScript as F, trackProcess as G, runInitCommandFlow as H, runAggregateBackfillFlow as I, createSpinner as J, withLocalCodegenEnv as K, runAggregatePruneFlow as L, resolveInitProjectDir as M, resolveMigrationConfig as N, resolveBackfillConfig as O, resolveRunDeps as P, promptForScaffoldTemplateSelection as Q, runBackendFunction as R, isEntryPoint as S, stripConvexCommandNoise as St, parseBackendRunJson as T, logger as Tt, runMigrationCreate as U, runDevSchemaBackfillIfNeeded as V, runMigrationFlow as W, filterScaffoldTemplatePathMap as X, collectPluginScaffoldTemplates as Y, promptForPluginSelection as Z, formatInfoOutput as _, applyPluginDependencyInstall as _t, cleanup as a, getSupportedPluginKeys as at, hasRemoteConvexDeploymentEnv as b, resolveAuthEnvState as bt, createCommandEnv as c, resolvePluginScaffoldRoots as ct, extractBackfillCliOptions as d, getPluginLockfilePath as dt, resolvePluginPreset as et, extractConcaveRunTargetArgs as f, getSchemaFilePath as ft, formatDocsOutput as g, applyPlanningDependencyInstall as gt, extractResetCliOptions as h, applyDependencyHintsInstall as ht, buildInitializationPlan as i, getPluginCatalogEntry as it, resolveDocTopic as j, resolveCodegenTrimSegments as k, ensureConvexGitignoreEntry as l, assertSchemaFileExists as lt, extractMigrationDownOptions as m, resolveSchemaInstalledPlugins as mt, applyPluginInstallPlanFiles as n, resolveTemplateSelectionSource as nt, createBackendAdapter as o, isSupportedPluginKey as ot, extractMigrationCliOptions as p, readPluginLockfile as pt, withWorkingDirectory as q, assertNoRemovedDevPreRunFlag as r, resolveTemplatesByIdOrThrow as rt, createBackendCommandEnv as s, buildPluginInstallPlan as st, applyDependencyInstallPlan as t, resolvePresetScaffoldTemplates as tt, extractBackendRunTargetArgs as u, collectInstalledPluginKeys as ut, getAggregateBackfillDeploymentKey as v, inspectPluginDependencyInstall as vt, parseArgs as w, getConvexConfig as wt, isConvexDevPreRunConflictFlag as x, serializeEnvValue as xt, getDevAggregateBackfillStatePath as y, resolveProjectScaffoldContext as yt, runConfiguredCodegen as z };

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as resolvePluginPreset, A as resolveConfiguredBackend, B as runConvexInitIfNeeded, C as isInitialized, D as readPackageVersions, E as parseInitCommandArgs, F as runAfterScaffoldScript, G as trackProcess, H as runInitCommandFlow, I as runAggregateBackfillFlow, J as collectPluginScaffoldTemplates, K as withWorkingDirectory, L as runAggregatePruneFlow, M as resolveInitProjectDir, N as resolveMigrationConfig, O as resolveBackfillConfig, P as resolveRunDeps, Q as resolveAddTemplateDefaults, R as runBackendFunction, S as isEntryPoint, T as parseBackendRunJson, Tt as highlighter, U as runMigrationCreate, V as runDevSchemaBackfillIfNeeded, W as runMigrationFlow, X as promptForPluginSelection, Y as filterScaffoldTemplatePathMap, Z as promptForScaffoldTemplateSelection, _ as formatInfoOutput, _t as inspectPluginDependencyInstall, a as cleanup, at as isSupportedPluginKey, b as hasRemoteConvexDeploymentEnv, bt as serializeEnvValue, c as createCommandEnv, ct as assertSchemaFileExists, d as extractBackfillCliOptions, dt as getSchemaFilePath, et as resolvePresetScaffoldTemplates, f as extractConcaveRunTargetArgs, ft as readPluginLockfile, g as formatDocsOutput, gt as applyPluginDependencyInstall, h as extractResetCliOptions, ht as applyPlanningDependencyInstall, i as buildInitializationPlan, it as getSupportedPluginKeys, j as resolveDocTopic, k as resolveCodegenTrimSegments, l as ensureConvexGitignoreEntry, lt as collectInstalledPluginKeys, m as extractMigrationDownOptions, mt as applyDependencyHintsInstall, n as applyPluginInstallPlanFiles, nt as resolveTemplatesByIdOrThrow, o as createBackendAdapter, ot as buildPluginInstallPlan, p as extractMigrationCliOptions, pt as resolveSchemaInstalledPlugins, q as createSpinner, r as assertNoRemovedDevPreRunFlag, rt as getPluginCatalogEntry, s as createBackendCommandEnv, st as resolvePluginScaffoldRoots, t as applyDependencyInstallPlan, tt as resolveTemplateSelectionSource, u as extractBackendRunTargetArgs, ut as getPluginLockfilePath, v as getAggregateBackfillDeploymentKey, vt as resolveProjectScaffoldContext, w as parseArgs, wt as logger, x as isConvexDevPreRunConflictFlag, xt as stripConvexCommandNoise, y as getDevAggregateBackfillStatePath, yt as resolveAuthEnvState, z as runConfiguredCodegen } from "./backend-core-DA9iT-To.mjs";
+import { $ as resolveAddTemplateDefaults, A as resolveConfiguredBackend, B as runConvexInitIfNeeded, C as isInitialized, D as readPackageVersions, E as parseInitCommandArgs, Et as highlighter, F as runAfterScaffoldScript, G as trackProcess, H as runInitCommandFlow, I as runAggregateBackfillFlow, J as createSpinner, K as withLocalCodegenEnv, L as runAggregatePruneFlow, M as resolveInitProjectDir, N as resolveMigrationConfig, O as resolveBackfillConfig, P as resolveRunDeps, Q as promptForScaffoldTemplateSelection, R as runBackendFunction, S as isEntryPoint, St as stripConvexCommandNoise, T as parseBackendRunJson, Tt as logger, U as runMigrationCreate, V as runDevSchemaBackfillIfNeeded, W as runMigrationFlow, X as filterScaffoldTemplatePathMap, Y as collectPluginScaffoldTemplates, Z as promptForPluginSelection, _ as formatInfoOutput, _t as applyPluginDependencyInstall, a as cleanup, at as getSupportedPluginKeys, b as hasRemoteConvexDeploymentEnv, bt as resolveAuthEnvState, c as createCommandEnv, ct as resolvePluginScaffoldRoots, d as extractBackfillCliOptions, dt as getPluginLockfilePath, et as resolvePluginPreset, f as extractConcaveRunTargetArgs, ft as getSchemaFilePath, g as formatDocsOutput, gt as applyPlanningDependencyInstall, h as extractResetCliOptions, ht as applyDependencyHintsInstall, i as buildInitializationPlan, it as getPluginCatalogEntry, j as resolveDocTopic, k as resolveCodegenTrimSegments, l as ensureConvexGitignoreEntry, lt as assertSchemaFileExists, m as extractMigrationDownOptions, mt as resolveSchemaInstalledPlugins, n as applyPluginInstallPlanFiles, nt as resolveTemplateSelectionSource, o as createBackendAdapter, ot as isSupportedPluginKey, p as extractMigrationCliOptions, pt as readPluginLockfile, q as withWorkingDirectory, r as assertNoRemovedDevPreRunFlag, rt as resolveTemplatesByIdOrThrow, s as createBackendCommandEnv, st as buildPluginInstallPlan, t as applyDependencyInstallPlan, tt as resolvePresetScaffoldTemplates, u as extractBackendRunTargetArgs, ut as collectInstalledPluginKeys, v as getAggregateBackfillDeploymentKey, vt as inspectPluginDependencyInstall, w as parseArgs, x as isConvexDevPreRunConflictFlag, xt as serializeEnvValue, y as getDevAggregateBackfillStatePath, yt as resolveProjectScaffoldContext, z as runConfiguredCodegen } from "./backend-core-Rv9NorIW.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import path, { delimiter, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -945,11 +945,13 @@ const handleDevCommand = async (argv, deps) => {
 		silent: true,
 		targetArgs
 	});
-	await generateMetaFn(sharedDir, {
-		debug,
-		silent: true,
-		scope: "all",
-		trimSegments
+	await withLocalCodegenEnv(sharedDir, backend, async () => {
+		await generateMetaFn(sharedDir, {
+			debug,
+			silent: true,
+			scope: "all",
+			trimSegments
+		});
 	});
 	const { runtime, watcherPath } = resolveWatcherCommand();
 	const watcherProcess = execaFn(runtime, [watcherPath], {

package/dist/crpc/index.d.ts

@@ -1,5 +1,5 @@
-import { A as DataTransformer, F as decodeWire, I as defaultCRPCTransformer, L as encodeWire, M as WireCodec, N as createTaggedTransformer, O as CombinedDataTransformer, P as dateWireCodec, R as getTransformer, a as HttpProcedureCall, c as InferHttpInput, i as HttpErrorCode, j as DataTransformerOptions, k as DATE_CODEC_TAG, l as InferHttpOutput, n as HttpClientError, o as HttpRouteInfo, r as HttpClientFromRouter, s as HttpRouteMap, t as HttpClient, u as isHttpClientError, z as identityTransformer } from "../http-types-DqJubRPJ.js";
-import { A as HttpInputArgs, C as ReservedMutationOptions, D as VanillaMutation, E as VanillaAction, F as replaceUrlParam, M as RESERVED_KEYS, N as buildSearchParams, O as HttpClientOptions, P as executeHttpRequest, S as ReservedInfiniteQueryOptions, T as StaticQueryOptsParam, _ as IsPaginated, a as BaseInfiniteQueryOptsParam, b as PaginatedFnMeta, c as ConvexMutationKey, d as ConvexQueryMeta, f as EmptyObject, g as InfiniteQueryInput, h as FnMeta, i as BaseConvexQueryOptions, j as HttpProxyBaseOptions, k as HttpFormValue, l as ConvexQueryHookOptions, m as FUNC_REF_SYMBOL, n as BaseConvexActionOptions, o as ConvexActionKey, p as ExtractPaginatedItem, r as BaseConvexInfiniteQueryOptions, s as ConvexInfiniteQueryMeta, t as AuthType, u as ConvexQueryKey, v as Meta, w as ReservedQueryOptions, x as PaginationOpts, y as MutationVariables } from "../types-BLvtq_eH.js";
+import { A as DataTransformer, F as decodeWire, I as defaultCRPCTransformer, L as encodeWire, M as WireCodec, N as createTaggedTransformer, O as CombinedDataTransformer, P as dateWireCodec, R as getTransformer, a as HttpProcedureCall, c as InferHttpInput, i as HttpErrorCode, j as DataTransformerOptions, k as DATE_CODEC_TAG, l as InferHttpOutput, n as HttpClientError, o as HttpRouteInfo, r as HttpClientFromRouter, s as HttpRouteMap, t as HttpClient, u as isHttpClientError, z as identityTransformer } from "../http-types-BS63Nsug.js";
+import { A as HttpInputArgs, C as ReservedMutationOptions, D as VanillaMutation, E as VanillaAction, F as replaceUrlParam, M as RESERVED_KEYS, N as buildSearchParams, O as HttpClientOptions, P as executeHttpRequest, S as ReservedInfiniteQueryOptions, T as StaticQueryOptsParam, _ as IsPaginated, a as BaseInfiniteQueryOptsParam, b as PaginatedFnMeta, c as ConvexMutationKey, d as ConvexQueryMeta, f as EmptyObject, g as InfiniteQueryInput, h as FnMeta, i as BaseConvexQueryOptions, j as HttpProxyBaseOptions, k as HttpFormValue, l as ConvexQueryHookOptions, m as FUNC_REF_SYMBOL, n as BaseConvexActionOptions, o as ConvexActionKey, p as ExtractPaginatedItem, r as BaseConvexInfiniteQueryOptions, s as ConvexInfiniteQueryMeta, t as AuthType, u as ConvexQueryKey, v as Meta, w as ReservedQueryOptions, x as PaginationOpts, y as MutationVariables } from "../types-DrB2VeNb.js";
 import { FunctionArgs, FunctionReference } from "convex/server";
 
 //#region src/crpc/auth-error.d.ts

package/dist/{http-types-DqJubRPJ.d.ts → http-types-BS63Nsug.d.ts}

@@ -1,5 +1,5 @@
 import { o as Simplify } from "./types-BTb_4BaU.js";
-import { m as UnsetMarker, t as AnyMiddleware } from "./types-DEJpkIhw.js";
+import { m as UnsetMarker, t as AnyMiddleware } from "./types-BqUIoMfT.js";
 import { GenericActionCtx, GenericDataModel, HttpRouter } from "convex/server";
 import { z } from "zod";
 import { Context, Hono } from "hono";

package/dist/{middleware-BL2wn3s0.d.ts → middleware-CU0mDiRs.d.ts}

@@ -1,4 +1,4 @@
-import { o as MiddlewareBuilder } from "./types-DEJpkIhw.js";
+import { o as MiddlewareBuilder } from "./types-BqUIoMfT.js";
 
 //#region src/plugins/middleware.d.ts
 declare const PLUGIN_CONFIG_RESOLVERS: unique symbol;

package/dist/plugins/index.d.ts

@@ -1,2 +1,2 @@
-import { a as PluginConfigureResolver, i as PluginConfigureInput, n as PluginApiScope, o as definePlugin, r as PluginConfigureContext, s as resolvePluginOptions, t as Plugin } from "../middleware-BL2wn3s0.js";
+import { a as PluginConfigureResolver, i as PluginConfigureInput, n as PluginApiScope, o as definePlugin, r as PluginConfigureContext, s as resolvePluginOptions, t as Plugin } from "../middleware-CU0mDiRs.js";
 export { type Plugin, type PluginApiScope, type PluginConfigureContext, type PluginConfigureInput, type PluginConfigureResolver, definePlugin, resolvePluginOptions };

package/dist/{procedure-caller-DtxLmGwA.d.ts → procedure-caller-C15h5Iel.d.ts}

@@ -1,6 +1,6 @@
 import { t as VRequired } from "./validators-vzRKjBJC.js";
-import { C as HttpProcedure, D as ProcedureMeta, R as getTransformer, S as HttpMethod, c as InferHttpInput, d as CRPCHttpRouter, j as DataTransformerOptions, l as InferHttpOutput, p as HttpRouterRecord, w as HttpProcedureBuilderDef, x as HttpHandlerOpts } from "./http-types-DqJubRPJ.js";
-import { d as Overwrite$1, i as IntersectIfDefined, m as UnsetMarker, o as MiddlewareBuilder, s as MiddlewareFunction, t as AnyMiddleware } from "./types-DEJpkIhw.js";
+import { C as HttpProcedure, D as ProcedureMeta, R as getTransformer, S as HttpMethod, c as InferHttpInput, d as CRPCHttpRouter, j as DataTransformerOptions, l as InferHttpOutput, p as HttpRouterRecord, w as HttpProcedureBuilderDef, x as HttpHandlerOpts } from "./http-types-BS63Nsug.js";
+import { d as Overwrite$1, i as IntersectIfDefined, m as UnsetMarker, o as MiddlewareBuilder, s as MiddlewareFunction, t as AnyMiddleware } from "./types-BqUIoMfT.js";
 import { ConvexError, GenericId, GenericValidator, ObjectType, OptionalProperty, PropertyValidators, VAny, VArray, VBoolean, VBytes, VFloat64, VId, VInt64, VLiteral, VNull, VObject, VOptional, VRecord, VString, VUnion, Validator } from "convex/values";
 import * as convex_server0 from "convex/server";
 import { ActionBuilder, ArgsArrayToObject, DefaultFunctionArgs, FunctionReference, FunctionReturnType, FunctionVisibility, GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx, MutationBuilder, QueryBuilder, RegisteredAction, RegisteredMutation, RegisteredQuery, TableNamesInDataModel } from "convex/server";

package/dist/ratelimit/index.d.ts

@@ -1,5 +1,5 @@
-import { o as MiddlewareBuilder } from "../types-DEJpkIhw.js";
-import { t as Plugin } from "../middleware-BL2wn3s0.js";
+import { o as MiddlewareBuilder } from "../types-BqUIoMfT.js";
+import { t as Plugin } from "../middleware-CU0mDiRs.js";
 import * as convex_server0 from "convex/server";
 
 //#region src/ratelimit/duration.d.ts
@@ -203,7 +203,6 @@ declare const RatelimitPlugin: Plugin<"ratelimit", AnyRatelimitPluginOptions, An
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
-    api: Record<string, unknown> & Record<"ratelimit", AnyRatelimitPluginOptions>;
   }, unknown>;
 }, "middleware">>;
 //#endregion

package/dist/rsc/index.d.ts

@@ -1,7 +1,7 @@
 import { n as DeepPartial, o as Simplify, r as DistributiveOmit } from "../types-BTb_4BaU.js";
-import { C as HttpProcedure, d as CRPCHttpRouter, j as DataTransformerOptions, p as HttpRouterRecord } from "../http-types-DqJubRPJ.js";
-import { m as UnsetMarker } from "../types-DEJpkIhw.js";
-import { A as HttpInputArgs, C as ReservedMutationOptions$1, S as ReservedInfiniteQueryOptions, T as StaticQueryOptsParam, _ as IsPaginated, b as PaginatedFnMeta, c as ConvexMutationKey, d as ConvexQueryMeta, f as EmptyObject, g as InfiniteQueryInput, l as ConvexQueryHookOptions, m as FUNC_REF_SYMBOL, o as ConvexActionKey, p as ExtractPaginatedItem, s as ConvexInfiniteQueryMeta, u as ConvexQueryKey, w as ReservedQueryOptions$1, y as MutationVariables } from "../types-BLvtq_eH.js";
+import { C as HttpProcedure, d as CRPCHttpRouter, j as DataTransformerOptions, p as HttpRouterRecord } from "../http-types-BS63Nsug.js";
+import { m as UnsetMarker } from "../types-BqUIoMfT.js";
+import { A as HttpInputArgs, C as ReservedMutationOptions$1, S as ReservedInfiniteQueryOptions, T as StaticQueryOptsParam, _ as IsPaginated, b as PaginatedFnMeta, c as ConvexMutationKey, d as ConvexQueryMeta, f as EmptyObject, g as InfiniteQueryInput, l as ConvexQueryHookOptions, m as FUNC_REF_SYMBOL, o as ConvexActionKey, p as ExtractPaginatedItem, s as ConvexInfiniteQueryMeta, u as ConvexQueryKey, w as ReservedQueryOptions$1, y as MutationVariables } from "../types-DrB2VeNb.js";
 import { FunctionArgs, FunctionReference, FunctionReturnType } from "convex/server";
 import { z } from "zod";
 import { DefaultError, QueryFilters, SkipToken, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";

package/dist/server/index.d.ts

@@ -1,5 +1,5 @@
-import { $ as initCRPC, A as getCRPCErrorFromUnknown, B as CallerMeta, C as WithHttpRouter, D as CRPCErrorCode, E as CRPCError, F as createEnv, G as createGeneratedFunctionReference, H as ServerCaller, I as ConvexContext, J as CRPCFunctionTypeHint, K as getGeneratedValue, L as createCallerFactory, M as isCRPCError, N as toCRPCError, O as CRPC_ERROR_CODES_BY_KEY, P as CreateEnvOptions, Q as createMiddlewareFactory, R as LazyCaller, S as typedProcedureResolver, St as zodToConvexFields, T as inferApiOutputs, U as createServerCaller, V as CallerOpts, W as createApiLeaf, X as ProcedureBuilder, Y as MutationProcedureBuilder, Z as QueryProcedureBuilder, _ as createGenericHandlerFactory, _t as zCustomQuery, a as GeneratedRegistryCallerForContext, at as ConvexValidatorFromZod, b as defineProcedure, bt as zodOutputToConvexFields, c as ProcedureActionCallerFromRegistry, ct as ZCustomCtx, d as ProcedureDefinition, dt as ZodValidatorFromConvex, et as HttpProcedureBuilder, f as ProcedureFromFunctionReference, ft as convexToZod, g as createGenericCallerFactory, gt as zCustomMutation, h as createGeneratedRegistryRuntime, ht as zCustomAction, i as GeneratedRegistryCallerFactory, it as matchPathParams, j as getHTTPStatusCodeFromError, k as CRPC_ERROR_CODE_TO_HTTP, l as ProcedureCaller, lt as Zid, m as ProcedureScheduleCallerFromRegistry, mt as withSystemFields, n as GeneratedProcedureRegistry, nt as extractPathParams, o as GeneratedRegistryHandlerFactory, ot as ConvexValidatorFromZodOutput, p as ProcedureSchedulableCallerFromRegistry, pt as convexToZodFields, q as ActionProcedureBuilder, r as GeneratedProcedureRegistryEntry, rt as handleHttpError, s as GeneratedRegistryHandlerForContext, st as CustomBuilder, t as CreateProcedureCallerFactoryOptions, tt as createHttpProcedureBuilder, u as ProcedureCallerFromRegistry, ut as ZodFromValidatorBase, v as createProcedureCallerFactory, vt as zid, w as inferApiInputs, x as getGeneratedFunctionReference, xt as zodToConvex, y as createProcedureHandlerFactory, yt as zodOutputToConvex, z as createLazyCaller } from "../procedure-caller-DtxLmGwA.js";
-import { C as HttpProcedure, D as ProcedureMeta, E as InferHttpInput, S as HttpMethod, T as HttpRouteDefinition, _ as extractRouteMap, b as HttpActionHandler, d as CRPCHttpRouter, f as HttpRouterDef, g as createHttpRouterFactory, h as createHttpRouter, m as HttpRouterWithHono, p as HttpRouterRecord, v as CRPCHonoHandler, w as HttpProcedureBuilderDef, x as HttpHandlerOpts, y as HttpActionConstructor } from "../http-types-DqJubRPJ.js";
-import { a as MergeZodObjects, c as MiddlewareMarker, d as Overwrite, f as ResolveIfSet, i as IntersectIfDefined, l as MiddlewareNext, m as UnsetMarker, n as AnyMiddlewareBuilder, o as MiddlewareBuilder, p as Simplify, r as GetRawInputFn, s as MiddlewareFunction, t as AnyMiddleware, u as MiddlewareResult } from "../types-DEJpkIhw.js";
+import { $ as initCRPC, A as getCRPCErrorFromUnknown, B as CallerMeta, C as WithHttpRouter, D as CRPCErrorCode, E as CRPCError, F as createEnv, G as createGeneratedFunctionReference, H as ServerCaller, I as ConvexContext, J as CRPCFunctionTypeHint, K as getGeneratedValue, L as createCallerFactory, M as isCRPCError, N as toCRPCError, O as CRPC_ERROR_CODES_BY_KEY, P as CreateEnvOptions, Q as createMiddlewareFactory, R as LazyCaller, S as typedProcedureResolver, St as zodToConvexFields, T as inferApiOutputs, U as createServerCaller, V as CallerOpts, W as createApiLeaf, X as ProcedureBuilder, Y as MutationProcedureBuilder, Z as QueryProcedureBuilder, _ as createGenericHandlerFactory, _t as zCustomQuery, a as GeneratedRegistryCallerForContext, at as ConvexValidatorFromZod, b as defineProcedure, bt as zodOutputToConvexFields, c as ProcedureActionCallerFromRegistry, ct as ZCustomCtx, d as ProcedureDefinition, dt as ZodValidatorFromConvex, et as HttpProcedureBuilder, f as ProcedureFromFunctionReference, ft as convexToZod, g as createGenericCallerFactory, gt as zCustomMutation, h as createGeneratedRegistryRuntime, ht as zCustomAction, i as GeneratedRegistryCallerFactory, it as matchPathParams, j as getHTTPStatusCodeFromError, k as CRPC_ERROR_CODE_TO_HTTP, l as ProcedureCaller, lt as Zid, m as ProcedureScheduleCallerFromRegistry, mt as withSystemFields, n as GeneratedProcedureRegistry, nt as extractPathParams, o as GeneratedRegistryHandlerFactory, ot as ConvexValidatorFromZodOutput, p as ProcedureSchedulableCallerFromRegistry, pt as convexToZodFields, q as ActionProcedureBuilder, r as GeneratedProcedureRegistryEntry, rt as handleHttpError, s as GeneratedRegistryHandlerForContext, st as CustomBuilder, t as CreateProcedureCallerFactoryOptions, tt as createHttpProcedureBuilder, u as ProcedureCallerFromRegistry, ut as ZodFromValidatorBase, v as createProcedureCallerFactory, vt as zid, w as inferApiInputs, x as getGeneratedFunctionReference, xt as zodToConvex, y as createProcedureHandlerFactory, yt as zodOutputToConvex, z as createLazyCaller } from "../procedure-caller-C15h5Iel.js";
+import { C as HttpProcedure, D as ProcedureMeta, E as InferHttpInput, S as HttpMethod, T as HttpRouteDefinition, _ as extractRouteMap, b as HttpActionHandler, d as CRPCHttpRouter, f as HttpRouterDef, g as createHttpRouterFactory, h as createHttpRouter, m as HttpRouterWithHono, p as HttpRouterRecord, v as CRPCHonoHandler, w as HttpProcedureBuilderDef, x as HttpHandlerOpts, y as HttpActionConstructor } from "../http-types-BS63Nsug.js";
+import { a as MergeZodObjects, c as MiddlewareMarker, d as Overwrite, f as ResolveIfSet, i as IntersectIfDefined, l as MiddlewareNext, m as UnsetMarker, n as AnyMiddlewareBuilder, o as MiddlewareBuilder, p as Simplify, r as GetRawInputFn, s as MiddlewareFunction, t as AnyMiddleware, u as MiddlewareResult } from "../types-BqUIoMfT.js";
 import { a as isQueryCtx, c as requireMutationCtx, i as isMutationCtx, l as requireQueryCtx, n as RunMutationCtx, o as isRunMutationCtx, r as isActionCtx, s as requireActionCtx, t as GenericCtx, u as requireRunMutationCtx } from "../context-utils-HPC5nXzx.js";
 export { ActionProcedureBuilder, AnyMiddleware, AnyMiddlewareBuilder, CRPCError, CRPCErrorCode, CRPCFunctionTypeHint, CRPCHonoHandler, CRPCHttpRouter, CRPC_ERROR_CODES_BY_KEY, CRPC_ERROR_CODE_TO_HTTP, CallerMeta, CallerOpts, ConvexContext, ConvexValidatorFromZod, ConvexValidatorFromZodOutput, CreateEnvOptions, CreateProcedureCallerFactoryOptions, CustomBuilder, GeneratedProcedureRegistry, GeneratedProcedureRegistryEntry, GeneratedRegistryCallerFactory, GeneratedRegistryCallerForContext, GeneratedRegistryHandlerFactory, GeneratedRegistryHandlerForContext, GenericCtx, GetRawInputFn, HttpActionConstructor, HttpActionHandler, HttpHandlerOpts, HttpMethod, HttpProcedure, HttpProcedureBuilder, HttpProcedureBuilderDef, HttpRouteDefinition, HttpRouterDef, HttpRouterRecord, HttpRouterWithHono, InferHttpInput, IntersectIfDefined, LazyCaller, MergeZodObjects, MiddlewareBuilder, MiddlewareFunction, MiddlewareMarker, MiddlewareNext, MiddlewareResult, MutationProcedureBuilder, Overwrite, ProcedureActionCallerFromRegistry, ProcedureBuilder, ProcedureCaller, ProcedureCallerFromRegistry, ProcedureDefinition, ProcedureFromFunctionReference, ProcedureMeta, ProcedureSchedulableCallerFromRegistry, ProcedureScheduleCallerFromRegistry, QueryProcedureBuilder, ResolveIfSet, RunMutationCtx, ServerCaller, Simplify, UnsetMarker, WithHttpRouter, ZCustomCtx, Zid, ZodFromValidatorBase, ZodValidatorFromConvex, convexToZod, convexToZodFields, createApiLeaf, createCallerFactory, createEnv, createGeneratedFunctionReference, createGeneratedRegistryRuntime, createGenericCallerFactory, createGenericHandlerFactory, createHttpProcedureBuilder, createHttpRouter, createHttpRouterFactory, createLazyCaller, createMiddlewareFactory, createProcedureCallerFactory, createProcedureHandlerFactory, createServerCaller, defineProcedure, extractPathParams, extractRouteMap, getCRPCErrorFromUnknown, getGeneratedFunctionReference, getGeneratedValue, getHTTPStatusCodeFromError, handleHttpError, inferApiInputs, inferApiOutputs, initCRPC, isActionCtx, isCRPCError, isMutationCtx, isQueryCtx, isRunMutationCtx, matchPathParams, requireActionCtx, requireMutationCtx, requireQueryCtx, requireRunMutationCtx, toCRPCError, typedProcedureResolver, withSystemFields, zCustomAction, zCustomMutation, zCustomQuery, zid, zodOutputToConvex, zodOutputToConvexFields, zodToConvex, zodToConvexFields };

package/dist/{types-DEJpkIhw.d.ts → types-BqUIoMfT.d.ts}

@@ -40,17 +40,22 @@ type MiddlewareResult<TContext> = {
 };
 /** Function to get raw input before validation */
 type GetRawInputFn = () => Promise<unknown>;
+type CurrentMiddlewareContext<TContext, TContextOverridesIn> = Simplify<Overwrite<TContext, TContextOverridesIn>>;
+type ChangedKeys<TCurrent, TNext> = { [K in keyof TNext]: K extends keyof TCurrent ? [TNext[K]] extends [TCurrent[K]] ? [TCurrent[K]] extends [TNext[K]] ? never : K : K : K }[keyof TNext];
+type ContextOverridesFromNext<TCurrent, TNext> = TNext extends object ? Simplify<Pick<TNext, ChangedKeys<TCurrent, TNext>>> extends infer TDiff ? keyof TDiff extends never ? UnsetMarker : TDiff : never : TNext;
 /**
  * Next function overloads - key to automatic context and input inference
  * Matches tRPC's pattern: can modify context, input, or both
  */
-type MiddlewareNext<TContextOverridesIn> = {
-  /** Continue without modification - passes through existing overrides */(): Promise<MiddlewareResult<TContextOverridesIn>>; /** Continue with modified context and/or input */
-  <$ContextOverride>(opts: {
-    ctx?: $ContextOverride;
-    input?: unknown;
-  }): Promise<MiddlewareResult<$ContextOverride>>;
-};
+/**
+ * Continue middleware execution with optional ctx/input changes.
+ * When ctx includes the current context plus extra fields, only the delta is
+ * carried forward as middleware overrides.
+ */
+type MiddlewareNext<TContext, TContextOverridesIn> = <TNextContext extends object = CurrentMiddlewareContext<TContext, TContextOverridesIn>>(opts?: {
+  ctx?: TNextContext;
+  input?: unknown;
+}) => Promise<MiddlewareResult<Overwrite<TContextOverridesIn, ContextOverridesFromNext<CurrentMiddlewareContext<TContext, TContextOverridesIn>, TNextContext>>>>;
 /**
  * Middleware function signature with input access (tRPC-compatible)
  *
@@ -61,11 +66,11 @@ type MiddlewareNext<TContextOverridesIn> = {
  * @typeParam TInputOut - Parsed input type (unknown if before .input(), typed if after)
  */
 type MiddlewareFunction<TContext, TMeta, TContextOverridesIn, $ContextOverridesOut, TInputOut = unknown> = (opts: {
-  ctx: Simplify<Overwrite<TContext, TContextOverridesIn>>;
+  ctx: CurrentMiddlewareContext<TContext, TContextOverridesIn>;
   meta: TMeta;
   input: TInputOut;
   getRawInput: GetRawInputFn;
-  next: MiddlewareNext<TContextOverridesIn>;
+  next: MiddlewareNext<TContext, TContextOverridesIn>;
 }) => Promise<MiddlewareResult<$ContextOverridesOut>>;
 /** Stored middleware with type info erased for runtime */
 type AnyMiddleware = MiddlewareFunction<any, any, any, any, any>;

package/dist/{types-BLvtq_eH.d.ts → types-DrB2VeNb.d.ts}

@@ -1,4 +1,4 @@
-import { O as CombinedDataTransformer, n as HttpClientError } from "./http-types-DqJubRPJ.js";
+import { O as CombinedDataTransformer, n as HttpClientError } from "./http-types-BS63Nsug.js";
 import { FunctionArgs, FunctionReference, FunctionReturnType } from "convex/server";
 
 //#region src/crpc/http-client.d.ts

package/dist/watcher.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { A as resolveConfiguredBackend, Ct as getConvexConfig, P as resolveRunDeps, St as generateMeta, wt as logger } from "./backend-core-DA9iT-To.mjs";
+import { A as resolveConfiguredBackend, Ct as generateMeta, P as resolveRunDeps, Tt as logger, wt as getConvexConfig } from "./backend-core-Rv9NorIW.mjs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitcn",
-  "version": "0.12.15",
+  "version": "0.12.17",
   "description": "kitcn - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",

package/skills/convex/SKILL.md

@@ -54,7 +54,7 @@ Only remember these non-parity deltas:
 19. On the kitcn auth client path, use `createAuthMutations(authClient)` wrappers so logout unsubscribes auth queries before sign out. Raw Convex preset keeps a smaller plain `authClient`.
 20. **NEVER** use `ctx.runQuery`/`ctx.runMutation`/`ctx.runAction` directly for module-to-module calls. Use `create<Module>Handler(ctx)` or `create<Module>Caller(ctx)` from `convex/functions/generated/<module>.runtime` instead.
 21. **`create<Module>Handler(ctx)`** — default choice for queries/mutations. Bypasses input validation, middleware, output validation → zero overhead. Query/mutation ctx only. Import from `./generated/<module>.runtime`.
-22. **`create<Module>Caller(ctx)`** — use in actions and HTTP routes (where handler is unavailable). Goes through validation + middleware. Root caller exposes query+mutation procedures. In `ActionCtx`, action procedures are under `caller.actions.*`; scheduling is under `caller.schedule.now|after|at` with `caller.schedule.cancel(id)`. Import from `./generated/<module>.runtime`. Each caller/handler eagerly loads every procedure in its module (no lazy loading) — split large modules to keep bundles lean.
+22. **`create<Module>Caller(ctx)`** — use in actions and HTTP routes (where handler is unavailable). Goes through validation + middleware. Root caller exposes query+mutation procedures. In `ActionCtx`, action procedures are under `caller.actions.*`; scheduling is under `caller.schedule.now|after|at` with `caller.schedule.cancel(id)`. If your code widened `ctx` to a union like `MutationCtx | ActionCtx`, narrow it before accessing `caller.actions.*` (for example with `requireActionCtx(ctx)`). Import from `./generated/<module>.runtime`. Each caller/handler eagerly loads every procedure in its module (no lazy loading) — split large modules to keep bundles lean.
 23. API types (`Api`, `ApiInputs`, `ApiOutputs`, `Select`, `Insert`, `TableName`) import from `@convex/api` — no manual `inferApiInputs<typeof api>`.
 24. HTTP router must export as `httpRouter` (not `appRouter`) for codegen.
 25. Server wiring imports come from `convex/functions/generated/` directory: `getAuth`, `defineAuth` from `generated/auth`; `initCRPC`, `QueryCtx`, `MutationCtx`, `OrmCtx` from `generated/server`; `create<Module>Caller`, `create<Module>Handler` from `generated/<module>.runtime`. No manual `convex/lib/orm.ts`.
@@ -227,7 +227,8 @@ Builder rules that matter:
 1. Build `public`, `optional`, `auth`, and `private` procedure families once in `convex/lib/crpc.ts`.
 2. `.meta(...)` is client-visible via generated API metadata. Never put secrets there.
 3. Resolve session/user once in middleware. Do not re-fetch auth state in every procedure.
-4. Keep deeper auth/runtime edge cases in `references/setup/server.md` and `references/features/auth*.md`.
+4. Shared `c.middleware()` chains preserve mutation writer types on mutation procedures. If the middleware itself performs writes, type it as mutation-only with `c.middleware<MutationCtx>(...)`.
+5. Keep deeper auth/runtime edge cases in `references/setup/server.md` and `references/features/auth*.md`.
 
 ### 3) Query + Mutation Procedure Template