@wordrhyme/auto-crud-server 1.0.4 → 1.0.6

package/dist/index.js

@@ -15,8 +15,15 @@ const publicProcedure = t.procedure;
 /**
 * 检查列是否为空
 */
+function toSqlTarget(column) {
+	return sql`${column}`;
+}
+function isBooleanColumn(column) {
+	return "dataType" in column && column.dataType === "boolean";
+}
 function isEmpty(column) {
-	return or(isNull(column), eq(column, ""));
+	const expr = toSqlTarget(column);
+	return or(isNull(expr), eq(expr, ""));
 }
 /**
 * 安全解析日期时间戳
@@ -39,22 +46,24 @@ function safeParseNumber(value) {
 	const num = Number(value);
 	return Number.isNaN(num) ? null : num;
 }
-function filterColumns({ table, filters, joinOperator }) {
+function filterColumns({ table, filters, joinOperator, resolveColumn }) {
 	const joinFn = joinOperator === "and" ? and : or;
 	const validConditions = filters.map((filter) => {
-		const column = getColumn(table, filter.id);
+		const column = resolveColumn ? resolveColumn(filter.id) : getColumn(table, filter.id);
+		if (!column) return void 0;
+		const expr = toSqlTarget(column);
 		switch (filter.operator) {
-			case "iLike": return filter.variant === "text" && typeof filter.value === "string" ? ilike(column, `%${filter.value}%`) : void 0;
-			case "notILike": return filter.variant === "text" && typeof filter.value === "string" ? notIlike(column, `%${filter.value}%`) : void 0;
+			case "iLike": return filter.variant === "text" && typeof filter.value === "string" ? ilike(expr, `%${filter.value}%`) : void 0;
+			case "notILike": return filter.variant === "text" && typeof filter.value === "string" ? notIlike(expr, `%${filter.value}%`) : void 0;
 			case "eq":
-				if (column.dataType === "boolean" && typeof filter.value === "string") return eq(column, filter.value === "true");
+				if (isBooleanColumn(column) && typeof filter.value === "string") return eq(expr, filter.value === "true");
 				if (filter.variant === "dateRange" && Array.isArray(filter.value) && filter.value.length === 2) {
 					const startDate = safeParseDate(filter.value[0]);
 					const endDate = safeParseDate(filter.value[1]);
 					if (!startDate && !endDate) return void 0;
 					if (startDate) startDate.setHours(0, 0, 0, 0);
 					if (endDate) endDate.setHours(23, 59, 59, 999);
-					return and(startDate ? gte(column, startDate) : void 0, endDate ? lte(column, endDate) : void 0);
+					return and(startDate ? gte(expr, startDate) : void 0, endDate ? lte(expr, endDate) : void 0);
 				}
 				if (filter.variant === "date" && typeof filter.value === "string") {
 					const date = safeParseDate(filter.value);
@@ -62,72 +71,72 @@ function filterColumns({ table, filters, joinOperator }) {
 					date.setHours(0, 0, 0, 0);
 					const end = new Date(date);
 					end.setHours(23, 59, 59, 999);
-					return and(gte(column, date), lte(column, end));
+					return and(gte(expr, date), lte(expr, end));
 				}
-				return eq(column, filter.value);
+				return eq(expr, filter.value);
 			case "ne":
-				if (column.dataType === "boolean" && typeof filter.value === "string") return ne(column, filter.value === "true");
+				if (isBooleanColumn(column) && typeof filter.value === "string") return ne(expr, filter.value === "true");
 				if (filter.variant === "date" || filter.variant === "dateRange") {
 					const date = safeParseDate(filter.value);
 					if (!date) return void 0;
 					date.setHours(0, 0, 0, 0);
 					const end = new Date(date);
 					end.setHours(23, 59, 59, 999);
-					return or(lt(column, date), gt(column, end));
+					return or(lt(expr, date), gt(expr, end));
 				}
-				return ne(column, filter.value);
+				return ne(expr, filter.value);
 			case "inArray":
-				if (Array.isArray(filter.value)) return inArray(column, filter.value);
+				if (Array.isArray(filter.value)) return inArray(expr, filter.value);
 				return;
 			case "notInArray":
-				if (Array.isArray(filter.value)) return notInArray(column, filter.value);
+				if (Array.isArray(filter.value)) return notInArray(expr, filter.value);
 				return;
 			case "lt":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? lt(column, num) : void 0;
+					return num !== null ? lt(expr, num) : void 0;
 				}
 				if (filter.variant === "date" && typeof filter.value === "string") {
 					const date = safeParseDate(filter.value);
 					if (!date) return void 0;
 					date.setHours(23, 59, 59, 999);
-					return lt(column, date);
+					return lt(expr, date);
 				}
 				return;
 			case "lte":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? lte(column, num) : void 0;
+					return num !== null ? lte(expr, num) : void 0;
 				}
 				if (filter.variant === "date" && typeof filter.value === "string") {
 					const date = safeParseDate(filter.value);
 					if (!date) return void 0;
 					date.setHours(23, 59, 59, 999);
-					return lte(column, date);
+					return lte(expr, date);
 				}
 				return;
 			case "gt":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? gt(column, num) : void 0;
+					return num !== null ? gt(expr, num) : void 0;
 				}
 				if (filter.variant === "date" && typeof filter.value === "string") {
 					const date = safeParseDate(filter.value);
 					if (!date) return void 0;
 					date.setHours(0, 0, 0, 0);
-					return gt(column, date);
+					return gt(expr, date);
 				}
 				return;
 			case "gte":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? gte(column, num) : void 0;
+					return num !== null ? gte(expr, num) : void 0;
 				}
 				if (filter.variant === "date" && typeof filter.value === "string") {
 					const date = safeParseDate(filter.value);
 					if (!date) return void 0;
 					date.setHours(0, 0, 0, 0);
-					return gte(column, date);
+					return gte(expr, date);
 				}
 				return;
 			case "isBetween":
@@ -137,15 +146,15 @@ function filterColumns({ table, filters, joinOperator }) {
 					if (!startDate && !endDate) return void 0;
 					if (startDate) startDate.setHours(0, 0, 0, 0);
 					if (endDate) endDate.setHours(23, 59, 59, 999);
-					return and(startDate ? gte(column, startDate) : void 0, endDate ? lte(column, endDate) : void 0);
+					return and(startDate ? gte(expr, startDate) : void 0, endDate ? lte(expr, endDate) : void 0);
 				}
 				if ((filter.variant === "number" || filter.variant === "range") && Array.isArray(filter.value) && filter.value.length === 2) {
 					const firstValue = safeParseNumber(filter.value[0]);
 					const secondValue = safeParseNumber(filter.value[1]);
 					if (firstValue === null && secondValue === null) return;
-					if (firstValue !== null && secondValue === null) return eq(column, firstValue);
-					if (firstValue === null && secondValue !== null) return eq(column, secondValue);
-					return and(firstValue !== null ? gte(column, firstValue) : void 0, secondValue !== null ? lte(column, secondValue) : void 0);
+					if (firstValue !== null && secondValue === null) return eq(expr, firstValue);
+					if (firstValue === null && secondValue !== null) return eq(expr, secondValue);
+					return and(firstValue !== null ? gte(expr, firstValue) : void 0, secondValue !== null ? lte(expr, secondValue) : void 0);
 				}
 				return;
 			case "isRelativeToToday":
@@ -170,11 +179,11 @@ function filterColumns({ table, filters, joinOperator }) {
 							break;
 						default: return;
 					}
-					return and(gte(column, startDate), lte(column, endDate));
+					return and(gte(expr, startDate), lte(expr, endDate));
 				}
 				return;
-			case "isEmpty": return isEmpty(column);
-			case "isNotEmpty": return not(isEmpty(column));
+			case "isEmpty": return isEmpty(expr);
+			case "isNotEmpty": return not(isEmpty(expr));
 			default: throw new Error(`Unsupported operator: ${filter.operator}`);
 		}
 	}).filter((condition) => condition !== void 0);
@@ -471,7 +480,7 @@ const filterItemSchema = z.object({
 	operator: z.enum(dataTableConfig.operators),
 	filterId: z.string()
 });
-const listInputSchema = z.object({
+const baseListInputSchema = z.object({
 	page: z.number().min(1).default(1),
 	perPage: z.number().min(1).max(100).default(10),
 	sort: z.array(z.object({
@@ -481,7 +490,9 @@ const listInputSchema = z.object({
 	filters: z.array(filterItemSchema).optional(),
 	joinOperator: z.enum(["and", "or"]).default("and")
 });
-const exportInputSchema = z.object({
+const baseGetInputSchema = z.object({ id: z.string() });
+const defaultGetInputSchema = z.union([z.string(), baseGetInputSchema]);
+const baseExportInputSchema = z.object({
 	sort: z.array(z.object({
 		id: z.string(),
 		desc: z.boolean()
@@ -531,9 +542,43 @@ function resolveSchemas(config) {
 		updateSchema
 	};
 }
+function getColumnRefId(columnRef) {
+	return typeof columnRef === "string" ? columnRef : columnRef.id;
+}
+function findColumnRef(columnId, allowedColumns) {
+	return allowedColumns?.find((columnRef) => getColumnRefId(columnRef) === columnId);
+}
 function validateColumn(columnId, allowedColumns) {
 	if (!allowedColumns || allowedColumns.length === 0) return true;
-	return allowedColumns.includes(columnId);
+	return findColumnRef(columnId, allowedColumns) !== void 0;
+}
+function getTableColumn(table, columnId) {
+	return table[columnId];
+}
+function normalizeJsonFields(jsonField) {
+	return (Array.isArray(jsonField) ? jsonField : [jsonField]).filter((field) => field.length > 0);
+}
+function buildJsonFieldTextExpression(column, jsonField) {
+	const fields = normalizeJsonFields(jsonField);
+	if (fields.length === 0) throw new Error("[createCrudRouter] jsonField must include at least one json key.");
+	const objectFields = fields.map((field) => sql`${column} ->> ${field}`);
+	return sql`case jsonb_typeof(${column})
+    when 'object' then coalesce(${sql.join(objectFields, sql`, `)}, '')
+    when 'string' then ${column} #>> '{}'
+    else ''
+  end`;
+}
+function resolveColumnTarget({ table, columnId, allowedColumns }) {
+	const columnRef = findColumnRef(columnId, allowedColumns);
+	if ((allowedColumns?.length ?? 0) > 0 && columnRef === void 0) return;
+	if (columnRef && typeof columnRef !== "string") {
+		if (columnRef.expression) return columnRef.expression({ table });
+		const column = getTableColumn(table, columnRef.id);
+		if (!column) return void 0;
+		if (columnRef.jsonField) return buildJsonFieldTextExpression(column, columnRef.jsonField);
+		return column;
+	}
+	return getTableColumn(table, columnId);
 }
 /**
 * 创建 CRUD Router
@@ -584,6 +629,9 @@ function createCrudRouter(config) {
 	});
 	const resolved = resolveConfig(config);
 	const softDelete = resolveSoftDelete(softDeleteOption);
+	const resolvedListInputSchema = config.listInputSchema ?? baseListInputSchema;
+	const resolvedGetInputSchema = config.getInputSchema ? z.union([z.string(), config.getInputSchema]) : defaultGetInputSchema;
+	const resolvedExportInputSchema = config.exportInputSchema ?? baseExportInputSchema;
 	const m = middleware;
 	const getIdColumn = () => table[idField];
 	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
@@ -625,7 +673,7 @@ function createCrudRouter(config) {
 		});
 	};
 	const procedures = {
-		list: resolved.procedureFactory("list").input(listInputSchema).output(listOutputSchema).query(async ({ ctx, input }) => {
+		list: resolved.procedureFactory("list").input(resolvedListInputSchema).output(listOutputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "list");
 			const doList = async (listInput$1) => {
 				const offset = (listInput$1.page - 1) * listInput$1.perPage;
@@ -633,14 +681,23 @@ function createCrudRouter(config) {
 				const where = buildWhere(ctx, "list", validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
-					joinOperator: listInput$1.joinOperator
+					joinOperator: listInput$1.joinOperator,
+					resolveColumn: (columnId) => resolveColumnTarget({
+						table,
+						columnId: String(columnId),
+						allowedColumns: filterableColumns
+					})
 				}) : 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];
+						const column = resolveColumnTarget({
+							table,
+							columnId: sortField.id,
+							allowedColumns: sortableColumns
+						});
 						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
 					}
 				}
@@ -664,20 +721,23 @@ function createCrudRouter(config) {
 			});
 			return doList(listInput);
 		}),
-		get: resolved.procedureFactory("get").input(z.string()).output(entityOutputSchema.nullable()).query(async ({ ctx, input }) => {
+		get: resolved.procedureFactory("get").input(resolvedGetInputSchema).output(entityOutputSchema.nullable()).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "get");
-			const doGet = async () => {
-				const where = buildWhere(ctx, "get", eq(getIdColumn(), input));
+			const doGet = async (getInput) => {
+				const id$1 = typeof getInput === "string" ? getInput : getInput.id;
+				const where = buildWhere(ctx, "get", eq(getIdColumn(), id$1));
 				const [item] = await ctx.db.select().from(table).where(where);
 				await withAuthorize(ctx, item, "get");
 				return item ?? null;
 			};
+			const id = typeof input === "string" ? input : input.id;
 			if (m.get) return m.get({
 				ctx,
-				id: input,
-				next: doGet
+				id,
+				input,
+				next: async (modifiedInput) => doGet(modifiedInput ?? input)
 			});
-			return doGet();
+			return doGet(input);
 		}),
 		create: resolved.procedureFactory("create").input(schema).output(entityOutputSchema).mutation(async ({ ctx, input }) => {
 			await withGuard(ctx, "create");
@@ -823,7 +883,7 @@ function createCrudRouter(config) {
 			});
 			return doUpsert(input);
 		}),
-		export: resolved.procedureFactory("export").input(exportInputSchema).output(exportOutputSchema).query(async ({ ctx, input }) => {
+		export: resolved.procedureFactory("export").input(resolvedExportInputSchema).output(exportOutputSchema).query(async ({ ctx, input }) => {
 			await withGuard(ctx, "export");
 			const doExport = async (exportInput$1) => {
 				const effectiveLimit = Math.min(Math.max(exportInput$1.limit ?? maxExportSize, 1), maxExportSize);
@@ -831,14 +891,23 @@ function createCrudRouter(config) {
 				const where = buildWhere(ctx, "export", validatedFilters?.length ? filterColumns({
 					table,
 					filters: validatedFilters,
-					joinOperator: exportInput$1.joinOperator ?? "and"
+					joinOperator: exportInput$1.joinOperator ?? "and",
+					resolveColumn: (columnId) => resolveColumnTarget({
+						table,
+						columnId: String(columnId),
+						allowedColumns: filterableColumns
+					})
 				}) : void 0);
 				let query = ctx.db.select().from(table).$dynamic();
 				if (where) query = query.where(where);
 				if (exportInput$1.sort?.length) {
 					const sortField = exportInput$1.sort[0];
 					if (sortField && validateColumn(sortField.id, sortableColumns)) {
-						const column = table[sortField.id];
+						const column = resolveColumnTarget({
+							table,
+							columnId: sortField.id,
+							allowedColumns: sortableColumns
+						});
 						if (column) query = query.orderBy(sortField.desc ? desc(column) : asc(column));
 					}
 				}
@@ -1026,4 +1095,4 @@ function composeMiddleware(...middlewares) {
 const appRouter = router({});
 
 //#endregion
-export { afterMiddleware, appRouter, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud-server",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "tRPC server utilities for auto-crud - automatic CRUD routers for Drizzle ORM",
   "author": "wordrhyme",
   "license": "MIT",
@@ -48,9 +48,9 @@
     "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/prettier-config": "0.0.1",
     "@internal/vitest-config": "0.1.0"
   },
   "prettier": "@internal/prettier-config",