@wordrhyme/auto-crud-server 1.0.7 → 1.0.9

package/dist/index.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { and, asc, desc, eq, gt, gte, ilike, inArray, isNull, lt, lte, ne, not, notIlike, notInArray, or, sql } from "drizzle-orm";
+import { and, asc, desc, eq, getTableColumns, gt, gte, ilike, inArray, isNull, lt, lte, ne, not, notIlike, notInArray, or, sql } from "drizzle-orm";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import { TRPCError, initTRPC } from "@trpc/server";
 import superjson from "superjson";
@@ -422,12 +422,25 @@ function resolveSoftDelete(option) {
 /**
 * 判断 procedure 配置的类型
 */
+function isProcedureLike(config) {
+	if (!config || typeof config !== "object") return false;
+	const candidate = config;
+	return [
+		"input",
+		"output",
+		"query",
+		"mutation",
+		"use"
+	].some((key) => typeof candidate[key] === "function");
+}
 function isProcedureMap(config) {
 	if (!config) return false;
 	if (typeof config === "function") return false;
+	if (isProcedureLike(config)) return false;
 	if (typeof config === "object" && config !== null) {
 		const keys = Object.keys(config);
 		const validKeys = [
+			"meta",
 			"list",
 			"get",
 			"create",
@@ -473,6 +486,9 @@ function resolveConfig(config) {
 		}
 	};
 }
+function resolveMetaProcedure(config, fallback) {
+	return isProcedureMap(config) ? config.meta ?? fallback : fallback;
+}
 const filterItemSchema = z.object({
 	id: z.string(),
 	value: z.union([z.string(), z.array(z.string())]),
@@ -487,6 +503,7 @@ const baseListInputSchema = z.object({
 		id: z.string(),
 		desc: z.boolean()
 	})).optional(),
+	search: z.string().trim().optional(),
 	filters: z.array(filterItemSchema).optional(),
 	joinOperator: z.enum(["and", "or"]).default("and")
 });
@@ -497,6 +514,7 @@ const baseExportInputSchema = z.object({
 		id: z.string(),
 		desc: z.boolean()
 	})).optional(),
+	search: z.string().trim().optional(),
 	filters: z.array(filterItemSchema).optional(),
 	joinOperator: z.enum(["and", "or"]).default("and"),
 	limit: z.number().min(1).optional()
@@ -514,6 +532,13 @@ const DEFAULT_OMIT_FIELDS = [
 	"createdAt",
 	"updatedAt"
 ];
+function shouldEnableCrudExtensionSchema(config) {
+	return Boolean(config.id) && config.extensions !== false;
+}
+function withCrudExtensionInput(schema, config) {
+	if (!shouldEnableCrudExtensionSchema(config) || !isZodObject(schema)) return schema;
+	return schema.passthrough();
+}
 /**
 * 解析并派生 Schema
 * - 优先使用显式传入的 Schema
@@ -531,11 +556,12 @@ function resolveSchemas(config) {
 		const omitConfig = Object.fromEntries(omitFields.map((f) => [f, true]));
 		schema = rawSchema.omit(omitConfig);
 	}
+	schema = withCrudExtensionInput(schema, config);
 	let selectSchema;
 	if (config.selectSchema) selectSchema = config.selectSchema;
 	else if (config.schema) selectSchema = schema;
 	else selectSchema = createSelectSchema(table);
-	const updateSchema = config.updateSchema ?? schema.partial().refine(nonEmpty, { message: "Update payload cannot be empty. At least one field is required." });
+	const updateSchema = config.updateSchema ? withCrudExtensionInput(config.updateSchema, config) : schema.partial().refine(nonEmpty, { message: "Update payload cannot be empty. At least one field is required." });
 	return {
 		selectSchema,
 		schema,
@@ -580,6 +606,197 @@ function resolveColumnTarget({ table, columnId, allowedColumns }) {
 	}
 	return getTableColumn(table, columnId);
 }
+const CRUD_EXTENSION_FILTER_ID = "auto-crud-extension-filter";
+const NO_CRUD_EXTENSION_MATCH = "__auto_crud_no_crud_extension_match__";
+function isObjectRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isCrudExtensionIdFilter(filter, idField) {
+	return filter.id === idField && filter.filterId === CRUD_EXTENSION_FILTER_ID;
+}
+function readCrudTarget(config) {
+	const id = config.id;
+	if (!id) return null;
+	return { id };
+}
+function resolveCrudExtensions(ctx, config) {
+	const extensions = config.extensions;
+	if (extensions === false) return null;
+	if (typeof extensions === "function") return extensions(ctx) ?? null;
+	if (extensions) return extensions;
+	if (!config.id) return null;
+	return ctx?.crudExtensions ?? null;
+}
+function getTableColumnNames(table) {
+	try {
+		const columns = getTableColumns(table);
+		const names = Object.keys(columns);
+		if (names.length > 0) return new Set(names);
+	} catch {}
+	return new Set(Object.keys(table).filter((key) => !key.startsWith("_")));
+}
+function splitCrudExtensionWriteInput(inputData, tableColumnNames) {
+	if (!isObjectRecord(inputData)) return {
+		data: inputData,
+		rawValues: {},
+		baseValues: {},
+		extraValues: null
+	};
+	const baseValues = {};
+	const extraValues = {};
+	for (const [key, value] of Object.entries(inputData)) {
+		if (key === "ext") {
+			if (isObjectRecord(value)) Object.assign(extraValues, value);
+			continue;
+		}
+		if (tableColumnNames.has(key)) baseValues[key] = value;
+		else extraValues[key] = value;
+	}
+	return {
+		data: baseValues,
+		rawValues: inputData,
+		baseValues,
+		extraValues: Object.keys(extraValues).length > 0 ? extraValues : null
+	};
+}
+async function saveCrudExtraValues(ctx, config, entityId, input) {
+	const target = readCrudTarget(config);
+	const extraValues = input.extraValues;
+	if (!target || !extraValues) return;
+	if (entityId === null || entityId === void 0 || String(entityId).length === 0) return;
+	const provider = resolveCrudExtensions(ctx, config);
+	if (!provider?.saveExtraValues) throw new TRPCError({
+		code: "PRECONDITION_FAILED",
+		message: "CRUD extension persistence is not available"
+	});
+	await provider.saveExtraValues({
+		id: target.id,
+		entityId: String(entityId),
+		rawValues: input.rawValues,
+		baseValues: input.baseValues,
+		extraValues,
+		tx: ctx?.tx
+	});
+}
+function assertCrudExtraValuesWritable(ctx, config, input) {
+	if (!readCrudTarget(config) || !input.extraValues) return;
+	if (!resolveCrudExtensions(ctx, config)?.saveExtraValues) throw new TRPCError({
+		code: "PRECONDITION_FAILED",
+		message: "CRUD extension persistence is not available"
+	});
+}
+function assertCrudExtraValuesWritableForRows(ctx, config, inputs) {
+	if (inputs.some((input) => input.extraValues)) assertCrudExtraValuesWritable(ctx, config, inputs.find((input) => input.extraValues));
+}
+async function saveCrudExtraValuesForRows(ctx, config, idField, results, inputs) {
+	const extraByInputId = /* @__PURE__ */ new Map();
+	for (const input of inputs) {
+		if (!input.extraValues || !isObjectRecord(input.data)) continue;
+		const inputId = input.data[idField];
+		if (inputId !== null && inputId !== void 0) extraByInputId.set(String(inputId), input);
+	}
+	const canUseIndexFallback = results.length === inputs.length;
+	await Promise.all(results.map((result, index) => {
+		const resultId = result[idField];
+		const fallbackInput = canUseIndexFallback ? inputs[index] : void 0;
+		const fallbackInputId = fallbackInput && isObjectRecord(fallbackInput.data) ? fallbackInput.data[idField] : void 0;
+		const entityId = resultId !== null && resultId !== void 0 ? resultId : fallbackInputId;
+		const input = entityId !== null && entityId !== void 0 ? extraByInputId.get(String(entityId)) ?? fallbackInput : fallbackInput;
+		return input ? saveCrudExtraValues(ctx, config, entityId, input) : Promise.resolve();
+	}));
+}
+function readProjectionDisplay(value) {
+	if (!isObjectRecord(value)) return value;
+	if ("display" in value && value.display !== null && value.display !== void 0) return value.display;
+	if ("value" in value) return value.value;
+	return value;
+}
+async function enrichCrudRows(ctx, config, idField, rows) {
+	const target = readCrudTarget(config);
+	if (!target || rows.length === 0) return rows;
+	const provider = resolveCrudExtensions(ctx, config);
+	if (!provider?.readProjection) return rows;
+	const entityIds = rows.map((row) => row[idField]).filter((id) => typeof id === "string" && id.length > 0 || typeof id === "number").map(String);
+	if (entityIds.length === 0) return rows;
+	const projections = await provider.readProjection({
+		id: target.id,
+		entityIds
+	});
+	return rows.map((row) => {
+		const rowId = row[idField];
+		const projected = rowId !== null && rowId !== void 0 ? projections[String(rowId)] : void 0;
+		if (!projected || Object.keys(projected).length === 0) return row;
+		return {
+			...row,
+			...Object.fromEntries(Object.entries(projected).map(([field, value]) => [field, readProjectionDisplay(value)]))
+		};
+	});
+}
+function isAllowedBaseCrudColumn(table, columnId, allowedColumns) {
+	if (allowedColumns && allowedColumns.length > 0) return resolveColumnTarget({
+		table,
+		columnId,
+		allowedColumns
+	}) !== void 0;
+	return getTableColumn(table, columnId) !== void 0;
+}
+function isKnownBaseCrudColumn(table, columnId, allowedColumns) {
+	return getTableColumn(table, columnId) !== void 0 || findColumnRef(columnId, allowedColumns) !== void 0;
+}
+async function applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, input) {
+	const target = readCrudTarget(config);
+	const filters = input.filters ?? [];
+	const search = typeof input.search === "string" ? input.search.trim() : "";
+	if (!target || filters.length === 0 && !search) return input;
+	const baseFilters = [];
+	const extensionFilters = [];
+	for (const filter of filters) if (isAllowedBaseCrudColumn(table, filter.id, filterableColumns)) baseFilters.push(filter);
+	else if (isKnownBaseCrudColumn(table, filter.id, filterableColumns)) continue;
+	else extensionFilters.push(filter);
+	if (extensionFilters.length === 0 && !search) return {
+		...input,
+		filters: baseFilters
+	};
+	const provider = resolveCrudExtensions(ctx, config);
+	const matchedSets = [];
+	if (extensionFilters.length > 0) {
+		if (!provider?.matchEntityIds) throw new TRPCError({
+			code: "PRECONDITION_FAILED",
+			message: "CRUD extension filtering is not available"
+		});
+		const matchedIds$1 = await provider.matchEntityIds({
+			id: target.id,
+			filters: extensionFilters,
+			joinOperator: input.joinOperator,
+			limit: 5e3
+		});
+		matchedSets.push(new Set(matchedIds$1));
+	}
+	if (search && provider?.searchEntityIds) {
+		const matchedIds$1 = await provider.searchEntityIds({
+			id: target.id,
+			search,
+			limit: 5e3
+		});
+		matchedSets.push(new Set(matchedIds$1));
+	}
+	if (matchedSets.length === 0) return {
+		...input,
+		filters: baseFilters
+	};
+	let matchedIds = matchedSets[0] ? [...matchedSets[0]] : [];
+	for (const set of matchedSets.slice(1)) matchedIds = matchedIds.filter((id) => set.has(id));
+	return {
+		...input,
+		filters: [...baseFilters, {
+			id: idField,
+			value: matchedIds.length > 0 ? matchedIds : [NO_CRUD_EXTENSION_MATCH],
+			variant: "multiSelect",
+			operator: "inArray",
+			filterId: CRUD_EXTENSION_FILTER_ID
+		}]
+	};
+}
 /**
 * 创建 CRUD Router
 *
@@ -595,14 +812,19 @@ function resolveColumnTarget({ table, columnId, allowedColumns }) {
 function createCrudRouter(config) {
 	const { table, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, maxExportSize = 5e3, softDelete: softDeleteOption, middleware = {} } = config;
 	const { selectSchema, schema, updateSchema } = resolveSchemas(config);
-	const entityOutputSchema = selectSchema;
+	const entityOutputSchema = withCrudExtensionInput(selectSchema, config);
 	const listOutputSchema = z.object({
-		data: z.array(selectSchema),
+		data: z.array(entityOutputSchema),
 		total: z.number(),
 		page: z.number(),
 		perPage: z.number(),
 		pageCount: z.number()
 	});
+	const metadataOutputSchema = z.object({
+		schema: z.unknown().optional(),
+		fields: z.record(z.string(), z.unknown()).optional(),
+		errors: z.array(z.string()).optional()
+	});
 	const deleteManyOutputSchema = z.object({ deleted: z.number() });
 	const updateManyOutputSchema = z.object({ updated: z.number() });
 	const upsertOutputSchema = z.object({
@@ -610,12 +832,12 @@ function createCrudRouter(config) {
 		isNew: z.boolean()
 	});
 	const exportOutputSchema = z.object({
-		data: z.array(selectSchema),
+		data: z.array(entityOutputSchema),
 		total: z.number(),
 		hasMore: z.boolean()
 	});
 	const createManyOutputSchema = z.object({
-		created: z.array(selectSchema),
+		created: z.array(entityOutputSchema),
 		count: z.number()
 	});
 	const importOutputSchema = z.object({
@@ -628,12 +850,14 @@ function createCrudRouter(config) {
 		}))
 	});
 	const resolved = resolveConfig(config);
+	const metaProcedure = resolveMetaProcedure(config.procedure, resolved.procedureFactory("list"));
 	const softDelete = resolveSoftDelete(softDeleteOption);
 	const resolvedListInputSchema = config.listInputSchema ?? baseListInputSchema;
 	const resolvedGetInputSchema = config.getInputSchema ? z.union([z.string(), config.getInputSchema]) : defaultGetInputSchema;
 	const resolvedExportInputSchema = config.exportInputSchema ?? baseExportInputSchema;
 	const m = middleware;
 	const getIdColumn = () => table[idField];
+	const tableColumnNames = getTableColumnNames(table);
 	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
 	const buildWhere = (ctx, operation, additionalCondition) => {
 		const conditions = [];
@@ -673,25 +897,38 @@ function createCrudRouter(config) {
 		});
 	};
 	const procedures = {
+		meta: metaProcedure.output(metadataOutputSchema).query(async ({ ctx }) => {
+			await withGuard(ctx, "list");
+			const target = readCrudTarget(config);
+			if (!target) return {};
+			const provider = resolveCrudExtensions(ctx, config);
+			if (!provider?.getMetadata) return {};
+			return provider.getMetadata({ id: target.id });
+		}),
 		list: resolved.procedureFactory("list").input(resolvedListInputSchema).output(listOutputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "list");
 			const doList = async (listInput$1) => {
-				const offset = (listInput$1.page - 1) * listInput$1.perPage;
-				const validatedFilters = listInput$1.filters?.filter((filter) => validateColumn(filter.id, filterableColumns));
+				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, listInput$1);
+				const offset = (effectiveInput.page - 1) * effectiveInput.perPage;
+				const validatedFilters = effectiveInput.filters?.filter((filter) => isCrudExtensionIdFilter(filter, idField) || validateColumn(filter.id, filterableColumns));
 				const where = buildWhere(ctx, "list", validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
-					joinOperator: listInput$1.joinOperator,
-					resolveColumn: (columnId) => resolveColumnTarget({
-						table,
-						columnId: String(columnId),
-						allowedColumns: filterableColumns
-					})
+					joinOperator: effectiveInput.joinOperator,
+					resolveColumn: (columnId) => {
+						const id = String(columnId);
+						if (id === idField) return getTableColumn(table, idField);
+						return resolveColumnTarget({
+							table,
+							columnId: id,
+							allowedColumns: filterableColumns
+						});
+					}
 				}) : void 0);
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
-				if (listInput$1.sort?.length) {
-					const sortField = listInput$1.sort[0];
+				if (effectiveInput.sort?.length) {
+					const sortField = effectiveInput.sort[0];
 					if (sortField && validateColumn(sortField.id, sortableColumns)) {
 						const column = resolveColumnTarget({
 							table,
@@ -701,16 +938,16 @@ function createCrudRouter(config) {
 						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
 					}
 				}
-				const data = await query.limit(listInput$1.perPage).offset(offset);
+				const enrichedData = await enrichCrudRows(ctx, config, idField, await query.limit(effectiveInput.perPage).offset(offset));
 				let countQuery = ctx.db.select({ count: sql`count(*)::int` }).from(table).$dynamic();
 				if (where) countQuery = countQuery.where(where);
 				const count = (await countQuery)[0]?.count ?? 0;
 				return {
-					data,
+					data: enrichedData,
 					total: count,
-					page: listInput$1.page,
-					perPage: listInput$1.perPage,
-					pageCount: Math.ceil(count / listInput$1.perPage)
+					page: effectiveInput.page,
+					perPage: effectiveInput.perPage,
+					pageCount: Math.ceil(count / effectiveInput.perPage)
 				};
 			};
 			const listInput = input;
@@ -728,7 +965,9 @@ function createCrudRouter(config) {
 				const where = buildWhere(ctx, "get", eq(getIdColumn(), id$1));
 				const [item] = await ctx.db.select().from(table).where(where);
 				await withAuthorize(ctx, item, "get");
-				return item ?? null;
+				if (!item) return null;
+				const [enriched] = await enrichCrudRows(ctx, config, idField, [item]);
+				return enriched ?? null;
 			};
 			const id = typeof input === "string" ? input : input.id;
 			if (m.get) return m.get({
@@ -742,12 +981,15 @@ function createCrudRouter(config) {
 		create: resolved.procedureFactory("create").input(schema).output(entityOutputSchema).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "create");
 			const doCreate = async (inputData) => {
+				const splitInput = splitCrudExtensionWriteInput(inputData, tableColumnNames);
+				assertCrudExtraValuesWritable(ctx, config, splitInput);
 				const injectData = resolved.getInject(ctx, "create");
 				const data = {
-					...inputData,
+					...splitInput.data,
 					...injectData
 				};
 				const [created] = await ctx.db.insert(table).values(data).returning();
+				await saveCrudExtraValues(ctx, config, created?.[idField], splitInput);
 				return created;
 			};
 			if (m.create) return m.create({
@@ -770,12 +1012,16 @@ function createCrudRouter(config) {
 				message: "Resource not found or access denied"
 			});
 			const doUpdate = async (updateData) => {
+				const splitUpdate = splitCrudExtensionWriteInput(updateData, tableColumnNames);
+				assertCrudExtraValuesWritable(ctx, config, splitUpdate);
 				const injectData = resolved.getInject(ctx, "update");
 				const data = {
-					...updateData,
+					...splitUpdate.data,
 					...injectData
 				};
-				const [updated] = await ctx.db.update(table).set(data).where(where).returning();
+				let updated = existing;
+				if (Object.keys(data).length > 0) [updated] = await ctx.db.update(table).set(data).where(where).returning();
+				await saveCrudExtraValues(ctx, config, input.id, splitUpdate);
 				return updated;
 			};
 			if (m.update) return m.update({
@@ -831,12 +1077,18 @@ function createCrudRouter(config) {
 			await withGuard(ctx, "updateMany");
 			const where = buildWhere(ctx, "updateMany", inArray(getIdColumn(), input.ids));
 			const doUpdateMany = async (updateData) => {
+				const splitUpdate = splitCrudExtensionWriteInput(updateData, tableColumnNames);
+				assertCrudExtraValuesWritable(ctx, config, splitUpdate);
 				const injectData = resolved.getInject(ctx, "update");
 				const data = {
-					...updateData,
+					...splitUpdate.data,
 					...injectData
 				};
-				return { updated: (await ctx.db.update(table).set(data).where(where).returning({ id: getIdColumn() })).length };
+				let updated = input.ids.map((id) => ({ [idField]: id }));
+				if (Object.keys(data).length > 0) updated = await ctx.db.update(table).set(data).where(where).returning({ [idField]: getIdColumn() });
+				else updated = await ctx.db.select({ [idField]: getIdColumn() }).from(table).where(where);
+				await Promise.all(updated.map((row) => saveCrudExtraValues(ctx, config, row[idField], splitUpdate)));
+				return { updated: updated.length };
 			};
 			if (m.updateMany) return m.updateMany({
 				ctx,
@@ -849,7 +1101,9 @@ function createCrudRouter(config) {
 		upsert: resolved.procedureFactory("upsert").input(schema).output(upsertOutputSchema).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "upsert");
 			const doUpsert = async (inputData) => {
-				const inputId = inputData[idField];
+				const splitInput = splitCrudExtensionWriteInput(inputData, tableColumnNames);
+				assertCrudExtraValuesWritable(ctx, config, splitInput);
+				const inputId = splitInput.data[idField];
 				let isNew = true;
 				let existing = null;
 				if (inputId) {
@@ -861,16 +1115,17 @@ function createCrudRouter(config) {
 				}
 				const injectData = resolved.getInject(ctx, isNew ? "create" : "update");
 				const data = {
-					...inputData,
+					...splitInput.data,
 					...injectData
 				};
 				const [result] = await ctx.db.insert(table).values(data).onConflictDoUpdate({
 					target: getIdColumn(),
 					set: {
-						...inputData,
+						...splitInput.data,
 						...resolved.getInject(ctx, "update")
 					}
 				}).returning();
+				await saveCrudExtraValues(ctx, config, result?.[idField] ?? inputId, splitInput);
 				return {
 					data: result,
 					isNew
@@ -886,22 +1141,32 @@ function createCrudRouter(config) {
 		export: resolved.procedureFactory("export").input(resolvedExportInputSchema).output(exportOutputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "export");
 			const doExport = async (exportInput$1) => {
-				const effectiveLimit = Math.min(Math.max(exportInput$1.limit ?? maxExportSize, 1), maxExportSize);
-				const validatedFilters = exportInput$1.filters?.filter((filter) => validateColumn(filter.id, filterableColumns));
+				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, {
+					page: 1,
+					perPage: Math.min(Math.max(exportInput$1.limit ?? maxExportSize, 1), maxExportSize),
+					joinOperator: exportInput$1.joinOperator ?? "and",
+					...exportInput$1
+				});
+				const effectiveLimit = Math.min(Math.max(effectiveInput.limit ?? maxExportSize, 1), maxExportSize);
+				const validatedFilters = effectiveInput.filters?.filter((filter) => isCrudExtensionIdFilter(filter, idField) || validateColumn(filter.id, filterableColumns));
 				const where = buildWhere(ctx, "export", validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
-					joinOperator: exportInput$1.joinOperator ?? "and",
-					resolveColumn: (columnId) => resolveColumnTarget({
-						table,
-						columnId: String(columnId),
-						allowedColumns: filterableColumns
-					})
+					joinOperator: effectiveInput.joinOperator ?? "and",
+					resolveColumn: (columnId) => {
+						const id = String(columnId);
+						if (id === idField) return getTableColumn(table, idField);
+						return resolveColumnTarget({
+							table,
+							columnId: id,
+							allowedColumns: filterableColumns
+						});
+					}
 				}) : void 0);
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
-				if (exportInput$1.sort?.length) {
-					const sortField = exportInput$1.sort[0];
+				if (effectiveInput.sort?.length) {
+					const sortField = effectiveInput.sort[0];
 					if (sortField && validateColumn(sortField.id, sortableColumns)) {
 						const column = resolveColumnTarget({
 							table,
@@ -911,14 +1176,14 @@ function createCrudRouter(config) {
 						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
 					}
 				}
-				const data = await query.limit(effectiveLimit);
+				const enrichedData = await enrichCrudRows(ctx, config, idField, await query.limit(effectiveLimit));
 				let countQuery = ctx.db.select({ count: sql`count(*)::int` }).from(table).$dynamic();
 				if (where) countQuery = countQuery.where(where);
 				const total = (await countQuery)[0]?.count ?? 0;
 				return {
-					data,
+					data: enrichedData,
 					total,
-					hasMore: total > data.length
+					hasMore: total > enrichedData.length
 				};
 			};
 			const exportInput = input;
@@ -932,12 +1197,15 @@ function createCrudRouter(config) {
 		createMany: resolved.procedureFactory("createMany").input(z.array(schema).min(1).max(maxBatchSize)).output(createManyOutputSchema).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "createMany");
 			const doCreateMany = async (items) => {
+				const splitItems = items.map((item) => splitCrudExtensionWriteInput(item, tableColumnNames));
+				assertCrudExtraValuesWritableForRows(ctx, config, splitItems);
 				const injectData = resolved.getInject(ctx, "create");
-				const values = items.map((item) => ({
-					...item,
+				const values = splitItems.map(({ data }) => ({
+					...data,
 					...injectData
 				}));
 				const created = await ctx.db.insert(table).values(values).onConflictDoNothing().returning();
+				await saveCrudExtraValuesForRows(ctx, config, idField, created, splitItems);
 				return {
 					created,
 					count: created.length
@@ -958,8 +1226,10 @@ function createCrudRouter(config) {
 				for (let i = 0; i < importData$1.rows.length; i++) {
 					const row = importData$1.rows[i];
 					const result = schema.safeParse(row);
-					if (result.success) validRows.push(result.data);
-					else {
+					if (result.success) {
+						const splitRow = splitCrudExtensionWriteInput(result.data, tableColumnNames);
+						validRows.push(splitRow);
+					} else {
 						const errors = result.error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`);
 						failed.push({
 							row: i,
@@ -979,26 +1249,30 @@ function createCrudRouter(config) {
 					skipped: 0,
 					failed
 				};
+				assertCrudExtraValuesWritableForRows(ctx, config, validRows);
 				const injectData = resolved.getInject(ctx, "create");
 				const values = validRows.map((row) => ({
-					...row,
+					...row.data,
 					...injectData
 				}));
 				let insertedCount = 0;
 				let updatedCount = 0;
 				if (importData$1.onConflict === "upsert") {
 					const existingCount = (await ctx.db.select({ id: getIdColumn() }).from(table).where(inArray(getIdColumn(), values.map((v) => v[idField]).filter(Boolean)))).length;
-					const updateFields = Object.keys(validRows[0]);
+					const updateFields = Object.keys(validRows[0].data);
 					const setClause = { ...resolved.getInject(ctx, "update") };
 					for (const key of updateFields) setClause[key] = sql.raw(`excluded."${key}"`);
 					const results = await ctx.db.insert(table).values(values).onConflictDoUpdate({
 						target: getIdColumn(),
 						set: setClause
 					}).returning({ id: getIdColumn() });
+					await saveCrudExtraValuesForRows(ctx, config, idField, results.map((result) => ({ [idField]: result.id })), validRows);
 					updatedCount = Math.min(existingCount, results.length);
 					insertedCount = results.length - updatedCount;
 				} else {
-					insertedCount = (await ctx.db.insert(table).values(values).onConflictDoNothing().returning({ id: getIdColumn() })).length;
+					const inserted = await ctx.db.insert(table).values(values).onConflictDoNothing().returning({ id: getIdColumn() });
+					await saveCrudExtraValuesForRows(ctx, config, idField, inserted.map((result) => ({ [idField]: result.id })), validRows);
+					insertedCount = inserted.length;
 					updatedCount = 0;
 				}
 				const skipped = validRows.length - insertedCount - updatedCount;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud-server",
   "type": "module",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "tRPC server utilities for auto-crud - automatic CRUD routers for Drizzle ORM",
   "author": "wordrhyme",
   "license": "MIT",
@@ -38,20 +38,20 @@
   },
   "devDependencies": {
     "@trpc/server": "^11.0.0",
-    "@types/node": "^22.19.3",
+    "@types/node": "^22.19.17",
     "drizzle-orm": "1.0.0-beta.15-859cf75",
     "drizzle-zod": "1.0.0-beta.14-a36c63d",
-    "eslint": "^9.39.2",
+    "eslint": "^9.39.4",
     "superjson": "^2.2.6",
     "tsdown": "^0.15.12",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18",
-    "zod": "^4.1.13",
+    "zod": "^4.3.6",
     "@internal/eslint-config": "0.3.0",
-    "@internal/tsconfig": "0.1.0",
     "@internal/prettier-config": "0.0.1",
     "@internal/tsdown-config": "0.1.0",
-    "@internal/vitest-config": "0.1.0"
+    "@internal/vitest-config": "0.1.0",
+    "@internal/tsconfig": "0.1.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {