kitcn 0.12.8 → 0.12.9

package/dist/aggregate/index.d.ts

@@ -1,4 +1,4 @@
-import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial, dn as ConvexTableWithColumns, tr as ConvexTextBuilderInitial } from "../where-clause-compiler-DdjN63Io.js";
+import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial, dn as ConvexTableWithColumns, tr as ConvexTextBuilderInitial } from "../where-clause-compiler-Dw3EVdi6.js";
 import * as convex_values0 from "convex/values";
 import { GenericId, Infer, Value } from "convex/values";
 import { DocumentByName, GenericDataModel, GenericDatabaseReader, GenericDatabaseWriter, TableNamesInDataModel } from "convex/server";

package/dist/cli.mjs

@@ -1950,7 +1950,10 @@ const CONVEX_MANAGED_ENV_KEYS = new Set([
 	"NEXT_PUBLIC_CONVEX_URL",
 	"VITE_CONVEX_URL"
 ]);
-const defaultRunCommand = async (args, cwd) => runLocalConvexCommand(args, { cwd });
+const defaultRunCommand = async (args, cwd, env) => runLocalConvexCommand(args, {
+	cwd,
+	env
+});
 const generateAuthSecret = () => randomBytes(32).toString("base64url");
 const defaultSecretGenerator = () => generateAuthSecret();
 const normalizeRelativePath = (cwd, filePath) => path.relative(cwd, filePath).replaceAll("\\", "/") || ".";
@@ -2015,8 +2018,8 @@ const ensureAuthSecret = (params) => {
 	if (!params.silent) logger.info("Generated BETTER_AUTH_SECRET in convex/.env");
 	return secret;
 };
-const runConvexCommand = async (runCommand, cwd, args) => {
-	const result = await runCommand(args, cwd);
+const runConvexCommand = async (runCommand, cwd, args, env) => {
+	const result = await runCommand(args, cwd, env);
 	if (result.exitCode !== 0) throw new Error(formatConvexCommandFailure(args, result));
 	return result;
 };
@@ -2069,6 +2072,7 @@ async function pushEnv(options = {}, deps = {}) {
 	const rotate = options.rotate ?? false;
 	const silent = options.silent ?? false;
 	const targetArgs = options.targetArgs ?? [];
+	const commandEnv = options.commandEnv;
 	const runCommand = deps.runCommand ?? defaultRunCommand;
 	const secretGenerator = deps.secretGenerator ?? defaultSecretGenerator;
 	const envPath = path.join(cwd, "convex", ".env");
@@ -2096,7 +2100,7 @@ async function pushEnv(options = {}, deps = {}) {
 				envFilePath: tempEnvPath,
 				force,
 				targetArgs
-			}));
+			}), commandEnv);
 			return true;
 		} finally {
 			fs.rmSync(tempDir, {
@@ -2144,14 +2148,14 @@ async function pushEnv(options = {}, deps = {}) {
 				"run",
 				AUTH_ROTATE_KEYS_FUNCTION,
 				...targetArgs
-			]);
+			], commandEnv);
 			if (!silent) logger.info("Rotated auth keys.");
 		}
 		nextVars.JWKS = parseConvexRunValue((await runConvexCommand(runCommand, cwd, [
 			"run",
 			AUTH_JWKS_FUNCTION,
 			...targetArgs
-		])).stdout);
+		], commandEnv)).stdout);
 		await finalizePush();
 		return;
 	}
@@ -2169,23 +2173,26 @@ async function pushEnv(options = {}, deps = {}) {
 			"run",
 			AUTH_ROTATE_KEYS_FUNCTION,
 			...targetArgs
-		]);
+		], commandEnv);
 		if (!silent) logger.info("Rotated auth keys.");
 	}
 	nextVars.JWKS = parseConvexRunValue((await runConvexCommand(runCommand, cwd, [
 		"run",
 		AUTH_JWKS_FUNCTION,
 		...targetArgs
-	])).stdout);
+	], commandEnv)).stdout);
 	await finalizePush();
 }
 async function pullEnv(options = {}, deps = {}) {
 	const cwd = process.cwd();
-	const result = await runConvexCommand(deps.runCommand ?? defaultRunCommand, cwd, [
+	const runCommand = deps.runCommand ?? defaultRunCommand;
+	const targetArgs = options.targetArgs ?? [];
+	const commandEnv = options.commandEnv;
+	const result = await runConvexCommand(runCommand, cwd, [
 		"env",
 		"list",
-		...options.targetArgs ?? []
-	]);
+		...targetArgs
+	], commandEnv);
 	if (options.outFilePath) {
 		const outputPath = path.resolve(cwd, options.outFilePath);
 		fs.mkdirSync(path.dirname(outputPath), { recursive: true });
@@ -9206,6 +9213,7 @@ const CONVEX_DEPLOYMENT_ENV_KEYS = [
 	"CONVEX_SELF_HOSTED_URL",
 	"CONVEX_SELF_HOSTED_ADMIN_KEY"
 ];
+const LOCAL_CONVEX_DEPLOYMENT_PREFIXES = ["local:", "anonymous:"];
 function createBackendCommandEnv(overrides) {
 	const clearedDeploymentEnv = Object.fromEntries(CONVEX_DEPLOYMENT_ENV_KEYS.map((key) => [key, void 0]));
 	return {
@@ -9214,6 +9222,26 @@ function createBackendCommandEnv(overrides) {
 		...overrides
 	};
 }
+function hasRemoteConvexDeploymentEnv(env) {
+	const deployment = env.CONVEX_DEPLOYMENT?.trim();
+	if (deployment && !LOCAL_CONVEX_DEPLOYMENT_PREFIXES.some((prefix) => deployment.startsWith(prefix))) return true;
+	return Boolean(env.CONVEX_DEPLOY_KEY?.trim() || env.CONVEX_SELF_HOSTED_URL?.trim() || env.CONVEX_SELF_HOSTED_ADMIN_KEY?.trim());
+}
+function readConvexTargetEnvFile(args, cwd = process.cwd()) {
+	const envFile = readOptionalCliFlagValue(args, "--env-file");
+	if (!envFile) return null;
+	const envFilePath = resolve(cwd, envFile);
+	if (!fs.existsSync(envFilePath)) return null;
+	return parse(fs.readFileSync(envFilePath, "utf8"));
+}
+function resolveRemoteConvexDeploymentKey(env) {
+	if (!hasRemoteConvexDeploymentEnv(env)) return null;
+	const deployment = env.CONVEX_DEPLOYMENT?.trim();
+	if (deployment) return `deployment-env:${deployment}`;
+	const selfHostedUrl = env.CONVEX_SELF_HOSTED_URL?.trim();
+	if (selfHostedUrl) return `self-hosted-env:${selfHostedUrl}`;
+	return "remote-env";
+}
 async function withLocalConvexEnv(sharedDir, fn) {
 	const { functionsDir } = getConvexConfig(sharedDir);
 	const envPath = join(functionsDir, "..", ".env");
@@ -10612,12 +10640,19 @@ function writeAggregateFingerprintState(statePath, state) {
 	fs.writeFileSync(tmpPath, JSON.stringify(state, null, 2));
 	fs.renameSync(tmpPath, statePath);
 }
-function getAggregateBackfillDeploymentKey(args) {
+function getAggregateBackfillDeploymentKey(args, cwd = process.cwd(), env) {
 	if (args.includes("--prod")) return "prod";
 	const deploymentName = readOptionalCliFlagValue(args, "--deployment-name");
 	if (deploymentName) return `deployment:${deploymentName}`;
 	const previewName = readOptionalCliFlagValue(args, "--preview-name");
 	if (previewName) return `preview:${previewName}`;
+	const envKey = env ? resolveRemoteConvexDeploymentKey(env) : null;
+	if (envKey) return envKey;
+	const envFileVars = readConvexTargetEnvFile(args, cwd);
+	if (envFileVars) {
+		const envFileKey = resolveRemoteConvexDeploymentKey(envFileVars);
+		if (envFileKey) return envFileKey;
+	}
 	return "local";
 }
 function ensureConvexGitignoreEntry(cwd = process.cwd()) {
@@ -10825,9 +10860,6 @@ function buildCodegenBootstrapArgs(targetArgs) {
 function didConvexInitCreateConfiguration(output) {
 	return CONVEX_INIT_CREATED_CONFIG_RE.test(output);
 }
-function hasRemoteConvexInitTargetArgs(targetArgs) {
-	return targetArgs?.some((arg) => arg === "--prod" || arg === "--preview-name" || arg === "--deployment-name") ?? false;
-}
 async function runConvexInitIfNeeded(params) {
 	if (params.backendAdapter.publicName !== "convex") return {
 		created: false,
@@ -10835,7 +10867,7 @@ async function runConvexInitIfNeeded(params) {
 		stdout: "",
 		stderr: ""
 	};
-	const agentModeOverride = params.yes && !hasRemoteConvexInitTargetArgs(params.targetArgs) ? "anonymous" : params.env?.CONVEX_AGENT_MODE;
+	const agentModeOverride = params.yes && getAggregateBackfillDeploymentKey(params.targetArgs ?? [], process.cwd(), params.env) === "local" ? "anonymous" : params.env?.CONVEX_AGENT_MODE;
 	const result = normalizeConvexCommandResult(await params.execaFn(params.backendAdapter.command, [
 		...params.backendAdapter.argsPrefix,
 		"init",
@@ -11449,7 +11481,7 @@ async function runBackendFunction(execaFn, backendAdapter, functionName, args, t
 		JSON.stringify(args)
 	], {
 		cwd: process.cwd(),
-		env: createBackendCommandEnv(),
+		env: createBackendCommandEnv(options?.env),
 		reject: false,
 		stdio: "pipe"
 	});
@@ -11466,13 +11498,16 @@ async function runBackendFunction(execaFn, backendAdapter, functionName, args, t
 	};
 }
 async function runAggregateBackfillFlow(params) {
-	const { execaFn, backendAdapter, backfillConfig, mode, targetArgs, signal, context } = params;
+	const { execaFn, backendAdapter, backfillConfig, mode, targetArgs, env, signal, context } = params;
 	if (signal?.aborted) return 0;
 	if (backfillConfig.enabled === "off") return 0;
 	const kickoff = await runBackendFunction(execaFn, backendAdapter, "generated/server:aggregateBackfill", {
 		mode,
 		batchSize: backfillConfig.batchSize
-	}, targetArgs, { echoOutput: false });
+	}, targetArgs, {
+		echoOutput: false,
+		env
+	});
 	if (kickoff.exitCode !== 0) {
 		const combinedOutput = `${kickoff.stdout}\n${kickoff.stderr}`;
 		if (backfillConfig.enabled === "auto" && isMissingBackfillFunctionOutput(combinedOutput)) {
@@ -11499,7 +11534,10 @@ async function runAggregateBackfillFlow(params) {
 	const deadline = Date.now() + backfillConfig.timeoutMs;
 	let lastProgress = "";
 	while (!signal?.aborted) {
-		const statusResult = await runBackendFunction(execaFn, backendAdapter, "generated/server:aggregateBackfillStatus", {}, targetArgs, { echoOutput: false });
+		const statusResult = await runBackendFunction(execaFn, backendAdapter, "generated/server:aggregateBackfillStatus", {}, targetArgs, {
+			echoOutput: false,
+			env
+		});
 		if (statusResult.exitCode !== 0) return statusResult.exitCode;
 		const statuses = parseBackendRunJson(statusResult.stdout);
 		const failed = statuses.find((entry) => Boolean(entry.lastError));
@@ -11634,7 +11672,7 @@ export const migration = defineMigration({
 	logger.info(`manifest: ${manifestFile}`);
 }
 async function runMigrationFlow(params) {
-	const { execaFn, backendAdapter, migrationConfig, targetArgs, signal, context, direction, steps, to } = params;
+	const { execaFn, backendAdapter, migrationConfig, targetArgs, env, signal, context, direction, steps, to } = params;
 	if (signal?.aborted || migrationConfig.enabled === "off") return 0;
 	const kickoff = await runBackendFunction(execaFn, backendAdapter, "generated/server:migrationRun", {
 		direction,
@@ -11642,7 +11680,10 @@ async function runMigrationFlow(params) {
 		allowDrift: migrationConfig.allowDrift,
 		...steps !== void 0 ? { steps } : {},
 		...to !== void 0 ? { to } : {}
-	}, targetArgs, { echoOutput: false });
+	}, targetArgs, {
+		echoOutput: false,
+		env
+	});
 	if (kickoff.exitCode !== 0) {
 		const combinedOutput = `${kickoff.stdout}\n${kickoff.stderr}`;
 		if (migrationConfig.enabled === "auto" && isMissingBackfillFunctionOutput(combinedOutput)) {
@@ -11677,7 +11718,10 @@ async function runMigrationFlow(params) {
 	const deadline = Date.now() + migrationConfig.timeoutMs;
 	let lastStatusLine = "";
 	while (!signal?.aborted) {
-		const statusResult = await runBackendFunction(execaFn, backendAdapter, "generated/server:migrationStatus", { runId }, targetArgs, { echoOutput: false });
+		const statusResult = await runBackendFunction(execaFn, backendAdapter, "generated/server:migrationStatus", { runId }, targetArgs, {
+			echoOutput: false,
+			env
+		});
 		if (statusResult.exitCode !== 0) return statusResult.exitCode;
 		const statusPayload = parseBackendRunJson(statusResult.stdout);
 		const runStatus = typeof statusPayload === "object" && statusPayload !== null && !Array.isArray(statusPayload) ? statusPayload.activeRun?.status ?? statusPayload.runs?.[0]?.status ?? "unknown" : "unknown";
@@ -11712,10 +11756,10 @@ async function runMigrationFlow(params) {
 	return 0;
 }
 async function runDevSchemaBackfillIfNeeded(params) {
-	const { execaFn, backendAdapter, backfillConfig, functionsDir, targetArgs, signal } = params;
+	const { execaFn, backendAdapter, backfillConfig, functionsDir, targetArgs, env, signal } = params;
 	const fingerprint = await computeAggregateIndexFingerprint(functionsDir);
 	if (!fingerprint) return 0;
-	const deploymentKey = getAggregateBackfillDeploymentKey(targetArgs);
+	const deploymentKey = getAggregateBackfillDeploymentKey(targetArgs, process.cwd(), env);
 	const statePath = getDevAggregateBackfillStatePath();
 	const state = readAggregateFingerprintState(statePath);
 	if (state.entries[deploymentKey]?.fingerprint === fingerprint) return 0;
@@ -11729,6 +11773,7 @@ async function runDevSchemaBackfillIfNeeded(params) {
 		},
 		mode: "resume",
 		targetArgs,
+		env,
 		signal,
 		context: "dev"
 	});
@@ -12087,6 +12132,59 @@ function resolveConcaveLocalSiteUrl(cwd = process.cwd()) {
 	const parsed = parseEnv(fs.readFileSync(envLocalPath, "utf8"));
 	return parsed.NEXT_PUBLIC_SITE_URL ?? parsed.VITE_SITE_URL ?? "http://localhost:3000";
 }
+function resolveImplicitConvexRemoteDeploymentEnv(cwd = process.cwd()) {
+	const envLocalPath = join(cwd, ".env.local");
+	if (!fs.existsSync(envLocalPath)) return null;
+	const parsed = parseEnv(fs.readFileSync(envLocalPath, "utf8"));
+	if (!hasRemoteConvexDeploymentEnv(parsed)) return null;
+	return {
+		CONVEX_DEPLOYMENT: parsed.CONVEX_DEPLOYMENT,
+		CONVEX_DEPLOY_KEY: parsed.CONVEX_DEPLOY_KEY,
+		CONVEX_SELF_HOSTED_URL: parsed.CONVEX_SELF_HOSTED_URL,
+		CONVEX_SELF_HOSTED_ADMIN_KEY: parsed.CONVEX_SELF_HOSTED_ADMIN_KEY
+	};
+}
+function resolveConvexEnvFileCommandEnv(args, cwd = process.cwd()) {
+	let envFilePath = null;
+	for (let i = 0; i < args.length; i += 1) {
+		const arg = args[i];
+		if (arg === "--env-file") {
+			envFilePath = args[i + 1] ?? null;
+			break;
+		}
+		if (arg.startsWith("--env-file=")) {
+			envFilePath = arg.slice(11) || null;
+			break;
+		}
+	}
+	if (!envFilePath) return null;
+	const resolvedPath = resolve(cwd, envFilePath);
+	if (!fs.existsSync(resolvedPath)) return null;
+	const parsed = parseEnv(fs.readFileSync(resolvedPath, "utf8"));
+	return {
+		CONVEX_DEPLOYMENT: parsed.CONVEX_DEPLOYMENT,
+		CONVEX_DEPLOY_KEY: parsed.CONVEX_DEPLOY_KEY,
+		CONVEX_SELF_HOSTED_URL: parsed.CONVEX_SELF_HOSTED_URL,
+		CONVEX_SELF_HOSTED_ADMIN_KEY: parsed.CONVEX_SELF_HOSTED_ADMIN_KEY
+	};
+}
+function stripConvexEnvFileTargetArgs(args) {
+	const nextArgs = [];
+	let skipNext = false;
+	for (const arg of args) {
+		if (skipNext) {
+			skipNext = false;
+			continue;
+		}
+		if (arg === "--env-file") {
+			skipNext = true;
+			continue;
+		}
+		if (arg.startsWith("--env-file=")) continue;
+		nextArgs.push(arg);
+	}
+	return nextArgs;
+}
 const resolveWatcherCommand = (currentFilename = __filename$1, currentDir = __dirname) => {
 	const isTs = currentFilename.endsWith(".ts");
 	return {
@@ -12265,6 +12363,10 @@ const handleDevCommand = async (argv, deps) => {
 	const debug = parsed.debug || config.dev.debug;
 	assertNoRemovedDevPreRunFlag(config.dev.args);
 	const { bootstrap, remainingArgs: convexDevArgs } = extractDevBootstrapCliFlag([...config.dev.args, ...devCommandArgs]);
+	const explicitConvexTargetArgs = extractBackendRunTargetArgs("convex", convexDevArgs);
+	const explicitConvexCommandEnv = resolveConvexEnvFileCommandEnv(convexDevArgs);
+	const implicitConvexCommandEnv = backend === "convex" && explicitConvexTargetArgs.length === 0 && explicitConvexCommandEnv === null ? resolveImplicitConvexRemoteDeploymentEnv() : null;
+	const effectiveConvexCommandEnv = explicitConvexCommandEnv ?? implicitConvexCommandEnv;
 	const preRunFunction = config.dev.preRun;
 	if (bootstrap && backend !== "convex") throw new Error("`kitcn dev --bootstrap` is only supported for backend convex.");
 	if (preRunFunction && backend === "concave") throw new Error("`dev.preRun` is only supported for backend convex. Concave dev has no equivalent `--run` flow.");
@@ -12281,10 +12383,10 @@ const handleDevCommand = async (argv, deps) => {
 	const concaveLocalDevContract = backend === "concave" ? resolveConcaveLocalDevContract(convexDevArgs, (deps?.resolveConcaveLocalSiteUrl ?? resolveConcaveLocalSiteUrl)(process.cwd())) : null;
 	const backendDevArgs = concaveLocalDevContract?.backendArgs ?? applyConvexDevPreRunArgs(convexDevArgs, preRunFunction);
 	const backendOutputMode = debug || backend === "convex" && !hasDevArg(backendDevArgs, "--once") ? "raw" : "filtered";
-	const targetArgs = concaveLocalDevContract?.targetArgs ?? extractBackendRunTargetArgs(backend, convexDevArgs);
+	const targetArgs = concaveLocalDevContract?.targetArgs ?? stripConvexEnvFileTargetArgs(extractBackendRunTargetArgs(backend, convexDevArgs));
 	const trimSegments = resolveCodegenTrimSegments(config);
 	const localNodeEnvOverrides = backend === "convex" ? await resolveSupportedLocalNodeEnvOverridesFn({ execaFn }) : {};
-	if (!bootstrap && backend === "convex" && !debug) logger.info("Bootstrapping local Convex...");
+	if (!bootstrap && backend === "convex" && !debug && getAggregateBackfillDeploymentKey(targetArgs, process.cwd(), effectiveConvexCommandEnv ?? void 0) === "local") logger.info("Bootstrapping local Convex...");
 	if (bootstrap) return runLocalConvexBootstrap({
 		authSyncMode: "complete",
 		config,
@@ -12307,7 +12409,10 @@ const handleDevCommand = async (argv, deps) => {
 		execaFn,
 		backendAdapter,
 		echoOutput: false,
-		env: localNodeEnvOverrides,
+		env: {
+			...localNodeEnvOverrides,
+			...effectiveConvexCommandEnv
+		},
 		targetArgs
 	});
 	if (convexInitResult.exitCode !== 0) return convexInitResult.exitCode;
@@ -12318,6 +12423,7 @@ const handleDevCommand = async (argv, deps) => {
 	});
 	if (backend === "convex" && (fs.existsSync(localConvexEnvPath) || authEnvState.installed)) await syncEnvFn({
 		authSyncMode: authEnvState.installed ? "prepare" : "skip",
+		commandEnv: effectiveConvexCommandEnv ?? void 0,
 		force: true,
 		sharedDir,
 		silent: true,
@@ -12353,6 +12459,7 @@ const handleDevCommand = async (argv, deps) => {
 		cwd: process.cwd(),
 		env: createBackendCommandEnv({
 			...localNodeEnvOverrides,
+			...effectiveConvexCommandEnv,
 			...concaveLocalDevContract?.backendEnv
 		}),
 		reject: false
@@ -12366,6 +12473,7 @@ const handleDevCommand = async (argv, deps) => {
 			signal: backfillAbortController.signal,
 			runTask: () => syncEnvFn({
 				authSyncMode: "complete",
+				commandEnv: effectiveConvexCommandEnv ?? void 0,
 				force: true,
 				sharedDir,
 				silent: true,
@@ -12388,6 +12496,7 @@ const handleDevCommand = async (argv, deps) => {
 				backendAdapter,
 				backfillConfig: devBackfillConfig,
 				functionsDir,
+				env: effectiveConvexCommandEnv ?? void 0,
 				targetArgs,
 				signal: backfillAbortController.signal
 			}) !== 0 && !backfillAbortController.signal.aborted) logger.warn("⚠️  aggregateBackfill on schema update failed in dev (continuing without blocking).");
@@ -12415,6 +12524,7 @@ const handleDevCommand = async (argv, deps) => {
 			await authEnvSyncPromise;
 			await syncEnvFn({
 				authSyncMode: "auto",
+				commandEnv: effectiveConvexCommandEnv ?? void 0,
 				force: true,
 				sharedDir,
 				silent: true,
@@ -12442,6 +12552,7 @@ const handleDevCommand = async (argv, deps) => {
 				runTask: () => runMigrationFlow({
 					execaFn,
 					backendAdapter,
+					env: effectiveConvexCommandEnv ?? void 0,
 					migrationConfig: devMigrationConfig,
 					targetArgs,
 					signal: backfillAbortController.signal,
@@ -12464,6 +12575,7 @@ const handleDevCommand = async (argv, deps) => {
 					execaFn,
 					backendAdapter,
 					backfillConfig: devBackfillConfig,
+					env: effectiveConvexCommandEnv ?? void 0,
 					mode: "resume",
 					targetArgs,
 					signal: backfillAbortController.signal,

package/dist/orm/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as GenericOrmCtx$1, $n as unique, $r as endsWith, $t as ManyConfig, A as ConvexDateMode, An as ConvexRankIndexBuilder, Ar as ReturningResult, At as MigrationManifestEntry, B as ConvexBytesBuilderInitial, Bn as rankIndex, Br as OrmSchemaRelations, Bt as defineMigration, C as ConvexNumberBuilderInitial, Ci as ColumnBuilderWithTableName, Cn as RlsRole, Cr as MutationReturning, Ct as MigrationStatusArgs, D as id, Di as IsPrimaryKey, Dn as ConvexAggregateIndexBuilderOn, Dr as PaginatedResult, Dt as MigrationDoc, E as ConvexIdBuilderInitial, Ei as HasDefault, En as ConvexAggregateIndexBuilder, Er as OrderDirection, Et as MigrationDirection, F as custom, Fn as ConvexVectorIndexBuilder, Fr as unsetToken, Ft as MigrationStateMap, G as ConvexBigIntBuilder, Gn as ConvexCheckConfig, Gr as ExpressionVisitor, Gt as OrmReader$1, H as ConvexBooleanBuilder, Hn as uniqueIndex, Hr as TableName, Ht as detectMigrationDrift, I as json, In as ConvexVectorIndexBuilderOn, Ir as Brand, It as MigrationStep, J as CountBackfillChunkArgs, Jn as ConvexUniqueConstraintBuilder, Jr as LogicalExpression, Jt as RlsMode, K as ConvexBigIntBuilderInitial, Kn as ConvexForeignKeyBuilder, Kr as FieldReference, Kt as OrmWriter$1, L as objectOf, Ln as ConvexVectorIndexConfig, Lr as Columns, Lt as MigrationTableName, M as ConvexCustomBuilder, Mn as ConvexSearchIndexBuilder, Mr as UpdateSet, Mt as MigrationPlan, N as ConvexCustomBuilderInitial, Nn as ConvexSearchIndexBuilderOn, Nr as VectorQueryConfig, Nt as MigrationRunStatus, O as ConvexDateBuilder, Oi as IsUnique, On as ConvexIndexBuilder, Or as PredicateWhereIndexConfig, Ot as MigrationDocContext, P as arrayOf, Pn as ConvexSearchIndexConfig, Pr as VectorSearchProvider, Pt as MigrationSet, Q as GenericOrm$1, Qn as foreignKey, Qr as contains, Qt as ExtractTablesWithRelations, R as unionOf, Rn as aggregateIndex, Rr as OrmSchemaExtensionTables, Rt as MigrationWriteMode, S as ConvexNumberBuilder, Si as ColumnBuilderTypeConfig, Sn as rlsPolicy, Sr as MutationResult, St as MigrationRunChunkArgs, T as ConvexIdBuilder, Ti as DrizzleEntity, Tn as rlsRole, Tr as OrderByClause, Tt as MigrationDefinition, U as ConvexBooleanBuilderInitial, Un as vectorIndex, Ur as SystemFields, Ut as DatabaseWithMutations, V as bytes, Vn as searchIndex, Vr as OrmSchemaTriggers, Vt as defineMigrationSet, W as boolean, Wn as ConvexCheckBuilder, Wr as BinaryExpression, Wt as DatabaseWithQuery, X as CountBackfillStatusArgs, Xn as ConvexUniqueConstraintConfig, Xr as and, Xt as extractRelationsConfig, Y as CountBackfillKickoffArgs, Yn as ConvexUniqueConstraintBuilderOn, Yr as UnaryExpression, Yt as EdgeMetadata, Z as CreateOrmOptions, Zn as check, Zr as between, Zt as ExtractTablesFromSchema, _ as ConvexTimestampMode, _i as startsWith, _n as deletion, _r as MutationExecuteConfig, _t as OrmTriggerContext, a as requireSchemaRelations, ai as inArray, an as TablesRelationalConfig, ar as AggregateResult, at as OrmWriterCtx, b as ConvexTextEnumBuilderInitial, bi as ColumnBuilderBaseConfig, bn as RlsPolicyConfig, br as MutationPaginateConfig, bt as MigrationCancelArgs, c as TableConfigResult, ci as isNull, cn as ConvexDeletionBuilder, cr as CountConfig, ct as ScheduledMutationBatchArgs, d as OrmNotFoundError, di as lte, dn as ConvexTableWithColumns, dr as FilterOperators, dt as scheduledDeleteFactory, ei as eq, en as OneConfig, er as ConvexTextBuilder, et as OrmApiResult, f as ConvexVectorBuilder, fi as ne, fn as DiscriminatorBuilderConfig, fr as GetColumnData, ft as SchemaExtension, g as ConvexTimestampBuilderInitial, gi as or, gn as convexTable, gr as InsertValue, gt as OrmTriggerChange, h as ConvexTimestampBuilder, hi as notInArray, hn as TableConfig, hr as InferSelectModel, ht as OrmTableTriggers, i as getSchemaTriggers, ii as ilike, in as TableRelationalConfig, ir as AggregateFieldValue, it as OrmReaderCtx, j as date, jn as ConvexRankIndexBuilderOn, jr as ReturningSelection, jt as MigrationMigrateOne, k as ConvexDateBuilderInitial, ki as NotNull, kn as ConvexIndexBuilderOn, kr as ReturningAll, kt as MigrationDriftIssue, l as getTableColumns, li as like, ln as ConvexDeletionConfig, lr as CountResult, lt as scheduledMutationBatchFactory, m as vector, mi as notBetween, mn as OrmLifecycleOperation, mr as InferModelFromColumns, mt as OrmBeforeResult, n as defineSchema, ni as gt, nn as RelationsBuilderColumnBase, nr as text, nt as OrmClientWithApi$1, o as asc, oi as isFieldReference, on as defineRelations, or as BuildQueryResult, ot as ResolveOrmSchema, p as ConvexVectorBuilderInitial, pi as not, pn as OrmLifecycleChange, pr as InferInsertModel, pt as defineSchemaExtension, q as bigint, qn as ConvexForeignKeyConfig, qr as FilterExpression, qt as RlsContext, r as getSchemaRelations, ri as gte, rn as RelationsBuilderColumnConfig, rr as AggregateConfig, rt as OrmFunctions, s as desc, si as isNotNull, sn as defineRelationsPart, sr as BuildRelationResult, st as createOrm, t as WhereClauseResult, ti as fieldRef, tn as RelationsBuilder, tr as ConvexTextBuilderInitial, tt as OrmClientBase$1, u as getTableConfig, ui as lt, un as ConvexTable, ur as DBQueryConfig, ut as ScheduledDeleteArgs, v as timestamp, vi as AnyColumn, vn as discriminator, vr as MutationExecuteResult, vt as OrmTriggers, w as integer, wi as ColumnDataType, wn as RlsRoleConfig, wr as MutationRunMode, wt as MigrationAppliedState, x as textEnum, xi as ColumnBuilderRuntimeConfig, xn as RlsPolicyToOption, xr as MutationPaginatedResult, xt as MigrationRunArgs, y as ConvexTextEnumBuilder, yi as ColumnBuilder, yn as RlsPolicy, yr as MutationExecutionMode, yt as defineTriggers, z as ConvexBytesBuilder, zn as index, zr as OrmSchemaExtensions, zt as buildMigrationPlan } from "../where-clause-compiler-DdjN63Io.js";
+import { $ as GenericOrmCtx$1, $n as unique, $r as endsWith, $t as ManyConfig, A as ConvexDateMode, An as ConvexRankIndexBuilder, Ar as ReturningResult, At as MigrationManifestEntry, B as ConvexBytesBuilderInitial, Bn as rankIndex, Br as OrmSchemaRelations, Bt as defineMigration, C as ConvexNumberBuilderInitial, Ci as ColumnBuilderWithTableName, Cn as RlsRole, Cr as MutationReturning, Ct as MigrationStatusArgs, D as id, Di as IsPrimaryKey, Dn as ConvexAggregateIndexBuilderOn, Dr as PaginatedResult, Dt as MigrationDoc, E as ConvexIdBuilderInitial, Ei as HasDefault, En as ConvexAggregateIndexBuilder, Er as OrderDirection, Et as MigrationDirection, F as custom, Fn as ConvexVectorIndexBuilder, Fr as unsetToken, Ft as MigrationStateMap, G as ConvexBigIntBuilder, Gn as ConvexCheckConfig, Gr as ExpressionVisitor, Gt as OrmReader$1, H as ConvexBooleanBuilder, Hn as uniqueIndex, Hr as TableName, Ht as detectMigrationDrift, I as json, In as ConvexVectorIndexBuilderOn, Ir as Brand, It as MigrationStep, J as CountBackfillChunkArgs, Jn as ConvexUniqueConstraintBuilder, Jr as LogicalExpression, Jt as RlsMode, K as ConvexBigIntBuilderInitial, Kn as ConvexForeignKeyBuilder, Kr as FieldReference, Kt as OrmWriter$1, L as objectOf, Ln as ConvexVectorIndexConfig, Lr as Columns, Lt as MigrationTableName, M as ConvexCustomBuilder, Mn as ConvexSearchIndexBuilder, Mr as UpdateSet, Mt as MigrationPlan, N as ConvexCustomBuilderInitial, Nn as ConvexSearchIndexBuilderOn, Nr as VectorQueryConfig, Nt as MigrationRunStatus, O as ConvexDateBuilder, Oi as IsUnique, On as ConvexIndexBuilder, Or as PredicateWhereIndexConfig, Ot as MigrationDocContext, P as arrayOf, Pn as ConvexSearchIndexConfig, Pr as VectorSearchProvider, Pt as MigrationSet, Q as GenericOrm$1, Qn as foreignKey, Qr as contains, Qt as ExtractTablesWithRelations, R as unionOf, Rn as aggregateIndex, Rr as OrmSchemaExtensionTables, Rt as MigrationWriteMode, S as ConvexNumberBuilder, Si as ColumnBuilderTypeConfig, Sn as rlsPolicy, Sr as MutationResult, St as MigrationRunChunkArgs, T as ConvexIdBuilder, Ti as DrizzleEntity, Tn as rlsRole, Tr as OrderByClause, Tt as MigrationDefinition, U as ConvexBooleanBuilderInitial, Un as vectorIndex, Ur as SystemFields, Ut as DatabaseWithMutations, V as bytes, Vn as searchIndex, Vr as OrmSchemaTriggers, Vt as defineMigrationSet, W as boolean, Wn as ConvexCheckBuilder, Wr as BinaryExpression, Wt as DatabaseWithQuery, X as CountBackfillStatusArgs, Xn as ConvexUniqueConstraintConfig, Xr as and, Xt as extractRelationsConfig, Y as CountBackfillKickoffArgs, Yn as ConvexUniqueConstraintBuilderOn, Yr as UnaryExpression, Yt as EdgeMetadata, Z as CreateOrmOptions, Zn as check, Zr as between, Zt as ExtractTablesFromSchema, _ as ConvexTimestampMode, _i as startsWith, _n as deletion, _r as MutationExecuteConfig, _t as OrmTriggerContext, a as requireSchemaRelations, ai as inArray, an as TablesRelationalConfig, ar as AggregateResult, at as OrmWriterCtx, b as ConvexTextEnumBuilderInitial, bi as ColumnBuilderBaseConfig, bn as RlsPolicyConfig, br as MutationPaginateConfig, bt as MigrationCancelArgs, c as TableConfigResult, ci as isNull, cn as ConvexDeletionBuilder, cr as CountConfig, ct as ScheduledMutationBatchArgs, d as OrmNotFoundError, di as lte, dn as ConvexTableWithColumns, dr as FilterOperators, dt as scheduledDeleteFactory, ei as eq, en as OneConfig, er as ConvexTextBuilder, et as OrmApiResult, f as ConvexVectorBuilder, fi as ne, fn as DiscriminatorBuilderConfig, fr as GetColumnData, ft as SchemaExtension, g as ConvexTimestampBuilderInitial, gi as or, gn as convexTable, gr as InsertValue, gt as OrmTriggerChange, h as ConvexTimestampBuilder, hi as notInArray, hn as TableConfig, hr as InferSelectModel, ht as OrmTableTriggers, i as getSchemaTriggers, ii as ilike, in as TableRelationalConfig, ir as AggregateFieldValue, it as OrmReaderCtx, j as date, jn as ConvexRankIndexBuilderOn, jr as ReturningSelection, jt as MigrationMigrateOne, k as ConvexDateBuilderInitial, ki as NotNull, kn as ConvexIndexBuilderOn, kr as ReturningAll, kt as MigrationDriftIssue, l as getTableColumns, li as like, ln as ConvexDeletionConfig, lr as CountResult, lt as scheduledMutationBatchFactory, m as vector, mi as notBetween, mn as OrmLifecycleOperation, mr as InferModelFromColumns, mt as OrmBeforeResult, n as defineSchema, ni as gt, nn as RelationsBuilderColumnBase, nr as text, nt as OrmClientWithApi$1, o as asc, oi as isFieldReference, on as defineRelations, or as BuildQueryResult, ot as ResolveOrmSchema, p as ConvexVectorBuilderInitial, pi as not, pn as OrmLifecycleChange, pr as InferInsertModel, pt as defineSchemaExtension, q as bigint, qn as ConvexForeignKeyConfig, qr as FilterExpression, qt as RlsContext, r as getSchemaRelations, ri as gte, rn as RelationsBuilderColumnConfig, rr as AggregateConfig, rt as OrmFunctions, s as desc, si as isNotNull, sn as defineRelationsPart, sr as BuildRelationResult, st as createOrm, t as WhereClauseResult, ti as fieldRef, tn as RelationsBuilder, tr as ConvexTextBuilderInitial, tt as OrmClientBase$1, u as getTableConfig, ui as lt, un as ConvexTable, ur as DBQueryConfig, ut as ScheduledDeleteArgs, v as timestamp, vi as AnyColumn, vn as discriminator, vr as MutationExecuteResult, vt as OrmTriggers, w as integer, wi as ColumnDataType, wn as RlsRoleConfig, wr as MutationRunMode, wt as MigrationAppliedState, x as textEnum, xi as ColumnBuilderRuntimeConfig, xn as RlsPolicyToOption, xr as MutationPaginatedResult, xt as MigrationRunArgs, y as ConvexTextEnumBuilder, yi as ColumnBuilder, yn as RlsPolicy, yr as MutationExecutionMode, yt as defineTriggers, z as ConvexBytesBuilder, zn as index, zr as OrmSchemaExtensions, zt as buildMigrationPlan } from "../where-clause-compiler-Dw3EVdi6.js";
 import { i as pretendRequired, n as deprecated, r as pretend } from "../validators-vzRKjBJC.js";
 import { a as QueryCtxWithPreferredOrmQueryTable, i as QueryCtxWithOrmQueryTable, n as LookupByIdResultByCtx, o as getByIdWithOrmQueryFallback, r as QueryCtxWithOptionalOrmQueryTable, t as DocByCtx } from "../query-context-CFZqIvD7.js";
 import { DefineSchemaOptions, GenericDatabaseReader, GenericDatabaseWriter, GenericSchema, SchemaDefinition } from "convex/server";

package/dist/{where-clause-compiler-DdjN63Io.d.ts → where-clause-compiler-Dw3EVdi6.d.ts}

@@ -3717,19 +3717,6 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly aggregate_bucket: ConvexTableWithColumns<{
     name: "aggregate_bucket";
     columns: {
-      count: ConvexNumberBuilderInitial<""> & {
-        _: {
-          notNull: true;
-        };
-      } & {
-        _: {
-          tableName: "aggregate_bucket";
-        };
-      } & {
-        _: {
-          fieldName: "count";
-        };
-      };
       tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
@@ -3799,6 +3786,19 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "keyParts";
         };
       };
+      count: ConvexNumberBuilderInitial<""> & {
+        _: {
+          notNull: true;
+        };
+      } & {
+        _: {
+          tableName: "aggregate_bucket";
+        };
+      } & {
+        _: {
+          fieldName: "count";
+        };
+      };
       sumValues: (NotNull<$Type<ConvexCustomBuilderInitial<"", convex_values0.VRecord<Record<string, any>, convex_values0.VString<string, "required">, convex_values0.VId<any, any> | convex_values0.VString<any, any> | convex_values0.VFloat64<any, any> | convex_values0.VInt64<any, any> | convex_values0.VBoolean<any, any> | convex_values0.VNull<any, any> | convex_values0.VAny<any, any, string> | convex_values0.VLiteral<any, any> | convex_values0.VBytes<any, any> | convex_values0.VObject<any, Record<string, convex_values0.Validator<any, convex_values0.OptionalProperty, any>>, any, any> | convex_values0.VArray<any, convex_values0.Validator<any, "required", any>, any> | convex_values0.VRecord<any, convex_values0.Validator<string, "required", any>, convex_values0.Validator<any, "required", any>, any, any> | convex_values0.VUnion<any, convex_values0.Validator<any, "required", any>[], any, any>, "required", string>>, Record<string, number>>> | NotNull<$Type<ConvexCustomBuilderInitial<"", convex_values0.VId<any, any> | convex_values0.VString<any, any> | convex_values0.VFloat64<any, any> | convex_values0.VInt64<any, any> | convex_values0.VBoolean<any, any> | convex_values0.VNull<any, any> | convex_values0.VAny<any, any, string> | convex_values0.VLiteral<any, any> | convex_values0.VBytes<any, any> | convex_values0.VObject<any, Record<string, convex_values0.Validator<any, convex_values0.OptionalProperty, any>>, any, any> | convex_values0.VArray<any, convex_values0.Validator<any, "required", any>, any> | convex_values0.VRecord<any, convex_values0.Validator<string, "required", any>, convex_values0.Validator<any, "required", any>, any, any> | convex_values0.VUnion<any, convex_values0.Validator<any, "required", any>[], any, any>>, Record<string, number>>>) & {
         _: {
           tableName: "aggregate_bucket";
@@ -4009,7 +4009,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "value";
         };
       };
-      count: ConvexNumberBuilderInitial<""> & {
+      tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4019,10 +4019,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "count";
+          fieldName: "tableKey";
         };
       };
-      tableKey: ConvexTextBuilderInitial<""> & {
+      indexName: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4032,10 +4032,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "tableKey";
+          fieldName: "indexName";
         };
       };
-      indexName: ConvexTextBuilderInitial<""> & {
+      updatedAt: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4045,10 +4045,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "indexName";
+          fieldName: "updatedAt";
         };
       };
-      updatedAt: ConvexNumberBuilderInitial<""> & {
+      keyHash: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4058,10 +4058,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "updatedAt";
+          fieldName: "keyHash";
         };
       };
-      keyHash: ConvexTextBuilderInitial<""> & {
+      count: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4071,7 +4071,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "keyHash";
+          fieldName: "count";
         };
       };
       fieldName: ConvexTextBuilderInitial<""> & {

package/package.json

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