@ai0x0/utils 0.0.17 → 0.0.20

package/lib/backend/schemas/index.js

@@ -21,29 +21,34 @@ var schemas_exports = {};
 __export(schemas_exports, {
   basicFields: () => basicFields,
   createTableSchema: () => createTableSchema,
-  integer: () => import_sqlite_core.integer,
   listBodySchema: () => listBodySchema,
-  queryListSchema: () => queryListSchema,
-  text: () => import_sqlite_core.text
+  queryListSchema: () => queryListSchema
 });
 module.exports = __toCommonJS(schemas_exports);
 var import_zod = require("zod");
-var import_sqlite_core = require("drizzle-orm/sqlite-core");
+var import_pg_core = require("drizzle-orm/pg-core");
 var import_drizzle_zod = require("drizzle-zod");
-var timestamp = (name) => (0, import_sqlite_core.text)(name).$defaultFn(() => (/* @__PURE__ */ new Date()).toISOString());
+var timestamptz = (name) => (0, import_pg_core.timestamp)(name, { withTimezone: true });
+var createdAt = () => timestamptz("created_at").notNull().defaultNow();
+var updatedAt = () => timestamptz("updated_at").notNull().defaultNow();
+var accessedAt = () => timestamptz("accessed_at").notNull().defaultNow();
 var basicFields = {
-  id: (0, import_sqlite_core.text)("id").primaryKey().$defaultFn(() => crypto.randomUUID()),
-  creatorId: (0, import_sqlite_core.text)("creator_id"),
-  editorId: (0, import_sqlite_core.text)("editor_id"),
-  accessedAt: timestamp("accessed_at").notNull(),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull()
+  id: (0, import_pg_core.uuid)("id").defaultRandom().primaryKey(),
+  creatorId: (0, import_pg_core.uuid)("creator_id"),
+  editorId: (0, import_pg_core.uuid)("editor_id"),
+  accessedAt: accessedAt(),
+  createdAt: createdAt(),
+  updatedAt: updatedAt()
 };
 var queryListSchema = (schema) => import_zod.z.object({
   current: import_zod.z.string().optional().default("1"),
+  // 默认页码为 1
   pageSize: import_zod.z.string().optional().default("10"),
+  // 默认每页条数为 10
   createdAtFrom: import_zod.z.string().optional(),
+  // 筛选开始日期
   createdAtTo: import_zod.z.string().optional(),
+  // 筛选结束日期
   orderBy: import_zod.z.string().optional(),
   creatorId: import_zod.z.string().optional(),
   orderDir: import_zod.z.enum(["asc", "desc"]).optional()
@@ -55,45 +60,30 @@ var listBodySchema = (schema) => import_zod.z.object({
 var createTableSchema = ({
   name,
   columns,
-  refineSchema,
   extraConfig
 }) => {
-  const table = (0, import_sqlite_core.sqliteTable)(
+  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 insertTable = (0, import_sqlite_core.sqliteTable)(
-    name,
-    columns
+  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 updateTable = (0, import_sqlite_core.sqliteTable)(name, {
-    id: (0, import_sqlite_core.text)("id"),
-    ...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
   };
 };
@@ -101,8 +91,6 @@ var createTableSchema = ({
 0 && (module.exports = {
   basicFields,
   createTableSchema,
-  integer,
   listBodySchema,
-  queryListSchema,
-  text
+  queryListSchema
 });

package/lib/backend/types.d.ts

@@ -1,18 +1,12 @@
-import { SQLiteColumn, SQLiteTable } from "drizzle-orm/sqlite-core";
+import { PgColumn, PgTable } from "drizzle-orm/pg-core";
 import { SQL } from "drizzle-orm";
-/**
- * 对底层 drizzle 数据库实例做最宽松的约束：
- * 只要能 `select / insert / update / delete` 并支持 drizzle 语法即可，
- * 从而允许在不同 driver（如 drizzle-orm/d1）之间切换。
- */
-export type AnyDatabase = any;
-export interface BaseTable extends SQLiteTable {
-    id: SQLiteColumn;
-    creatorId: SQLiteColumn;
-    editorId: SQLiteColumn;
-    accessedAt: SQLiteColumn;
-    createdAt: SQLiteColumn;
-    updatedAt: SQLiteColumn;
+export interface BaseTable extends PgTable {
+    id: PgColumn;
+    creatorId: PgColumn;
+    editorId: PgColumn;
+    accessedAt: PgColumn;
+    createdAt: PgColumn;
+    updatedAt: PgColumn;
 }
 export type GetListRelations = {
     groupBy?: boolean;

package/package.json

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