@wordrhyme/auto-crud-server 1.1.1 → 1.1.3

package/dist/index.cjs

@@ -648,6 +648,28 @@ function readCrudTarget(config) {
 	if (!id) return null;
 	return { id };
 }
+function buildCrudLifecycleHookId(config, operation) {
+	const target = readCrudTarget(config);
+	if (!target) return null;
+	return `${target.id}.${operation}`;
+}
+function getCrudLifecycleHooks(ctx) {
+	const hooks = ctx?.hooks;
+	return typeof hooks?.emit === "function" ? hooks : null;
+}
+function shouldWrapCrudLifecycleTransaction(ctx, config) {
+	return Boolean(buildCrudLifecycleHookId(config, "create") && getCrudLifecycleHooks(ctx));
+}
+async function emitCrudWriteLifecycle(ctx, config, operation, payload) {
+	const hookId = buildCrudLifecycleHookId(config, operation);
+	const hooks = getCrudLifecycleHooks(ctx);
+	if (!hookId || !hooks) return;
+	await hooks.emit(hookId, payload, {
+		dispatch: "hook",
+		mode: "effect",
+		tx: ctx?.tx
+	});
+}
 function resolveCrudExtensions(ctx, config) {
 	const extensions = config.extensions;
 	if (extensions === false) return null;
@@ -707,6 +729,14 @@ async function saveCrudExtraValues(ctx, config, entityId, input) {
 		tx: ctx?.tx
 	});
 }
+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({
+		...ctx,
+		db: tx,
+		tx
+	}));
+	return operation(ctx);
+}
 function assertCrudExtraValuesWritable(ctx, config, input) {
 	if (!readCrudTarget(config) || !input.extraValues) return;
 	if (!resolveCrudExtensions(ctx, config)?.saveExtraValues) throw new __trpc_server.TRPCError({
@@ -718,6 +748,8 @@ 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 inputsWithExtra = inputs.filter((input) => input.extraValues);
+	if (inputsWithExtra.length === 0) return;
 	const extraByInputId = /* @__PURE__ */ new Map();
 	for (const input of inputs) {
 		if (!input.extraValues || !isObjectRecord(input.data)) continue;
@@ -725,15 +757,37 @@ async function saveCrudExtraValuesForRows(ctx, config, idField, results, inputs)
 		if (inputId !== null && inputId !== void 0) extraByInputId.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) => {
 		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();
+		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);
 	}));
 }
+function createCrudBatchTransactionInput(inputs) {
+	return {
+		data: {},
+		rawValues: {},
+		baseValues: {},
+		extraValues: inputs.some((input) => input.extraValues) ? {} : null
+	};
+}
 function readProjectionDisplay(value) {
 	if (!isObjectRecord(value)) return value;
 	if ("display" in value && value.display !== null && value.display !== void 0) return value.display;
@@ -772,7 +826,7 @@ function isAllowedBaseCrudColumn(table, columnId, allowedColumns) {
 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) {
+async function applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, searchColumns, input) {
 	const target = readCrudTarget(config);
 	const filters = input.filters ?? [];
 	const search = typeof input.search === "string" ? input.search.trim() : "";
@@ -808,7 +862,14 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 			limit: 5e3
 		});
 		matchedSets.push(new Set(matchedIds$1));
-	}
+	} else if (search && !buildCrudSearchCondition({
+		table,
+		search,
+		searchColumns
+	})) throw new __trpc_server.TRPCError({
+		code: "PRECONDITION_FAILED",
+		message: "CRUD search is not available"
+	});
 	if (matchedSets.length === 0) return {
 		...input,
 		filters: baseFilters
@@ -826,6 +887,24 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 		}]
 	};
 }
+function buildCrudSearchCondition({ table, search, searchColumns }) {
+	const term = typeof search === "string" ? search.trim() : "";
+	if (!term || !searchColumns || searchColumns.length === 0) return void 0;
+	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}%`}`);
+	if (conditions.length === 0) return void 0;
+	if (conditions.length === 1) return conditions[0];
+	return (0, drizzle_orm.or)(...conditions);
+}
+function combineConditions(...conditions) {
+	const filtered = conditions.filter((condition) => condition !== void 0);
+	if (filtered.length === 0) return void 0;
+	if (filtered.length === 1) return filtered[0];
+	return (0, drizzle_orm.and)(...filtered);
+}
 /**
 * 创建 CRUD Router
 *
@@ -839,7 +918,7 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 * @typeParam TUpdate - 更新输入类型
 */
 function createCrudRouter(config) {
-	const { table, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, maxExportSize = 5e3, softDelete: softDeleteOption, middleware = {} } = config;
+	const { table, idField = "id", filterableColumns, searchColumns, sortableColumns, maxBatchSize = 100, maxExportSize = 5e3, softDelete: softDeleteOption, middleware = {} } = config;
 	const { selectSchema, schema, updateSchema } = resolveSchemas(config);
 	const entityOutputSchema = withCrudExtensionInput(selectSchema, config);
 	const listOutputSchema = zod.z.object({
@@ -937,10 +1016,10 @@ function createCrudRouter(config) {
 		list: resolved.procedureFactory("list").input(resolvedListInputSchema).output(listOutputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "list");
 			const doList = async (listInput$1) => {
-				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, listInput$1);
+				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, searchColumns, 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({
+				const where = buildWhere(ctx, "list", combineConditions(validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
 					joinOperator: effectiveInput.joinOperator,
@@ -953,7 +1032,11 @@ function createCrudRouter(config) {
 							allowedColumns: filterableColumns
 						});
 					}
-				}) : void 0);
+				}) : void 0, buildCrudSearchCondition({
+					table,
+					search: effectiveInput.search,
+					searchColumns
+				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
 				if (effectiveInput.sort?.length) {
@@ -1012,14 +1095,24 @@ function createCrudRouter(config) {
 			const doCreate = async (inputData) => {
 				const splitInput = splitCrudExtensionWriteInput(inputData, tableColumnNames);
 				assertCrudExtraValuesWritable(ctx, config, splitInput);
-				const injectData = resolved.getInject(ctx, "create");
-				const data = {
-					...splitInput.data,
-					...injectData
-				};
-				const [created] = await ctx.db.insert(table).values(data).returning();
-				await saveCrudExtraValues(ctx, config, created?.[idField], splitInput);
-				return created;
+				return runCrudExtensionWriteTransaction(ctx, config, splitInput, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "create");
+					const data = {
+						...splitInput.data,
+						...injectData
+					};
+					const [created] = await writeCtx.db.insert(table).values(data).returning();
+					await saveCrudExtraValues(writeCtx, config, created?.[idField], splitInput);
+					await emitCrudWriteLifecycle(writeCtx, config, "create", {
+						input: inputData,
+						row: created,
+						entityId: created?.[idField],
+						rawValues: splitInput.rawValues,
+						baseValues: splitInput.baseValues,
+						extraValues: splitInput.extraValues ?? {}
+					});
+					return created;
+				});
 			};
 			if (m.create) return m.create({
 				ctx,
@@ -1043,15 +1136,27 @@ function createCrudRouter(config) {
 			const doUpdate = async (updateData) => {
 				const splitUpdate = splitCrudExtensionWriteInput(updateData, tableColumnNames);
 				assertCrudExtraValuesWritable(ctx, config, splitUpdate);
-				const injectData = resolved.getInject(ctx, "update");
-				const data = {
-					...splitUpdate.data,
-					...injectData
-				};
-				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;
+				return runCrudExtensionWriteTransaction(ctx, config, splitUpdate, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "update");
+					const data = {
+						...splitUpdate.data,
+						...injectData
+					};
+					let updated = existing;
+					if (Object.keys(data).length > 0) [updated] = await writeCtx.db.update(table).set(data).where(where).returning();
+					await saveCrudExtraValues(writeCtx, config, input.id, splitUpdate);
+					await emitCrudWriteLifecycle(writeCtx, config, "update", {
+						id: input.id,
+						input: updateData,
+						row: updated,
+						existing,
+						entityId: input.id,
+						rawValues: splitUpdate.rawValues,
+						baseValues: splitUpdate.baseValues,
+						extraValues: splitUpdate.extraValues ?? {}
+					});
+					return updated;
+				});
 			};
 			if (m.update) return m.update({
 				ctx,
@@ -1072,10 +1177,23 @@ function createCrudRouter(config) {
 				message: "Resource not found or access denied"
 			});
 			const doDelete = async () => {
-				let deleted;
-				if (softDelete) [deleted] = await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning();
-				else [deleted] = await ctx.db.delete(table).where(where).returning();
-				return deleted;
+				return runCrudExtensionWriteTransaction(ctx, config, {
+					data: {},
+					rawValues: { id: input },
+					baseValues: {},
+					extraValues: null
+				}, async (writeCtx) => {
+					let deleted;
+					if (softDelete) [deleted] = await writeCtx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning();
+					else [deleted] = await writeCtx.db.delete(table).where(where).returning();
+					await emitCrudWriteLifecycle(writeCtx, config, "delete", {
+						id: input,
+						row: deleted,
+						existing,
+						entityId: input
+					});
+					return deleted;
+				});
 			};
 			if (m.delete) return m.delete({
 				ctx,
@@ -1108,16 +1226,18 @@ function createCrudRouter(config) {
 			const doUpdateMany = async (updateData) => {
 				const splitUpdate = splitCrudExtensionWriteInput(updateData, tableColumnNames);
 				assertCrudExtraValuesWritable(ctx, config, splitUpdate);
-				const injectData = resolved.getInject(ctx, "update");
-				const data = {
-					...splitUpdate.data,
-					...injectData
-				};
-				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 };
+				return runCrudExtensionWriteTransaction(ctx, config, splitUpdate, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "update");
+					const data = {
+						...splitUpdate.data,
+						...injectData
+					};
+					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)));
+					return { updated: updated.length };
+				});
 			};
 			if (m.updateMany) return m.updateMany({
 				ctx,
@@ -1142,23 +1262,35 @@ function createCrudRouter(config) {
 					isNew = !existing;
 					if (!isNew && existing) await withAuthorize(ctx, existing, "update");
 				}
-				const injectData = resolved.getInject(ctx, isNew ? "create" : "update");
-				const data = {
-					...splitInput.data,
-					...injectData
-				};
-				const [result] = await ctx.db.insert(table).values(data).onConflictDoUpdate({
-					target: getIdColumn(),
-					set: {
+				return runCrudExtensionWriteTransaction(ctx, config, splitInput, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, isNew ? "create" : "update");
+					const data = {
 						...splitInput.data,
-						...resolved.getInject(ctx, "update")
-					}
-				}).returning();
-				await saveCrudExtraValues(ctx, config, result?.[idField] ?? inputId, splitInput);
-				return {
-					data: result,
-					isNew
-				};
+						...injectData
+					};
+					const [result] = await writeCtx.db.insert(table).values(data).onConflictDoUpdate({
+						target: getIdColumn(),
+						set: {
+							...splitInput.data,
+							...resolved.getInject(writeCtx, "update")
+						}
+					}).returning();
+					await saveCrudExtraValues(writeCtx, config, result?.[idField] ?? inputId, splitInput);
+					await emitCrudWriteLifecycle(writeCtx, config, "upsert", {
+						input: inputData,
+						row: result,
+						existing,
+						isNew,
+						entityId: result?.[idField] ?? inputId,
+						rawValues: splitInput.rawValues,
+						baseValues: splitInput.baseValues,
+						extraValues: splitInput.extraValues ?? {}
+					});
+					return {
+						data: result,
+						isNew
+					};
+				});
 			};
 			if (m.upsert) return m.upsert({
 				ctx,
@@ -1170,7 +1302,7 @@ 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 effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, {
+				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, searchColumns, {
 					page: 1,
 					perPage: Math.min(Math.max(exportInput$1.limit ?? maxExportSize, 1), maxExportSize),
 					joinOperator: exportInput$1.joinOperator ?? "and",
@@ -1178,7 +1310,7 @@ function createCrudRouter(config) {
 				});
 				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({
+				const where = buildWhere(ctx, "export", combineConditions(validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
 					joinOperator: effectiveInput.joinOperator ?? "and",
@@ -1191,7 +1323,11 @@ function createCrudRouter(config) {
 							allowedColumns: filterableColumns
 						});
 					}
-				}) : void 0);
+				}) : void 0, buildCrudSearchCondition({
+					table,
+					search: effectiveInput.search,
+					searchColumns
+				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
 				if (effectiveInput.sort?.length) {
@@ -1228,17 +1364,19 @@ function createCrudRouter(config) {
 			const doCreateMany = async (items) => {
 				const splitItems = items.map((item) => splitCrudExtensionWriteInput(item, tableColumnNames));
 				assertCrudExtraValuesWritableForRows(ctx, config, splitItems);
-				const injectData = resolved.getInject(ctx, "create");
-				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
-				};
+				return runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(splitItems), async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "create");
+					const values = splitItems.map(({ data }) => ({
+						...data,
+						...injectData
+					}));
+					const created = await writeCtx.db.insert(table).values(values).onConflictDoNothing().returning();
+					await saveCrudExtraValuesForRows(writeCtx, config, idField, created, splitItems);
+					return {
+						created,
+						count: created.length
+					};
+				});
 			};
 			if (m.createMany) return m.createMany({
 				ctx,
@@ -1279,36 +1417,41 @@ function createCrudRouter(config) {
 					failed
 				};
 				assertCrudExtraValuesWritableForRows(ctx, config, validRows);
-				const injectData = resolved.getInject(ctx, "create");
-				const values = validRows.map((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((0, drizzle_orm.inArray)(getIdColumn(), values.map((v) => v[idField]).filter(Boolean)))).length;
-					const updateFields = Object.keys(validRows[0].data);
-					const setClause = { ...resolved.getInject(ctx, "update") };
-					for (const key of updateFields) setClause[key] = drizzle_orm.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 {
-					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;
+				const { insertedCount, updatedCount } = await runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(validRows), async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "create");
+					const values = validRows.map((row) => ({
+						...row.data,
+						...injectData
+					}));
+					let insertedCount$1 = 0;
+					let updatedCount$1 = 0;
+					if (importData$1.onConflict === "upsert") {
+						const existingCount = (await writeCtx.db.select({ id: getIdColumn() }).from(table).where((0, drizzle_orm.inArray)(getIdColumn(), values.map((v) => v[idField]).filter(Boolean)))).length;
+						const updateFields = Object.keys(validRows[0].data);
+						const setClause = { ...resolved.getInject(writeCtx, "update") };
+						for (const key of updateFields) setClause[key] = drizzle_orm.sql.raw(`excluded."${key}"`);
+						const results = await writeCtx.db.insert(table).values(values).onConflictDoUpdate({
+							target: getIdColumn(),
+							set: setClause
+						}).returning({ id: getIdColumn() });
+						await saveCrudExtraValuesForRows(writeCtx, config, idField, results.map((result) => ({ [idField]: result.id })), validRows);
+						updatedCount$1 = Math.min(existingCount, results.length);
+						insertedCount$1 = results.length - updatedCount$1;
+					} else {
+						const inserted = await writeCtx.db.insert(table).values(values).onConflictDoNothing().returning({ id: getIdColumn() });
+						await saveCrudExtraValuesForRows(writeCtx, config, idField, inserted.map((result) => ({ [idField]: result.id })), validRows);
+						insertedCount$1 = inserted.length;
+						updatedCount$1 = 0;
+					}
+					return {
+						insertedCount: insertedCount$1,
+						updatedCount: updatedCount$1
+					};
+				});
 				return {
 					success: insertedCount,
 					updated: updatedCount,
-					skipped,
+					skipped: validRows.length - insertedCount - updatedCount,
 					failed
 				};
 			};

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { PgTable } from "drizzle-orm/pg-core";
-import * as _trpc_server2 from "@trpc/server";
+import * as _trpc_server0 from "@trpc/server";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
 import { AnyColumn, SQL } from "drizzle-orm";
 
@@ -12,13 +12,13 @@ import { AnyColumn, SQL } from "drizzle-orm";
 interface Context {
   db: PostgresJsDatabase<Record<string, never>>;
 }
-declare const router: _trpc_server2.TRPCRouterBuilder<{
+declare const router: _trpc_server0.TRPCRouterBuilder<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server2.TRPCDefaultErrorShape;
+  errorShape: _trpc_server0.TRPCDefaultErrorShape;
   transformer: true;
 }>;
-declare const publicProcedure: _trpc_server2.TRPCProcedureBuilder<Context, object, object, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, false>;
+declare const publicProcedure: _trpc_server0.TRPCProcedureBuilder<Context, object, object, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, false>;
 //#endregion
 //#region src/types/config.d.ts
 type CrudOperation = 'list' | 'get' | 'create' | 'update' | 'delete' | 'deleteMany' | 'updateMany' | 'upsert' | 'export' | 'import' | 'createMany';
@@ -599,6 +599,17 @@ interface CrudRouterConfig<TTable extends PgTable = PgTable, TContext = unknown,
    * ]
    */
   filterableColumns?: CrudColumnRef<TTable>[];
+  /**
+   * 全局搜索列白名单。
+   *
+   * 当列表/导出输入包含 `search` 时，默认查询会对这些列做文本化 ILIKE
+   * 搜索，并与其他筛选条件按 AND 组合。扩展字段搜索仍由
+   * `CrudExtensionsProvider.searchEntityIds` 处理。
+   *
+   * @example
+   * searchColumns: ['title', { id: 'name', jsonField: ['zh-CN', 'en-US'] }]
+   */
+  searchColumns?: CrudColumnRef<TTable>[];
   /**
    * 可排序的列白名单。
    *
@@ -879,12 +890,12 @@ type CrudHookEventMap<PluginId extends string, ResourceName extends string, TCre
 } } & { [K in `${PluginId}.${ResourceName}.createMany`]: TCreate[] };
 //#endregion
 //#region src/routers/index.d.ts
-declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
+declare const appRouter: _trpc_server0.TRPCBuiltRouter<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server2.TRPCDefaultErrorShape;
+  errorShape: _trpc_server0.TRPCDefaultErrorShape;
   transformer: true;
-}, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
+}, _trpc_server0.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
 export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, 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 DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, 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 } from "drizzle-orm";
-import * as _trpc_server0 from "@trpc/server";
+import * as _trpc_server2 from "@trpc/server";
 import superjson from "superjson";
 import { PgTable } from "drizzle-orm/pg-core";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
@@ -13,13 +13,13 @@ import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
 interface Context {
   db: PostgresJsDatabase<Record<string, never>>;
 }
-declare const router: _trpc_server0.TRPCRouterBuilder<{
+declare const router: _trpc_server2.TRPCRouterBuilder<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server0.TRPCDefaultErrorShape;
+  errorShape: _trpc_server2.TRPCDefaultErrorShape;
   transformer: true;
 }>;
-declare const publicProcedure: _trpc_server0.TRPCProcedureBuilder<Context, object, object, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, false>;
+declare const publicProcedure: _trpc_server2.TRPCProcedureBuilder<Context, object, object, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, false>;
 //#endregion
 //#region src/types/config.d.ts
 type CrudOperation = 'list' | 'get' | 'create' | 'update' | 'delete' | 'deleteMany' | 'updateMany' | 'upsert' | 'export' | 'import' | 'createMany';
@@ -600,6 +600,17 @@ interface CrudRouterConfig<TTable extends PgTable = PgTable, TContext = unknown,
    * ]
    */
   filterableColumns?: CrudColumnRef<TTable>[];
+  /**
+   * 全局搜索列白名单。
+   *
+   * 当列表/导出输入包含 `search` 时，默认查询会对这些列做文本化 ILIKE
+   * 搜索，并与其他筛选条件按 AND 组合。扩展字段搜索仍由
+   * `CrudExtensionsProvider.searchEntityIds` 处理。
+   *
+   * @example
+   * searchColumns: ['title', { id: 'name', jsonField: ['zh-CN', 'en-US'] }]
+   */
+  searchColumns?: CrudColumnRef<TTable>[];
   /**
    * 可排序的列白名单。
    *
@@ -880,12 +891,12 @@ type CrudHookEventMap<PluginId extends string, ResourceName extends string, TCre
 } } & { [K in `${PluginId}.${ResourceName}.createMany`]: TCreate[] };
 //#endregion
 //#region src/routers/index.d.ts
-declare const appRouter: _trpc_server0.TRPCBuiltRouter<{
+declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server0.TRPCDefaultErrorShape;
+  errorShape: _trpc_server2.TRPCDefaultErrorShape;
   transformer: true;
-}, _trpc_server0.TRPCDecorateCreateRouterOptions<{}>>;
+}, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
 export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, 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 DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, 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

@@ -619,6 +619,28 @@ function readCrudTarget(config) {
 	if (!id) return null;
 	return { id };
 }
+function buildCrudLifecycleHookId(config, operation) {
+	const target = readCrudTarget(config);
+	if (!target) return null;
+	return `${target.id}.${operation}`;
+}
+function getCrudLifecycleHooks(ctx) {
+	const hooks = ctx?.hooks;
+	return typeof hooks?.emit === "function" ? hooks : null;
+}
+function shouldWrapCrudLifecycleTransaction(ctx, config) {
+	return Boolean(buildCrudLifecycleHookId(config, "create") && getCrudLifecycleHooks(ctx));
+}
+async function emitCrudWriteLifecycle(ctx, config, operation, payload) {
+	const hookId = buildCrudLifecycleHookId(config, operation);
+	const hooks = getCrudLifecycleHooks(ctx);
+	if (!hookId || !hooks) return;
+	await hooks.emit(hookId, payload, {
+		dispatch: "hook",
+		mode: "effect",
+		tx: ctx?.tx
+	});
+}
 function resolveCrudExtensions(ctx, config) {
 	const extensions = config.extensions;
 	if (extensions === false) return null;
@@ -678,6 +700,14 @@ async function saveCrudExtraValues(ctx, config, entityId, input) {
 		tx: ctx?.tx
 	});
 }
+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({
+		...ctx,
+		db: tx,
+		tx
+	}));
+	return operation(ctx);
+}
 function assertCrudExtraValuesWritable(ctx, config, input) {
 	if (!readCrudTarget(config) || !input.extraValues) return;
 	if (!resolveCrudExtensions(ctx, config)?.saveExtraValues) throw new TRPCError({
@@ -689,6 +719,8 @@ 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 inputsWithExtra = inputs.filter((input) => input.extraValues);
+	if (inputsWithExtra.length === 0) return;
 	const extraByInputId = /* @__PURE__ */ new Map();
 	for (const input of inputs) {
 		if (!input.extraValues || !isObjectRecord(input.data)) continue;
@@ -696,15 +728,37 @@ async function saveCrudExtraValuesForRows(ctx, config, idField, results, inputs)
 		if (inputId !== null && inputId !== void 0) extraByInputId.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) => {
 		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();
+		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);
 	}));
 }
+function createCrudBatchTransactionInput(inputs) {
+	return {
+		data: {},
+		rawValues: {},
+		baseValues: {},
+		extraValues: inputs.some((input) => input.extraValues) ? {} : null
+	};
+}
 function readProjectionDisplay(value) {
 	if (!isObjectRecord(value)) return value;
 	if ("display" in value && value.display !== null && value.display !== void 0) return value.display;
@@ -743,7 +797,7 @@ function isAllowedBaseCrudColumn(table, columnId, allowedColumns) {
 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) {
+async function applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, searchColumns, input) {
 	const target = readCrudTarget(config);
 	const filters = input.filters ?? [];
 	const search = typeof input.search === "string" ? input.search.trim() : "";
@@ -779,7 +833,14 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 			limit: 5e3
 		});
 		matchedSets.push(new Set(matchedIds$1));
-	}
+	} else if (search && !buildCrudSearchCondition({
+		table,
+		search,
+		searchColumns
+	})) throw new TRPCError({
+		code: "PRECONDITION_FAILED",
+		message: "CRUD search is not available"
+	});
 	if (matchedSets.length === 0) return {
 		...input,
 		filters: baseFilters
@@ -797,6 +858,24 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 		}]
 	};
 }
+function buildCrudSearchCondition({ table, search, searchColumns }) {
+	const term = typeof search === "string" ? search.trim() : "";
+	if (!term || !searchColumns || searchColumns.length === 0) return void 0;
+	const conditions = searchColumns.map((columnRef) => resolveColumnTarget({
+		table,
+		columnId: getColumnRefId(columnRef),
+		allowedColumns: searchColumns
+	})).filter((column) => column !== void 0).map((column) => sql`${column}::text ilike ${`%${term}%`}`);
+	if (conditions.length === 0) return void 0;
+	if (conditions.length === 1) return conditions[0];
+	return or(...conditions);
+}
+function combineConditions(...conditions) {
+	const filtered = conditions.filter((condition) => condition !== void 0);
+	if (filtered.length === 0) return void 0;
+	if (filtered.length === 1) return filtered[0];
+	return and(...filtered);
+}
 /**
 * 创建 CRUD Router
 *
@@ -810,7 +889,7 @@ async function applyCrudExtensionFilters(ctx, config, table, idField, filterable
 * @typeParam TUpdate - 更新输入类型
 */
 function createCrudRouter(config) {
-	const { table, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, maxExportSize = 5e3, softDelete: softDeleteOption, middleware = {} } = config;
+	const { table, idField = "id", filterableColumns, searchColumns, sortableColumns, maxBatchSize = 100, maxExportSize = 5e3, softDelete: softDeleteOption, middleware = {} } = config;
 	const { selectSchema, schema, updateSchema } = resolveSchemas(config);
 	const entityOutputSchema = withCrudExtensionInput(selectSchema, config);
 	const listOutputSchema = z.object({
@@ -908,10 +987,10 @@ function createCrudRouter(config) {
 		list: resolved.procedureFactory("list").input(resolvedListInputSchema).output(listOutputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "list");
 			const doList = async (listInput$1) => {
-				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, listInput$1);
+				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, searchColumns, 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({
+				const where = buildWhere(ctx, "list", combineConditions(validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
 					joinOperator: effectiveInput.joinOperator,
@@ -924,7 +1003,11 @@ function createCrudRouter(config) {
 							allowedColumns: filterableColumns
 						});
 					}
-				}) : void 0);
+				}) : void 0, buildCrudSearchCondition({
+					table,
+					search: effectiveInput.search,
+					searchColumns
+				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
 				if (effectiveInput.sort?.length) {
@@ -983,14 +1066,24 @@ function createCrudRouter(config) {
 			const doCreate = async (inputData) => {
 				const splitInput = splitCrudExtensionWriteInput(inputData, tableColumnNames);
 				assertCrudExtraValuesWritable(ctx, config, splitInput);
-				const injectData = resolved.getInject(ctx, "create");
-				const data = {
-					...splitInput.data,
-					...injectData
-				};
-				const [created] = await ctx.db.insert(table).values(data).returning();
-				await saveCrudExtraValues(ctx, config, created?.[idField], splitInput);
-				return created;
+				return runCrudExtensionWriteTransaction(ctx, config, splitInput, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "create");
+					const data = {
+						...splitInput.data,
+						...injectData
+					};
+					const [created] = await writeCtx.db.insert(table).values(data).returning();
+					await saveCrudExtraValues(writeCtx, config, created?.[idField], splitInput);
+					await emitCrudWriteLifecycle(writeCtx, config, "create", {
+						input: inputData,
+						row: created,
+						entityId: created?.[idField],
+						rawValues: splitInput.rawValues,
+						baseValues: splitInput.baseValues,
+						extraValues: splitInput.extraValues ?? {}
+					});
+					return created;
+				});
 			};
 			if (m.create) return m.create({
 				ctx,
@@ -1014,15 +1107,27 @@ function createCrudRouter(config) {
 			const doUpdate = async (updateData) => {
 				const splitUpdate = splitCrudExtensionWriteInput(updateData, tableColumnNames);
 				assertCrudExtraValuesWritable(ctx, config, splitUpdate);
-				const injectData = resolved.getInject(ctx, "update");
-				const data = {
-					...splitUpdate.data,
-					...injectData
-				};
-				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;
+				return runCrudExtensionWriteTransaction(ctx, config, splitUpdate, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "update");
+					const data = {
+						...splitUpdate.data,
+						...injectData
+					};
+					let updated = existing;
+					if (Object.keys(data).length > 0) [updated] = await writeCtx.db.update(table).set(data).where(where).returning();
+					await saveCrudExtraValues(writeCtx, config, input.id, splitUpdate);
+					await emitCrudWriteLifecycle(writeCtx, config, "update", {
+						id: input.id,
+						input: updateData,
+						row: updated,
+						existing,
+						entityId: input.id,
+						rawValues: splitUpdate.rawValues,
+						baseValues: splitUpdate.baseValues,
+						extraValues: splitUpdate.extraValues ?? {}
+					});
+					return updated;
+				});
 			};
 			if (m.update) return m.update({
 				ctx,
@@ -1043,10 +1148,23 @@ function createCrudRouter(config) {
 				message: "Resource not found or access denied"
 			});
 			const doDelete = async () => {
-				let deleted;
-				if (softDelete) [deleted] = await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning();
-				else [deleted] = await ctx.db.delete(table).where(where).returning();
-				return deleted;
+				return runCrudExtensionWriteTransaction(ctx, config, {
+					data: {},
+					rawValues: { id: input },
+					baseValues: {},
+					extraValues: null
+				}, async (writeCtx) => {
+					let deleted;
+					if (softDelete) [deleted] = await writeCtx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning();
+					else [deleted] = await writeCtx.db.delete(table).where(where).returning();
+					await emitCrudWriteLifecycle(writeCtx, config, "delete", {
+						id: input,
+						row: deleted,
+						existing,
+						entityId: input
+					});
+					return deleted;
+				});
 			};
 			if (m.delete) return m.delete({
 				ctx,
@@ -1079,16 +1197,18 @@ function createCrudRouter(config) {
 			const doUpdateMany = async (updateData) => {
 				const splitUpdate = splitCrudExtensionWriteInput(updateData, tableColumnNames);
 				assertCrudExtraValuesWritable(ctx, config, splitUpdate);
-				const injectData = resolved.getInject(ctx, "update");
-				const data = {
-					...splitUpdate.data,
-					...injectData
-				};
-				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 };
+				return runCrudExtensionWriteTransaction(ctx, config, splitUpdate, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "update");
+					const data = {
+						...splitUpdate.data,
+						...injectData
+					};
+					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)));
+					return { updated: updated.length };
+				});
 			};
 			if (m.updateMany) return m.updateMany({
 				ctx,
@@ -1113,23 +1233,35 @@ function createCrudRouter(config) {
 					isNew = !existing;
 					if (!isNew && existing) await withAuthorize(ctx, existing, "update");
 				}
-				const injectData = resolved.getInject(ctx, isNew ? "create" : "update");
-				const data = {
-					...splitInput.data,
-					...injectData
-				};
-				const [result] = await ctx.db.insert(table).values(data).onConflictDoUpdate({
-					target: getIdColumn(),
-					set: {
+				return runCrudExtensionWriteTransaction(ctx, config, splitInput, async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, isNew ? "create" : "update");
+					const data = {
 						...splitInput.data,
-						...resolved.getInject(ctx, "update")
-					}
-				}).returning();
-				await saveCrudExtraValues(ctx, config, result?.[idField] ?? inputId, splitInput);
-				return {
-					data: result,
-					isNew
-				};
+						...injectData
+					};
+					const [result] = await writeCtx.db.insert(table).values(data).onConflictDoUpdate({
+						target: getIdColumn(),
+						set: {
+							...splitInput.data,
+							...resolved.getInject(writeCtx, "update")
+						}
+					}).returning();
+					await saveCrudExtraValues(writeCtx, config, result?.[idField] ?? inputId, splitInput);
+					await emitCrudWriteLifecycle(writeCtx, config, "upsert", {
+						input: inputData,
+						row: result,
+						existing,
+						isNew,
+						entityId: result?.[idField] ?? inputId,
+						rawValues: splitInput.rawValues,
+						baseValues: splitInput.baseValues,
+						extraValues: splitInput.extraValues ?? {}
+					});
+					return {
+						data: result,
+						isNew
+					};
+				});
 			};
 			if (m.upsert) return m.upsert({
 				ctx,
@@ -1141,7 +1273,7 @@ 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 effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, {
+				const effectiveInput = await applyCrudExtensionFilters(ctx, config, table, idField, filterableColumns, searchColumns, {
 					page: 1,
 					perPage: Math.min(Math.max(exportInput$1.limit ?? maxExportSize, 1), maxExportSize),
 					joinOperator: exportInput$1.joinOperator ?? "and",
@@ -1149,7 +1281,7 @@ function createCrudRouter(config) {
 				});
 				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({
+				const where = buildWhere(ctx, "export", combineConditions(validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
 					joinOperator: effectiveInput.joinOperator ?? "and",
@@ -1162,7 +1294,11 @@ function createCrudRouter(config) {
 							allowedColumns: filterableColumns
 						});
 					}
-				}) : void 0);
+				}) : void 0, buildCrudSearchCondition({
+					table,
+					search: effectiveInput.search,
+					searchColumns
+				})));
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
 				if (effectiveInput.sort?.length) {
@@ -1199,17 +1335,19 @@ function createCrudRouter(config) {
 			const doCreateMany = async (items) => {
 				const splitItems = items.map((item) => splitCrudExtensionWriteInput(item, tableColumnNames));
 				assertCrudExtraValuesWritableForRows(ctx, config, splitItems);
-				const injectData = resolved.getInject(ctx, "create");
-				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
-				};
+				return runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(splitItems), async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "create");
+					const values = splitItems.map(({ data }) => ({
+						...data,
+						...injectData
+					}));
+					const created = await writeCtx.db.insert(table).values(values).onConflictDoNothing().returning();
+					await saveCrudExtraValuesForRows(writeCtx, config, idField, created, splitItems);
+					return {
+						created,
+						count: created.length
+					};
+				});
 			};
 			if (m.createMany) return m.createMany({
 				ctx,
@@ -1250,36 +1388,41 @@ function createCrudRouter(config) {
 					failed
 				};
 				assertCrudExtraValuesWritableForRows(ctx, config, validRows);
-				const injectData = resolved.getInject(ctx, "create");
-				const values = validRows.map((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].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 {
-					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;
+				const { insertedCount, updatedCount } = await runCrudExtensionWriteTransaction(ctx, config, createCrudBatchTransactionInput(validRows), async (writeCtx) => {
+					const injectData = resolved.getInject(writeCtx, "create");
+					const values = validRows.map((row) => ({
+						...row.data,
+						...injectData
+					}));
+					let insertedCount$1 = 0;
+					let updatedCount$1 = 0;
+					if (importData$1.onConflict === "upsert") {
+						const existingCount = (await writeCtx.db.select({ id: getIdColumn() }).from(table).where(inArray(getIdColumn(), values.map((v) => v[idField]).filter(Boolean)))).length;
+						const updateFields = Object.keys(validRows[0].data);
+						const setClause = { ...resolved.getInject(writeCtx, "update") };
+						for (const key of updateFields) setClause[key] = sql.raw(`excluded."${key}"`);
+						const results = await writeCtx.db.insert(table).values(values).onConflictDoUpdate({
+							target: getIdColumn(),
+							set: setClause
+						}).returning({ id: getIdColumn() });
+						await saveCrudExtraValuesForRows(writeCtx, config, idField, results.map((result) => ({ [idField]: result.id })), validRows);
+						updatedCount$1 = Math.min(existingCount, results.length);
+						insertedCount$1 = results.length - updatedCount$1;
+					} else {
+						const inserted = await writeCtx.db.insert(table).values(values).onConflictDoNothing().returning({ id: getIdColumn() });
+						await saveCrudExtraValuesForRows(writeCtx, config, idField, inserted.map((result) => ({ [idField]: result.id })), validRows);
+						insertedCount$1 = inserted.length;
+						updatedCount$1 = 0;
+					}
+					return {
+						insertedCount: insertedCount$1,
+						updatedCount: updatedCount$1
+					};
+				});
 				return {
 					success: insertedCount,
 					updated: updatedCount,
-					skipped,
+					skipped: validRows.length - insertedCount - updatedCount,
 					failed
 				};
 			};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud-server",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "tRPC server utilities for auto-crud - automatic CRUD routers for Drizzle ORM",
   "author": "wordrhyme",
   "license": "MIT",
@@ -37,6 +37,7 @@
     "zod": "^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
+    "@testing-library/jest-dom": "^6.9.1",
     "@trpc/server": "^11.0.0",
     "@types/node": "^22.19.17",
     "drizzle-orm": "1.0.0-beta.15-859cf75",
@@ -47,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/prettier-config": "0.0.1",
+    "@internal/tsdown-config": "0.1.0",
     "@internal/vitest-config": "0.1.0",
-    "@internal/tsconfig": "0.1.0"
+    "@internal/eslint-config": "0.3.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {