@ai0x0/utils 0.0.18 → 0.0.21

package/lib/backend/schemas/index.js

@@ -20,7 +20,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var schemas_exports = {};
 __export(schemas_exports, {
   basicFields: () => basicFields,
+  createInsertBodySchema: () => createInsertBodySchema,
   createTableSchema: () => createTableSchema,
+  createUpdateBodySchema: () => createUpdateBodySchema,
   listBodySchema: () => listBodySchema,
   queryListSchema: () => queryListSchema
 });
@@ -40,6 +42,23 @@ var basicFields = {
   createdAt: createdAt(),
   updatedAt: updatedAt()
 };
+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
+};
+var createInsertBodySchema = (table) => (0, import_drizzle_zod.createInsertSchema)(table).omit(basicInsertOmit);
+var createUpdateBodySchema = (table) => (0, import_drizzle_zod.createUpdateSchema)(table).omit(basicUpdateOmit).required({ id: true });
 var queryListSchema = (schema) => import_zod.z.object({
   current: import_zod.z.string().optional().default("1"),
   // 默认页码为 1
@@ -60,49 +79,39 @@ var listBodySchema = (schema) => import_zod.z.object({
 var createTableSchema = ({
   name,
   columns,
-  refineSchema,
   extraConfig
 }) => {
+  const mergedColumns = { ...basicFields, ...columns };
   const table = (0, import_pg_core.pgTable)(
     name,
-    {
-      ...basicFields,
-      ...columns
-    },
+    mergedColumns,
     extraConfig
   );
-  const selectSchema = (0, import_drizzle_zod.createSelectSchema)(
-    table,
-    refineSchema
+  const selectSchema = (0, import_drizzle_zod.createSelectSchema)(table);
+  const insertSchema = (0, import_drizzle_zod.createInsertSchema)((0, import_pg_core.pgTable)(name, columns));
+  const updateSchema = (0, import_drizzle_zod.createUpdateSchema)(
+    (0, import_pg_core.pgTable)(name, { id: (0, import_pg_core.uuid)("id"), ...columns })
+  ).extend({ id: import_zod.z.string() });
+  const querySchema = import_zod.z.object({ id: import_zod.z.string() });
+  const queryListWithSchema = queryListSchema(
+    import_zod.z.object({}).catchall(import_zod.z.unknown())
   );
-  const insertTable = (0, import_pg_core.pgTable)(name, columns);
-  const updateTable = (0, import_pg_core.pgTable)(name, {
-    id: (0, import_pg_core.uuid)(),
-    ...columns
-  });
   return {
     table,
     selectSchema,
-    insertSchema: (0, import_drizzle_zod.createInsertSchema)(
-      insertTable,
-      refineSchema
-    ),
-    updateSchema: (0, import_drizzle_zod.createUpdateSchema)(
-      updateTable,
-      {
-        id: import_zod.z.string(),
-        ...refineSchema
-      }
-    ),
-    querySchema: selectSchema.pick({ id: true }),
-    queryListSchema: queryListSchema(selectSchema.partial()),
+    insertSchema,
+    updateSchema,
+    querySchema,
+    queryListSchema: queryListWithSchema,
     queryListSelectSchema: selectSchema
   };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   basicFields,
+  createInsertBodySchema,
   createTableSchema,
+  createUpdateBodySchema,
   listBodySchema,
   queryListSchema
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai0x0/utils",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "AI0x0 utils",
   "keywords": [
     "ai0x0"