@wordrhyme/auto-crud-server 0.6.0 → 0.6.1

package/README.md

@@ -136,7 +136,7 @@ export { handler as GET, handler as POST };
 
 ## 📖 自动生成的路由
 
-`createCrudRouter` 会自动生成以下 7 个路由：
+`createCrudRouter` 会自动生成以下 8 个路由：
 
 ### 1. `list` - 列表查询
 
@@ -299,6 +299,42 @@ await trpc.tasks.updateMany({
 });
 ```
 
+### 8. `upsert` - 存在则更新，不存在则创建
+
+**输入**:
+```typescript
+Omit<Task, "createdAt" | "updatedAt">  // 需要包含 id
+```
+
+**输出**:
+```typescript
+{
+  data: Task;       // 创建或更新后的记录
+  isNew: boolean;   // true = 新建, false = 更新
+}
+```
+
+**示例**:
+```typescript
+// 如果 id="123" 存在则更新，不存在则创建
+const { data, isNew } = await trpc.tasks.upsert({
+  id: "123",
+  title: "My Task",
+  status: "todo",
+});
+
+if (isNew) {
+  console.log("Created new task");
+} else {
+  console.log("Updated existing task");
+}
+```
+
+**适用场景**：
+- 同步外部数据
+- 幂等导入
+- 配置项更新
+
 ---
 
 ## 🎯 高级过滤

package/dist/index.cjs

@@ -474,6 +474,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);
@@ -496,6 +504,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`);
 		}
 	};
@@ -543,7 +557,7 @@ function createCrudRouter(config) {
 			});
 			return doList(listInput);
 		}),
-		getById: resolved.procedureFactory("get").input(zod.z.string()).query(async ({ ctx, input }) => {
+		get: resolved.procedureFactory("get").input(zod.z.string()).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "get");
 			const doGet = async () => {
 				const where = buildWhere(ctx, "get", (0, drizzle_orm.eq)(getIdColumn(), input));
@@ -658,6 +672,37 @@ 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 injectData = resolved.getInject(ctx, "create");
+				const data = {
+					...inputData,
+					...injectData
+				};
+				const inputId = inputData[idField];
+				let isNew = true;
+				if (inputId) {
+					const where = buildWhere(ctx, "get", (0, drizzle_orm.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
+				};
+			};
+			if (m.upsert) return m.upsert({
+				ctx,
+				input,
+				next: async (modifiedInput) => doUpsert(modifiedInput ?? input)
+			});
+			return doUpsert(input);
 		})
 	};
 	const crudRouter = router(procedures);
@@ -667,6 +712,10 @@ function createCrudRouter(config) {
 //#endregion
 //#region src/lib/middleware-helpers.ts
 /**
+* Middleware 便捷工具函数
+* 简化常见场景的 middleware 创建
+*/
+/**
 * 创建 after-only 的 middleware（最常见场景）
 * 在操作完成后执行副作用，不修改返回值
 *
@@ -679,28 +728,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
 * 在操作执行前修改输入数据
 *
@@ -712,8 +746,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);
 	};
 }
 /**
@@ -730,69 +765,25 @@ 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
-exports.afterCreate = afterCreate;
-exports.afterDelete = afterDelete;
-exports.afterList = afterList;
 exports.afterMiddleware = afterMiddleware;
-exports.afterMiddlewareTransform = afterMiddlewareTransform;
-exports.afterUpdate = afterUpdate;
 exports.appRouter = appRouter;
-exports.beforeCreate = beforeCreate;
-exports.beforeList = beforeList;
 exports.beforeMiddleware = beforeMiddleware;
 exports.composeMiddleware = composeMiddleware;
 exports.createCrudRouter = createCrudRouter;

package/dist/index.d.cts

@@ -1,6 +1,5 @@
-import * as _trpc_server5 from "@trpc/server";
+import * as _trpc_server2 from "@trpc/server";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
-import * as node_modules__trpc_server_dist_unstable_core_do_not_import_d_CjQPvBRI_mjs0 from "node_modules/@trpc/server/dist/unstable-core-do-not-import.d-CjQPvBRI.mjs";
 import { SQL } from "drizzle-orm";
 import { PgTable } from "drizzle-orm/pg-core";
 import { z } from "zod";
@@ -13,16 +12,16 @@ import { z } from "zod";
 interface Context {
   db: PostgresJsDatabase<Record<string, never>>;
 }
-declare const router: _trpc_server5.TRPCRouterBuilder<{
+declare const router: _trpc_server2.TRPCRouterBuilder<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server5.TRPCDefaultErrorShape;
+  errorShape: _trpc_server2.TRPCDefaultErrorShape;
   transformer: true;
 }>;
-declare const publicProcedure: _trpc_server5.TRPCProcedureBuilder<Context, object, object, _trpc_server5.TRPCUnsetMarker, _trpc_server5.TRPCUnsetMarker, _trpc_server5.TRPCUnsetMarker, _trpc_server5.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";
+type CrudOperation = "list" | "get" | "create" | "update" | "delete" | "deleteMany" | "updateMany" | "upsert";
 type WriteOperation = "create" | "update";
 type AnyProcedure = any;
 interface SoftDeleteConfig {
@@ -71,6 +70,57 @@ interface ListResult<TSelect> {
   perPage: number;
   pageCount: number;
 }
+interface ListMiddlewareParams<TContext, TSelect> {
+  ctx: TContext;
+  input: ListInput;
+  next: (input?: ListInput) => Promise<ListResult<TSelect>>;
+}
+interface GetMiddlewareParams<TContext, TSelect> {
+  ctx: TContext;
+  id: string;
+  next: () => Promise<TSelect | null>;
+}
+interface CreateMiddlewareParams<TContext, TSelect, TInsert> {
+  ctx: TContext;
+  input: TInsert;
+  next: (input?: TInsert) => Promise<TSelect>;
+}
+interface UpdateMiddlewareParams<TContext, TSelect, TUpdate> {
+  ctx: TContext;
+  id: string;
+  data: TUpdate;
+  existing: TSelect;
+  next: (data?: TUpdate) => Promise<TSelect>;
+}
+interface DeleteMiddlewareParams<TContext, TSelect> {
+  ctx: TContext;
+  id: string;
+  existing: TSelect;
+  next: () => Promise<TSelect>;
+}
+interface DeleteManyMiddlewareParams<TContext> {
+  ctx: TContext;
+  ids: string[];
+  next: () => Promise<{
+    deleted: number;
+  }>;
+}
+interface UpdateManyMiddlewareParams<TContext, TUpdate> {
+  ctx: TContext;
+  ids: string[];
+  data: TUpdate;
+  next: (data?: TUpdate) => Promise<{
+    updated: number;
+  }>;
+}
+interface UpsertMiddlewareParams<TContext, TSelect, TInsert> {
+  ctx: TContext;
+  input: TInsert;
+  next: (input?: TInsert) => Promise<{
+    data: TSelect;
+    isNew: boolean;
+  }>;
+}
 /**
  * 操作包装器 - 类似 tRPC middleware 的 next 模式
  *
@@ -81,6 +131,11 @@ interface ListResult<TSelect> {
  * - 条件拦截（不调用 next 直接返回/抛错）
  * - 包装事务（try/catch 包裹 next）
  *
+ * @typeParam TContext - 上下文类型
+ * @typeParam TSelect - 查询返回类型（从 selectSchema 推断）
+ * @typeParam TInsert - 创建输入类型（从 insertSchema 推断）
+ * @typeParam TUpdate - 更新输入类型（从 updateSchema 推断）
+ *
  * @example
  * // 修改输入 + 执行副作用
  * middleware: {
@@ -91,98 +146,60 @@ interface ListResult<TSelect> {
  *     return result;
  *   },
  * }
- *
- * @example
- * // 简单副作用 - 使用工具函数
- * import { afterMiddleware } from "@wordrhyme/auto-crud-server";
- *
- * middleware: {
- *   create: afterMiddleware(async (ctx, result) => {
- *     await sendEmail(result);
- *   }),
- * }
  */
-interface CrudMiddleware<TContext = unknown> {
+interface CrudMiddleware<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> {
   /**
    * 列表查询包装器
    */
-  list?: (params: {
-    ctx: TContext;
-    input: ListInput;
-    next: (input?: ListInput) => Promise<ListResult<unknown>>;
-  }) => Promise<ListResult<unknown>>;
+  list?: (params: ListMiddlewareParams<TContext, TSelect>) => Promise<ListResult<TSelect>>;
   /**
    * 单条查询包装器
    */
-  get?: (params: {
-    ctx: TContext;
-    id: string;
-    next: () => Promise<unknown | null>;
-  }) => Promise<unknown | null>;
+  get?: (params: GetMiddlewareParams<TContext, TSelect>) => Promise<TSelect | null>;
   /**
    * 创建包装器
    */
-  create?: (params: {
-    ctx: TContext;
-    input: unknown;
-    next: (input?: unknown) => Promise<unknown>;
-  }) => Promise<unknown>;
+  create?: (params: CreateMiddlewareParams<TContext, TSelect, TInsert>) => Promise<TSelect>;
   /**
    * 更新包装器
    * existing: 更新前的记录
    */
-  update?: (params: {
-    ctx: TContext;
-    id: string;
-    data: unknown;
-    existing: unknown;
-    next: (data?: unknown) => Promise<unknown>;
-  }) => Promise<unknown>;
+  update?: (params: UpdateMiddlewareParams<TContext, TSelect, TUpdate>) => Promise<TSelect>;
   /**
    * 删除包装器
    * existing: 删除前的记录
    */
-  delete?: (params: {
-    ctx: TContext;
-    id: string;
-    existing: unknown;
-    next: () => Promise<unknown>;
-  }) => Promise<unknown>;
+  delete?: (params: DeleteMiddlewareParams<TContext, TSelect>) => Promise<TSelect>;
   /**
    * 批量删除包装器
    */
-  deleteMany?: (params: {
-    ctx: TContext;
-    ids: string[];
-    next: () => Promise<{
-      deleted: number;
-    }>;
-  }) => Promise<{
+  deleteMany?: (params: DeleteManyMiddlewareParams<TContext>) => Promise<{
     deleted: number;
   }>;
   /**
    * 批量更新包装器
    */
-  updateMany?: (params: {
-    ctx: TContext;
-    ids: string[];
-    data: unknown;
-    next: (data?: unknown) => Promise<{
-      updated: number;
-    }>;
-  }) => Promise<{
+  updateMany?: (params: UpdateManyMiddlewareParams<TContext, TUpdate>) => Promise<{
     updated: number;
   }>;
+  /**
+   * Upsert 包装器
+   * isNew: 是否为新建（冲突检测后）
+   */
+  upsert?: (params: UpsertMiddlewareParams<TContext, TSelect, TInsert>) => Promise<{
+    data: TSelect;
+    isNew: boolean;
+  }>;
 }
-interface CrudRouterConfigBase<TContext = unknown> {
+interface CrudRouterConfigBase<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> {
   /** Drizzle 表定义 */
   table: PgTable;
   /** 查询返回 Schema */
-  selectSchema?: z.ZodType;
+  selectSchema?: z.ZodType<TSelect>;
   /** 创建输入 Schema */
-  insertSchema: z.ZodType;
+  insertSchema: z.ZodType<TInsert>;
   /** 更新输入 Schema */
-  updateSchema: z.ZodType;
+  updateSchema: z.ZodType<TUpdate>;
   /** ID 字段名，默认 "id" */
   idField?: string;
   /** 可过滤的列白名单 */
@@ -237,9 +254,9 @@ interface CrudRouterConfigBase<TContext = unknown> {
    *   }),
    * }
    */
-  middleware?: CrudMiddleware<TContext>;
+  middleware?: CrudMiddleware<TContext, TSelect, TInsert, TUpdate>;
 }
-interface DeclarativeConfig<TContext = unknown> extends CrudRouterConfigBase<TContext> {
+interface DeclarativeConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> extends CrudRouterConfigBase<TContext, TSelect, TInsert, TUpdate> {
   mode?: "declarative";
   /**
    * 基础 procedure（认证）
@@ -277,9 +294,9 @@ interface DeclarativeConfig<TContext = unknown> extends CrudRouterConfigBase<TCo
    * @example
    * authorize: (ctx, resource, op) => resource.ownerId === ctx.user.id
    */
-  authorize?: (ctx: TContext, resource: Record<string, unknown>, operation: CrudOperation) => boolean | Promise<boolean>;
+  authorize?: (ctx: TContext, resource: TSelect, operation: CrudOperation) => boolean | Promise<boolean>;
 }
-interface FactoryConfig<TContext = unknown> extends CrudRouterConfigBase<TContext> {
+interface FactoryConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> extends CrudRouterConfigBase<TContext, TSelect, TInsert, TUpdate> {
   mode: "factory";
   /**
    * Procedure 工厂函数
@@ -298,7 +315,7 @@ interface FactoryConfig<TContext = unknown> extends CrudRouterConfigBase<TContex
    */
   inject?: (ctx: TContext, operation: WriteOperation) => Record<string, unknown>;
 }
-interface ProceduresConfig<TContext = unknown> extends CrudRouterConfigBase<TContext> {
+interface ProceduresConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> extends CrudRouterConfigBase<TContext, TSelect, TInsert, TUpdate> {
   mode: "procedures";
   /**
    * 按操作指定不同的 procedure
@@ -322,49 +339,36 @@ interface ProceduresConfig<TContext = unknown> extends CrudRouterConfigBase<TCon
    */
   inject?: (ctx: TContext, operation: WriteOperation) => Record<string, unknown>;
 }
-type CrudRouterConfig<TContext = unknown> = DeclarativeConfig<TContext> | FactoryConfig<TContext> | ProceduresConfig<TContext>;
+type CrudRouterConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> = DeclarativeConfig<TContext, TSelect, TInsert, TUpdate> | FactoryConfig<TContext, TSelect, TInsert, TUpdate> | ProceduresConfig<TContext, TSelect, TInsert, TUpdate>;
+interface CrudProcedures<TSelect, TInsert, TUpdate> {
+  list: AnyProcedure;
+  get: AnyProcedure;
+  create: AnyProcedure;
+  update: AnyProcedure;
+  delete: AnyProcedure;
+  deleteMany: AnyProcedure;
+  updateMany: AnyProcedure;
+  upsert: AnyProcedure;
+}
 //#endregion
 //#region src/routers/_factory.d.ts
-declare function createCrudRouter<TContext = unknown>(config: CrudRouterConfig<TContext>): node_modules__trpc_server_dist_unstable_core_do_not_import_d_CjQPvBRI_mjs0.Router<{
-  ctx: Context;
-  meta: object;
-  errorShape: _trpc_server5.TRPCDefaultErrorShape;
-  transformer: true;
-}, _trpc_server5.TRPCDecorateCreateRouterOptions<{
-  list: any;
-  getById: any;
-  create: any;
-  update: any;
-  delete: any;
-  deleteMany: any;
-  updateMany: any;
-}>> & _trpc_server5.TRPCDecorateCreateRouterOptions<{
-  list: any;
-  getById: any;
-  create: any;
-  update: any;
-  delete: any;
-  deleteMany: any;
-  updateMany: any;
-}> & {
-  procedures: {
-    list: any;
-    getById: any;
-    create: any;
-    update: any;
-    delete: any;
-    deleteMany: any;
-    updateMany: any;
-  };
+/**
+ * 创建 CRUD Router
+ *
+ * @typeParam TContext - 上下文类型（包含 db）
+ * @typeParam TSelect - 查询返回类型（从 selectSchema 或 insertSchema 推断）
+ * @typeParam TInsert - 创建输入类型（从 insertSchema 推断）
+ * @typeParam TUpdate - 更新输入类型（从 updateSchema 推断）
+ */
+declare function createCrudRouter<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown>(config: CrudRouterConfig<TContext, TSelect, TInsert, TUpdate>): ReturnType<typeof router> & {
+  procedures: CrudProcedures<TSelect, TInsert, TUpdate>;
 };
 //#endregion
 //#region src/lib/middleware-helpers.d.ts
-type NextFn<TInput, TResult> = (input?: TInput) => Promise<TResult>;
-interface MiddlewareParams<TContext, TInput, TResult> {
-  ctx: TContext;
-  input?: TInput;
-  next: NextFn<TInput, TResult>;
-}
+/**
+ * Middleware 便捷工具函数
+ * 简化常见场景的 middleware 创建
+ */
 /**
  * 创建 after-only 的 middleware（最常见场景）
  * 在操作完成后执行副作用，不修改返回值
@@ -377,29 +381,10 @@ interface MiddlewareParams<TContext, TInput, TResult> {
  *   }),
  * }
  */
-declare function afterMiddleware<TContext, TResult>(fn: (ctx: TContext, result: TResult) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TResult>;
-}) => Promise<TResult>;
-/**
- * 创建 after-only 的 middleware，可修改返回值
- *
- * @example
- * middleware: {
- *   get: afterMiddlewareTransform(async (ctx, result) => {
- *     return { ...result, computed: calculateSomething(result) };
- *   }),
- * }
- */
-declare function afterMiddlewareTransform<TContext, TResult>(fn: (ctx: TContext, result: TResult) => TResult | Promise<TResult>): ({
-  ctx,
-  next
-}: {
+declare function afterMiddleware<TContext, TResult>(fn: (ctx: TContext, result: TResult) => void | Promise<void>): (params: {
   ctx: TContext;
   next: () => Promise<TResult>;
+  [key: string]: any;
 }) => Promise<TResult>;
 /**
  * 创建 before-only 的 middleware
@@ -412,11 +397,17 @@ declare function afterMiddlewareTransform<TContext, TResult>(fn: (ctx: TContext,
  *   }),
  * }
  */
-declare function beforeMiddleware<TContext, TInput>(fn: (ctx: TContext, input: TInput) => TInput | Promise<TInput>): <TResult>({
-  ctx,
-  input,
-  next
-}: MiddlewareParams<TContext, TInput, TResult>) => Promise<TResult>;
+declare function beforeMiddleware<TContext, TInput>(fn: (ctx: TContext, input: TInput) => TInput | Promise<TInput>): <TResult>(params: {
+  ctx: TContext;
+  input: TInput;
+  next: (input?: TInput) => Promise<TResult>;
+  [key: string]: any;
+}) => Promise<TResult>;
+type AnyMiddlewareParams<TContext> = {
+  ctx: TContext;
+  next: (...args: any[]) => Promise<any>;
+  [key: string]: any;
+};
 /**
  * 组合多个 middleware 为一个
  *
@@ -428,71 +419,15 @@ declare function beforeMiddleware<TContext, TInput>(fn: (ctx: TContext, input: T
  *   ),
  * }
  */
-declare function composeMiddleware<TContext, TInput, TResult>(...middlewares: Array<(params: MiddlewareParams<TContext, TInput, TResult>) => Promise<TResult>>): (params: MiddlewareParams<TContext, TInput, TResult>) => Promise<TResult>;
-/**
- * 创建 list 操作的 after middleware
- */
-declare function afterList<TContext, TSelect>(fn: (ctx: TContext, result: ListResult<TSelect>) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<ListResult<TSelect>>;
-}) => Promise<ListResult<TSelect>>;
-/**
- * 创建 list 操作的 before middleware
- */
-declare function beforeList<TContext>(fn: (ctx: TContext, input: ListInput) => ListInput | Promise<ListInput>): <TResult>({
-  ctx,
-  input,
-  next
-}: MiddlewareParams<TContext, ListInput, TResult>) => Promise<TResult>;
-/**
- * 创建 create 操作的 after middleware
- */
-declare function afterCreate<TContext, TSelect>(fn: (ctx: TContext, created: TSelect) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TSelect>;
-}) => Promise<TSelect>;
-/**
- * 创建 create 操作的 before middleware
- */
-declare function beforeCreate<TContext, TInsert>(fn: (ctx: TContext, input: TInsert) => TInsert | Promise<TInsert>): <TResult>({
-  ctx,
-  input,
-  next
-}: MiddlewareParams<TContext, TInsert, TResult>) => Promise<TResult>;
-/**
- * 创建 update 操作的 after middleware
- */
-declare function afterUpdate<TContext, TSelect>(fn: (ctx: TContext, updated: TSelect) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TSelect>;
-}) => Promise<TSelect>;
-/**
- * 创建 delete 操作的 after middleware
- */
-declare function afterDelete<TContext, TSelect>(fn: (ctx: TContext, deleted: TSelect) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TSelect>;
-}) => Promise<TSelect>;
+declare function composeMiddleware<TContext, TResult>(...middlewares: Array<(params: AnyMiddlewareParams<TContext>) => Promise<any>>): (params: AnyMiddlewareParams<TContext>) => Promise<TResult>;
 //#endregion
 //#region src/routers/index.d.ts
-declare const appRouter: _trpc_server5.TRPCBuiltRouter<{
+declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server5.TRPCDefaultErrorShape;
+  errorShape: _trpc_server2.TRPCDefaultErrorShape;
   transformer: true;
-}, _trpc_server5.TRPCDecorateCreateRouterOptions<{}>>;
+}, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
-export { type AnyProcedure, type AppRouter, type CrudMiddleware, type CrudOperation, type CrudRouterConfig, type DeclarativeConfig, type FactoryConfig, type ListInput, type ListResult, type ProceduresConfig, type SoftDeleteConfig, type SoftDeleteOption, type WriteOperation, afterCreate, afterDelete, afterList, afterMiddleware, afterMiddlewareTransform, afterUpdate, appRouter, beforeCreate, beforeList, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { type AnyProcedure, type AppRouter, type CreateMiddlewareParams, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type CrudRouterConfigBase, type DeclarativeConfig, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type FactoryConfig, type GetMiddlewareParams, type ListInput, type ListMiddlewareParams, type ListResult, type ProceduresConfig, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import { z } from "zod";
 import { SQL } from "drizzle-orm";
-import * as _trpc_server5 from "@trpc/server";
+import * as _trpc_server2 from "@trpc/server";
 import superjson from "superjson";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
-import * as node_modules__trpc_server_dist_unstable_core_do_not_import_d_CjQPvBRI_mjs0 from "node_modules/@trpc/server/dist/unstable-core-do-not-import.d-CjQPvBRI.mjs";
 import { PgTable } from "drizzle-orm/pg-core";
 
 //#region src/trpc.d.ts
@@ -14,16 +13,16 @@ import { PgTable } from "drizzle-orm/pg-core";
 interface Context {
   db: PostgresJsDatabase<Record<string, never>>;
 }
-declare const router: _trpc_server5.TRPCRouterBuilder<{
+declare const router: _trpc_server2.TRPCRouterBuilder<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server5.TRPCDefaultErrorShape;
+  errorShape: _trpc_server2.TRPCDefaultErrorShape;
   transformer: true;
 }>;
-declare const publicProcedure: _trpc_server5.TRPCProcedureBuilder<Context, object, object, _trpc_server5.TRPCUnsetMarker, _trpc_server5.TRPCUnsetMarker, _trpc_server5.TRPCUnsetMarker, _trpc_server5.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";
+type CrudOperation = "list" | "get" | "create" | "update" | "delete" | "deleteMany" | "updateMany" | "upsert";
 type WriteOperation = "create" | "update";
 type AnyProcedure = any;
 interface SoftDeleteConfig {
@@ -72,6 +71,57 @@ interface ListResult<TSelect> {
   perPage: number;
   pageCount: number;
 }
+interface ListMiddlewareParams<TContext, TSelect> {
+  ctx: TContext;
+  input: ListInput;
+  next: (input?: ListInput) => Promise<ListResult<TSelect>>;
+}
+interface GetMiddlewareParams<TContext, TSelect> {
+  ctx: TContext;
+  id: string;
+  next: () => Promise<TSelect | null>;
+}
+interface CreateMiddlewareParams<TContext, TSelect, TInsert> {
+  ctx: TContext;
+  input: TInsert;
+  next: (input?: TInsert) => Promise<TSelect>;
+}
+interface UpdateMiddlewareParams<TContext, TSelect, TUpdate> {
+  ctx: TContext;
+  id: string;
+  data: TUpdate;
+  existing: TSelect;
+  next: (data?: TUpdate) => Promise<TSelect>;
+}
+interface DeleteMiddlewareParams<TContext, TSelect> {
+  ctx: TContext;
+  id: string;
+  existing: TSelect;
+  next: () => Promise<TSelect>;
+}
+interface DeleteManyMiddlewareParams<TContext> {
+  ctx: TContext;
+  ids: string[];
+  next: () => Promise<{
+    deleted: number;
+  }>;
+}
+interface UpdateManyMiddlewareParams<TContext, TUpdate> {
+  ctx: TContext;
+  ids: string[];
+  data: TUpdate;
+  next: (data?: TUpdate) => Promise<{
+    updated: number;
+  }>;
+}
+interface UpsertMiddlewareParams<TContext, TSelect, TInsert> {
+  ctx: TContext;
+  input: TInsert;
+  next: (input?: TInsert) => Promise<{
+    data: TSelect;
+    isNew: boolean;
+  }>;
+}
 /**
  * 操作包装器 - 类似 tRPC middleware 的 next 模式
  *
@@ -82,6 +132,11 @@ interface ListResult<TSelect> {
  * - 条件拦截（不调用 next 直接返回/抛错）
  * - 包装事务（try/catch 包裹 next）
  *
+ * @typeParam TContext - 上下文类型
+ * @typeParam TSelect - 查询返回类型（从 selectSchema 推断）
+ * @typeParam TInsert - 创建输入类型（从 insertSchema 推断）
+ * @typeParam TUpdate - 更新输入类型（从 updateSchema 推断）
+ *
  * @example
  * // 修改输入 + 执行副作用
  * middleware: {
@@ -92,98 +147,60 @@ interface ListResult<TSelect> {
  *     return result;
  *   },
  * }
- *
- * @example
- * // 简单副作用 - 使用工具函数
- * import { afterMiddleware } from "@wordrhyme/auto-crud-server";
- *
- * middleware: {
- *   create: afterMiddleware(async (ctx, result) => {
- *     await sendEmail(result);
- *   }),
- * }
  */
-interface CrudMiddleware<TContext = unknown> {
+interface CrudMiddleware<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> {
   /**
    * 列表查询包装器
    */
-  list?: (params: {
-    ctx: TContext;
-    input: ListInput;
-    next: (input?: ListInput) => Promise<ListResult<unknown>>;
-  }) => Promise<ListResult<unknown>>;
+  list?: (params: ListMiddlewareParams<TContext, TSelect>) => Promise<ListResult<TSelect>>;
   /**
    * 单条查询包装器
    */
-  get?: (params: {
-    ctx: TContext;
-    id: string;
-    next: () => Promise<unknown | null>;
-  }) => Promise<unknown | null>;
+  get?: (params: GetMiddlewareParams<TContext, TSelect>) => Promise<TSelect | null>;
   /**
    * 创建包装器
    */
-  create?: (params: {
-    ctx: TContext;
-    input: unknown;
-    next: (input?: unknown) => Promise<unknown>;
-  }) => Promise<unknown>;
+  create?: (params: CreateMiddlewareParams<TContext, TSelect, TInsert>) => Promise<TSelect>;
   /**
    * 更新包装器
    * existing: 更新前的记录
    */
-  update?: (params: {
-    ctx: TContext;
-    id: string;
-    data: unknown;
-    existing: unknown;
-    next: (data?: unknown) => Promise<unknown>;
-  }) => Promise<unknown>;
+  update?: (params: UpdateMiddlewareParams<TContext, TSelect, TUpdate>) => Promise<TSelect>;
   /**
    * 删除包装器
    * existing: 删除前的记录
    */
-  delete?: (params: {
-    ctx: TContext;
-    id: string;
-    existing: unknown;
-    next: () => Promise<unknown>;
-  }) => Promise<unknown>;
+  delete?: (params: DeleteMiddlewareParams<TContext, TSelect>) => Promise<TSelect>;
   /**
    * 批量删除包装器
    */
-  deleteMany?: (params: {
-    ctx: TContext;
-    ids: string[];
-    next: () => Promise<{
-      deleted: number;
-    }>;
-  }) => Promise<{
+  deleteMany?: (params: DeleteManyMiddlewareParams<TContext>) => Promise<{
     deleted: number;
   }>;
   /**
    * 批量更新包装器
    */
-  updateMany?: (params: {
-    ctx: TContext;
-    ids: string[];
-    data: unknown;
-    next: (data?: unknown) => Promise<{
-      updated: number;
-    }>;
-  }) => Promise<{
+  updateMany?: (params: UpdateManyMiddlewareParams<TContext, TUpdate>) => Promise<{
     updated: number;
   }>;
+  /**
+   * Upsert 包装器
+   * isNew: 是否为新建（冲突检测后）
+   */
+  upsert?: (params: UpsertMiddlewareParams<TContext, TSelect, TInsert>) => Promise<{
+    data: TSelect;
+    isNew: boolean;
+  }>;
 }
-interface CrudRouterConfigBase<TContext = unknown> {
+interface CrudRouterConfigBase<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> {
   /** Drizzle 表定义 */
   table: PgTable;
   /** 查询返回 Schema */
-  selectSchema?: z.ZodType;
+  selectSchema?: z.ZodType<TSelect>;
   /** 创建输入 Schema */
-  insertSchema: z.ZodType;
+  insertSchema: z.ZodType<TInsert>;
   /** 更新输入 Schema */
-  updateSchema: z.ZodType;
+  updateSchema: z.ZodType<TUpdate>;
   /** ID 字段名，默认 "id" */
   idField?: string;
   /** 可过滤的列白名单 */
@@ -238,9 +255,9 @@ interface CrudRouterConfigBase<TContext = unknown> {
    *   }),
    * }
    */
-  middleware?: CrudMiddleware<TContext>;
+  middleware?: CrudMiddleware<TContext, TSelect, TInsert, TUpdate>;
 }
-interface DeclarativeConfig<TContext = unknown> extends CrudRouterConfigBase<TContext> {
+interface DeclarativeConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> extends CrudRouterConfigBase<TContext, TSelect, TInsert, TUpdate> {
   mode?: "declarative";
   /**
    * 基础 procedure（认证）
@@ -278,9 +295,9 @@ interface DeclarativeConfig<TContext = unknown> extends CrudRouterConfigBase<TCo
    * @example
    * authorize: (ctx, resource, op) => resource.ownerId === ctx.user.id
    */
-  authorize?: (ctx: TContext, resource: Record<string, unknown>, operation: CrudOperation) => boolean | Promise<boolean>;
+  authorize?: (ctx: TContext, resource: TSelect, operation: CrudOperation) => boolean | Promise<boolean>;
 }
-interface FactoryConfig<TContext = unknown> extends CrudRouterConfigBase<TContext> {
+interface FactoryConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> extends CrudRouterConfigBase<TContext, TSelect, TInsert, TUpdate> {
   mode: "factory";
   /**
    * Procedure 工厂函数
@@ -299,7 +316,7 @@ interface FactoryConfig<TContext = unknown> extends CrudRouterConfigBase<TContex
    */
   inject?: (ctx: TContext, operation: WriteOperation) => Record<string, unknown>;
 }
-interface ProceduresConfig<TContext = unknown> extends CrudRouterConfigBase<TContext> {
+interface ProceduresConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> extends CrudRouterConfigBase<TContext, TSelect, TInsert, TUpdate> {
   mode: "procedures";
   /**
    * 按操作指定不同的 procedure
@@ -323,49 +340,36 @@ interface ProceduresConfig<TContext = unknown> extends CrudRouterConfigBase<TCon
    */
   inject?: (ctx: TContext, operation: WriteOperation) => Record<string, unknown>;
 }
-type CrudRouterConfig<TContext = unknown> = DeclarativeConfig<TContext> | FactoryConfig<TContext> | ProceduresConfig<TContext>;
+type CrudRouterConfig<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown> = DeclarativeConfig<TContext, TSelect, TInsert, TUpdate> | FactoryConfig<TContext, TSelect, TInsert, TUpdate> | ProceduresConfig<TContext, TSelect, TInsert, TUpdate>;
+interface CrudProcedures<TSelect, TInsert, TUpdate> {
+  list: AnyProcedure;
+  get: AnyProcedure;
+  create: AnyProcedure;
+  update: AnyProcedure;
+  delete: AnyProcedure;
+  deleteMany: AnyProcedure;
+  updateMany: AnyProcedure;
+  upsert: AnyProcedure;
+}
 //#endregion
 //#region src/routers/_factory.d.ts
-declare function createCrudRouter<TContext = unknown>(config: CrudRouterConfig<TContext>): node_modules__trpc_server_dist_unstable_core_do_not_import_d_CjQPvBRI_mjs0.Router<{
-  ctx: Context;
-  meta: object;
-  errorShape: _trpc_server5.TRPCDefaultErrorShape;
-  transformer: true;
-}, _trpc_server5.TRPCDecorateCreateRouterOptions<{
-  list: any;
-  getById: any;
-  create: any;
-  update: any;
-  delete: any;
-  deleteMany: any;
-  updateMany: any;
-}>> & _trpc_server5.TRPCDecorateCreateRouterOptions<{
-  list: any;
-  getById: any;
-  create: any;
-  update: any;
-  delete: any;
-  deleteMany: any;
-  updateMany: any;
-}> & {
-  procedures: {
-    list: any;
-    getById: any;
-    create: any;
-    update: any;
-    delete: any;
-    deleteMany: any;
-    updateMany: any;
-  };
+/**
+ * 创建 CRUD Router
+ *
+ * @typeParam TContext - 上下文类型（包含 db）
+ * @typeParam TSelect - 查询返回类型（从 selectSchema 或 insertSchema 推断）
+ * @typeParam TInsert - 创建输入类型（从 insertSchema 推断）
+ * @typeParam TUpdate - 更新输入类型（从 updateSchema 推断）
+ */
+declare function createCrudRouter<TContext = unknown, TSelect = unknown, TInsert = unknown, TUpdate = unknown>(config: CrudRouterConfig<TContext, TSelect, TInsert, TUpdate>): ReturnType<typeof router> & {
+  procedures: CrudProcedures<TSelect, TInsert, TUpdate>;
 };
 //#endregion
 //#region src/lib/middleware-helpers.d.ts
-type NextFn<TInput, TResult> = (input?: TInput) => Promise<TResult>;
-interface MiddlewareParams<TContext, TInput, TResult> {
-  ctx: TContext;
-  input?: TInput;
-  next: NextFn<TInput, TResult>;
-}
+/**
+ * Middleware 便捷工具函数
+ * 简化常见场景的 middleware 创建
+ */
 /**
  * 创建 after-only 的 middleware（最常见场景）
  * 在操作完成后执行副作用，不修改返回值
@@ -378,29 +382,10 @@ interface MiddlewareParams<TContext, TInput, TResult> {
  *   }),
  * }
  */
-declare function afterMiddleware<TContext, TResult>(fn: (ctx: TContext, result: TResult) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TResult>;
-}) => Promise<TResult>;
-/**
- * 创建 after-only 的 middleware，可修改返回值
- *
- * @example
- * middleware: {
- *   get: afterMiddlewareTransform(async (ctx, result) => {
- *     return { ...result, computed: calculateSomething(result) };
- *   }),
- * }
- */
-declare function afterMiddlewareTransform<TContext, TResult>(fn: (ctx: TContext, result: TResult) => TResult | Promise<TResult>): ({
-  ctx,
-  next
-}: {
+declare function afterMiddleware<TContext, TResult>(fn: (ctx: TContext, result: TResult) => void | Promise<void>): (params: {
   ctx: TContext;
   next: () => Promise<TResult>;
+  [key: string]: any;
 }) => Promise<TResult>;
 /**
  * 创建 before-only 的 middleware
@@ -413,11 +398,17 @@ declare function afterMiddlewareTransform<TContext, TResult>(fn: (ctx: TContext,
  *   }),
  * }
  */
-declare function beforeMiddleware<TContext, TInput>(fn: (ctx: TContext, input: TInput) => TInput | Promise<TInput>): <TResult>({
-  ctx,
-  input,
-  next
-}: MiddlewareParams<TContext, TInput, TResult>) => Promise<TResult>;
+declare function beforeMiddleware<TContext, TInput>(fn: (ctx: TContext, input: TInput) => TInput | Promise<TInput>): <TResult>(params: {
+  ctx: TContext;
+  input: TInput;
+  next: (input?: TInput) => Promise<TResult>;
+  [key: string]: any;
+}) => Promise<TResult>;
+type AnyMiddlewareParams<TContext> = {
+  ctx: TContext;
+  next: (...args: any[]) => Promise<any>;
+  [key: string]: any;
+};
 /**
  * 组合多个 middleware 为一个
  *
@@ -429,71 +420,15 @@ declare function beforeMiddleware<TContext, TInput>(fn: (ctx: TContext, input: T
  *   ),
  * }
  */
-declare function composeMiddleware<TContext, TInput, TResult>(...middlewares: Array<(params: MiddlewareParams<TContext, TInput, TResult>) => Promise<TResult>>): (params: MiddlewareParams<TContext, TInput, TResult>) => Promise<TResult>;
-/**
- * 创建 list 操作的 after middleware
- */
-declare function afterList<TContext, TSelect>(fn: (ctx: TContext, result: ListResult<TSelect>) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<ListResult<TSelect>>;
-}) => Promise<ListResult<TSelect>>;
-/**
- * 创建 list 操作的 before middleware
- */
-declare function beforeList<TContext>(fn: (ctx: TContext, input: ListInput) => ListInput | Promise<ListInput>): <TResult>({
-  ctx,
-  input,
-  next
-}: MiddlewareParams<TContext, ListInput, TResult>) => Promise<TResult>;
-/**
- * 创建 create 操作的 after middleware
- */
-declare function afterCreate<TContext, TSelect>(fn: (ctx: TContext, created: TSelect) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TSelect>;
-}) => Promise<TSelect>;
-/**
- * 创建 create 操作的 before middleware
- */
-declare function beforeCreate<TContext, TInsert>(fn: (ctx: TContext, input: TInsert) => TInsert | Promise<TInsert>): <TResult>({
-  ctx,
-  input,
-  next
-}: MiddlewareParams<TContext, TInsert, TResult>) => Promise<TResult>;
-/**
- * 创建 update 操作的 after middleware
- */
-declare function afterUpdate<TContext, TSelect>(fn: (ctx: TContext, updated: TSelect) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TSelect>;
-}) => Promise<TSelect>;
-/**
- * 创建 delete 操作的 after middleware
- */
-declare function afterDelete<TContext, TSelect>(fn: (ctx: TContext, deleted: TSelect) => void | Promise<void>): ({
-  ctx,
-  next
-}: {
-  ctx: TContext;
-  next: () => Promise<TSelect>;
-}) => Promise<TSelect>;
+declare function composeMiddleware<TContext, TResult>(...middlewares: Array<(params: AnyMiddlewareParams<TContext>) => Promise<any>>): (params: AnyMiddlewareParams<TContext>) => Promise<TResult>;
 //#endregion
 //#region src/routers/index.d.ts
-declare const appRouter: _trpc_server5.TRPCBuiltRouter<{
+declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server5.TRPCDefaultErrorShape;
+  errorShape: _trpc_server2.TRPCDefaultErrorShape;
   transformer: true;
-}, _trpc_server5.TRPCDecorateCreateRouterOptions<{}>>;
+}, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
-export { type AnyProcedure, type AppRouter, type CrudMiddleware, type CrudOperation, type CrudRouterConfig, type DeclarativeConfig, type FactoryConfig, type ListInput, type ListResult, type ProceduresConfig, type SoftDeleteConfig, type SoftDeleteOption, type WriteOperation, afterCreate, afterDelete, afterList, afterMiddleware, afterMiddlewareTransform, afterUpdate, appRouter, beforeCreate, beforeList, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { type AnyProcedure, type AppRouter, type CreateMiddlewareParams, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type CrudRouterConfigBase, type DeclarativeConfig, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type FactoryConfig, type GetMiddlewareParams, type ListInput, type ListMiddlewareParams, type ListResult, type ProceduresConfig, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/dist/index.js

@@ -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);
@@ -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`);
 		}
 	};
@@ -515,7 +529,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));
@@ -630,6 +644,37 @@ 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 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
+				};
+			};
+			if (m.upsert) return m.upsert({
+				ctx,
+				input,
+				next: async (modifiedInput) => doUpsert(modifiedInput ?? input)
+			});
+			return doUpsert(input);
 		})
 	};
 	const crudRouter = router(procedures);
@@ -639,6 +684,10 @@ function createCrudRouter(config) {
 //#endregion
 //#region src/lib/middleware-helpers.ts
 /**
+* Middleware 便捷工具函数
+* 简化常见场景的 middleware 创建
+*/
+/**
 * 创建 after-only 的 middleware（最常见场景）
 * 在操作完成后执行副作用，不修改返回值
 *
@@ -651,28 +700,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 +718,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 +737,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.1",
   "description": "tRPC server utilities for auto-crud - automatic CRUD routers for Drizzle ORM",
   "author": "wordrhyme",
   "license": "MIT",
@@ -49,8 +49,8 @@
     "@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/tsdown-config": "0.1.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {