@ai0x0/utils 0.0.17 → 0.0.20

package/es/backend/schemas/index.js

@@ -5,35 +5,44 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { z } from "zod";
-import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
+import { pgTable, timestamp, uuid } from "drizzle-orm/pg-core";
 import { createInsertSchema, createSelectSchema, createUpdateSchema } from "drizzle-zod";
 
 //============================基本字段============================//
-// SQLite / D1：用 text 存 ISO 时间戳，用 text 存 uuid（crypto.randomUUID()）
-var timestamp = function timestamp(name) {
-  return text(name).$defaultFn(function () {
-    return new Date().toISOString();
+var timestamptz = function timestamptz(name) {
+  return timestamp(name, {
+    withTimezone: true
   });
 };
+var createdAt = function createdAt() {
+  return timestamptz("created_at").notNull().defaultNow();
+};
+var updatedAt = function updatedAt() {
+  return timestamptz("updated_at").notNull().defaultNow();
+};
+var accessedAt = function accessedAt() {
+  return timestamptz("accessed_at").notNull().defaultNow();
+};
 export var basicFields = {
-  id: text("id").primaryKey().$defaultFn(function () {
-    return crypto.randomUUID();
-  }),
-  creatorId: text("creator_id"),
-  editorId: text("editor_id"),
-  accessedAt: timestamp("accessed_at").notNull(),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull()
+  id: uuid("id").defaultRandom().primaryKey(),
+  creatorId: uuid("creator_id"),
+  editorId: uuid("editor_id"),
+  accessedAt: accessedAt(),
+  createdAt: createdAt(),
+  updatedAt: updatedAt()
 };
-export { integer, text };
 
 //============================列表查询字段============================//
 export var queryListSchema = function queryListSchema(schema) {
   return z.object({
     current: z.string().optional().default("1"),
+    // 默认页码为 1
     pageSize: z.string().optional().default("10"),
+    // 默认每页条数为 10
     createdAtFrom: z.string().optional(),
+    // 筛选开始日期
     createdAtTo: z.string().optional(),
+    // 筛选结束日期
     orderBy: z.string().optional(),
     creatorId: z.string().optional(),
     orderDir: z.enum(["asc", "desc"]).optional()
@@ -48,29 +57,44 @@ export var listBodySchema = function listBodySchema(schema) {
   });
 };
 
-//============================创建一个 SQLite 表（D1）============================//
+//============================创建一个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 = sqliteTable(name, _objectSpread(_objectSpread({}, basicFields), columns), extraConfig);
-  var selectSchema = createSelectSchema(table, refineSchema);
-  var insertTable = sqliteTable(name, columns);
-  var updateTable = sqliteTable(name, _objectSpread({
-    id: text("id")
-  }, 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/es/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/lib/backend/actions/create-delete-action.d.ts

@@ -1,8 +1,9 @@
-import { BaseTable, AnyDatabase } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { BaseTable } from "../types";
 export declare function createDeleteAction<TTable extends BaseTable>({ table, db, }: {
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     table: TTable;
 }): ({ id, creatorId }: {
     id: string;
     creatorId?: string | undefined;
-}) => Promise<any>;
+}) => Promise<TTable["$inferSelect"] extends infer T ? T extends TTable["$inferSelect"] ? T extends undefined ? QueryResult<import("drizzle-orm").Assume<this["row"], QueryResultRow>> : T[] : never : never>;

package/lib/backend/actions/create-get-action.d.ts

@@ -1,8 +1,9 @@
 import { z, ZodSchema } from "zod";
-import { BaseTable, GetListRelations, AnyDatabase } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { BaseTable, GetListRelations } from "../types";
 export declare function createGetAction<T extends ZodSchema, TTable extends BaseTable>({ bodySchema, db, jsonArrayFields, relations, table, }: {
     bodySchema: T;
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     jsonArrayFields?: string[];
     relations?: GetListRelations;
     table: TTable;

package/lib/backend/actions/create-get-list-action.d.ts

@@ -1,8 +1,9 @@
 import { z, ZodSchema } from "zod";
-import { BaseTable, GetListRelations, AnyDatabase } from "../types";
+import { BaseTable, GetListRelations } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
 export declare function createGetListAction<T extends ZodSchema, TTable extends BaseTable>({ bodySchema, db, jsonArrayFields, relations, table, }: {
     bodySchema: T;
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     jsonArrayFields?: string[];
     relations?: GetListRelations;
     table: TTable;

package/lib/backend/actions/create-post-action.d.ts

@@ -1,8 +1,8 @@
 import { z, ZodSchema } from "zod";
-import { AnyDatabase } from "../types";
-import { SQLiteTable } from "drizzle-orm/sqlite-core";
-export declare function createPostAction<T extends ZodSchema, TTable extends SQLiteTable>({ table, db }: {
+import { PgTable } from "drizzle-orm/pg-core";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+export declare function createPostAction<T extends ZodSchema, TTable extends PgTable>({ table, db, }: {
     bodySchema: T;
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     table: TTable;
 }): (body: z.infer<T>) => Promise<z.infer<T>[]>;

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

@@ -23,7 +23,10 @@ __export(create_post_action_exports, {
 });
 module.exports = __toCommonJS(create_post_action_exports);
 var import_transform_body = require("./transform-body");
-function createPostAction({ table, db }) {
+function createPostAction({
+  table,
+  db
+}) {
   return async (body) => {
     const values = (0, import_transform_body.transformBody)(body);
     const result = await db.insert(table).values(values).returning();

package/lib/backend/actions/create-put-action.d.ts

@@ -1,8 +1,9 @@
 import { z, ZodSchema } from "zod";
-import { BaseTable, AnyDatabase } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { BaseTable } from "../types";
 export declare function createPutAction<T extends ZodSchema, TTable extends BaseTable>({ db, table, }: {
     bodySchema: T;
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     table: TTable;
 }): (body: Partial<z.infer<T>> & Record<string, unknown>, { byCreator, }?: {
     byCreator?: boolean | undefined;

package/lib/backend/actions/get-list-query.d.ts

@@ -1,7 +1,9 @@
-import { BaseTable, GetListRelations, AnyDatabase } from "../types";
-import { SelectedFields } from "drizzle-orm/sqlite-core/query-builders/select.types";
+import { BaseTable, GetListRelations } from "../types";
+import { SelectedFields } from "drizzle-orm/pg-core/query-builders/select.types";
+import { SQL } from "drizzle-orm";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
 export declare function getListQuery<TTable extends BaseTable, TSelection extends SelectedFields>({ db, fields, jsonArrayFields, params, relations, table, }: {
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     fields: TSelection;
     jsonArrayFields?: string[];
     params: {
@@ -14,6 +16,12 @@ export declare function getListQuery<TTable extends BaseTable, TSelection extend
     relations?: GetListRelations;
     table: TTable;
 }): {
-    countQuery: any;
+    countQuery: Omit<import("drizzle-orm/pg-core").PgSelectBase<string, {
+        count: SQL<unknown>;
+    }, "partial", Record<string, "not-null">, false, "where", {
+        count: unknown;
+    }[], {
+        count: import("drizzle-orm").DrizzleTypeError<"You cannot reference this field without assigning it an alias first - use `.as(<alias>)`">;
+    }>, "where">;
     query: any;
 };

package/lib/backend/actions/get-list-query.js

@@ -23,7 +23,6 @@ __export(get_list_query_exports, {
 });
 module.exports = __toCommonJS(get_list_query_exports);
 var import_drizzle_orm = require("drizzle-orm");
-var ciLike = (col, value) => import_drizzle_orm.sql`LOWER(${col}) LIKE ${value.toLowerCase()}`;
 function getListQuery({
   db,
   fields,
@@ -72,8 +71,8 @@ function getListQuery({
             conditions2.push(
               import_drizzle_orm.sql`
                 EXISTS (
-                  SELECT 1 FROM json_each(${targetColumn})
-                  WHERE LOWER(json_each.value) LIKE ${`%${values[0]}%`}
+                  SELECT 1 FROM jsonb_array_elements_text(${targetColumn}) tag
+                  WHERE tag LIKE ${`%${values[0]}%`}
                 )
               `
             );
@@ -82,7 +81,7 @@ function getListQuery({
           } else {
             conditions2.push(
               (0, import_drizzle_orm.or)(
-                ...values.map((v) => ciLike(targetColumn, `%${v}%`))
+                ...values.map((v) => (0, import_drizzle_orm.ilike)(targetColumn, `%${v}%`))
               )
             );
           }
@@ -92,15 +91,15 @@ function getListQuery({
           conditions2.push(
             import_drizzle_orm.sql`
               EXISTS (
-                SELECT 1 FROM json_each(${targetColumn})
-                WHERE LOWER(json_each.value) LIKE ${`%${value}%`}
+                SELECT 1 FROM jsonb_array_elements_text(${targetColumn}) tag
+                WHERE tag LIKE ${`%${value}%`}
               )
             `
           );
         } else if (isIdField) {
           conditions2.push((0, import_drizzle_orm.eq)(targetColumn, value));
         } else {
-          conditions2.push(ciLike(targetColumn, `%${value}%`));
+          conditions2.push((0, import_drizzle_orm.ilike)(targetColumn, `%${value}%`));
         }
       }
     } else {

package/lib/backend/route-operation/delete-operation.d.ts

@@ -1,5 +1,6 @@
 import { TypedNextResponse } from "next-rest-framework";
-import { BaseTable, AnyDatabase } from "../types";
+import { BaseTable } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NextRequest } from "next/server";
 export interface DeleteOperationOptions<TTable extends BaseTable> {
     table: TTable;
@@ -9,7 +10,7 @@ export interface DeleteOperationOptions<TTable extends BaseTable> {
     byCreator?: boolean;
 }
 export declare const createDeleteOperation: ({ db, getSession, }: {
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;

package/lib/backend/route-operation/get-list-operation.d.ts

@@ -1,7 +1,8 @@
 import { z, ZodSchema } from "zod";
 import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
-import { BaseTable, GetListRelations, AnyDatabase } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { BaseTable, GetListRelations } from "../types";
 export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
     bodySchema: T;
     jsonArrayFields?: string[];
@@ -21,7 +22,7 @@ export interface GetListOperationOptions<T extends ZodSchema, Q extends ZodSchem
     onError?: (error: Error) => Promise<ReturnType<(typeof TypedNextResponse)["json"]> | undefined>;
 }
 export declare const createGetListOperation: ({ db, getSession, }: {
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;

package/lib/backend/route-operation/get-operation.d.ts

@@ -1,7 +1,8 @@
 import { z, ZodSchema } from "zod";
 import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
-import { BaseTable, GetListRelations, AnyDatabase } from "../types";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { BaseTable, GetListRelations } from "../types";
 export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, TTable extends BaseTable> {
     bodySchema: T;
     jsonArrayFields?: string[];
@@ -15,7 +16,7 @@ export interface GetOperationOptions<T extends ZodSchema, Q extends ZodSchema, T
     byCreator?: boolean;
 }
 export declare const createGetOperation: ({ getSession, db, }: {
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;

package/lib/backend/route-operation/get-table-name.d.ts

@@ -1,3 +1,3 @@
-import { SQLiteTable } from "drizzle-orm/sqlite-core";
-declare function getTableName(table: SQLiteTable): string;
+import { PgTable } from "drizzle-orm/pg-core";
+declare function getTableName(table: PgTable): string;
 export default getTableName;

package/lib/backend/route-operation/post-operation.d.ts

@@ -1,9 +1,9 @@
 import { z, ZodSchema } from "zod";
-import { AnyDatabase } from "../types";
-import { SQLiteTable } from "drizzle-orm/sqlite-core";
+import { PgTable } from "drizzle-orm/pg-core";
 import { NextRequest } from "next/server";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
-export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends SQLiteTable> {
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends PgTable> {
     bodySchema: IB;
     outputBodySchema?: IB;
     setBody?: (req: TypedNextRequest<"POST", "application/json", z.infer<IB>>) => Promise<Partial<z.infer<IB>>>;
@@ -13,8 +13,8 @@ export interface PostOperationOptions<IB extends ZodSchema, OB extends ZodSchema
     table: TTable;
 }
 export declare const createPostOperation: ({ getSession, db, }: {
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;
-}) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends SQLiteTable<import("drizzle-orm/sqlite-core").TableConfig>>({ bodySchema, outputBodySchema, setBody, summary, table, onSuccess, onError, }: PostOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"POST">;
+}) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends PgTable<import("drizzle-orm/pg-core").TableConfig>>({ bodySchema, outputBodySchema, setBody, summary, table, onSuccess, onError, }: PostOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"POST">;

package/lib/backend/route-operation/put-operation.d.ts

@@ -1,9 +1,10 @@
 import { z, ZodSchema } from "zod";
-import { SQLiteTable } from "drizzle-orm/sqlite-core";
+import { PgTable } from "drizzle-orm/pg-core";
 import { TypedNextRequest, TypedNextResponse } from "next-rest-framework";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NextRequest } from "next/server";
-import { BaseTable, AnyDatabase } from "../types";
-export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends SQLiteTable> {
+import { BaseTable } from "../types";
+export interface PutOperationOptions<IB extends ZodSchema, OB extends ZodSchema, TTable extends PgTable> {
     bodySchema: IB;
     outputBodySchema?: OB;
     table: TTable;
@@ -17,5 +18,5 @@ export declare const createPutOperation: ({ getSession, db, }: {
     getSession: (req: NextRequest) => Promise<{
         userId?: string;
     } | undefined>;
-    db: AnyDatabase;
+    db: NodePgDatabase<Record<string, unknown>>;
 }) => <IB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, OB extends z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>, TTable extends BaseTable>({ bodySchema, outputBodySchema, table, summary, setBody, onSuccess, byCreator, onError, }: PutOperationOptions<IB, OB, TTable>) => import("next-rest-framework").RouteOperationDefinition<"PUT">;