kitcn 0.12.10 → 0.12.11

package/dist/watcher.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as getConvexConfig, r as logger, t as generateMeta } from "./codegen-B60fOYhd.mjs";
+import { N as resolveRunDeps, St as logger, bt as generateMeta, k as resolveConfiguredBackend, xt as getConvexConfig } from "./backend-core-DUsUG58E.mjs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -8,6 +8,17 @@ function getWatchRoots(functionsDir) {
 	const convexDir = path.dirname(functionsDir);
 	return [functionsDir, path.join(convexDir, "routers")];
 }
+function parseWatcherBackendEnv(value) {
+	if (value === "convex" || value === "concave") return value;
+}
+function resolveWatcherCliCommand(currentFilename = fileURLToPath(import.meta.url)) {
+	const currentDir = path.dirname(currentFilename);
+	const isTs = currentFilename.endsWith(".ts");
+	return {
+		cliPath: isTs ? path.join(currentDir, "cli.ts") : path.join(currentDir, "cli.mjs"),
+		runtime: isTs ? "bun" : "node"
+	};
+}
 function parseTrimSegmentsEnv(value) {
 	if (!value) return;
 	const parseFromArray = (segments) => {
@@ -26,14 +37,54 @@ function shouldIgnoreWatchPath(watchedPath, functionsDir, outputFile) {
 	const normalizedPath = path.resolve(watchedPath);
 	const normalizedFunctionsDir = path.resolve(functionsDir);
 	const normalizedOutputFile = path.resolve(outputFile);
+	const convexGeneratedDir = path.join(normalizedFunctionsDir, "_generated");
 	const generatedDir = path.join(normalizedFunctionsDir, "generated");
 	const generatedFile = path.join(normalizedFunctionsDir, "generated.ts");
 	if (normalizedPath === normalizedOutputFile) return true;
 	if (normalizedPath === generatedFile) return true;
+	if (normalizedPath === convexGeneratedDir || normalizedPath.startsWith(`${convexGeneratedDir}${path.sep}`)) return true;
 	if (normalizedPath === generatedDir || normalizedPath.startsWith(`${generatedDir}${path.sep}`)) return true;
 	return normalizedPath.endsWith(".runtime.ts");
 }
+async function runWatcherCodegen(params, deps = {}) {
+	const resolveRunDepsFn = deps.resolveRunDeps ?? resolveRunDeps;
+	const resolveConfiguredBackendFn = deps.resolveConfiguredBackendFn ?? resolveConfiguredBackend;
+	const { execa: execaFn, generateMeta: generateMetaFn, loadCliConfig: loadCliConfigFn } = resolveRunDepsFn();
+	const config = loadCliConfigFn(params.configPath);
+	if (resolveConfiguredBackendFn({
+		backendArg: params.backendArg,
+		config
+	}) !== "concave") {
+		await generateMetaFn(params.sharedDir, {
+			debug: params.debug,
+			silent: true,
+			scope: params.scope,
+			trimSegments: params.trimSegments
+		});
+		return;
+	}
+	const { cliPath, runtime } = resolveWatcherCliCommand();
+	const args = [
+		cliPath,
+		"codegen",
+		"--backend",
+		"concave",
+		"--scope",
+		params.scope
+	];
+	if (params.sharedDir) args.push("--api", params.sharedDir);
+	if (params.configPath) args.push("--config", params.configPath);
+	if (params.debug) args.push("--debug");
+	const result = await execaFn(runtime, args, {
+		cwd: process.cwd(),
+		reject: false,
+		stdio: "pipe"
+	});
+	if (result.exitCode !== 0) throw new Error(`Watcher codegen failed with exit code ${result.exitCode}.\n${`${result.stdout ?? ""}\n${result.stderr ?? ""}`.trim()}`);
+}
 async function startWatcher(opts) {
+	const backendArg = opts?.backend ?? parseWatcherBackendEnv(process.env.KITCN_BACKEND);
+	const configPath = opts?.configPath ?? process.env.KITCN_CONFIG_PATH;
 	const sharedDir = opts?.sharedDir ?? (process.env.KITCN_API_OUTPUT_DIR || void 0);
 	const debug = opts?.debug ?? process.env.KITCN_DEBUG === "1";
 	const scope = opts?.scope ?? process.env.KITCN_CODEGEN_SCOPE ?? "all";
@@ -41,6 +92,7 @@ async function startWatcher(opts) {
 	const debounceMs = opts?.debounceMs ?? 100;
 	const resolveConfig = opts?.getConvexConfig ?? getConvexConfig;
 	const runGenerateMeta = opts?.generateMeta ?? generateMeta;
+	const runWatchCodegen = opts?.runWatcherCodegen ?? runWatcherCodegen;
 	const { functionsDir, outputFile } = resolveConfig(sharedDir);
 	const watchRoots = getWatchRoots(functionsDir);
 	const watch = opts?.watch ?? (await import("chokidar")).watch;
@@ -63,7 +115,15 @@ async function startWatcher(opts) {
 		}
 		generateMetaInFlight = true;
 		try {
-			await runGenerateMeta(sharedDir, createGenerateOptions());
+			if (backendArg || configPath) await runWatchCodegen({
+				backendArg,
+				configPath,
+				debug,
+				scope,
+				sharedDir,
+				trimSegments
+			});
+			else await runGenerateMeta(sharedDir, createGenerateOptions());
 			logger.success("Convex api updated");
 		} catch (error) {
 			logger.error("Watch codegen error:", error);
@@ -93,4 +153,4 @@ if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.me
 });
 
 //#endregion
-export { getWatchRoots, shouldIgnoreWatchPath, startWatcher };
+export { getWatchRoots, runWatcherCodegen, shouldIgnoreWatchPath, startWatcher };

package/dist/{where-clause-compiler-DdjN63Io.d.ts → where-clause-compiler-DJ2S06w0.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";
@@ -3826,7 +3826,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly aggregate_member: ConvexTableWithColumns<{
     name: "aggregate_member";
     columns: {
-      kind: ConvexTextBuilderInitial<""> & {
+      tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -3836,10 +3836,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "kind";
+          fieldName: "tableKey";
         };
       };
-      tableKey: ConvexTextBuilderInitial<""> & {
+      kind: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -3849,7 +3849,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "tableKey";
+          fieldName: "kind";
         };
       };
       indexName: ConvexTextBuilderInitial<""> & {
@@ -3992,11 +3992,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly aggregate_extrema: ConvexTableWithColumns<{
     name: "aggregate_extrema";
     columns: {
-      value: ConvexCustomBuilderInitial<"", convex_values0.VAny<any, "required", string>> & {
-        _: {
-          $type: convex_values0.Value;
-        };
-      } & {
+      tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4006,10 +4002,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "value";
+          fieldName: "tableKey";
         };
       };
-      count: ConvexNumberBuilderInitial<""> & {
+      indexName: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4019,10 +4015,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "count";
+          fieldName: "indexName";
         };
       };
-      tableKey: ConvexTextBuilderInitial<""> & {
+      updatedAt: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4032,10 +4028,14 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "tableKey";
+          fieldName: "updatedAt";
         };
       };
-      indexName: ConvexTextBuilderInitial<""> & {
+      value: ConvexCustomBuilderInitial<"", convex_values0.VAny<any, "required", string>> & {
+        _: {
+          $type: convex_values0.Value;
+        };
+      } & {
         _: {
           notNull: true;
         };
@@ -4045,10 +4045,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "indexName";
+          fieldName: "value";
         };
       };
-      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<""> & {
@@ -4244,7 +4244,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly aggregate_state: ConvexTableWithColumns<{
     name: "aggregate_state";
     columns: {
-      kind: ConvexTextBuilderInitial<""> & {
+      tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4254,19 +4254,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "kind";
-        };
-      };
-      cursor: ConvexTextBuilderInitial<""> & {
-        _: {
-          tableName: "aggregate_state";
-        };
-      } & {
-        _: {
-          fieldName: "cursor";
+          fieldName: "tableKey";
         };
       };
-      tableKey: ConvexTextBuilderInitial<""> & {
+      kind: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4276,7 +4267,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "tableKey";
+          fieldName: "kind";
         };
       };
       indexName: ConvexTextBuilderInitial<""> & {
@@ -4331,6 +4322,15 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "status";
         };
       };
+      cursor: ConvexTextBuilderInitial<""> & {
+        _: {
+          tableName: "aggregate_state";
+        };
+      } & {
+        _: {
+          fieldName: "cursor";
+        };
+      };
       processed: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
@@ -4398,35 +4398,26 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly migration_state: ConvexTableWithColumns<{
     name: "migration_state";
     columns: {
-      cursor: ConvexTextBuilderInitial<""> & {
+      status: ConvexTextBuilderInitial<""> & {
         _: {
-          tableName: "migration_state";
+          notNull: true;
         };
       } & {
-        _: {
-          fieldName: "cursor";
-        };
-      };
-      direction: ConvexTextBuilderInitial<""> & {
         _: {
           tableName: "migration_state";
         };
       } & {
         _: {
-          fieldName: "direction";
+          fieldName: "status";
         };
       };
-      status: ConvexTextBuilderInitial<""> & {
-        _: {
-          notNull: true;
-        };
-      } & {
+      cursor: ConvexTextBuilderInitial<""> & {
         _: {
           tableName: "migration_state";
         };
       } & {
         _: {
-          fieldName: "status";
+          fieldName: "cursor";
         };
       };
       processed: ConvexNumberBuilderInitial<""> & {
@@ -4521,6 +4512,15 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "applied";
         };
       };
+      direction: ConvexTextBuilderInitial<""> & {
+        _: {
+          tableName: "migration_state";
+        };
+      } & {
+        _: {
+          fieldName: "direction";
+        };
+      };
       runId: ConvexTextBuilderInitial<""> & {
         _: {
           tableName: "migration_state";
@@ -4552,19 +4552,6 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly migration_run: ConvexTableWithColumns<{
     name: "migration_run";
     columns: {
-      direction: ConvexTextBuilderInitial<""> & {
-        _: {
-          notNull: true;
-        };
-      } & {
-        _: {
-          tableName: "migration_run";
-        };
-      } & {
-        _: {
-          fieldName: "direction";
-        };
-      };
       status: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
@@ -4622,6 +4609,19 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "lastError";
         };
       };
+      direction: ConvexTextBuilderInitial<""> & {
+        _: {
+          notNull: true;
+        };
+      } & {
+        _: {
+          tableName: "migration_run";
+        };
+      } & {
+        _: {
+          fieldName: "direction";
+        };
+      };
       runId: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;

package/package.json

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

package/skills/convex/references/setup/auth.md

@@ -272,7 +272,15 @@ Repair / remote sync:
 bunx kitcn env push
 ```
 
-Use this for `--prod` or explicit repair against an already active deployment.
+Use this to sync static `JWKS` onto the target deployment too.
+
+```bash
+bunx kitcn env push --prod
+bunx kitcn env push --rotate
+```
+
+Use `--prod` for production and `--rotate` when you want fresh keys plus fresh
+`JWKS`. See `/docs/cli/backend#env` for the full env command surface.
 
 Rotate later: