@ai0x0/utils 0.0.18 → 0.0.21

package/es/backend/schemas/index.js

@@ -7,7 +7,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { z } from "zod";
 import { pgTable, timestamp, uuid } from "drizzle-orm/pg-core";
 import { createInsertSchema, createSelectSchema, createUpdateSchema } from "drizzle-zod";
-
 //============================基本字段============================//
 var timestamptz = function timestamptz(name) {
   return timestamp(name, {
@@ -32,6 +31,42 @@ export var basicFields = {
   updatedAt: updatedAt()
 };
 
+// basicFields 中需要从业务 insert/update schema 中排除的字段。
+// update 保留 id（必填），其他基础字段都由后端自动维护。
+var basicInsertOmit = {
+  id: true,
+  creatorId: true,
+  editorId: true,
+  accessedAt: true,
+  createdAt: true,
+  updatedAt: true
+};
+var basicUpdateOmit = {
+  creatorId: true,
+  editorId: true,
+  accessedAt: true,
+  createdAt: true,
+  updatedAt: true
+};
+
+/**
+ * 基于 drizzle-zod 生成业务侧 insert schema，自动排除 basicFields
+ * （id / creatorId / editorId / accessedAt / createdAt / updatedAt）。
+ */
+export var createInsertBodySchema = function createInsertBodySchema(table) {
+  return createInsertSchema(table).omit(basicInsertOmit);
+};
+
+/**
+ * 基于 drizzle-zod 生成业务侧 update schema，保留 id 为必填，
+ * 其余 basicFields 全部排除。
+ */
+export var createUpdateBodySchema = function createUpdateBodySchema(table) {
+  return createUpdateSchema(table).omit(basicUpdateOmit).required({
+    id: true
+  });
+};
+
 //============================列表查询字段============================//
 export var queryListSchema = function queryListSchema(schema) {
   return z.object({
@@ -58,31 +93,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
   };
 };

package/lib/backend/actions/create-delete-action.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(create_delete_action_exports);
 var import_drizzle_orm = require("drizzle-orm");
 var import_backend = require("..");
 var import_zod = require("zod");
+var import_errors = require("../errors");
 function createDeleteAction({
   table,
   db
@@ -40,7 +41,7 @@ function createDeleteAction({
         })
       })({ creatorId, id });
       if (!data) {
-        throw Error("未找到删除对象，或没有权限");
+        throw new import_errors.HttpError(404, "未找到删除对象，或没有权限");
       }
     }
     return db.delete(table).where((0, import_drizzle_orm.eq)(table.id, id)).returning();

package/lib/backend/actions/create-put-action.js

@@ -26,6 +26,7 @@ var import_zod = require("zod");
 var import_transform_body = require("./transform-body");
 var import_drizzle_orm = require("drizzle-orm");
 var import_backend = require("..");
+var import_errors = require("../errors");
 function createPutAction({
   db,
   table
@@ -46,7 +47,7 @@ function createPutAction({
         id: body.id
       });
       if (!data2) {
-        throw Error("未找到编辑对象，或没有权限");
+        throw new import_errors.HttpError(404, "未找到编辑对象，或没有权限");
       }
     }
     const [data] = await db.update(table).set((0, import_transform_body.transformBody)(body)).where((0, import_drizzle_orm.eq)(table.id, body.id)).returning();

package/lib/backend/errors.d.ts

@@ -0,0 +1,4 @@
+export declare class HttpError extends Error {
+    status: number;
+    constructor(status: number, message: string);
+}

package/lib/backend/errors.js

@@ -0,0 +1,35 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/backend/errors.ts
+var errors_exports = {};
+__export(errors_exports, {
+  HttpError: () => HttpError
+});
+module.exports = __toCommonJS(errors_exports);
+var HttpError = class extends Error {
+  constructor(status, message) {
+    super(message);
+    this.name = "HttpError";
+    this.status = status;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  HttpError
+});

package/lib/backend/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./actions";
 export * from "./route-operation";
 export * from "./schemas";
+export * from "./errors";

package/lib/backend/index.js

@@ -19,9 +19,11 @@ module.exports = __toCommonJS(backend_exports);
 __reExport(backend_exports, require("./actions"), module.exports);
 __reExport(backend_exports, require("./route-operation"), module.exports);
 __reExport(backend_exports, require("./schemas"), module.exports);
+__reExport(backend_exports, require("./errors"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./actions"),
   ...require("./route-operation"),
-  ...require("./schemas")
+  ...require("./schemas"),
+  ...require("./errors")
 });

package/lib/backend/route-operation/delete-operation.js

@@ -36,6 +36,7 @@ var import_next_rest_framework = require("next-rest-framework");
 var import_zod = require("zod");
 var import_get_table_name = __toESM(require("./get-table-name"));
 var import_actions = require("../actions");
+var import_errors = require("../errors");
 var createDeleteOperation = ({
   db,
   getSession
@@ -72,9 +73,13 @@ var createDeleteOperation = ({
     const response = await (onError == null ? void 0 : onError(e));
     if (response) {
       return response;
-    } else {
-      throw e;
     }
+    if (e instanceof import_errors.HttpError) {
+      return import_next_rest_framework.TypedNextResponse.json({ message: e.message }, {
+        status: e.status
+      });
+    }
+    throw e;
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/lib/backend/route-operation/put-operation.js

@@ -36,6 +36,7 @@ var import_zod = require("zod");
 var import_next_rest_framework = require("next-rest-framework");
 var import_get_table_name = __toESM(require("./get-table-name"));
 var import_actions = require("../actions");
+var import_errors = require("../errors");
 var createPutOperation = ({
   getSession,
   db
@@ -89,9 +90,13 @@ var createPutOperation = ({
     const response = await (onError == null ? void 0 : onError(e));
     if (response) {
       return response;
-    } else {
-      throw e;
     }
+    if (e instanceof import_errors.HttpError) {
+      return import_next_rest_framework.TypedNextResponse.json({ message: e.message }, {
+        status: e.status
+      });
+    }
+    throw e;
   }
 });
 // Annotate the CommonJS export names for ESM import in node: