@wordrhyme/auto-crud-server 1.0.4 → 1.0.6

package/dist/index.cjs

@@ -44,8 +44,15 @@ const publicProcedure = t.procedure;
 /**
 * 检查列是否为空
 */
+function toSqlTarget(column) {
+	return drizzle_orm.sql`${column}`;
+}
+function isBooleanColumn(column) {
+	return "dataType" in column && column.dataType === "boolean";
+}
 function isEmpty(column) {
-	return (0, drizzle_orm.or)((0, drizzle_orm.isNull)(column), (0, drizzle_orm.eq)(column, ""));
+	const expr = toSqlTarget(column);
+	return (0, drizzle_orm.or)((0, drizzle_orm.isNull)(expr), (0, drizzle_orm.eq)(expr, ""));
 }
 /**
 * 安全解析日期时间戳
@@ -68,22 +75,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" ? drizzle_orm.and : drizzle_orm.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" ? (0, drizzle_orm.ilike)(column, `%${filter.value}%`) : void 0;
-			case "notILike": return filter.variant === "text" && typeof filter.value === "string" ? (0, drizzle_orm.notIlike)(column, `%${filter.value}%`) : void 0;
+			case "iLike": return filter.variant === "text" && typeof filter.value === "string" ? (0, drizzle_orm.ilike)(expr, `%${filter.value}%`) : void 0;
+			case "notILike": return filter.variant === "text" && typeof filter.value === "string" ? (0, drizzle_orm.notIlike)(expr, `%${filter.value}%`) : void 0;
 			case "eq":
-				if (column.dataType === "boolean" && typeof filter.value === "string") return (0, drizzle_orm.eq)(column, filter.value === "true");
+				if (isBooleanColumn(column) && typeof filter.value === "string") return (0, drizzle_orm.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 (0, drizzle_orm.and)(startDate ? (0, drizzle_orm.gte)(column, startDate) : void 0, endDate ? (0, drizzle_orm.lte)(column, endDate) : void 0);
+					return (0, drizzle_orm.and)(startDate ? (0, drizzle_orm.gte)(expr, startDate) : void 0, endDate ? (0, drizzle_orm.lte)(expr, endDate) : void 0);
 				}
 				if (filter.variant === "date" && typeof filter.value === "string") {
 					const date = safeParseDate(filter.value);
@@ -91,72 +100,72 @@ function filterColumns({ table, filters, joinOperator }) {
 					date.setHours(0, 0, 0, 0);
 					const end = new Date(date);
 					end.setHours(23, 59, 59, 999);
-					return (0, drizzle_orm.and)((0, drizzle_orm.gte)(column, date), (0, drizzle_orm.lte)(column, end));
+					return (0, drizzle_orm.and)((0, drizzle_orm.gte)(expr, date), (0, drizzle_orm.lte)(expr, end));
 				}
-				return (0, drizzle_orm.eq)(column, filter.value);
+				return (0, drizzle_orm.eq)(expr, filter.value);
 			case "ne":
-				if (column.dataType === "boolean" && typeof filter.value === "string") return (0, drizzle_orm.ne)(column, filter.value === "true");
+				if (isBooleanColumn(column) && typeof filter.value === "string") return (0, drizzle_orm.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 (0, drizzle_orm.or)((0, drizzle_orm.lt)(column, date), (0, drizzle_orm.gt)(column, end));
+					return (0, drizzle_orm.or)((0, drizzle_orm.lt)(expr, date), (0, drizzle_orm.gt)(expr, end));
 				}
-				return (0, drizzle_orm.ne)(column, filter.value);
+				return (0, drizzle_orm.ne)(expr, filter.value);
 			case "inArray":
-				if (Array.isArray(filter.value)) return (0, drizzle_orm.inArray)(column, filter.value);
+				if (Array.isArray(filter.value)) return (0, drizzle_orm.inArray)(expr, filter.value);
 				return;
 			case "notInArray":
-				if (Array.isArray(filter.value)) return (0, drizzle_orm.notInArray)(column, filter.value);
+				if (Array.isArray(filter.value)) return (0, drizzle_orm.notInArray)(expr, filter.value);
 				return;
 			case "lt":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? (0, drizzle_orm.lt)(column, num) : void 0;
+					return num !== null ? (0, drizzle_orm.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 (0, drizzle_orm.lt)(column, date);
+					return (0, drizzle_orm.lt)(expr, date);
 				}
 				return;
 			case "lte":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? (0, drizzle_orm.lte)(column, num) : void 0;
+					return num !== null ? (0, drizzle_orm.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 (0, drizzle_orm.lte)(column, date);
+					return (0, drizzle_orm.lte)(expr, date);
 				}
 				return;
 			case "gt":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? (0, drizzle_orm.gt)(column, num) : void 0;
+					return num !== null ? (0, drizzle_orm.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 (0, drizzle_orm.gt)(column, date);
+					return (0, drizzle_orm.gt)(expr, date);
 				}
 				return;
 			case "gte":
 				if (filter.variant === "number" || filter.variant === "range") {
 					const num = safeParseNumber(filter.value);
-					return num !== null ? (0, drizzle_orm.gte)(column, num) : void 0;
+					return num !== null ? (0, drizzle_orm.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 (0, drizzle_orm.gte)(column, date);
+					return (0, drizzle_orm.gte)(expr, date);
 				}
 				return;
 			case "isBetween":
@@ -166,15 +175,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 (0, drizzle_orm.and)(startDate ? (0, drizzle_orm.gte)(column, startDate) : void 0, endDate ? (0, drizzle_orm.lte)(column, endDate) : void 0);
+					return (0, drizzle_orm.and)(startDate ? (0, drizzle_orm.gte)(expr, startDate) : void 0, endDate ? (0, drizzle_orm.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 (0, drizzle_orm.eq)(column, firstValue);
-					if (firstValue === null && secondValue !== null) return (0, drizzle_orm.eq)(column, secondValue);
-					return (0, drizzle_orm.and)(firstValue !== null ? (0, drizzle_orm.gte)(column, firstValue) : void 0, secondValue !== null ? (0, drizzle_orm.lte)(column, secondValue) : void 0);
+					if (firstValue !== null && secondValue === null) return (0, drizzle_orm.eq)(expr, firstValue);
+					if (firstValue === null && secondValue !== null) return (0, drizzle_orm.eq)(expr, secondValue);
+					return (0, drizzle_orm.and)(firstValue !== null ? (0, drizzle_orm.gte)(expr, firstValue) : void 0, secondValue !== null ? (0, drizzle_orm.lte)(expr, secondValue) : void 0);
 				}
 				return;
 			case "isRelativeToToday":
@@ -199,11 +208,11 @@ function filterColumns({ table, filters, joinOperator }) {
 							break;
 						default: return;
 					}
-					return (0, drizzle_orm.and)((0, drizzle_orm.gte)(column, startDate), (0, drizzle_orm.lte)(column, endDate));
+					return (0, drizzle_orm.and)((0, drizzle_orm.gte)(expr, startDate), (0, drizzle_orm.lte)(expr, endDate));
 				}
 				return;
-			case "isEmpty": return isEmpty(column);
-			case "isNotEmpty": return (0, drizzle_orm.not)(isEmpty(column));
+			case "isEmpty": return isEmpty(expr);
+			case "isNotEmpty": return (0, drizzle_orm.not)(isEmpty(expr));
 			default: throw new Error(`Unsupported operator: ${filter.operator}`);
 		}
 	}).filter((condition) => condition !== void 0);
@@ -500,7 +509,7 @@ const filterItemSchema = zod.z.object({
 	operator: zod.z.enum(dataTableConfig.operators),
 	filterId: zod.z.string()
 });
-const listInputSchema = zod.z.object({
+const baseListInputSchema = zod.z.object({
 	page: zod.z.number().min(1).default(1),
 	perPage: zod.z.number().min(1).max(100).default(10),
 	sort: zod.z.array(zod.z.object({
@@ -510,7 +519,9 @@ const listInputSchema = zod.z.object({
 	filters: zod.z.array(filterItemSchema).optional(),
 	joinOperator: zod.z.enum(["and", "or"]).default("and")
 });
-const exportInputSchema = zod.z.object({
+const baseGetInputSchema = zod.z.object({ id: zod.z.string() });
+const defaultGetInputSchema = zod.z.union([zod.z.string(), baseGetInputSchema]);
+const baseExportInputSchema = zod.z.object({
 	sort: zod.z.array(zod.z.object({
 		id: zod.z.string(),
 		desc: zod.z.boolean()
@@ -560,9 +571,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) => drizzle_orm.sql`${column} ->> ${field}`);
+	return drizzle_orm.sql`case jsonb_typeof(${column})
+    when 'object' then coalesce(${drizzle_orm.sql.join(objectFields, drizzle_orm.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
@@ -613,6 +658,9 @@ function createCrudRouter(config) {
 	});
 	const resolved = resolveConfig(config);
 	const softDelete = resolveSoftDelete(softDeleteOption);
+	const resolvedListInputSchema = config.listInputSchema ?? baseListInputSchema;
+	const resolvedGetInputSchema = config.getInputSchema ? zod.z.union([zod.z.string(), config.getInputSchema]) : defaultGetInputSchema;
+	const resolvedExportInputSchema = config.exportInputSchema ?? baseExportInputSchema;
 	const m = middleware;
 	const getIdColumn = () => table[idField];
 	const getSoftDeleteColumn = () => softDelete ? table[softDelete.column] : null;
@@ -654,7 +702,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;
@@ -662,14 +710,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 ? (0, drizzle_orm.desc)(column) : (0, drizzle_orm.asc)(column));
 					}
 				}
@@ -693,20 +750,23 @@ function createCrudRouter(config) {
 			});
 			return doList(listInput);
 		}),
-		get: resolved.procedureFactory("get").input(zod.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", (0, drizzle_orm.eq)(getIdColumn(), input));
+			const doGet = async (getInput) => {
+				const id$1 = typeof getInput === "string" ? getInput : getInput.id;
+				const where = buildWhere(ctx, "get", (0, drizzle_orm.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");
@@ -852,7 +912,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);
@@ -860,14 +920,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 ? (0, drizzle_orm.desc)(column) : (0, drizzle_orm.asc)(column));
 					}
 				}
@@ -1057,6 +1126,9 @@ const appRouter = router({});
 //#endregion
 exports.afterMiddleware = afterMiddleware;
 exports.appRouter = appRouter;
+exports.baseExportInputSchema = baseExportInputSchema;
+exports.baseGetInputSchema = baseGetInputSchema;
+exports.baseListInputSchema = baseListInputSchema;
 exports.beforeMiddleware = beforeMiddleware;
 exports.composeMiddleware = composeMiddleware;
 exports.createCrudRouter = createCrudRouter;