@ai0x0/utils 0.0.18 → 0.0.20

package/es/backend/schemas/index.js

@@ -58,31 +58,43 @@ export var listBodySchema = function listBodySchema(schema) {
 };
 
 //============================创建一个pg表============================//
+/**
+ * 基于 drizzle + drizzle-zod 快速生成带基础字段（id / 创建时间等）的
+ * 表定义以及 select / insert / update / query / list zod schema。
+ *
+ * 关键点：把合并后的 `basicFields & TColumnsMap` 交给 pgTable 时同时
+ * 提供显式泛型参数，返回的 table 会携带完整列类型；drizzle-zod 由此
+ * 推导出的 selectSchema 才是强类型的，而不是退化成
+ * `z.ZodObject<Record<string, any[] | null>>`。
+ */
 export var createTableSchema = function createTableSchema(_ref) {
   var name = _ref.name,
     columns = _ref.columns,
-    refineSchema = _ref.refineSchema,
     extraConfig = _ref.extraConfig;
-  // 创建表
-  var table = pgTable(name, _objectSpread(_objectSpread({}, basicFields), columns), extraConfig);
-  // 创建基础的schema
-  var selectSchema = createSelectSchema(table, refineSchema);
-  // 去掉基础的字段的table
-  var insertTable = pgTable(name, columns);
-  var updateTable = pgTable(name, _objectSpread({
-    id: uuid()
-  }, columns));
+  var mergedColumns = _objectSpread(_objectSpread({}, basicFields), columns);
+  var table = pgTable(name, mergedColumns, extraConfig);
+  var selectSchema = createSelectSchema(table);
+  var insertSchema = createInsertSchema(pgTable(name, columns));
+  // id 用 defaultRandom() 避免进入 insert 必填；随后在 zod 层把 id 标为必填
+  var updateSchema = createUpdateSchema(pgTable(name, _objectSpread({
+    id: uuid("id")
+  }, columns))).extend({
+    id: z.string()
+  });
+
+  // querySchema / queryListSchema 使用手写 zod，避免 selectSchema 泛型通过 .pick / .partial
+  // 扩散，导致外部类型声明过长（TS7056）。运行时行为不变。
+  var querySchema = z.object({
+    id: z.string()
+  });
+  var queryListWithSchema = queryListSchema(z.object({}).catchall(z.unknown()));
   return {
     table: table,
     selectSchema: selectSchema,
-    insertSchema: createInsertSchema(insertTable, refineSchema),
-    updateSchema: createUpdateSchema(updateTable, _objectSpread({
-      id: z.string()
-    }, refineSchema)),
-    querySchema: selectSchema.pick({
-      id: true
-    }),
-    queryListSchema: queryListSchema(selectSchema.partial()),
+    insertSchema: insertSchema,
+    updateSchema: updateSchema,
+    querySchema: querySchema,
+    queryListSchema: queryListWithSchema,
     queryListSelectSchema: selectSchema
   };
 };