@ai0x0/utils 0.0.17 → 0.0.18

package/es/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/es/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/es/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/es/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/es/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/es/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/es/backend/actions/get-list-query.js

@@ -1,10 +1,11 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _templateObject, _templateObject2, _templateObject3;
 var _excluded = ["page", "pageSize", "orderBy", "orderDir"];
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -19,11 +20,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-import { and, asc, desc, eq, gte, inArray, lte, or, sql } from "drizzle-orm";
-var ciLike = function ciLike(col, value) {
-  return sql(_templateObject || (_templateObject = _taggedTemplateLiteral(["LOWER(", ") LIKE ", ""])), col, value.toLowerCase());
-};
+import { and, asc, desc, eq, gte, ilike, inArray, lte, or, sql } from "drizzle-orm";
 export function getListQuery(_ref) {
   var db = _ref.db,
     fields = _ref.fields,
@@ -105,12 +102,12 @@ export function getListQuery(_ref) {
         if (values.length > 0) {
           if (isJsonArray) {
             // 处理JSONB数组字段
-            conditions.push(sql(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                EXISTS (\n                  SELECT 1 FROM json_each(", ")\n                  WHERE LOWER(json_each.value) LIKE ", "\n                )\n              "])), targetColumn, "%".concat(values[0], "%")));
+            conditions.push(sql(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                EXISTS (\n                  SELECT 1 FROM jsonb_array_elements_text(", ") tag\n                  WHERE tag LIKE ", "\n                )\n              "])), targetColumn, "%".concat(values[0], "%")));
           } else if (isIdField) {
             conditions.push(inArray(targetColumn, values));
           } else {
             conditions.push(or.apply(void 0, _toConsumableArray(values.map(function (v) {
-              return ciLike(targetColumn, "%".concat(v, "%"));
+              return ilike(targetColumn, "%".concat(v, "%"));
             }))));
           }
         }
@@ -118,11 +115,11 @@ export function getListQuery(_ref) {
         // 处理单值
         if (isJsonArray) {
           // 处理JSONB数组字段
-          conditions.push(sql(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              EXISTS (\n                SELECT 1 FROM json_each(", ")\n                WHERE LOWER(json_each.value) LIKE ", "\n              )\n            "])), targetColumn, "%".concat(value, "%")));
+          conditions.push(sql(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              EXISTS (\n                SELECT 1 FROM jsonb_array_elements_text(", ") tag\n                WHERE tag LIKE ", "\n              )\n            "])), targetColumn, "%".concat(value, "%")));
         } else if (isIdField) {
           conditions.push(eq(targetColumn, value));
         } else {
-          conditions.push(ciLike(targetColumn, "%".concat(value, "%")));
+          conditions.push(ilike(targetColumn, "%".concat(value, "%")));
         }
       }
     } else {
@@ -182,7 +179,7 @@ export function getListQuery(_ref) {
 
   // 构建计数查询(优化后)
   var countQuery = db.select({
-    count: sql(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["COUNT(DISTINCT ", ")"])), table.id)
+    count: sql(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["COUNT(DISTINCT ", ")"])), table.id)
   }).from(table).where(conditions.length > 0 ? and.apply(void 0, _toConsumableArray(conditions)) : undefined);
 
   // 添加关联

package/es/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/es/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/es/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/es/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/es/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/es/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">;