kitcn 0.15.1 → 0.15.4

package/dist/{backend-core-B091CyHN.mjs → backend-core-BA0CgHrL.mjs}

@@ -7063,7 +7063,69 @@ const BASE_ENV_FIELDS = [{
 	schema: "z.string().default('http://localhost:3000')"
 }];
 const ENV_SCHEMA_RE = /(const\s+\w+\s*=\s*z\.object\(\{\n)([\s\S]*?)(\n\}\);)/m;
+const CREATE_ENV_OPTIONS_START_RE = /createEnv\s*\(\s*\{/m;
+const READ_OPTIONAL_RUNTIME_ENV_PROPERTY_RE = /\breadOptionalRuntimeEnv\s*:/m;
+const READ_OPTIONAL_RUNTIME_ENV_RE = /(\s*readOptionalRuntimeEnv\s*:\s*\[)([\s\S]*?)(\]\s*,?)/m;
+const LEADING_WHITESPACE_RE = /^\s*/;
+const STRING_LITERAL_ARRAY_ENTRY_RE = /^(['"])([^'"]+)\1$/;
 const WHITESPACE_RE$1 = /\s/;
+const findMatchingObjectBraceIndex = (source, openIndex) => {
+	let depth = 0;
+	let quote;
+	let escaped = false;
+	let lineComment = false;
+	let blockComment = false;
+	for (let index = openIndex; index < source.length; index++) {
+		const char = source[index];
+		const nextChar = source[index + 1];
+		if (lineComment) {
+			if (char === "\n" || char === "\r") lineComment = false;
+			continue;
+		}
+		if (blockComment) {
+			if (char === "*" && nextChar === "/") {
+				blockComment = false;
+				index++;
+			}
+			continue;
+		}
+		if (quote) {
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			if (char === "\\") {
+				escaped = true;
+				continue;
+			}
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "/" && nextChar === "/") {
+			lineComment = true;
+			index++;
+			continue;
+		}
+		if (char === "/" && nextChar === "*") {
+			blockComment = true;
+			index++;
+			continue;
+		}
+		if (char === "\"" || char === "'" || char === "`") {
+			quote = char;
+			continue;
+		}
+		if (char === "{") {
+			depth++;
+			continue;
+		}
+		if (char === "}") {
+			depth--;
+			if (depth === 0) return index;
+		}
+	}
+	return -1;
+};
 const resolveEnvBootstrapPlanFileDetails = (templateId) => {
 	if (templateId === KITCN_CONFIG_TEMPLATE_ID) return {
 		createReason: "Create kitcn config.",
@@ -7099,18 +7161,64 @@ const resolveBootstrapEnvFields = (envFields) => {
 	for (const field of envFields) if (!fields.some((existing) => existing.key === field.key)) fields.push(field);
 	return fields;
 };
+const resolveReadOptionalRuntimeEnvKeys = (fields) => fields.filter((field) => field.readOptionalRuntimeEnv).map((field) => field.key);
+const renderReadOptionalRuntimeEnvOption = (keys) => {
+	if (keys.length === 0) return "";
+	return `  readOptionalRuntimeEnv: [\n${keys.map((key) => `    '${key}',`).join("\n")}\n  ],\n`;
+};
+const parseReadOptionalRuntimeEnvKeys = (existingOptionsBody, existingMatch) => {
+	if (existingMatch.index === void 0) return [];
+	const matchEnd = existingMatch.index + existingMatch[0].length;
+	if (!existingMatch[3].includes(",") && existingOptionsBody.slice(matchEnd).trim()) throw new Error("Expected env helper `readOptionalRuntimeEnv` to be an inline array of string literals before adding keys.");
+	const rawEntries = existingMatch[2].trim();
+	if (!rawEntries) return [];
+	const keys = [];
+	const entries = rawEntries.split(",");
+	for (let index = 0; index < entries.length; index++) {
+		const entry = entries[index].trim();
+		if (!entry && index === entries.length - 1) continue;
+		const stringLiteralMatch = entry.match(STRING_LITERAL_ARRAY_ENTRY_RE);
+		if (!stringLiteralMatch) throw new Error("Expected env helper `readOptionalRuntimeEnv` to be an inline array of string literals before adding keys.");
+		keys.push(stringLiteralMatch[2]);
+	}
+	return keys;
+};
+const upsertReadOptionalRuntimeEnvOption = (source, keys) => {
+	if (keys.length === 0) return source;
+	const createEnvMatch = source.match(CREATE_ENV_OPTIONS_START_RE);
+	if (!createEnvMatch || createEnvMatch.index === void 0) throw new Error("Expected env helper to call `createEnv({ ... })` before adding `readOptionalRuntimeEnv`.");
+	const insertIndex = createEnvMatch.index + createEnvMatch[0].lastIndexOf("{") + 1;
+	const closingBraceIndex = findMatchingObjectBraceIndex(source, insertIndex - 1);
+	if (closingBraceIndex === -1) throw new Error("Expected env helper `createEnv` options object to close before adding `readOptionalRuntimeEnv`.");
+	const existingOptionsBody = source.slice(insertIndex, closingBraceIndex);
+	const existingMatch = existingOptionsBody.match(READ_OPTIONAL_RUNTIME_ENV_RE);
+	if (!existingMatch && READ_OPTIONAL_RUNTIME_ENV_PROPERTY_RE.test(existingOptionsBody)) throw new Error("Expected env helper `readOptionalRuntimeEnv` to be an inline array before adding keys.");
+	const existingKeys = existingMatch ? parseReadOptionalRuntimeEnvKeys(existingOptionsBody, existingMatch) : [];
+	const option = renderReadOptionalRuntimeEnvOption([...new Set([...existingKeys, ...keys])]);
+	if (existingMatch && existingMatch.index !== void 0) {
+		const replacement = `${existingMatch[1].match(LEADING_WHITESPACE_RE)?.[0] ?? ""}${option.trimStart().trimEnd()}`;
+		const existingOptionStart = insertIndex + existingMatch.index;
+		return `${source.slice(0, existingOptionStart)}${replacement}${source.slice(existingOptionStart + existingMatch[0].length)}`;
+	}
+	const before = source.slice(0, insertIndex);
+	const after = source.slice(insertIndex);
+	if (after.startsWith("\n")) return `${before}\n${option}${after.slice(1)}`;
+	const body = source.slice(insertIndex, closingBraceIndex).trim();
+	return `${before}\n${option}${body.length === 0 ? "" : `  ${body}${body.endsWith(",") ? "" : ","}\n`}${source.slice(closingBraceIndex)}`;
+};
 const renderEnvHelperContent = (envFields, existingContent) => {
 	const fields = resolveBootstrapEnvFields(envFields);
-	if (!existingContent) return `import { createEnv } from 'kitcn/server';\nimport { z } from 'zod';\n\nconst envSchema = z.object({\n${fields.map((field) => `  ${field.key}: ${field.schema},`).join("\n")}\n});\n\nexport const getEnv = createEnv({\n  schema: envSchema,\n});\n`;
+	const readOptionalRuntimeEnvKeys = resolveReadOptionalRuntimeEnvKeys(fields);
+	if (!existingContent) return `import { createEnv } from 'kitcn/server';\nimport { z } from 'zod';\n\nconst envSchema = z.object({\n${fields.map((field) => `  ${field.key}: ${field.schema},`).join("\n")}\n});\n\nexport const getEnv = createEnv({\n${renderReadOptionalRuntimeEnvOption(readOptionalRuntimeEnvKeys)}  schema: envSchema,\n});\n`;
 	const match = existingContent.match(ENV_SCHEMA_RE);
 	if (!match) throw new Error("Expected env helper to define `const envSchema = z.object({ ... });`.");
 	const existingBody = match[2];
 	const missingFieldLines = fields.filter((field) => {
 		return !new RegExp(`(^|\\n)\\s*${field.key}\\s*:`, "m").test(existingBody);
 	}).map((field) => `  ${field.key}: ${field.schema},`);
-	if (missingFieldLines.length === 0) return existingContent;
+	if (missingFieldLines.length === 0) return upsertReadOptionalRuntimeEnvOption(existingContent, readOptionalRuntimeEnvKeys);
 	const nextBody = `${existingBody}${existingBody.endsWith("\n") ? "" : "\n"}${missingFieldLines.join("\n")}`;
-	return existingContent.replace(ENV_SCHEMA_RE, `${match[1]}${nextBody}${match[3]}`);
+	return upsertReadOptionalRuntimeEnvOption(existingContent.replace(ENV_SCHEMA_RE, `${match[1]}${nextBody}${match[3]}`), readOptionalRuntimeEnvKeys);
 };
 const renderLocalConvexEnvContent = (envFields, existingContent) => {
 	const fields = resolveBootstrapEnvFields(envFields).filter((field) => field.bootstrap !== void 0);
@@ -8345,7 +8453,6 @@ import {
   ConvexReactClient,
   getConvexQueryClientSingleton,
   getQueryClientSingleton,
-  useAuthStore,
 } from 'kitcn/react';
 import { useRouter } from 'next/navigation';
 import type { ReactNode } from 'react';
@@ -8362,11 +8469,17 @@ export function AppConvexProvider({
   children: ReactNode;
 }) {
   const router = useRouter();
+  const queryClient = getQueryClientSingleton(createQueryClient);
+  const convexQueryClient = getConvexQueryClientSingleton({
+    convex,
+    queryClient,
+  });
 
   return (
     <ConvexAuthProvider
       authClient={authClient}
       client={convex}
+      convexQueryClient={convexQueryClient}
       onMutationUnauthorized={() => {
         router.push('/auth');
       }}
@@ -8374,28 +8487,14 @@ export function AppConvexProvider({
         router.push('/auth');
       }}
     >
-      <QueryProvider>{children}</QueryProvider>
+      <TanstackQueryClientProvider client={queryClient}>
+        <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
+          {children}
+        </CRPCProvider>
+      </TanstackQueryClientProvider>
     </ConvexAuthProvider>
   );
 }
-
-function QueryProvider({ children }: { children: ReactNode }) {
-  const authStore = useAuthStore();
-  const queryClient = getQueryClientSingleton(createQueryClient);
-  const convexQueryClient = getConvexQueryClientSingleton({
-    authStore,
-    convex,
-    queryClient,
-  });
-
-  return (
-    <TanstackQueryClientProvider client={queryClient}>
-      <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
-        {children}
-      </CRPCProvider>
-    </TanstackQueryClientProvider>
-  );
-}
 `;
 
 //#endregion
@@ -8554,7 +8653,6 @@ import {
   ConvexReactClient,
   getConvexQueryClientSingleton,
   getQueryClientSingleton,
-  useAuthStore,
 } from 'kitcn/react';
 import type { ReactNode } from 'react';
 
@@ -8570,11 +8668,17 @@ export function AppConvexProvider({
   children: ReactNode;
 }) {
   const router = useRouter();
+  const queryClient = getQueryClientSingleton(createQueryClient);
+  const convexQueryClient = getConvexQueryClientSingleton({
+    convex,
+    queryClient,
+  });
 
   return (
     <ConvexAuthProvider
       authClient={authClient}
       client={convex}
+      convexQueryClient={convexQueryClient}
       onMutationUnauthorized={() => {
         router.push('/auth');
       }}
@@ -8582,28 +8686,14 @@ export function AppConvexProvider({
         router.push('/auth');
       }}
     >
-      <QueryProvider>{children}</QueryProvider>
+      <TanstackQueryClientProvider client={queryClient}>
+        <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
+          {children}
+        </CRPCProvider>
+      </TanstackQueryClientProvider>
     </ConvexAuthProvider>
   );
 }
-
-function QueryProvider({ children }: { children: ReactNode }) {
-  const authStore = useAuthStore();
-  const queryClient = getQueryClientSingleton(createQueryClient);
-  const convexQueryClient = getConvexQueryClientSingleton({
-    authStore,
-    convex,
-    queryClient,
-  });
-
-  return (
-    <TanstackQueryClientProvider client={queryClient}>
-      <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
-        {children}
-      </CRPCProvider>
-    </TanstackQueryClientProvider>
-  );
-}
 `;
 
 //#endregion
@@ -9021,7 +9111,6 @@ import {
   ConvexReactClient,
   getConvexQueryClientSingleton,
   getQueryClientSingleton,
-  useAuthStore,
 } from 'kitcn/react';
 import type { ReactNode } from 'react';
 
@@ -9038,32 +9127,25 @@ export function AppConvexProvider({
   children: ReactNode;
   token?: string;
 }) {
-  return (
-    <ConvexAuthProvider
-      authClient={authClient}
-      client={convex}
-      initialToken={token}
-    >
-      <QueryProvider>{children}</QueryProvider>
-    </ConvexAuthProvider>
-  );
-}
-
-function QueryProvider({ children }: { children: ReactNode }) {
-  const authStore = useAuthStore();
   const queryClient = getQueryClientSingleton(createQueryClient);
   const convexQueryClient = getConvexQueryClientSingleton({
-    authStore,
     convex,
     queryClient,
   });
 
   return (
-    <TanstackQueryClientProvider client={queryClient}>
-      <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
-        {children}
-      </CRPCProvider>
-    </TanstackQueryClientProvider>
+    <ConvexAuthProvider
+      authClient={authClient}
+      client={convex}
+      convexQueryClient={convexQueryClient}
+      initialToken={token}
+    >
+      <TanstackQueryClientProvider client={queryClient}>
+        <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
+          {children}
+        </CRPCProvider>
+      </TanstackQueryClientProvider>
+    </ConvexAuthProvider>
   );
 }
 `;
@@ -9264,7 +9346,6 @@ import {
   ConvexReactClient,
   getConvexQueryClientSingleton,
   getQueryClientSingleton,
-  useAuthStore,
 } from 'kitcn/react';
 import type { ReactNode } from 'react';
 
@@ -9279,28 +9360,24 @@ export function AppConvexProvider({
 }: {
   children: ReactNode;
 }) {
-  return (
-    <ConvexAuthProvider authClient={authClient} client={convex}>
-      <QueryProvider>{children}</QueryProvider>
-    </ConvexAuthProvider>
-  );
-}
-
-function QueryProvider({ children }: { children: ReactNode }) {
-  const authStore = useAuthStore();
   const queryClient = getQueryClientSingleton(createQueryClient);
   const convexQueryClient = getConvexQueryClientSingleton({
-    authStore,
     convex,
     queryClient,
   });
 
   return (
-    <TanstackQueryClientProvider client={queryClient}>
-      <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
-        {children}
-      </CRPCProvider>
-    </TanstackQueryClientProvider>
+    <ConvexAuthProvider
+      authClient={authClient}
+      client={convex}
+      convexQueryClient={convexQueryClient}
+    >
+      <TanstackQueryClientProvider client={queryClient}>
+        <CRPCProvider convexClient={convex} convexQueryClient={convexQueryClient}>
+          {children}
+        </CRPCProvider>
+      </TanstackQueryClientProvider>
+    </ConvexAuthProvider>
   );
 }
 `;
@@ -11970,19 +12047,19 @@ const RESEND_SCHEMA_TEMPLATE = `import {
   unionOf,
 } from "kitcn/orm";
 
-export const resendContentTable = convexTable("resend_content", {
+export const resendContentTable = convexTable("resendContent", {
   content: bytes().notNull(),
   mimeType: text().notNull(),
   filename: text(),
   path: text(),
 });
 
-export const resendNextBatchRunTable = convexTable("resend_next_batch_run", {
+export const resendNextBatchRunTable = convexTable("resendNextBatchRun", {
   runId: text().notNull(),
 });
 
 export const resendDeliveryEventsTable = convexTable(
-  "resend_delivery_events",
+  "resendDeliveryEvents",
   {
     emailId: text().notNull(),
     resendId: text().notNull(),
@@ -11997,7 +12074,7 @@ export const resendDeliveryEventsTable = convexTable(
 );
 
 export const resendEmailsTable = convexTable(
-  "resend_emails",
+  "resendEmails",
   {
     from: text().notNull(),
     to: arrayOf(text().notNull()).notNull(),
@@ -12200,15 +12277,18 @@ const resendRegistryItem = defineInternalRegistryItem({
 		envFields: [
 			{
 				key: "RESEND_API_KEY",
+				readOptionalRuntimeEnv: true,
 				schema: "z.string().optional()",
 				reminder: { message: "Set before sending email through Resend." }
 			},
 			{
 				key: "RESEND_WEBHOOK_SECRET",
+				readOptionalRuntimeEnv: true,
 				schema: "z.string().optional()"
 			},
 			{
 				key: "RESEND_FROM_EMAIL",
+				readOptionalRuntimeEnv: true,
 				schema: "z.string().optional()"
 			}
 		],

package/dist/cli.mjs

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

package/dist/{generated-contract-disabled-C_-KWRfT.d.ts → generated-contract-disabled-xOmfTKh8.d.ts}

@@ -173,10 +173,18 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     };
   }, Promise<any>>;
   deleteMany: convex_server0.RegisteredMutation<"internal", {
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
     input: {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
       }[] | undefined;
@@ -185,14 +193,6 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       where?: any[] | undefined;
       model: string;
     };
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -204,8 +204,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   deleteOne: convex_server0.RegisteredMutation<"internal", {
     input: {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
       }[] | undefined;
@@ -216,21 +216,20 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     };
   }, Promise<Record<string, unknown> | undefined>>;
   findMany: convex_server0.RegisteredQuery<"internal", {
+    limit?: number | undefined;
     join?: any;
     where?: {
       mode?: "sensitive" | "insensitive" | undefined;
+      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
       field: string;
     }[] | undefined;
-    limit?: number | undefined;
     offset?: number | undefined;
     sortBy?: {
       field: string;
       direction: "asc" | "desc";
     } | undefined;
-    model: string;
     paginationOpts: {
       id?: number;
       endCursor?: string | null;
@@ -239,47 +238,48 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       numItems: number;
       cursor: string | null;
     };
+    model: string;
   }, Promise<convex_server0.PaginationResult<convex_server0.GenericDocument>>>;
   findOne: convex_server0.RegisteredQuery<"internal", {
     join?: any;
-    select?: string[] | undefined;
     where?: {
       mode?: "sensitive" | "insensitive" | undefined;
+      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
       field: string;
     }[] | undefined;
+    select?: string[] | undefined;
     model: string;
   }, Promise<convex_server0.GenericDocument | null>>;
   getLatestJwks: convex_server0.RegisteredAction<"internal", {}, Promise<unknown>>;
   rotateKeys: convex_server0.RegisteredAction<"internal", {}, Promise<unknown>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
     input: {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
       }[] | undefined;
-      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     } | {
       where?: any[] | undefined;
-      model: string;
       update: any;
-    };
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
+      model: string;
     };
   }, Promise<{
     count: number;
@@ -292,21 +292,21 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   updateOne: convex_server0.RegisteredMutation<"internal", {
     input: {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
       }[] | undefined;
-      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     } | {
       where?: any[] | undefined;
-      model: string;
       update: any;
+      model: string;
     };
   }, Promise<any>>;
 };

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-DcEhkJ12.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-Dv-3mnJF.js";
 import { i as pretendRequired, n as deprecated, r as pretend } from "../validators-BhsByJeg.js";
 import { a as QueryCtxWithPreferredOrmQueryTable, i as QueryCtxWithOrmQueryTable, n as LookupByIdResultByCtx, o as getByIdWithOrmQueryFallback, r as QueryCtxWithOptionalOrmQueryTable, t as DocByCtx } from "../query-context-CNo9ffvI.js";
 import { DefineSchemaOptions, GenericDatabaseReader, GenericDatabaseWriter, GenericSchema, SchemaDefinition } from "convex/server";

package/dist/{procedure-caller-DplSC7Us.js → procedure-caller-9m6NBxQu.js}

@@ -4,8 +4,13 @@ import { z } from "zod";
 
 //#region src/server/env.ts
 function createEnv(options) {
-	const { schema, runtimeEnv, cache = true, codegenFallback = false } = options;
+	const { schema, runtimeEnv, cache = true, codegenFallback = false, readOptionalRuntimeEnv = [] } = options;
+	const directOptionalKeys = new Set(readOptionalRuntimeEnv);
 	let cached;
+	const createInvalidEnvError = () => new CRPCError({
+		code: "INTERNAL_SERVER_ERROR",
+		message: "Invalid environment variables"
+	});
 	return () => {
 		if (cache && cached) return cached;
 		const isCodegenParse = globalThis.__KITCN_CODEGEN__ === true || codegenFallback;
@@ -14,6 +19,11 @@ function createEnv(options) {
 		for (const [key, zodType] of Object.entries(schema.shape)) {
 			const undefinedParse = zodType.safeParse(void 0);
 			if (undefinedParse.success) {
+				if (directOptionalKeys.has(key)) {
+					if (Object.hasOwn(runtimeEnvSource, key) || Object.getOwnPropertyDescriptor(runtimeEnvSource, key) !== void 0 || key in runtimeEnvSource) runtimeEnvSnapshot[key] = runtimeEnvSource[key];
+					else if (!isCodegenParse && undefinedParse.data !== void 0) runtimeEnvSnapshot[key] = runtimeEnvSource[key];
+					continue;
+				}
 				if (Object.hasOwn(runtimeEnvSource, key) || Object.getOwnPropertyDescriptor(runtimeEnvSource, key) !== void 0 || key in runtimeEnvSource) runtimeEnvSnapshot[key] = runtimeEnvSource[key];
 				else if (!isCodegenParse && undefinedParse.data !== void 0) runtimeEnvSnapshot[key] = runtimeEnvSource[key];
 				continue;
@@ -32,10 +42,22 @@ function createEnv(options) {
 			...Object.fromEntries(Object.entries(runtimeEnvSnapshot).filter(([, value]) => value !== void 0))
 		} : runtimeEnvSnapshot;
 		const parsed = schema.safeParse(envForParse);
-		if (!parsed.success) throw new CRPCError({
-			code: "INTERNAL_SERVER_ERROR",
-			message: "Invalid environment variables"
-		});
+		if (!parsed.success) throw createInvalidEnvError();
+		const parsedData = parsed.data;
+		for (const key of directOptionalKeys) {
+			if (!(key in schema.shape) || parsedData[key] !== void 0) continue;
+			Object.defineProperty(parsedData, key, {
+				configurable: true,
+				enumerable: true,
+				get: () => {
+					const value = runtimeEnvSource[key];
+					if (value === void 0) return;
+					const result = schema.shape[key].safeParse(value);
+					if (!result.success) throw createInvalidEnvError();
+					return result.data;
+				}
+			});
+		}
 		if (cache) cached = parsed.data;
 		return parsed.data;
 	};