kitcn 0.13.6 → 0.13.8

package/dist/auth/index.js

@@ -319,6 +319,34 @@ const resolveSchemaTableName = (schema, betterAuthSchema, model) => {
 		if (schema.tables[value.modelName]) return value.modelName;
 	}
 };
+const AUTH_TIMESTAMP_FIELDS = ["createdAt", "updatedAt"];
+const resolveBetterAuthModel = (betterAuthSchema, model) => {
+	if (betterAuthSchema?.[model]) return betterAuthSchema[model];
+	return Object.values(betterAuthSchema ?? {}).find((value) => value?.modelName === model);
+};
+const resolveWriteFields = (schema, betterAuthSchema, model) => {
+	const tableName = resolveSchemaTableName(schema, betterAuthSchema, model);
+	const validatorFields = tableName ? schema.tables[tableName]?.validator?.fields : void 0;
+	if (validatorFields) return new Set(Object.keys(validatorFields));
+	const modelFields = resolveBetterAuthModel(betterAuthSchema, model)?.fields;
+	if (!modelFields) return;
+	const fields = /* @__PURE__ */ new Set();
+	for (const [field, config] of Object.entries(modelFields)) {
+		fields.add(field);
+		if (typeof config?.fieldName === "string") fields.add(config.fieldName);
+	}
+	return fields;
+};
+const stripUnsupportedAuthTimestamps = (data, schema, betterAuthSchema, model) => {
+	const writeFields = resolveWriteFields(schema, betterAuthSchema, model);
+	if (!writeFields) return data;
+	let result;
+	for (const field of AUTH_TIMESTAMP_FIELDS) if (field in data && !writeFields.has(field)) {
+		result ??= { ...data };
+		delete result[field];
+	}
+	return result ?? data;
+};
 const resolveOrmTable = (ctx, schema, betterAuthSchema, model) => {
 	if (!ctx?.orm || typeof ctx.orm.insert !== "function" || typeof ctx.orm.update !== "function" || typeof ctx.orm.delete !== "function") return;
 	const tableName = resolveSchemaTableName(schema, betterAuthSchema, model);
@@ -418,19 +446,23 @@ const serializeDatesForConvex = (value) => {
 	return serialized ?? value;
 };
 const toConvexSafe = (value) => serializeDatesForConvex(value);
-const withAuthTimestamps = (data) => {
-	if (data.createdAt !== void 0) return data;
+const withAuthTimestamps = (data, schema, betterAuthSchema, model) => {
+	const writeFields = resolveWriteFields(schema, betterAuthSchema, model);
+	if (data.createdAt !== void 0) return stripUnsupportedAuthTimestamps(data, schema, betterAuthSchema, model);
+	const supportsCreatedAt = !writeFields || writeFields.has("createdAt");
+	const supportsUpdatedAt = !writeFields || writeFields.has("updatedAt");
+	if (!(supportsCreatedAt || supportsUpdatedAt)) return data;
 	const now = Date.now();
-	return {
+	return stripUnsupportedAuthTimestamps({
 		...data,
-		createdAt: now,
-		...data.updatedAt === void 0 ? { updatedAt: now } : {}
-	};
+		...supportsCreatedAt ? { createdAt: now } : {},
+		...supportsUpdatedAt && data.updatedAt === void 0 ? { updatedAt: now } : {}
+	}, schema, betterAuthSchema, model);
 };
 const createHandler = async (ctx, args, schema, betterAuthSchema) => {
 	const triggerCtx = args.triggerCtx ?? ctx;
 	const tableTriggers = args.tableTriggers;
-	const data = serializeDatesForConvex(withAuthTimestamps(await applyBeforeHook(args.input.model, "create", args.input.data, tableTriggers?.create?.before, triggerCtx)));
+	const data = serializeDatesForConvex(withAuthTimestamps(await applyBeforeHook(args.input.model, "create", args.input.data, tableTriggers?.create?.before, triggerCtx), schema, betterAuthSchema, args.input.model));
 	await checkUniqueFields(ctx, schema, betterAuthSchema, args.input.model, data);
 	const ormTable = resolveOrmTable(ctx, schema, betterAuthSchema, args.input.model);
 	const doc = ormTable ? await ormInsert(ctx, ormTable.table, data) : await (async () => {
@@ -459,7 +491,7 @@ const updateOneHandler = async (ctx, args, schema, betterAuthSchema) => {
 	const doc = await listOne(ctx, schema, betterAuthSchema, args.input);
 	if (!doc) throw new Error(`Failed to update ${args.input.model}`);
 	const normalizedDoc = withBothIdFields(doc);
-	const update = serializeDatesForConvex(await applyBeforeHook(args.input.model, "update", args.input.update, tableTriggers?.update?.before, triggerCtx));
+	const update = stripUnsupportedAuthTimestamps(serializeDatesForConvex(await applyBeforeHook(args.input.model, "update", args.input.update, tableTriggers?.update?.before, triggerCtx)), schema, betterAuthSchema, args.input.model);
 	await checkUniqueFields(ctx, schema, betterAuthSchema, args.input.model, update, normalizedDoc);
 	const ormTable = resolveOrmTable(ctx, schema, betterAuthSchema, args.input.model);
 	const updatedDoc = ormTable ? await ormUpdate(ctx, ormTable.table, normalizedDoc._id, update) : await (async () => {
@@ -492,7 +524,7 @@ const updateManyHandler = async (ctx, args, schema, betterAuthSchema) => {
 		if (hasUniqueFields(betterAuthSchema, args.input.model, args.input.update ?? {}) && page.length > 1) throw new Error(`Attempted to set unique fields in multiple documents in ${args.input.model} with the same value. Fields: ${Object.keys(args.input.update ?? {}).join(", ")}`);
 		await asyncMap(page, async (doc) => {
 			const normalizedDoc = withBothIdFields(doc);
-			const update = serializeDatesForConvex(await applyBeforeHook(args.input.model, "update", args.input.update ?? {}, tableTriggers?.update?.before, triggerCtx));
+			const update = stripUnsupportedAuthTimestamps(serializeDatesForConvex(await applyBeforeHook(args.input.model, "update", args.input.update ?? {}, tableTriggers?.update?.before, triggerCtx)), schema, betterAuthSchema, args.input.model);
 			await checkUniqueFields(ctx, schema, betterAuthSchema, args.input.model, update ?? {}, normalizedDoc);
 			const hookNewDoc = serializeDatesForConvex(withBothIdFields(ormTable ? await ormUpdate(ctx, ormTable.table, normalizedDoc._id, update ?? {}) : await (async () => {
 				await ctx.db.patch(normalizedDoc._id, update);

package/dist/{backend-core-D2a2poAE.mjs → backend-core-s2N3CTN-.mjs}

@@ -10089,6 +10089,7 @@ const AUTH_CONVEX_HTTP_ROUTER_RE = /const\s+http\s*=\s*httpRouter\(\);?/;
 const AUTH_CONVEX_HTTP_IMPORT_RE = /from\s+['"]kitcn\/auth\/http['"]/;
 const AUTH_CONVEX_HTTP_GET_AUTH_IMPORT_RE = /from\s+['"]\.\/generated\/auth['"]/;
 const AUTH_CONVEX_SCHEMA_CALL_RE = /defineSchema\(\s*\{/;
+const AUTH_CONVEX_SCHEMA_AUTH_SCHEMA_IMPORT_RE = /import\s+\{\s*authSchema\s*\}\s+from\s+['"]\.\/authSchema['"];?/;
 const AUTH_CONVEX_APP_IMPORT_RE = /import App from ['"][^'"]+['"];?/;
 const AUTH_CONVEX_PROVIDER_IMPORT_RE = /import\s+\{\s*ConvexProvider,\s*ConvexReactClient\s*\}\s+from\s+['"]convex\/react['"];?/;
 const AUTH_PROVIDER_REACT_NODE_IMPORT_RE = /import\s+type\s+\{\s*ReactNode\s*\}\s+from\s+['"]react['"];?/;
@@ -10428,7 +10429,7 @@ export default http;
 function buildAuthConvexSchemaPlanFile(params) {
 	const schemaPath = getSchemaFilePath(params.functionsDir);
 	let source = fs.readFileSync(schemaPath, "utf8");
-	if (!source.includes("import { authSchema } from './authSchema';")) source = `import { authSchema } from './authSchema';\n${source}`;
+	if (!AUTH_CONVEX_SCHEMA_AUTH_SCHEMA_IMPORT_RE.test(source)) source = `import { authSchema } from './authSchema';\n${source}`;
 	if (!source.includes("...authSchema")) source = source.replace(AUTH_CONVEX_SCHEMA_CALL_RE, (match) => `${match}\n  ...authSchema,`);
 	return createPlanFile({
 		kind: "schema",

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, B as runConfiguredCodegen, C as isEntryPoint, Ct as serializeEnvValue, D as parseInitCommandArgs, Dt as logger, E as parseBackendRunJson, 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, Ot as highlighter, P as resolveMigrationConfig, Q as promptForPluginSelection, R as runAggregatePruneFlow, S as isConvexDevPreRunConflictFlag, St as resolveAuthEnvState, T as parseArgs, 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, 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 stripConvexCommandNoise, x as hasRemoteConvexDeploymentEnv, xt as resolveProjectScaffoldContext, y as getConvexDeploymentCommandEnv, yt as inspectPluginDependencyInstall, z as runBackendFunction } from "./backend-core-D2a2poAE.mjs";
+import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, B as runConfiguredCodegen, C as isEntryPoint, Ct as serializeEnvValue, D as parseInitCommandArgs, Dt as logger, E as parseBackendRunJson, 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, Ot as highlighter, P as resolveMigrationConfig, Q as promptForPluginSelection, R as runAggregatePruneFlow, S as isConvexDevPreRunConflictFlag, St as resolveAuthEnvState, T as parseArgs, 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, 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 stripConvexCommandNoise, x as hasRemoteConvexDeploymentEnv, xt as resolveProjectScaffoldContext, y as getConvexDeploymentCommandEnv, yt as inspectPluginDependencyInstall, z as runBackendFunction } from "./backend-core-s2N3CTN-.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/watcher.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Dt as logger, Et as getConvexConfig, F as resolveRunDeps, Tt as generateMeta, j as resolveConfiguredBackend, q as withLocalCodegenEnv } from "./backend-core-D2a2poAE.mjs";
+import { Dt as logger, Et as getConvexConfig, F as resolveRunDeps, Tt as generateMeta, j as resolveConfiguredBackend, q as withLocalCodegenEnv } from "./backend-core-s2N3CTN-.mjs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 

package/package.json

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