@wordrhyme/auto-crud-server 0.6.0 → 0.6.2

package/dist/index.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { and, asc, desc, eq, gt, gte, ilike, inArray, isNull, lt, lte, ne, not, notIlike, notInArray, or, sql } from "drizzle-orm";
-import { initTRPC } from "@trpc/server";
+import { TRPCError, initTRPC } from "@trpc/server";
 import superjson from "superjson";
 import { addDays, endOfDay, startOfDay } from "date-fns";
 
@@ -446,6 +446,14 @@ 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, middleware = {} } = config;
 	const resolved = resolveConfig(config);
@@ -457,7 +465,7 @@ function createCrudRouter(config) {
 		const conditions = [];
 		const scopeCondition = resolved.getScope(ctx, table, operation);
 		if (scopeCondition) conditions.push(scopeCondition);
-		if (softDelete && (operation === "list" || operation === "get")) {
+		if (softDelete) {
 			const col = getSoftDeleteColumn();
 			if (col) conditions.push(isNull(col));
 		}
@@ -468,12 +476,27 @@ function createCrudRouter(config) {
 	};
 	const withGuard = async (ctx, operation) => {
 		if (resolved.guard) {
-			if (!await resolved.guard(ctx, operation)) throw new Error(`Forbidden: ${operation} not allowed`);
+			if (operation === "upsert") {
+				const canCreate = await resolved.guard(ctx, "create");
+				const canUpdate = await resolved.guard(ctx, "update");
+				if (!canCreate || !canUpdate) throw new TRPCError({
+					code: "FORBIDDEN",
+					message: "Forbidden: upsert requires both create and update permissions"
+				});
+				return;
+			}
+			if (!await resolved.guard(ctx, operation)) throw new TRPCError({
+				code: "FORBIDDEN",
+				message: `Forbidden: ${operation} not allowed`
+			});
 		}
 	};
 	const withAuthorize = async (ctx, resource, operation) => {
 		if (!resource) return;
-		if (!await resolved.checkAuthorize(ctx, resource, operation)) throw new Error(`Forbidden: Cannot ${operation} this resource`);
+		if (!await resolved.checkAuthorize(ctx, resource, operation)) throw new TRPCError({
+			code: "FORBIDDEN",
+			message: `Forbidden: Cannot ${operation} this resource`
+		});
 	};
 	const procedures = {
 		list: resolved.procedureFactory("list").input(listInputSchema).query(async ({ ctx, input }) => {
@@ -515,7 +538,7 @@ function createCrudRouter(config) {
 			});
 			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");
 			const doGet = async () => {
 				const where = buildWhere(ctx, "get", eq(getIdColumn(), input));
@@ -556,7 +579,10 @@ function createCrudRouter(config) {
 			const where = buildWhere(ctx, "update", eq(getIdColumn(), input.id));
 			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");
+			if (!existing) throw new TRPCError({
+				code: "NOT_FOUND",
+				message: "Resource not found or access denied"
+			});
 			const doUpdate = async (updateData) => {
 				const injectData = resolved.getInject(ctx, "update");
 				const data = {
@@ -580,7 +606,10 @@ function createCrudRouter(config) {
 			const where = buildWhere(ctx, "delete", eq(getIdColumn(), input));
 			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 (!existing) throw new TRPCError({
+				code: "NOT_FOUND",
+				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();
@@ -599,8 +628,8 @@ function createCrudRouter(config) {
 			await withGuard(ctx, "deleteMany");
 			const where = buildWhere(ctx, "deleteMany", inArray(getIdColumn(), input));
 			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 (softDelete) return { deleted: (await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning({ id: getIdColumn() })).length };
+				else return { deleted: (await ctx.db.delete(table).where(where).returning({ id: getIdColumn() })).length };
 			};
 			if (m.deleteMany) return m.deleteMany({
 				ctx,
@@ -621,7 +650,7 @@ function createCrudRouter(config) {
 					...updateData,
 					...injectData
 				};
-				return { updated: (await ctx.db.update(table).set(data).where(where).returning()).length };
+				return { updated: (await ctx.db.update(table).set(data).where(where).returning({ id: getIdColumn() })).length };
 			};
 			if (m.updateMany) return m.updateMany({
 				ctx,
@@ -630,6 +659,43 @@ function createCrudRouter(config) {
 				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 inputId = inputData[idField];
+				let isNew = true;
+				let existing = null;
+				if (inputId) {
+					const where = buildWhere(ctx, "get", eq(getIdColumn(), inputId));
+					const [found] = await ctx.db.select().from(table).where(where);
+					existing = found;
+					isNew = !existing;
+					if (!isNew && existing) await withAuthorize(ctx, existing, "update");
+				}
+				const injectData = resolved.getInject(ctx, isNew ? "create" : "update");
+				const data = {
+					...inputData,
+					...injectData
+				};
+				const [result] = await ctx.db.insert(table).values(data).onConflictDoUpdate({
+					target: getIdColumn(),
+					set: {
+						...inputData,
+						...resolved.getInject(ctx, "update")
+					}
+				}).returning();
+				return {
+					data: result,
+					isNew
+				};
+			};
+			if (m.upsert) return m.upsert({
+				ctx,
+				input,
+				next: async (modifiedInput) => doUpsert(modifiedInput ?? input)
+			});
+			return doUpsert(input);
 		})
 	};
 	const crudRouter = router(procedures);
@@ -639,6 +705,10 @@ function createCrudRouter(config) {
 //#endregion
 //#region src/lib/middleware-helpers.ts
 /**
+* Middleware 便捷工具函数
+* 简化常见场景的 middleware 创建
+*/
+/**
 * 创建 after-only 的 middleware（最常见场景）
 * 在操作完成后执行副作用，不修改返回值
 *
@@ -651,28 +721,13 @@ function createCrudRouter(config) {
 * }
 */
 function afterMiddleware(fn) {
-	return async ({ ctx, next }) => {
-		const result = await next();
-		await fn(ctx, result);
+	return async (params) => {
+		const result = await params.next();
+		await fn(params.ctx, result);
 		return result;
 	};
 }
 /**
-* 创建 after-only 的 middleware，可修改返回值
-*
-* @example
-* middleware: {
-*   get: afterMiddlewareTransform(async (ctx, result) => {
-*     return { ...result, computed: calculateSomething(result) };
-*   }),
-* }
-*/
-function afterMiddlewareTransform(fn) {
-	return async ({ ctx, next }) => {
-		return fn(ctx, await next());
-	};
-}
-/**
 * 创建 before-only 的 middleware
 * 在操作执行前修改输入数据
 *
@@ -684,8 +739,9 @@ function afterMiddlewareTransform(fn) {
 * }
 */
 function beforeMiddleware(fn) {
-	return async ({ ctx, input, next }) => {
-		return next(await fn(ctx, input));
+	return async (params) => {
+		const modifiedInput = await fn(params.ctx, params.input);
+		return params.next(modifiedInput);
 	};
 }
 /**
@@ -702,58 +758,21 @@ function beforeMiddleware(fn) {
 function composeMiddleware(...middlewares) {
 	return async (params) => {
 		let index = 0;
-		const executeNext = async (input) => {
-			if (index >= middlewares.length) return params.next(input);
+		const executeNext = async (...args) => {
+			if (index >= middlewares.length) return params.next(...args);
 			const currentMiddleware = middlewares[index++];
 			return currentMiddleware({
-				ctx: params.ctx,
-				input,
+				...params,
 				next: executeNext
 			});
 		};
-		return executeNext(params.input);
+		return executeNext();
 	};
 }
-/**
-* 创建 list 操作的 after middleware
-*/
-function afterList(fn) {
-	return afterMiddleware(fn);
-}
-/**
-* 创建 list 操作的 before middleware
-*/
-function beforeList(fn) {
-	return beforeMiddleware(fn);
-}
-/**
-* 创建 create 操作的 after middleware
-*/
-function afterCreate(fn) {
-	return afterMiddleware(fn);
-}
-/**
-* 创建 create 操作的 before middleware
-*/
-function beforeCreate(fn) {
-	return beforeMiddleware(fn);
-}
-/**
-* 创建 update 操作的 after middleware
-*/
-function afterUpdate(fn) {
-	return afterMiddleware(fn);
-}
-/**
-* 创建 delete 操作的 after middleware
-*/
-function afterDelete(fn) {
-	return afterMiddleware(fn);
-}
 
 //#endregion
 //#region src/routers/index.ts
 const appRouter = router({});
 
 //#endregion
-export { afterCreate, afterDelete, afterList, afterMiddleware, afterMiddlewareTransform, afterUpdate, appRouter, beforeCreate, beforeList, beforeMiddleware, composeMiddleware, 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.6.0",
+  "version": "0.6.2",
   "description": "tRPC server utilities for auto-crud - automatic CRUD routers for Drizzle ORM",
   "author": "wordrhyme",
   "license": "MIT",
@@ -45,12 +45,13 @@
     "superjson": "^2.2.6",
     "tsdown": "^0.15.12",
     "typescript": "^5.9.3",
+    "vitest": "^4.0.18",
     "zod": "^4.1.13",
-    "@internal/eslint-config": "0.3.0",
     "@internal/prettier-config": "0.0.1",
     "@internal/tsconfig": "0.1.0",
     "@internal/tsdown-config": "0.1.0",
-    "@internal/vitest-config": "0.1.0"
+    "@internal/vitest-config": "0.1.0",
+    "@internal/eslint-config": "0.3.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {
@@ -60,6 +61,7 @@
     "build:watch": "tsdown --watch",
     "test": "vitest --run --passWithNoTests",
     "test:watch": "vitest --watch",
+    "test:coverage": "vitest --run --coverage",
     "typecheck": "tsc --noEmit",
     "lint": "eslint",
     "format": "prettier --check . --ignore-path ../../.gitignore"