@wordrhyme/auto-crud-server 1.0.5 → 1.0.7

package/README.md

@@ -489,6 +489,8 @@ interface CrudRouterConfig<TTable, TSelect, TInsert, TUpdate> {
 
   // ========== 其他配置 ==========
   idField?: string; // ID 字段名，默认 "id"
+  filterableColumns?: CrudColumnRef<TTable>[]; // 可过滤字段白名单
+  sortableColumns?: CrudColumnRef<TTable>[]; // 可排序字段白名单
   omitFields?: string[]; // 自动派生时排除的字段
   // 默认 ["id", "createdAt", "updatedAt"]
 }
@@ -1030,6 +1032,55 @@ export const tasksRouter = createCrudRouter({
 });
 ```
 
+普通字段不需要特殊配置，前端仍然传字段 id：
+
+```typescript
+filters: [{ id: 'title', value: 'bug', operator: 'iLike', variant: 'text', filterId: 'title' }],
+sort: [{ id: 'createdAt', desc: true }],
+```
+
+jsonb/i18n 字段可以在对应字段配置里声明读取哪个 JSON field。服务端会显式生成
+text expression，不会自动把所有 jsonb 字段都 cast 成 text：
+
+```typescript
+export const productsRouter = createCrudRouter({
+  table: shopProducts,
+  idField: 'spuId',
+  filterableColumns: [
+    { id: 'name', jsonField: ['zh-CN', 'en-US', 'en', 'zh'] },
+    'status',
+    'categoryId',
+  ],
+  sortableColumns: [
+    { id: 'name', jsonField: ['zh-CN', 'en-US', 'en', 'zh'] },
+    'createdAt',
+  ],
+});
+```
+
+上面的 `name` 过滤会生成类似 SQL：
+
+```sql
+case jsonb_typeof(name)
+  when 'object' then coalesce(name ->> 'zh-CN', name ->> 'en-US', name ->> 'en', name ->> 'zh', '')
+  when 'string' then name #>> '{}'
+  else ''
+end ilike '%关键词%'
+```
+
+复杂业务仍可用 `expression` 显式接管查询目标：
+
+```typescript
+import { sql } from 'drizzle-orm';
+
+createCrudRouter({
+  table: products,
+  filterableColumns: [
+    { id: 'displayName', expression: ({ table }) => sql<string>`lower(${table.name})` },
+  ],
+});
+```
+
 ---
 
 ## 📦 导出的类型
@@ -1043,6 +1094,9 @@ export {
   createCrudRouter,
 } from './routers/_factory';
 export type {
+  CrudColumnConfig,
+  CrudColumnExpression,
+  CrudColumnRef,
   CrudRouterConfig,
   CrudMiddleware,
   GetInput,

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);
@@ -562,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
@@ -667,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));
 					}
 				}
@@ -868,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));
 					}
 				}

package/dist/index.d.cts

@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { PgTable } from "drizzle-orm/pg-core";
-import * as _trpc_server2 from "@trpc/server";
+import * as _trpc_server0 from "@trpc/server";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
-import { SQL } from "drizzle-orm";
+import { AnyColumn, SQL } from "drizzle-orm";
 
 //#region src/trpc.d.ts
 /**
@@ -12,13 +12,13 @@ import { SQL } from "drizzle-orm";
 interface Context {
   db: PostgresJsDatabase<Record<string, never>>;
 }
-declare const router: _trpc_server2.TRPCRouterBuilder<{
+declare const router: _trpc_server0.TRPCRouterBuilder<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server2.TRPCDefaultErrorShape;
+  errorShape: _trpc_server0.TRPCDefaultErrorShape;
   transformer: true;
 }>;
-declare const publicProcedure: _trpc_server2.TRPCProcedureBuilder<Context, object, object, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, _trpc_server2.TRPCUnsetMarker, false>;
+declare const publicProcedure: _trpc_server0.TRPCProcedureBuilder<Context, object, object, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, _trpc_server0.TRPCUnsetMarker, false>;
 //#endregion
 //#region src/types/config.d.ts
 type CrudOperation = 'list' | 'get' | 'create' | 'update' | 'delete' | 'deleteMany' | 'updateMany' | 'upsert' | 'export' | 'import' | 'createMany';
@@ -29,6 +29,31 @@ type WriteOperation = 'create' | 'update';
  */
 type TableColumnKeys<T extends PgTable> = keyof T['_']['columns'];
 type AnyProcedure = any;
+/**
+ * 过滤/排序字段的自定义 SQL expression。
+ *
+ * 普通字段无需配置 expression，直接使用字段名即可；jsonb、i18n、派生字段等
+ * 需要自定义查询目标时，可通过 expression 显式返回 Drizzle SQL 片段或列对象。
+ */
+type CrudColumnExpression<TTable extends PgTable = PgTable> = (params: {
+  table: TTable;
+}) => SQL | AnyColumn;
+/**
+ * 过滤/排序字段配置。
+ *
+ * - string: 普通表字段，继续使用 table[id]
+ * - object.jsonField: 从 jsonb 字段中提取一个或多个 key 作为文本查询目标
+ * - object.expression: 高级场景自定义 SQL expression
+ */
+interface CrudColumnConfig<TTable extends PgTable = PgTable> {
+  /** 前端传入的逻辑字段名，同时默认对应 table 上的列名 */
+  id: string;
+  /** jsonb 对象内部要读取的字段；数组按顺序 coalesce 作为 fallback */
+  jsonField?: string | string[];
+  /** 高级场景自定义查询目标，优先级高于 jsonField */
+  expression?: CrudColumnExpression<TTable>;
+}
+type CrudColumnRef<TTable extends PgTable = PgTable> = string | CrudColumnConfig<TTable>;
 interface SoftDeleteConfig {
   /** 软删除标记列名 */
   column: string;
@@ -496,10 +521,25 @@ interface CrudRouterConfig<TTable extends PgTable = PgTable, TContext = unknown,
   omitFields?: TableColumnKeys<TTable>[];
   /** ID 字段名，默认 "id" */
   idField?: string;
-  /** 可过滤的列白名单 */
-  filterableColumns?: string[];
-  /** 可排序的列白名单 */
-  sortableColumns?: string[];
+  /**
+   * 可过滤的列白名单。
+   *
+   * 普通字段使用字符串；jsonb/i18n 字段可用对象配置 jsonField，
+   * 由服务端显式生成 text expression，前端仍然传 id。
+   *
+   * @example
+   * filterableColumns: [
+   *   'status',
+   *   { id: 'name', jsonField: ['zh-CN', 'en-US', 'en', 'zh'] },
+   * ]
+   */
+  filterableColumns?: CrudColumnRef<TTable>[];
+  /**
+   * 可排序的列白名单。
+   *
+   * 与 filterableColumns 相同，普通字段使用字符串，jsonb/i18n 字段可配置 jsonField。
+   */
+  sortableColumns?: CrudColumnRef<TTable>[];
   /** 批量操作的最大数量限制，默认 100 */
   maxBatchSize?: number;
   /**
@@ -771,12 +811,12 @@ type CrudHookEventMap<PluginId extends string, ResourceName extends string, TCre
 } } & { [K in `${PluginId}.${ResourceName}.createMany`]: TCreate[] };
 //#endregion
 //#region src/routers/index.d.ts
-declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
+declare const appRouter: _trpc_server0.TRPCBuiltRouter<{
   ctx: Context;
   meta: object;
-  errorShape: _trpc_server2.TRPCDefaultErrorShape;
+  errorShape: _trpc_server0.TRPCDefaultErrorShape;
   transformer: true;
-}, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
+}, _trpc_server0.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
-export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudColumnConfig, type CrudColumnExpression, type CrudColumnRef, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { SQL } from "drizzle-orm";
+import { AnyColumn, SQL } from "drizzle-orm";
 import * as _trpc_server2 from "@trpc/server";
 import superjson from "superjson";
 import { PgTable } from "drizzle-orm/pg-core";
@@ -30,6 +30,31 @@ type WriteOperation = 'create' | 'update';
  */
 type TableColumnKeys<T extends PgTable> = keyof T['_']['columns'];
 type AnyProcedure = any;
+/**
+ * 过滤/排序字段的自定义 SQL expression。
+ *
+ * 普通字段无需配置 expression，直接使用字段名即可；jsonb、i18n、派生字段等
+ * 需要自定义查询目标时，可通过 expression 显式返回 Drizzle SQL 片段或列对象。
+ */
+type CrudColumnExpression<TTable extends PgTable = PgTable> = (params: {
+  table: TTable;
+}) => SQL | AnyColumn;
+/**
+ * 过滤/排序字段配置。
+ *
+ * - string: 普通表字段，继续使用 table[id]
+ * - object.jsonField: 从 jsonb 字段中提取一个或多个 key 作为文本查询目标
+ * - object.expression: 高级场景自定义 SQL expression
+ */
+interface CrudColumnConfig<TTable extends PgTable = PgTable> {
+  /** 前端传入的逻辑字段名，同时默认对应 table 上的列名 */
+  id: string;
+  /** jsonb 对象内部要读取的字段；数组按顺序 coalesce 作为 fallback */
+  jsonField?: string | string[];
+  /** 高级场景自定义查询目标，优先级高于 jsonField */
+  expression?: CrudColumnExpression<TTable>;
+}
+type CrudColumnRef<TTable extends PgTable = PgTable> = string | CrudColumnConfig<TTable>;
 interface SoftDeleteConfig {
   /** 软删除标记列名 */
   column: string;
@@ -497,10 +522,25 @@ interface CrudRouterConfig<TTable extends PgTable = PgTable, TContext = unknown,
   omitFields?: TableColumnKeys<TTable>[];
   /** ID 字段名，默认 "id" */
   idField?: string;
-  /** 可过滤的列白名单 */
-  filterableColumns?: string[];
-  /** 可排序的列白名单 */
-  sortableColumns?: string[];
+  /**
+   * 可过滤的列白名单。
+   *
+   * 普通字段使用字符串；jsonb/i18n 字段可用对象配置 jsonField，
+   * 由服务端显式生成 text expression，前端仍然传 id。
+   *
+   * @example
+   * filterableColumns: [
+   *   'status',
+   *   { id: 'name', jsonField: ['zh-CN', 'en-US', 'en', 'zh'] },
+   * ]
+   */
+  filterableColumns?: CrudColumnRef<TTable>[];
+  /**
+   * 可排序的列白名单。
+   *
+   * 与 filterableColumns 相同，普通字段使用字符串，jsonb/i18n 字段可配置 jsonField。
+   */
+  sortableColumns?: CrudColumnRef<TTable>[];
   /** 批量操作的最大数量限制，默认 100 */
   maxBatchSize?: number;
   /**
@@ -780,4 +820,4 @@ declare const appRouter: _trpc_server2.TRPCBuiltRouter<{
 }, _trpc_server2.TRPCDecorateCreateRouterOptions<{}>>;
 type AppRouter = typeof appRouter;
 //#endregion
-export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };
+export { type AnyProcedure, type AppRouter, type CreateManyMiddlewareParams, type CreateMiddlewareParams, type CrudColumnConfig, type CrudColumnExpression, type CrudColumnRef, type CrudHookEventMap, type CrudMiddleware, type CrudOperation, type CrudProcedures, type CrudRouterConfig, type DeleteManyMiddlewareParams, type DeleteMiddlewareParams, type ExportInput, type ExportMiddlewareParams, type ExportResult, type GetInput, type GetMiddlewareParams, type ImportFailedRow, type ImportInput, type ImportMiddlewareParams, type ImportResult, type ListInput, type ListMiddlewareParams, type ListResult, type ProcedureConfig, type ProcedureFactory, type ProcedureMap, type SoftDeleteConfig, type SoftDeleteOption, type UpdateManyMiddlewareParams, type UpdateMiddlewareParams, type UpsertMiddlewareParams, type WriteOperation, afterMiddleware, appRouter, baseExportInputSchema, baseGetInputSchema, baseListInputSchema, beforeMiddleware, composeMiddleware, createCrudRouter, publicProcedure, router };

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);
@@ -533,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
@@ -638,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));
 					}
 				}
@@ -839,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));
 					}
 				}

package/package.json

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