@wordrhyme/auto-crud-server 1.3.0 → 1.4.0

package/README.md

@@ -170,7 +170,8 @@ export { handler as GET, handler as POST };
 ```
 
 未传 `sort` 或传空数组时，如果表存在 `createdAt` 且未被 `sortableColumns`
-白名单排除，列表默认按 `createdAt` 降序返回。
+白名单排除，列表默认按 `createdAt` 降序返回。存在有效排序时，服务端会自动追加
+主键作为同方向的稳定排序条件，避免 OFFSET 分页在相同排序值之间漂移。
 
 **输出**:
 
@@ -1120,6 +1121,50 @@ createCrudRouter({
 
 ---
 
+## ⚡ 性能与索引
+
+- `list` 和 `export` 会并发执行数据查询与精确计数，降低一次数据库往返延迟。
+- 多字段 `sort` 会全部应用，并自动追加 `idField` 作为稳定 tie-breaker。
+- `perPage`、批量写入和导出都有上限，但深分页仍建议由业务 middleware 改为
+  cursor/keyset pagination。
+- 不要开放所有字段过滤和排序；请通过 `filters`、`sort`、`search` 白名单只暴露
+  已有索引支持的字段。
+
+常见列表至少应覆盖默认排序；有租户和软删除时可使用部分复合索引：
+
+```sql
+create index tasks_created_at_id_idx
+  on tasks (created_at desc, id desc);
+
+create index tasks_tenant_created_at_id_idx
+  on tasks (tenant_id, created_at desc, id desc)
+  where deleted_at is null;
+```
+
+`search` 的 contains 查询使用 `ILIKE '%term%'`。PostgreSQL 普通 B-tree 无法高效处理，
+应为真实文本列配置 `pg_trgm` GIN 索引；JSON/custom expression 需要与生成 SQL 一致的
+表达式索引。
+
+扩展字段 provider 可以实现批量写接口，避免 `createMany`、`updateMany` 和 `import`
+逐行访问数据库。未实现时仍兼容旧的 `saveExtraValues`：
+
+```typescript
+const extensions: CrudExtensionsProvider = {
+  saveExtraValuesMany: async ({ id, rows, tx }) => {
+    await saveExtensionRowsInOneStatement(tx, id, rows);
+  },
+};
+```
+
+`createMany` 和 `import` 中携带扩展字段的每一行都必须提供唯一、稳定的 `idField`。
+服务端只按显式 ID 关联 `RETURNING` 结果，不依赖数据库未承诺的返回顺序；无法可靠映射时
+会在写入前返回 `PRECONDITION_FAILED`。
+
+任意组合筛选的列表缓存失效成本较高。优先优化索引和查询计划；metadata 或低频变更的
+无筛选计数才适合按 TTL 缓存。
+
+---
+
 ## 📦 导出的类型
 
 ```typescript
@@ -1134,6 +1179,8 @@ export type {
   CrudColumnConfig,
   CrudColumnExpression,
   CrudColumnRef,
+  CrudExtensionValueWrite,
+  CrudExtensionsProvider,
   CrudRouterConfig,
   CrudMiddleware,
   GetInput,

package/dist/index.cjs

@@ -21,18 +21,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-let zod = require("zod");
-zod = __toESM(zod);
+let __trpc_server = require("@trpc/server");
+__trpc_server = __toESM(__trpc_server);
 let drizzle_orm = require("drizzle-orm");
 drizzle_orm = __toESM(drizzle_orm);
 let drizzle_zod = require("drizzle-zod");
 drizzle_zod = __toESM(drizzle_zod);
-let __trpc_server = require("@trpc/server");
-__trpc_server = __toESM(__trpc_server);
+let zod = require("zod");
+zod = __toESM(zod);
 let superjson = require("superjson");
 superjson = __toESM(superjson);
-let date_fns = require("date-fns");
-date_fns = __toESM(date_fns);
+let date_fns_addDays = require("date-fns/addDays");
+date_fns_addDays = __toESM(date_fns_addDays);
+let date_fns_endOfDay = require("date-fns/endOfDay");
+date_fns_endOfDay = __toESM(date_fns_endOfDay);
+let date_fns_startOfDay = require("date-fns/startOfDay");
+date_fns_startOfDay = __toESM(date_fns_startOfDay);
 
 //#region src/trpc.ts
 const t = __trpc_server.initTRPC.context().create({ transformer: superjson.default });
@@ -256,16 +260,16 @@ function filterColumns({ table, filters, joinOperator, resolveColumn, resolveDat
 					if (!amount || !unit) return void 0;
 					switch (unit) {
 						case "days":
-							startDate = (0, date_fns.startOfDay)((0, date_fns.addDays)(today, Number.parseInt(amount, 10)));
-							endDate = (0, date_fns.endOfDay)(startDate);
+							startDate = (0, date_fns_startOfDay.startOfDay)((0, date_fns_addDays.addDays)(today, Number.parseInt(amount, 10)));
+							endDate = (0, date_fns_endOfDay.endOfDay)(startDate);
 							break;
 						case "weeks":
-							startDate = (0, date_fns.startOfDay)((0, date_fns.addDays)(today, Number.parseInt(amount, 10) * 7));
-							endDate = (0, date_fns.endOfDay)((0, date_fns.addDays)(startDate, 6));
+							startDate = (0, date_fns_startOfDay.startOfDay)((0, date_fns_addDays.addDays)(today, Number.parseInt(amount, 10) * 7));
+							endDate = (0, date_fns_endOfDay.endOfDay)((0, date_fns_addDays.addDays)(startDate, 6));
 							break;
 						case "months":
-							startDate = (0, date_fns.startOfDay)((0, date_fns.addDays)(today, Number.parseInt(amount, 10) * 30));
-							endDate = (0, date_fns.endOfDay)((0, date_fns.addDays)(startDate, 29));
+							startDate = (0, date_fns_startOfDay.startOfDay)((0, date_fns_addDays.addDays)(today, Number.parseInt(amount, 10) * 30));
+							endDate = (0, date_fns_endOfDay.endOfDay)((0, date_fns_addDays.addDays)(startDate, 29));
 							break;
 						default: return;
 					}
@@ -872,24 +876,44 @@ function splitCrudExtensionWriteInput(inputData, tableColumnNames) {
 		extraValues: Object.keys(extraValues).length > 0 ? extraValues : null
 	};
 }
-async function saveCrudExtraValues(ctx, config, entityId, input) {
+function createCrudExtensionValueWrite(entityId, input) {
+	const { extraValues } = input;
+	if (!extraValues) return null;
+	if (entityId === null || entityId === void 0 || String(entityId).length === 0) return null;
+	return {
+		entityId: String(entityId),
+		rawValues: input.rawValues,
+		baseValues: input.baseValues,
+		extraValues
+	};
+}
+async function persistCrudExtensionValueWrites(ctx, config, rows, preferBulk) {
 	const target = readCrudTarget(config);
-	const extraValues = input.extraValues;
-	if (!target || !extraValues) return;
-	if (entityId === null || entityId === void 0 || String(entityId).length === 0) return;
+	if (!target || rows.length === 0) return;
 	const provider = resolveCrudExtensions(ctx, config);
-	if (!provider?.saveExtraValues) throw new __trpc_server.TRPCError({
+	if (!provider?.saveExtraValues && !provider?.saveExtraValuesMany) throw new __trpc_server.TRPCError({
 		code: "PRECONDITION_FAILED",
 		message: "CRUD extension persistence is not available"
 	});
-	await provider.saveExtraValues({
+	const tx = ctx?.tx;
+	if ((preferBulk || !provider.saveExtraValues) && provider.saveExtraValuesMany) {
+		await provider.saveExtraValuesMany({
+			id: target.id,
+			rows,
+			tx
+		});
+		return;
+	}
+	await Promise.all(rows.map(async (row) => provider.saveExtraValues({
 		id: target.id,
-		entityId: String(entityId),
-		rawValues: input.rawValues,
-		baseValues: input.baseValues,
-		extraValues,
-		tx: ctx?.tx
-	});
+		...row,
+		tx
+	})));
+}
+async function saveCrudExtraValues(ctx, config, entityId, input) {
+	const row = createCrudExtensionValueWrite(entityId, input);
+	if (!row) return;
+	await persistCrudExtensionValueWrites(ctx, config, [row], false);
 }
 async function runCrudExtensionWriteTransaction(ctx, config, input, operation) {
 	if ((input.extraValues || shouldWrapCrudLifecycleTransaction(ctx, config)) && ctx.tx === void 0 && typeof ctx.db?.transaction === "function") return ctx.db.transaction((tx) => operation({
@@ -901,7 +925,8 @@ async function runCrudExtensionWriteTransaction(ctx, config, input, operation) {
 }
 function assertCrudExtraValuesWritable(ctx, config, input) {
 	if (!readCrudTarget(config) || !input.extraValues) return;
-	if (!resolveCrudExtensions(ctx, config)?.saveExtraValues) throw new __trpc_server.TRPCError({
+	const provider = resolveCrudExtensions(ctx, config);
+	if (!provider?.saveExtraValues && !provider?.saveExtraValuesMany) throw new __trpc_server.TRPCError({
 		code: "PRECONDITION_FAILED",
 		message: "CRUD extension persistence is not available"
 	});
@@ -909,38 +934,44 @@ function assertCrudExtraValuesWritable(ctx, config, input) {
 function assertCrudExtraValuesWritableForRows(ctx, config, inputs) {
 	if (inputs.some((input) => input.extraValues)) assertCrudExtraValuesWritable(ctx, config, inputs.find((input) => input.extraValues));
 }
+function assertCrudExtraValuesMappableForRows(inputs, idField) {
+	const idCounts = /* @__PURE__ */ new Map();
+	for (const input of inputs) {
+		const inputId = isObjectRecord(input.data) ? input.data[idField] : void 0;
+		if (inputId !== null && inputId !== void 0 && String(inputId).length > 0) {
+			const normalizedId = String(inputId);
+			idCounts.set(normalizedId, (idCounts.get(normalizedId) ?? 0) + 1);
+		}
+	}
+	for (const input of inputs) if (input.extraValues) {
+		const inputId = isObjectRecord(input.data) ? input.data[idField] : void 0;
+		if (inputId === null || inputId === void 0 || String(inputId).length === 0) throw new __trpc_server.TRPCError({
+			code: "PRECONDITION_FAILED",
+			message: "Batch CRUD extension writes require every row with extra values to provide a stable id."
+		});
+		const normalizedId = String(inputId);
+		if (idCounts.get(normalizedId) !== 1) throw new __trpc_server.TRPCError({
+			code: "PRECONDITION_FAILED",
+			message: `Batch CRUD extension writes require unique ids; duplicate id "${normalizedId}" was provided.`
+		});
+	}
+}
 async function saveCrudExtraValuesForRows(ctx, config, idField, results, inputs) {
-	const inputsWithExtra = inputs.filter((input) => input.extraValues);
-	if (inputsWithExtra.length === 0) return;
-	const extraByInputId = /* @__PURE__ */ new Map();
+	if (inputs.filter((input) => input.extraValues).length === 0) return;
+	assertCrudExtraValuesMappableForRows(inputs, idField);
+	const inputById = /* @__PURE__ */ new Map();
 	for (const input of inputs) {
-		if (!input.extraValues || !isObjectRecord(input.data)) continue;
+		if (!isObjectRecord(input.data)) continue;
 		const inputId = input.data[idField];
-		if (inputId !== null && inputId !== void 0) extraByInputId.set(String(inputId), input);
+		if (inputId !== null && inputId !== void 0 && String(inputId).length > 0) inputById.set(String(inputId), input);
 	}
-	const canUseIndexFallback = results.length === inputs.length;
-	const hasUnidentifiedExtraInput = inputsWithExtra.some((input) => {
-		if (!isObjectRecord(input.data)) return true;
-		const inputId = input.data[idField];
-		return inputId === null || inputId === void 0 || String(inputId).length === 0;
-	});
-	if (!canUseIndexFallback && hasUnidentifiedExtraInput) throw new __trpc_server.TRPCError({
-		code: "PRECONDITION_FAILED",
-		message: "Cannot persist CRUD extension values because inserted rows cannot be matched to input rows. Provide stable ids or avoid partial-conflict batch writes."
-	});
-	await Promise.all(results.map((result, index) => {
+	await persistCrudExtensionValueWrites(ctx, config, results.flatMap((result) => {
 		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;
-		if (!input?.extraValues) return Promise.resolve();
-		if (entityId === null || entityId === void 0 || String(entityId).length === 0) throw new __trpc_server.TRPCError({
-			code: "PRECONDITION_FAILED",
-			message: "Cannot persist CRUD extension values because the created entity id is unavailable."
-		});
-		return saveCrudExtraValues(ctx, config, entityId, input);
-	}));
+		const input = resultId !== null && resultId !== void 0 ? inputById.get(String(resultId)) : void 0;
+		if (!input?.extraValues) return [];
+		const row = createCrudExtensionValueWrite(resultId, input);
+		return row ? [row] : [];
+	}), true);
 }
 function createCrudBatchTransactionInput(inputs) {
 	return {
@@ -1009,28 +1040,25 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 		filters: baseFilters
 	};
 	const provider = resolveCrudExtensions(ctx, config);
-	const matchedSets = [];
+	const matchRequests = [];
 	if (extensionFilters.length > 0) {
 		if (!provider?.matchEntityIds) throw new __trpc_server.TRPCError({
 			code: "PRECONDITION_FAILED",
 			message: "CRUD extension filtering is not available"
 		});
-		const matchedIds$1 = await provider.matchEntityIds({
+		matchRequests.push(provider.matchEntityIds({
 			id: target.id,
 			filters: extensionFilters,
 			joinOperator: input.joinOperator,
 			limit: 5e3
-		});
-		matchedSets.push(new Set(matchedIds$1));
+		}));
 	}
-	if (search && !searchDisabled && provider?.searchEntityIds) {
-		const matchedIds$1 = await provider.searchEntityIds({
-			id: target.id,
-			search,
-			limit: 5e3
-		});
-		matchedSets.push(new Set(matchedIds$1));
-	} else if (search && !searchDisabled && !buildCrudSearchCondition({
+	if (search && !searchDisabled && provider?.searchEntityIds) matchRequests.push(provider.searchEntityIds({
+		id: target.id,
+		search,
+		limit: 5e3
+	}));
+	else if (search && !searchDisabled && !buildCrudSearchCondition({
 		table,
 		search,
 		searchColumns
@@ -1038,6 +1066,7 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 		code: "PRECONDITION_FAILED",
 		message: "CRUD search is not available"
 	});
+	const matchedSets = (await Promise.all(matchRequests)).map((matchedIds$1) => new Set(matchedIds$1));
 	if (matchedSets.length === 0) return {
 		...input,
 		filters: baseFilters
@@ -1058,11 +1087,17 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 function buildCrudSearchCondition({ table, search, searchColumns }) {
 	const term = typeof search === "string" ? search.trim() : "";
 	if (!term || !Array.isArray(searchColumns) || searchColumns.length === 0) return;
-	const conditions = searchColumns.map((columnRef) => resolveColumnTarget({
-		table,
-		columnId: getColumnRefId(columnRef),
-		allowedColumns: searchColumns
-	})).filter((column) => column !== void 0).map((column) => drizzle_orm.sql`${column}::text ilike ${`%${term}%`}`);
+	const conditions = searchColumns.flatMap((columnRef) => {
+		const column = resolveColumnTarget({
+			table,
+			columnId: getColumnRefId(columnRef),
+			allowedColumns: searchColumns
+		});
+		if (!column) return [];
+		const pattern = `%${term}%`;
+		const isJsonTextExpression = typeof columnRef !== "string" && columnRef.expression === void 0 && columnRef.jsonField !== void 0;
+		return ["dataType" in column && column.dataType === "string" || isJsonTextExpression ? (0, drizzle_orm.ilike)(column, pattern) : (0, drizzle_orm.ilike)(drizzle_orm.sql`${column}::text`, pattern)];
+	});
 	if (conditions.length === 0) return void 0;
 	if (conditions.length === 1) return conditions[0];
 	return (0, drizzle_orm.or)(...conditions);
@@ -1158,6 +1193,34 @@ function createCrudRouter(config) {
 	const getIdColumn = () => table[idField];
 	const tableColumnNames = getTableColumnNames(table);
 	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
+	const buildOrderByExpressions = (requestedSort, useCreatedAtDefault) => {
+		let sortFields = [];
+		if (requestedSort && requestedSort.length > 0) sortFields = requestedSort;
+		else if (useCreatedAtDefault && getTableColumn(table, "createdAt")) sortFields = [{
+			id: "createdAt",
+			desc: true
+		}];
+		const expressions = [];
+		const appliedIds = /* @__PURE__ */ new Set();
+		let tieBreakerDesc = false;
+		for (const sortField of sortFields) if (!appliedIds.has(sortField.id) && validateColumn(sortField.id, sortableColumns)) {
+			const column = resolveColumnTarget({
+				table,
+				columnId: sortField.id,
+				allowedColumns: sortableColumns
+			});
+			if (column) {
+				if (expressions.length === 0) tieBreakerDesc = sortField.desc;
+				expressions.push(sortField.desc ? (0, drizzle_orm.desc)(column) : (0, drizzle_orm.asc)(column));
+				appliedIds.add(sortField.id);
+			}
+		}
+		if (expressions.length > 0 && !appliedIds.has(idField)) {
+			const idColumn = getTableColumn(table, idField);
+			if (idColumn) expressions.push(tieBreakerDesc ? (0, drizzle_orm.desc)(idColumn) : (0, drizzle_orm.asc)(idColumn));
+		}
+		return expressions;
+	};
 	const buildWhere = (ctx, operation, additionalCondition) => {
 		const conditions = [];
 		const scopeCondition = resolved.getScope(ctx, table, operation);
@@ -1231,24 +1294,15 @@ function createCrudRouter(config) {
 				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
-				const sortField = effectiveInput.sort?.[0] ?? (getTableColumn(table, "createdAt") ? {
-					id: "createdAt",
-					desc: true
-				} : void 0);
-				if (sortField) {
-					if (validateColumn(sortField.id, sortableColumns)) {
-						const column = resolveColumnTarget({
-							table,
-							columnId: sortField.id,
-							allowedColumns: sortableColumns
-						});
-						if (column) query = query.orderBy(sortField.desc ? (0, drizzle_orm.desc)(column) : (0, drizzle_orm.asc)(column));
-					}
-				}
-				const enrichedData = await enrichCrudRows(ctx, config, idField, await query.limit(effectiveInput.perPage).offset(offset));
+				const orderByExpressions = buildOrderByExpressions(effectiveInput.sort, true);
+				if (orderByExpressions.length > 0) query = query.orderBy(...orderByExpressions);
 				let countQuery = ctx.db.select({ count: drizzle_orm.sql`count(*)::int` }).from(table).$dynamic();
 				if (where) countQuery = countQuery.where(where);
-				const count = (await countQuery)[0]?.count ?? 0;
+				const dataPromise = Promise.resolve(query.limit(effectiveInput.perPage).offset(offset));
+				const countPromise = Promise.resolve(countQuery);
+				const enrichedDataPromise = dataPromise.then(async (data) => enrichCrudRows(ctx, config, idField, data));
+				const [enrichedData, countResult] = await Promise.all([enrichedDataPromise, countPromise]);
+				const count = countResult[0]?.count ?? 0;
 				return {
 					data: enrichedData,
 					total: count,
@@ -1430,7 +1484,10 @@ function createCrudRouter(config) {
 					let updated = input.ids.map((id) => ({ [idField]: id }));
 					if (Object.keys(data).length > 0) updated = await writeCtx.db.update(table).set(data).where(where).returning({ [idField]: getIdColumn() });
 					else updated = await writeCtx.db.select({ [idField]: getIdColumn() }).from(table).where(where);
-					await Promise.all(updated.map((row) => saveCrudExtraValues(writeCtx, config, row[idField], splitUpdate)));
+					await persistCrudExtensionValueWrites(writeCtx, config, updated.flatMap((row) => {
+						const extensionRow = createCrudExtensionValueWrite(row[idField], splitUpdate);
+						return extensionRow ? [extensionRow] : [];
+					}), true);
 					return { updated: updated.length };
 				});
 			};
@@ -1526,21 +1583,15 @@ function createCrudRouter(config) {
 				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
-				if (effectiveInput.sort?.length) {
-					const sortField = effectiveInput.sort[0];
-					if (sortField && validateColumn(sortField.id, sortableColumns)) {
-						const column = resolveColumnTarget({
-							table,
-							columnId: sortField.id,
-							allowedColumns: sortableColumns
-						});
-						if (column) query = query.orderBy(sortField.desc ? (0, drizzle_orm.desc)(column) : (0, drizzle_orm.asc)(column));
-					}
-				}
-				const enrichedData = await enrichCrudRows(ctx, config, idField, await query.limit(effectiveLimit));
+				const orderByExpressions = buildOrderByExpressions(effectiveInput.sort, false);
+				if (orderByExpressions.length > 0) query = query.orderBy(...orderByExpressions);
 				let countQuery = ctx.db.select({ count: drizzle_orm.sql`count(*)::int` }).from(table).$dynamic();
 				if (where) countQuery = countQuery.where(where);
-				const total = (await countQuery)[0]?.count ?? 0;
+				const dataPromise = Promise.resolve(query.limit(effectiveLimit));
+				const countPromise = Promise.resolve(countQuery);
+				const enrichedDataPromise = dataPromise.then(async (data) => enrichCrudRows(ctx, config, idField, data));
+				const [enrichedData, countResult] = await Promise.all([enrichedDataPromise, countPromise]);
+				const total = countResult[0]?.count ?? 0;
 				return {
 					data: enrichedData,
 					total,
@@ -1560,6 +1611,7 @@ function createCrudRouter(config) {
 			const doCreateMany = async (items) => {
 				const splitItems = items.map((item) => splitCrudExtensionWriteInput(item, tableColumnNames));
 				assertCrudExtraValuesWritableForRows(ctx, config, splitItems);
+				assertCrudExtraValuesMappableForRows(splitItems, idField);
 				return runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(splitItems), async (writeCtx) => {
 					const injectData = resolved.getInject(writeCtx, "create");
 					const values = splitItems.map(({ data }) => ({
@@ -1613,6 +1665,7 @@ function createCrudRouter(config) {
 					failed
 				};
 				assertCrudExtraValuesWritableForRows(ctx, config, validRows);
+				assertCrudExtraValuesMappableForRows(validRows, idField);
 				const { insertedCount, updatedCount } = await runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(validRows), async (writeCtx) => {
 					const injectData = resolved.getInject(writeCtx, "create");
 					const values = validRows.map((row) => ({

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { AnyColumn, SQL, Table } from "drizzle-orm";
-import { z } from "zod";
 import { PgTable } from "drizzle-orm/pg-core";
+import { z } from "zod";
 import * as _trpc_server2 from "@trpc/server";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
 
@@ -186,16 +186,31 @@ interface CrudExtensionFilter {
   operator: string;
   filterId?: string | undefined;
 }
+interface CrudExtensionValueWrite {
+  entityId: string;
+  rawValues: Record<string, unknown>;
+  baseValues: Record<string, unknown>;
+  extraValues: Record<string, unknown>;
+}
 interface CrudExtensionsProvider {
   getMetadata?: (input: {
     id: string;
   }) => Promise<CrudExtensionMetadata>;
   saveExtraValues?: (input: {
     id: string;
-    entityId: string;
-    rawValues: Record<string, unknown>;
-    baseValues: Record<string, unknown>;
-    extraValues: Record<string, unknown>;
+    tx?: unknown;
+  } & CrudExtensionValueWrite) => Promise<void>;
+  /**
+   * Optional bulk persistence path used by createMany, updateMany, and import.
+   *
+   * Providers should implement this when extension values are stored in a
+   * database. The router falls back to saveExtraValues for backward
+   * compatibility when this method is absent. Batch create/import rows with
+   * extension values must provide stable, unique entity ids.
+   */
+  saveExtraValuesMany?: (input: {
+    id: string;
+    rows: CrudExtensionValueWrite[];
     tx?: unknown;
   }) => Promise<void>;
   readProjection?: (input: {
@@ -972,4 +987,4 @@ declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
 }, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
-export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudCapabilityMetadata, type CrudColumnCapability, type CrudColumnConfig, type CrudColumnExpression, type CrudColumnRef, type CrudExtensionFilter, type CrudExtensionMetadata, type CrudExtensionsConfig, type CrudExtensionsProvider, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DateFilterRange, type DateRangeResolver, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type ExtendedColumnFilter, type FilterOperator, type FilterVariant, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudCapabilityMetadata, type CrudColumnCapability, type CrudColumnConfig, type CrudColumnExpression, type CrudColumnRef, type CrudExtensionFilter, type CrudExtensionMetadata, type CrudExtensionValueWrite, type CrudExtensionsConfig, type CrudExtensionsProvider, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DateFilterRange, type DateRangeResolver, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type ExtendedColumnFilter, type FilterOperator, type FilterVariant, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { z } from "zod";
-import { AnyColumn, SQL, Table } from "drizzle-orm";
 import * as _trpc_server2 from "@trpc/server";
+import { AnyColumn, SQL, Table } from "drizzle-orm";
+import { z } from "zod";
 import superjson from "superjson";
 import { PgTable } from "drizzle-orm/pg-core";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
@@ -187,16 +187,31 @@ interface CrudExtensionFilter {
   operator: string;
   filterId?: string | undefined;
 }
+interface CrudExtensionValueWrite {
+  entityId: string;
+  rawValues: Record<string, unknown>;
+  baseValues: Record<string, unknown>;
+  extraValues: Record<string, unknown>;
+}
 interface CrudExtensionsProvider {
   getMetadata?: (input: {
     id: string;
   }) => Promise<CrudExtensionMetadata>;
   saveExtraValues?: (input: {
     id: string;
-    entityId: string;
-    rawValues: Record<string, unknown>;
-    baseValues: Record<string, unknown>;
-    extraValues: Record<string, unknown>;
+    tx?: unknown;
+  } & CrudExtensionValueWrite) => Promise<void>;
+  /**
+   * Optional bulk persistence path used by createMany, updateMany, and import.
+   *
+   * Providers should implement this when extension values are stored in a
+   * database. The router falls back to saveExtraValues for backward
+   * compatibility when this method is absent. Batch create/import rows with
+   * extension values must provide stable, unique entity ids.
+   */
+  saveExtraValuesMany?: (input: {
+    id: string;
+    rows: CrudExtensionValueWrite[];
     tx?: unknown;
   }) => Promise<void>;
   readProjection?: (input: {
@@ -973,4 +988,4 @@ declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
 }, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
-export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudCapabilityMetadata, type CrudColumnCapability, type CrudColumnConfig, type CrudColumnExpression, type CrudColumnRef, type CrudExtensionFilter, type CrudExtensionMetadata, type CrudExtensionsConfig, type CrudExtensionsProvider, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DateFilterRange, type DateRangeResolver, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type ExtendedColumnFilter, type FilterOperator, type FilterVariant, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudCapabilityMetadata, type CrudColumnCapability, type CrudColumnConfig, type CrudColumnExpression, type CrudColumnRef, type CrudExtensionFilter, type CrudExtensionMetadata, type CrudExtensionValueWrite, type CrudExtensionsConfig, type CrudExtensionsProvider, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DateFilterRange, type DateRangeResolver, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type ExtendedColumnFilter, type FilterOperator, type FilterVariant, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/dist/index.js

@@ -1,9 +1,11 @@
-import { z } from "zod";
+import { TRPCError, initTRPC } from "@trpc/server";
 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 { z } from "zod";
 import superjson from "superjson";
-import { addDays, endOfDay, startOfDay } from "date-fns";
+import { addDays } from "date-fns/addDays";
+import { endOfDay } from "date-fns/endOfDay";
+import { startOfDay } from "date-fns/startOfDay";
 
 //#region src/trpc.ts
 const t = initTRPC.context().create({ transformer: superjson });
@@ -843,24 +845,44 @@ function splitCrudExtensionWriteInput(inputData, tableColumnNames) {
 		extraValues: Object.keys(extraValues).length > 0 ? extraValues : null
 	};
 }
-async function saveCrudExtraValues(ctx, config, entityId, input) {
+function createCrudExtensionValueWrite(entityId, input) {
+	const { extraValues } = input;
+	if (!extraValues) return null;
+	if (entityId === null || entityId === void 0 || String(entityId).length === 0) return null;
+	return {
+		entityId: String(entityId),
+		rawValues: input.rawValues,
+		baseValues: input.baseValues,
+		extraValues
+	};
+}
+async function persistCrudExtensionValueWrites(ctx, config, rows, preferBulk) {
 	const target = readCrudTarget(config);
-	const extraValues = input.extraValues;
-	if (!target || !extraValues) return;
-	if (entityId === null || entityId === void 0 || String(entityId).length === 0) return;
+	if (!target || rows.length === 0) return;
 	const provider = resolveCrudExtensions(ctx, config);
-	if (!provider?.saveExtraValues) throw new TRPCError({
+	if (!provider?.saveExtraValues && !provider?.saveExtraValuesMany) throw new TRPCError({
 		code: "PRECONDITION_FAILED",
 		message: "CRUD extension persistence is not available"
 	});
-	await provider.saveExtraValues({
+	const tx = ctx?.tx;
+	if ((preferBulk || !provider.saveExtraValues) && provider.saveExtraValuesMany) {
+		await provider.saveExtraValuesMany({
+			id: target.id,
+			rows,
+			tx
+		});
+		return;
+	}
+	await Promise.all(rows.map(async (row) => provider.saveExtraValues({
 		id: target.id,
-		entityId: String(entityId),
-		rawValues: input.rawValues,
-		baseValues: input.baseValues,
-		extraValues,
-		tx: ctx?.tx
-	});
+		...row,
+		tx
+	})));
+}
+async function saveCrudExtraValues(ctx, config, entityId, input) {
+	const row = createCrudExtensionValueWrite(entityId, input);
+	if (!row) return;
+	await persistCrudExtensionValueWrites(ctx, config, [row], false);
 }
 async function runCrudExtensionWriteTransaction(ctx, config, input, operation) {
 	if ((input.extraValues || shouldWrapCrudLifecycleTransaction(ctx, config)) && ctx.tx === void 0 && typeof ctx.db?.transaction === "function") return ctx.db.transaction((tx) => operation({
@@ -872,7 +894,8 @@ async function runCrudExtensionWriteTransaction(ctx, config, input, operation) {
 }
 function assertCrudExtraValuesWritable(ctx, config, input) {
 	if (!readCrudTarget(config) || !input.extraValues) return;
-	if (!resolveCrudExtensions(ctx, config)?.saveExtraValues) throw new TRPCError({
+	const provider = resolveCrudExtensions(ctx, config);
+	if (!provider?.saveExtraValues && !provider?.saveExtraValuesMany) throw new TRPCError({
 		code: "PRECONDITION_FAILED",
 		message: "CRUD extension persistence is not available"
 	});
@@ -880,38 +903,44 @@ function assertCrudExtraValuesWritable(ctx, config, input) {
 function assertCrudExtraValuesWritableForRows(ctx, config, inputs) {
 	if (inputs.some((input) => input.extraValues)) assertCrudExtraValuesWritable(ctx, config, inputs.find((input) => input.extraValues));
 }
+function assertCrudExtraValuesMappableForRows(inputs, idField) {
+	const idCounts = /* @__PURE__ */ new Map();
+	for (const input of inputs) {
+		const inputId = isObjectRecord(input.data) ? input.data[idField] : void 0;
+		if (inputId !== null && inputId !== void 0 && String(inputId).length > 0) {
+			const normalizedId = String(inputId);
+			idCounts.set(normalizedId, (idCounts.get(normalizedId) ?? 0) + 1);
+		}
+	}
+	for (const input of inputs) if (input.extraValues) {
+		const inputId = isObjectRecord(input.data) ? input.data[idField] : void 0;
+		if (inputId === null || inputId === void 0 || String(inputId).length === 0) throw new TRPCError({
+			code: "PRECONDITION_FAILED",
+			message: "Batch CRUD extension writes require every row with extra values to provide a stable id."
+		});
+		const normalizedId = String(inputId);
+		if (idCounts.get(normalizedId) !== 1) throw new TRPCError({
+			code: "PRECONDITION_FAILED",
+			message: `Batch CRUD extension writes require unique ids; duplicate id "${normalizedId}" was provided.`
+		});
+	}
+}
 async function saveCrudExtraValuesForRows(ctx, config, idField, results, inputs) {
-	const inputsWithExtra = inputs.filter((input) => input.extraValues);
-	if (inputsWithExtra.length === 0) return;
-	const extraByInputId = /* @__PURE__ */ new Map();
+	if (inputs.filter((input) => input.extraValues).length === 0) return;
+	assertCrudExtraValuesMappableForRows(inputs, idField);
+	const inputById = /* @__PURE__ */ new Map();
 	for (const input of inputs) {
-		if (!input.extraValues || !isObjectRecord(input.data)) continue;
+		if (!isObjectRecord(input.data)) continue;
 		const inputId = input.data[idField];
-		if (inputId !== null && inputId !== void 0) extraByInputId.set(String(inputId), input);
+		if (inputId !== null && inputId !== void 0 && String(inputId).length > 0) inputById.set(String(inputId), input);
 	}
-	const canUseIndexFallback = results.length === inputs.length;
-	const hasUnidentifiedExtraInput = inputsWithExtra.some((input) => {
-		if (!isObjectRecord(input.data)) return true;
-		const inputId = input.data[idField];
-		return inputId === null || inputId === void 0 || String(inputId).length === 0;
-	});
-	if (!canUseIndexFallback && hasUnidentifiedExtraInput) throw new TRPCError({
-		code: "PRECONDITION_FAILED",
-		message: "Cannot persist CRUD extension values because inserted rows cannot be matched to input rows. Provide stable ids or avoid partial-conflict batch writes."
-	});
-	await Promise.all(results.map((result, index) => {
+	await persistCrudExtensionValueWrites(ctx, config, results.flatMap((result) => {
 		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;
-		if (!input?.extraValues) return Promise.resolve();
-		if (entityId === null || entityId === void 0 || String(entityId).length === 0) throw new TRPCError({
-			code: "PRECONDITION_FAILED",
-			message: "Cannot persist CRUD extension values because the created entity id is unavailable."
-		});
-		return saveCrudExtraValues(ctx, config, entityId, input);
-	}));
+		const input = resultId !== null && resultId !== void 0 ? inputById.get(String(resultId)) : void 0;
+		if (!input?.extraValues) return [];
+		const row = createCrudExtensionValueWrite(resultId, input);
+		return row ? [row] : [];
+	}), true);
 }
 function createCrudBatchTransactionInput(inputs) {
 	return {
@@ -980,28 +1009,25 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 		filters: baseFilters
 	};
 	const provider = resolveCrudExtensions(ctx, config);
-	const matchedSets = [];
+	const matchRequests = [];
 	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({
+		matchRequests.push(provider.matchEntityIds({
 			id: target.id,
 			filters: extensionFilters,
 			joinOperator: input.joinOperator,
 			limit: 5e3
-		});
-		matchedSets.push(new Set(matchedIds$1));
+		}));
 	}
-	if (search && !searchDisabled && provider?.searchEntityIds) {
-		const matchedIds$1 = await provider.searchEntityIds({
-			id: target.id,
-			search,
-			limit: 5e3
-		});
-		matchedSets.push(new Set(matchedIds$1));
-	} else if (search && !searchDisabled && !buildCrudSearchCondition({
+	if (search && !searchDisabled && provider?.searchEntityIds) matchRequests.push(provider.searchEntityIds({
+		id: target.id,
+		search,
+		limit: 5e3
+	}));
+	else if (search && !searchDisabled && !buildCrudSearchCondition({
 		table,
 		search,
 		searchColumns
@@ -1009,6 +1035,7 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 		code: "PRECONDITION_FAILED",
 		message: "CRUD search is not available"
 	});
+	const matchedSets = (await Promise.all(matchRequests)).map((matchedIds$1) => new Set(matchedIds$1));
 	if (matchedSets.length === 0) return {
 		...input,
 		filters: baseFilters
@@ -1029,11 +1056,17 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 function buildCrudSearchCondition({ table, search, searchColumns }) {
 	const term = typeof search === "string" ? search.trim() : "";
 	if (!term || !Array.isArray(searchColumns) || searchColumns.length === 0) return;
-	const conditions = searchColumns.map((columnRef) => resolveColumnTarget({
-		table,
-		columnId: getColumnRefId(columnRef),
-		allowedColumns: searchColumns
-	})).filter((column) => column !== void 0).map((column) => sql`${column}::text ilike ${`%${term}%`}`);
+	const conditions = searchColumns.flatMap((columnRef) => {
+		const column = resolveColumnTarget({
+			table,
+			columnId: getColumnRefId(columnRef),
+			allowedColumns: searchColumns
+		});
+		if (!column) return [];
+		const pattern = `%${term}%`;
+		const isJsonTextExpression = typeof columnRef !== "string" && columnRef.expression === void 0 && columnRef.jsonField !== void 0;
+		return ["dataType" in column && column.dataType === "string" || isJsonTextExpression ? ilike(column, pattern) : ilike(sql`${column}::text`, pattern)];
+	});
 	if (conditions.length === 0) return void 0;
 	if (conditions.length === 1) return conditions[0];
 	return or(...conditions);
@@ -1129,6 +1162,34 @@ function createCrudRouter(config) {
 	const getIdColumn = () => table[idField];
 	const tableColumnNames = getTableColumnNames(table);
 	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
+	const buildOrderByExpressions = (requestedSort, useCreatedAtDefault) => {
+		let sortFields = [];
+		if (requestedSort && requestedSort.length > 0) sortFields = requestedSort;
+		else if (useCreatedAtDefault && getTableColumn(table, "createdAt")) sortFields = [{
+			id: "createdAt",
+			desc: true
+		}];
+		const expressions = [];
+		const appliedIds = /* @__PURE__ */ new Set();
+		let tieBreakerDesc = false;
+		for (const sortField of sortFields) if (!appliedIds.has(sortField.id) && validateColumn(sortField.id, sortableColumns)) {
+			const column = resolveColumnTarget({
+				table,
+				columnId: sortField.id,
+				allowedColumns: sortableColumns
+			});
+			if (column) {
+				if (expressions.length === 0) tieBreakerDesc = sortField.desc;
+				expressions.push(sortField.desc ? desc(column) : asc(column));
+				appliedIds.add(sortField.id);
+			}
+		}
+		if (expressions.length > 0 && !appliedIds.has(idField)) {
+			const idColumn = getTableColumn(table, idField);
+			if (idColumn) expressions.push(tieBreakerDesc ? desc(idColumn) : asc(idColumn));
+		}
+		return expressions;
+	};
 	const buildWhere = (ctx, operation, additionalCondition) => {
 		const conditions = [];
 		const scopeCondition = resolved.getScope(ctx, table, operation);
@@ -1202,24 +1263,15 @@ function createCrudRouter(config) {
 				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
-				const sortField = effectiveInput.sort?.[0] ?? (getTableColumn(table, "createdAt") ? {
-					id: "createdAt",
-					desc: true
-				} : void 0);
-				if (sortField) {
-					if (validateColumn(sortField.id, sortableColumns)) {
-						const column = resolveColumnTarget({
-							table,
-							columnId: sortField.id,
-							allowedColumns: sortableColumns
-						});
-						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
-					}
-				}
-				const enrichedData = await enrichCrudRows(ctx, config, idField, await query.limit(effectiveInput.perPage).offset(offset));
+				const orderByExpressions = buildOrderByExpressions(effectiveInput.sort, true);
+				if (orderByExpressions.length > 0) query = query.orderBy(...orderByExpressions);
 				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;
+				const dataPromise = Promise.resolve(query.limit(effectiveInput.perPage).offset(offset));
+				const countPromise = Promise.resolve(countQuery);
+				const enrichedDataPromise = dataPromise.then(async (data) => enrichCrudRows(ctx, config, idField, data));
+				const [enrichedData, countResult] = await Promise.all([enrichedDataPromise, countPromise]);
+				const count = countResult[0]?.count ?? 0;
 				return {
 					data: enrichedData,
 					total: count,
@@ -1401,7 +1453,10 @@ function createCrudRouter(config) {
 					let updated = input.ids.map((id) => ({ [idField]: id }));
 					if (Object.keys(data).length > 0) updated = await writeCtx.db.update(table).set(data).where(where).returning({ [idField]: getIdColumn() });
 					else updated = await writeCtx.db.select({ [idField]: getIdColumn() }).from(table).where(where);
-					await Promise.all(updated.map((row) => saveCrudExtraValues(writeCtx, config, row[idField], splitUpdate)));
+					await persistCrudExtensionValueWrites(writeCtx, config, updated.flatMap((row) => {
+						const extensionRow = createCrudExtensionValueWrite(row[idField], splitUpdate);
+						return extensionRow ? [extensionRow] : [];
+					}), true);
 					return { updated: updated.length };
 				});
 			};
@@ -1497,21 +1552,15 @@ function createCrudRouter(config) {
 				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
-				if (effectiveInput.sort?.length) {
-					const sortField = effectiveInput.sort[0];
-					if (sortField && validateColumn(sortField.id, sortableColumns)) {
-						const column = resolveColumnTarget({
-							table,
-							columnId: sortField.id,
-							allowedColumns: sortableColumns
-						});
-						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
-					}
-				}
-				const enrichedData = await enrichCrudRows(ctx, config, idField, await query.limit(effectiveLimit));
+				const orderByExpressions = buildOrderByExpressions(effectiveInput.sort, false);
+				if (orderByExpressions.length > 0) query = query.orderBy(...orderByExpressions);
 				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;
+				const dataPromise = Promise.resolve(query.limit(effectiveLimit));
+				const countPromise = Promise.resolve(countQuery);
+				const enrichedDataPromise = dataPromise.then(async (data) => enrichCrudRows(ctx, config, idField, data));
+				const [enrichedData, countResult] = await Promise.all([enrichedDataPromise, countPromise]);
+				const total = countResult[0]?.count ?? 0;
 				return {
 					data: enrichedData,
 					total,
@@ -1531,6 +1580,7 @@ function createCrudRouter(config) {
 			const doCreateMany = async (items) => {
 				const splitItems = items.map((item) => splitCrudExtensionWriteInput(item, tableColumnNames));
 				assertCrudExtraValuesWritableForRows(ctx, config, splitItems);
+				assertCrudExtraValuesMappableForRows(splitItems, idField);
 				return runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(splitItems), async (writeCtx) => {
 					const injectData = resolved.getInject(writeCtx, "create");
 					const values = splitItems.map(({ data }) => ({
@@ -1584,6 +1634,7 @@ function createCrudRouter(config) {
 					failed
 				};
 				assertCrudExtraValuesWritableForRows(ctx, config, validRows);
+				assertCrudExtraValuesMappableForRows(validRows, idField);
 				const { insertedCount, updatedCount } = await runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(validRows), async (writeCtx) => {
 					const injectData = resolved.getInject(writeCtx, "create");
 					const values = validRows.map((row) => ({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud-server",
   "type": "module",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "tRPC server utilities for auto-crud - automatic CRUD routers for Drizzle ORM",
   "author": "wordrhyme",
   "license": "MIT",
@@ -48,11 +48,11 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.18",
     "zod": "^4.3.6",
-    "@internal/eslint-config": "0.3.0",
-    "@internal/tsdown-config": "0.1.0",
     "@internal/tsconfig": "0.1.0",
+    "@internal/eslint-config": "0.3.0",
+    "@internal/vitest-config": "0.1.0",
     "@internal/prettier-config": "0.0.1",
-    "@internal/vitest-config": "0.1.0"
+    "@internal/tsdown-config": "0.1.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {