@wordrhyme/auto-crud-server 0.2.0 → 0.3.0

package/dist/index.js

@@ -373,9 +373,58 @@ const dataTableConfig = {
 
 //#endregion
 //#region src/routers/_factory.ts
-/**
-* 过滤器项 Schema
-*/
+function resolveSoftDelete(option) {
+	if (!option) return null;
+	if (option === true) return {
+		column: "deletedAt",
+		getValue: () => /* @__PURE__ */ new Date()
+	};
+	if (typeof option === "string") return {
+		column: option,
+		getValue: () => /* @__PURE__ */ new Date()
+	};
+	const config = option;
+	return {
+		column: config.column,
+		getValue: config.value ?? (() => /* @__PURE__ */ new Date())
+	};
+}
+function resolveConfig(config) {
+	const mode = config.mode || "declarative";
+	if (mode === "factory") {
+		const factoryConfig = config;
+		return {
+			procedureFactory: factoryConfig.procedureFactory,
+			guard: void 0,
+			getScope: () => void 0,
+			getInject: (ctx, op) => factoryConfig.inject?.(ctx, op) ?? {},
+			checkAuthorize: async () => true
+		};
+	}
+	if (mode === "procedures") {
+		const proceduresConfig = config;
+		const defaultProc = proceduresConfig.defaultProcedure ?? publicProcedure;
+		return {
+			procedureFactory: (op) => proceduresConfig.procedures[op] ?? defaultProc,
+			guard: void 0,
+			getScope: () => void 0,
+			getInject: (ctx, op) => proceduresConfig.inject?.(ctx, op) ?? {},
+			checkAuthorize: async () => true
+		};
+	}
+	const declarativeConfig = config;
+	const baseProcedure = declarativeConfig.procedure ?? publicProcedure;
+	return {
+		procedureFactory: () => baseProcedure,
+		guard: declarativeConfig.guard,
+		getScope: (ctx, tbl, op) => declarativeConfig.scope?.(ctx, tbl, op),
+		getInject: (ctx, op) => declarativeConfig.inject?.(ctx, op) ?? {},
+		checkAuthorize: async (ctx, resource, op) => {
+			if (declarativeConfig.authorize) return declarativeConfig.authorize(ctx, resource, op);
+			return true;
+		}
+	};
+}
 const filterItemSchema = z.object({
 	id: z.string(),
 	value: z.union([z.string(), z.array(z.string())]),
@@ -383,9 +432,6 @@ const filterItemSchema = z.object({
 	operator: z.enum(dataTableConfig.operators),
 	filterId: z.string()
 });
-/**
-* 列表查询输入 Schema
-*/
 const listInputSchema = z.object({
 	page: z.number().min(1).default(1),
 	perPage: z.number().min(1).max(100).default(10),
@@ -396,42 +442,53 @@ const listInputSchema = z.object({
 	filters: z.array(filterItemSchema).optional(),
 	joinOperator: z.enum(["and", "or"]).default("and")
 });
-/**
-* 验证列是否在白名单中
-*/
-function validateColumn(columnId, allowedColumns, columnType) {
+function validateColumn(columnId, allowedColumns) {
 	if (!allowedColumns || allowedColumns.length === 0) return true;
 	return allowedColumns.includes(columnId);
 }
-/**
-* 创建通用 CRUD Router
-*/
 function createCrudRouter(config) {
-	const { table, insertSchema, updateSchema, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, procedure: baseProcedure = publicProcedure, authorize } = config;
+	const { table, insertSchema, updateSchema, idField = "id", filterableColumns, sortableColumns, maxBatchSize = 100, softDelete: softDeleteOption } = config;
+	const resolved = resolveConfig(config);
+	const softDelete = resolveSoftDelete(softDeleteOption);
 	const getIdColumn = () => table[idField];
-	const withAuthorize = async (operation, input) => {
-		if (authorize) {
-			if (!await authorize({
-				operation,
-				input
-			})) throw new Error(`Unauthorized: ${operation} operation not allowed`);
+	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
+	const buildWhere = (ctx, operation, additionalCondition) => {
+		const conditions = [];
+		const scopeCondition = resolved.getScope(ctx, table, operation);
+		if (scopeCondition) conditions.push(scopeCondition);
+		if (softDelete && (operation === "list" || operation === "get")) {
+			const col = getSoftDeleteColumn();
+			if (col) conditions.push(isNull(col));
 		}
+		if (additionalCondition) conditions.push(additionalCondition);
+		if (conditions.length === 0) return void 0;
+		if (conditions.length === 1) return conditions[0];
+		return and(...conditions);
+	};
+	const withGuard = async (ctx, operation) => {
+		if (resolved.guard) {
+			if (!await resolved.guard(ctx, operation)) throw new Error(`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`);
 	};
-	return router({
-		list: baseProcedure.input(listInputSchema).query(async ({ ctx, input }) => {
-			await withAuthorize("list", input);
+	const procedures = {
+		list: resolved.procedureFactory("list").input(listInputSchema).query(async ({ ctx, input }) => {
+			await withGuard(ctx, "list");
 			const offset = (input.page - 1) * input.perPage;
-			const validatedFilters = input.filters?.filter((filter) => validateColumn(filter.id, filterableColumns, "filter"));
-			const where = validatedFilters?.length ? filterColumns({
+			const validatedFilters = input.filters?.filter((filter) => validateColumn(filter.id, filterableColumns));
+			const where = buildWhere(ctx, "list", validatedFilters?.length ? filterColumns({
 				table,
 				filters: validatedFilters,
 				joinOperator: input.joinOperator
-			}) : void 0;
+			}) : void 0);
 			let query = ctx.db.select().from(table).$dynamic();
 			if (where) query = query.where(where);
 			if (input.sort?.length) {
 				const sortField = input.sort[0];
-				if (sortField && validateColumn(sortField.id, sortableColumns, "sort")) {
+				if (sortField && validateColumn(sortField.id, sortableColumns)) {
 					const column = table[sortField.id];
 					if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
 				}
@@ -448,46 +505,75 @@ function createCrudRouter(config) {
 				pageCount: Math.ceil(count / input.perPage)
 			};
 		}),
-		getById: baseProcedure.input(z.string()).query(async ({ ctx, input }) => {
-			await withAuthorize("get", input);
-			const column = getIdColumn();
-			const [item] = await ctx.db.select().from(table).where(eq(column, input));
+		getById: resolved.procedureFactory("get").input(z.string()).query(async ({ ctx, input }) => {
+			await withGuard(ctx, "get");
+			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;
 		}),
-		create: baseProcedure.input(insertSchema).mutation(async ({ ctx, input }) => {
-			await withAuthorize("create", input);
-			const [created] = await ctx.db.insert(table).values(input).returning();
+		create: resolved.procedureFactory("create").input(insertSchema).mutation(async ({ ctx, input }) => {
+			await withGuard(ctx, "create");
+			const injectData = resolved.getInject(ctx, "create");
+			const data = {
+				...input,
+				...injectData
+			};
+			const [created] = await ctx.db.insert(table).values(data).returning();
 			return created;
 		}),
-		update: baseProcedure.input(z.object({
+		update: resolved.procedureFactory("update").input(z.object({
 			id: z.string(),
 			data: updateSchema
 		})).mutation(async ({ ctx, input }) => {
-			await withAuthorize("update", input);
-			const column = getIdColumn();
-			const [updated] = await ctx.db.update(table).set(input.data).where(eq(column, input.id)).returning();
+			await withGuard(ctx, "update");
+			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");
+			const injectData = resolved.getInject(ctx, "update");
+			const data = {
+				...input.data,
+				...injectData
+			};
+			const [updated] = await ctx.db.update(table).set(data).where(where).returning();
 			return updated;
 		}),
-		delete: baseProcedure.input(z.string()).mutation(async ({ ctx, input }) => {
-			await withAuthorize("delete", input);
-			const column = getIdColumn();
-			const [deleted] = await ctx.db.delete(table).where(eq(column, input)).returning();
+		delete: resolved.procedureFactory("delete").input(z.string()).mutation(async ({ ctx, input }) => {
+			await withGuard(ctx, "delete");
+			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 (softDelete) {
+				const [deleted$1] = await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning();
+				return deleted$1;
+			}
+			const [deleted] = await ctx.db.delete(table).where(where).returning();
 			return deleted;
 		}),
-		deleteMany: baseProcedure.input(z.array(z.string()).max(maxBatchSize, `Maximum ${maxBatchSize} items allowed`)).mutation(async ({ ctx, input }) => {
-			await withAuthorize("deleteMany", input);
-			const column = getIdColumn();
-			return { deleted: (await ctx.db.delete(table).where(inArray(column, input)).returning()).length };
+		deleteMany: resolved.procedureFactory("deleteMany").input(z.array(z.string()).max(maxBatchSize)).mutation(async ({ ctx, input }) => {
+			await withGuard(ctx, "deleteMany");
+			const where = buildWhere(ctx, "deleteMany", inArray(getIdColumn(), input));
+			if (softDelete) return { deleted: (await ctx.db.update(table).set({ [softDelete.column]: softDelete.getValue() }).where(where).returning()).length };
+			return { deleted: (await ctx.db.delete(table).where(where).returning()).length };
 		}),
-		updateMany: baseProcedure.input(z.object({
-			ids: z.array(z.string()).max(maxBatchSize, `Maximum ${maxBatchSize} items allowed`),
+		updateMany: resolved.procedureFactory("updateMany").input(z.object({
+			ids: z.array(z.string()).max(maxBatchSize),
 			data: updateSchema
 		})).mutation(async ({ ctx, input }) => {
-			await withAuthorize("updateMany", input);
-			const column = getIdColumn();
-			return { updated: (await ctx.db.update(table).set(input.data).where(inArray(column, input.ids)).returning()).length };
+			await withGuard(ctx, "updateMany");
+			const where = buildWhere(ctx, "updateMany", inArray(getIdColumn(), input.ids));
+			const injectData = resolved.getInject(ctx, "update");
+			const data = {
+				...input.data,
+				...injectData
+			};
+			return { updated: (await ctx.db.update(table).set(data).where(where).returning()).length };
 		})
-	});
+	};
+	const crudRouter = router(procedures);
+	return Object.assign(crudRouter, { procedures });
 }
 
 //#endregion

package/package.json

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