@wordrhyme/auto-crud-server 0.4.0 → 0.6.1

package/dist/index.js

@@ -446,11 +446,19 @@ function validateColumn(columnId, allowedColumns) {
 	if (!allowedColumns || allowedColumns.length === 0) return true;
 	return allowedColumns.includes(columnId);
 }
+/**
+* 创建 CRUD Router
+*
+* @typeParam TContext - 上下文类型（包含 db）
+* @typeParam TSelect - 查询返回类型（从 selectSchema 或 insertSchema 推断）
+* @typeParam TInsert - 创建输入类型（从 insertSchema 推断）
+* @typeParam TUpdate - 更新输入类型（从 updateSchema 推断）
+*/
 function createCrudRouter(config) {
-	const { table, insertSchema, updateSchema, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, softDelete: softDeleteOption, hooks = {} } = config;
+	const { table, insertSchema, updateSchema, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, softDelete: softDeleteOption, middleware = {} } = config;
 	const resolved = resolveConfig(config);
 	const softDelete = resolveSoftDelete(softDeleteOption);
-	const h = hooks;
+	const m = middleware;
 	const getIdColumn = () => table[idField];
 	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
 	const buildWhere = (ctx, operation, additionalCondition) => {
@@ -468,6 +476,12 @@ function createCrudRouter(config) {
 	};
 	const withGuard = async (ctx, operation) => {
 		if (resolved.guard) {
+			if (operation === "upsert") {
+				const canCreate = await resolved.guard(ctx, "create");
+				const canUpdate = await resolved.guard(ctx, "update");
+				if (!canCreate || !canUpdate) throw new Error("Forbidden: upsert requires both create and update permissions");
+				return;
+			}
 			if (!await resolved.guard(ctx, operation)) throw new Error(`Forbidden: ${operation} not allowed`);
 		}
 	};
@@ -478,72 +492,75 @@ function createCrudRouter(config) {
 	const procedures = {
 		list: resolved.procedureFactory("list").input(listInputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "list");
-			let processedInput = input;
-			if (h.beforeList) {
-				const result = await h.beforeList(ctx, processedInput);
-				if (result) processedInput = result;
-			}
-			const offset = (processedInput.page - 1) * processedInput.perPage;
-			const validatedFilters = processedInput.filters?.filter((filter) => validateColumn(filter.id, filterableColumns));
-			const where = buildWhere(ctx, "list", validatedFilters?.length ? filterColumns({
-				table,
-				filters: validatedFilters,
-				joinOperator: processedInput.joinOperator
-			}) : void 0);
-			let query = ctx.db.select().from(table).$dynamic();
-			if (where) query = query.where(where);
-			if (processedInput.sort?.length) {
-				const sortField = processedInput.sort[0];
-				if (sortField && validateColumn(sortField.id, sortableColumns)) {
-					const column = table[sortField.id];
-					if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
+			const doList = async (listInput$1) => {
+				const offset = (listInput$1.page - 1) * listInput$1.perPage;
+				const validatedFilters = listInput$1.filters?.filter((filter) => validateColumn(filter.id, filterableColumns));
+				const where = buildWhere(ctx, "list", validatedFilters?.length ? filterColumns({
+					table,
+					filters: validatedFilters,
+					joinOperator: listInput$1.joinOperator
+				}) : void 0);
+				let query = ctx.db.select().from(table).$dynamic();
+				if (where) query = query.where(where);
+				if (listInput$1.sort?.length) {
+					const sortField = listInput$1.sort[0];
+					if (sortField && validateColumn(sortField.id, sortableColumns)) {
+						const column = table[sortField.id];
+						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
+					}
 				}
-			}
-			const data = await query.limit(processedInput.perPage).offset(offset);
-			let countQuery = ctx.db.select({ count: sql`count(*)::int` }).from(table).$dynamic();
-			if (where) countQuery = countQuery.where(where);
-			const count = (await countQuery)[0]?.count ?? 0;
-			let listResult = {
-				data,
-				total: count,
-				page: processedInput.page,
-				perPage: processedInput.perPage,
-				pageCount: Math.ceil(count / processedInput.perPage)
+				const data = await query.limit(listInput$1.perPage).offset(offset);
+				let countQuery = ctx.db.select({ count: sql`count(*)::int` }).from(table).$dynamic();
+				if (where) countQuery = countQuery.where(where);
+				const count = (await countQuery)[0]?.count ?? 0;
+				return {
+					data,
+					total: count,
+					page: listInput$1.page,
+					perPage: listInput$1.perPage,
+					pageCount: Math.ceil(count / listInput$1.perPage)
+				};
 			};
-			if (h.afterList) {
-				const result = await h.afterList(ctx, listResult);
-				if (result) listResult = result;
-			}
-			return listResult;
+			const listInput = input;
+			if (m.list) return m.list({
+				ctx,
+				input: listInput,
+				next: async (modifiedInput) => doList(modifiedInput ?? listInput)
+			});
+			return doList(listInput);
 		}),
-		getById: resolved.procedureFactory("get").input(z.string()).query(async ({ ctx, input }) => {
+		get: resolved.procedureFactory("get").input(z.string()).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "get");
-			if (h.beforeGet) await h.beforeGet(ctx, input);
-			const where = buildWhere(ctx, "get", eq(getIdColumn(), input));
-			const [item] = await ctx.db.select().from(table).where(where);
-			await withAuthorize(ctx, item, "get");
-			let result = item ?? null;
-			if (h.afterGet) {
-				const hookResult = await h.afterGet(ctx, result);
-				if (hookResult !== void 0) result = hookResult;
-			}
-			return result;
+			const doGet = async () => {
+				const where = buildWhere(ctx, "get", eq(getIdColumn(), input));
+				const [item] = await ctx.db.select().from(table).where(where);
+				await withAuthorize(ctx, item, "get");
+				return item ?? null;
+			};
+			if (m.get) return m.get({
+				ctx,
+				id: input,
+				next: doGet
+			});
+			return doGet();
 		}),
 		create: resolved.procedureFactory("create").input(insertSchema).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "create");
-			let processedData = input;
-			if (h.beforeCreate) {
-				const result = await h.beforeCreate(ctx, processedData);
-				if (result) processedData = result;
-			}
-			const injectData = resolved.getInject(ctx, "create");
-			const data = {
-				...processedData,
-				...injectData
+			const doCreate = async (inputData) => {
+				const injectData = resolved.getInject(ctx, "create");
+				const data = {
+					...inputData,
+					...injectData
+				};
+				const [created] = await ctx.db.insert(table).values(data).returning();
+				return created;
 			};
-			const [created] = await ctx.db.insert(table).values(data).returning();
-			if (h.afterCreate) await h.afterCreate(ctx, created);
-			return created;
+			if (m.create) return m.create({
+				ctx,
+				input,
+				next: async (modifiedInput) => doCreate(modifiedInput ?? input)
+			});
+			return doCreate(input);
 		}),
 		update: resolved.procedureFactory("update").input(z.object({
 			id: z.string(),
@@ -554,19 +571,23 @@ function createCrudRouter(config) {
 			const [existing] = await ctx.db.select().from(table).where(where);
 			await withAuthorize(ctx, existing, "update");
 			if (!existing) throw new Error("Resource not found or access denied");
-			let processedData = input.data;
-			if (h.beforeUpdate) {
-				const result = await h.beforeUpdate(ctx, input.id, processedData, existing);
-				if (result) processedData = result;
-			}
-			const injectData = resolved.getInject(ctx, "update");
-			const data = {
-				...processedData,
-				...injectData
+			const doUpdate = async (updateData) => {
+				const injectData = resolved.getInject(ctx, "update");
+				const data = {
+					...updateData,
+					...injectData
+				};
+				const [updated] = await ctx.db.update(table).set(data).where(where).returning();
+				return updated;
 			};
-			const [updated] = await ctx.db.update(table).set(data).where(where).returning();
-			if (h.afterUpdate) await h.afterUpdate(ctx, updated);
-			return updated;
+			if (m.update) return m.update({
+				ctx,
+				id: input.id,
+				data: input.data,
+				existing,
+				next: async (modifiedData) => doUpdate(modifiedData ?? input.data)
+			});
+			return doUpdate(input.data);
 		}),
 		delete: resolved.procedureFactory("delete").input(z.string()).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "delete");
@@ -574,51 +595,163 @@ function createCrudRouter(config) {
 			const [existing] = await ctx.db.select().from(table).where(where);
 			await withAuthorize(ctx, existing, "delete");
 			if (!existing) throw new Error("Resource not found or access denied");
-			if (h.beforeDelete) await h.beforeDelete(ctx, input, existing);
-			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();
-			if (h.afterDelete) await h.afterDelete(ctx, deleted);
-			return deleted;
+			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;
+			};
+			if (m.delete) return m.delete({
+				ctx,
+				id: input,
+				existing,
+				next: doDelete
+			});
+			return doDelete();
 		}),
 		deleteMany: resolved.procedureFactory("deleteMany").input(z.array(z.string()).max(maxBatchSize)).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "deleteMany");
-			if (h.beforeDeleteMany) await h.beforeDeleteMany(ctx, input);
 			const where = buildWhere(ctx, "deleteMany", inArray(getIdColumn(), input));
-			let result;
-			if (softDelete) result = { deleted: (await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning()).length };
-			else result = { deleted: (await ctx.db.delete(table).where(where).returning()).length };
-			if (h.afterDeleteMany) await h.afterDeleteMany(ctx, result);
-			return result;
+			const doDeleteMany = async () => {
+				if (softDelete) return { deleted: (await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning()).length };
+				else return { deleted: (await ctx.db.delete(table).where(where).returning()).length };
+			};
+			if (m.deleteMany) return m.deleteMany({
+				ctx,
+				ids: input,
+				next: doDeleteMany
+			});
+			return doDeleteMany();
 		}),
 		updateMany: resolved.procedureFactory("updateMany").input(z.object({
 			ids: z.array(z.string()).max(maxBatchSize),
 			data: updateSchema
 		})).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "updateMany");
-			let processedData = input.data;
-			if (h.beforeUpdateMany) {
-				const result$1 = await h.beforeUpdateMany(ctx, input.ids, processedData);
-				if (result$1) processedData = result$1;
-			}
 			const where = buildWhere(ctx, "updateMany", inArray(getIdColumn(), input.ids));
-			const injectData = resolved.getInject(ctx, "update");
-			const data = {
-				...processedData,
-				...injectData
+			const doUpdateMany = async (updateData) => {
+				const injectData = resolved.getInject(ctx, "update");
+				const data = {
+					...updateData,
+					...injectData
+				};
+				return { updated: (await ctx.db.update(table).set(data).where(where).returning()).length };
+			};
+			if (m.updateMany) return m.updateMany({
+				ctx,
+				ids: input.ids,
+				data: input.data,
+				next: async (modifiedData) => doUpdateMany(modifiedData ?? input.data)
+			});
+			return doUpdateMany(input.data);
+		}),
+		upsert: resolved.procedureFactory("upsert").input(insertSchema).mutation(async ({ ctx, input }) => {
+			await withGuard(ctx, "upsert");
+			const doUpsert = async (inputData) => {
+				const injectData = resolved.getInject(ctx, "create");
+				const data = {
+					...inputData,
+					...injectData
+				};
+				const inputId = inputData[idField];
+				let isNew = true;
+				if (inputId) {
+					const where = buildWhere(ctx, "get", eq(getIdColumn(), inputId));
+					const [existing] = await ctx.db.select().from(table).where(where);
+					isNew = !existing;
+				}
+				const [result] = await ctx.db.insert(table).values(data).onConflictDoUpdate({
+					target: getIdColumn(),
+					set: data
+				}).returning();
+				return {
+					data: result,
+					isNew
+				};
 			};
-			const result = { updated: (await ctx.db.update(table).set(data).where(where).returning()).length };
-			if (h.afterUpdateMany) await h.afterUpdateMany(ctx, result);
-			return result;
+			if (m.upsert) return m.upsert({
+				ctx,
+				input,
+				next: async (modifiedInput) => doUpsert(modifiedInput ?? input)
+			});
+			return doUpsert(input);
 		})
 	};
 	const crudRouter = router(procedures);
 	return Object.assign(crudRouter, { procedures });
 }
 
+//#endregion
+//#region src/lib/middleware-helpers.ts
+/**
+* Middleware 便捷工具函数
+* 简化常见场景的 middleware 创建
+*/
+/**
+* 创建 after-only 的 middleware（最常见场景）
+* 在操作完成后执行副作用，不修改返回值
+*
+* @example
+* middleware: {
+*   create: afterMiddleware(async (ctx, result) => {
+*     await sendEmail(result);
+*     await logAudit(ctx.user, 'create', result);
+*   }),
+* }
+*/
+function afterMiddleware(fn) {
+	return async (params) => {
+		const result = await params.next();
+		await fn(params.ctx, result);
+		return result;
+	};
+}
+/**
+* 创建 before-only 的 middleware
+* 在操作执行前修改输入数据
+*
+* @example
+* middleware: {
+*   create: beforeMiddleware(async (ctx, input) => {
+*     return { ...input, slug: slugify(input.title), createdBy: ctx.user.id };
+*   }),
+* }
+*/
+function beforeMiddleware(fn) {
+	return async (params) => {
+		const modifiedInput = await fn(params.ctx, params.input);
+		return params.next(modifiedInput);
+	};
+}
+/**
+* 组合多个 middleware 为一个
+*
+* @example
+* middleware: {
+*   create: composeMiddleware(
+*     beforeMiddleware((ctx, input) => ({ ...input, slug: slugify(input.title) })),
+*     afterMiddleware((ctx, result) => sendEmail(result)),
+*   ),
+* }
+*/
+function composeMiddleware(...middlewares) {
+	return async (params) => {
+		let index = 0;
+		const executeNext = async (...args) => {
+			if (index >= middlewares.length) return params.next(...args);
+			const currentMiddleware = middlewares[index++];
+			return currentMiddleware({
+				...params,
+				next: executeNext
+			});
+		};
+		return executeNext();
+	};
+}
+
 //#endregion
 //#region src/routers/index.ts
 const appRouter = router({});
 
 //#endregion
-export { appRouter, createCrudRouter, publicProcedure, router };
+export { afterMiddleware, appRouter, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/package.json

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