baja-lite 1.2.2 → 1.3.2

package/boot-remote.js

@@ -1,5 +1,6 @@
+import { DBType, _Hump } from 'baja-lite-field';
 import { getEnums } from './enum.js';
-import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql.js';
+import { ColumnMode, SqlCache, SqliteRemote, _GlobalSqlOption, _dao, _defOption, _enums, _primaryDB, _sqlCache, logger } from './sql.js';
 export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;

package/boot.js

@@ -1,5 +1,6 @@
+import { _Hump, DBType } from 'baja-lite-field';
 import { getEnums } from './enum.js';
-import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql.js';
+import { _dao, _defOption, _enums, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;

package/index.d.ts

@@ -5,8 +5,8 @@ export * from './fn.js';
 export * from './list.js';
 export * from './math.js';
 export * from './object.js';
-export * from './set-ex.js';
 export * from './snowflake.js';
 export * from './sql.js';
 export * from './sqlite.js';
 export * from './string.js';
+export * from './validate.js';

package/index.js

@@ -5,8 +5,8 @@ export * from './fn.js';
 export * from './list.js';
 export * from './math.js';
 export * from './object.js';
-export * from './set-ex.js';
 export * from './snowflake.js';
 export * from './sql.js';
 export * from './sqlite.js';
 export * from './string.js';
+export * from './validate.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.2.2",
+  "version": "1.3.2",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -23,7 +23,6 @@
   "bin": {
     "baja": "./code.js"
   },
-  "models": "./index.js",
   "scripts": {
     "dist": "node ./ci.js",
     "mysql": "bun --inspect ./src/test-mysql.ts",
@@ -31,14 +30,15 @@
     "postgres": "bun --inspect ./src/test-postgresql.ts",
     "postgres2": "node inspect ./dist/cjs/test-postgresql.js",
     "sqlite": "node inspect ./dist/cjs/test-sqlite.js",
-    "xml": "bun --inspect ./src/test-xml.ts",
     "test": "bun --inspect ./src/test.ts",
-    "test2": "node inspect ./dist/cjs/tes.js"
+    "test2": "node inspect ./dist/cjs/tes.js",
+    "xml": "bun --inspect ./src/test-xml.ts"
   },
   "dependencies": {
-    "@msgpack/msgpack": "3.1.0",
+    "@msgpack/msgpack": "3.1.1",
     "@types/request-promise": "4.1.51",
-    "axios": "1.8.1",
+    "axios": "1.8.4",
+    "baja-lite-field": "1.3.2",
     "decimal.js": "10.5.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
@@ -57,18 +57,18 @@
     "@types/better-sqlite3": "7.6.12",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.5",
-    "@types/node": "22.13.0",
+    "@types/node": "22.13.10",
     "@types/pg-pool": "2.0.6",
     "@types/shelljs": "0.8.15",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.26.1",
-    "@typescript-eslint/parser": "8.26.1",
-    "better-sqlite3": "11.8.1",
+    "@typescript-eslint/eslint-plugin": "8.27.0",
+    "@typescript-eslint/parser": "8.27.0",
+    "better-sqlite3": "11.9.1",
     "ioredis": "5.6.0",
-    "mongodb": "6.14.2",
-    "mysql2": "3.13.0",
-    "pg": "8.13.3",
-    "pg-pool": "3.7.1",
+    "mongodb": "6.15.0",
+    "mysql2": "3.14.0",
+    "pg": "8.14.1",
+    "pg-pool": "3.8.0",
     "redlock": "5.0.0-beta.2",
     "shelljs": "0.8.5",
     "typescript": "5.7.3"
@@ -78,5 +78,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "models": "./index.js"
 }

package/sql.d.ts

@@ -1,4 +1,5 @@
 import { ExtensionCodec } from "@msgpack/msgpack";
+import { _columns, _columnsNoId, _def, _deleteState, _fields, _ids, _index, _logicIds, _stateFileName, AField, DBType, FieldOption } from 'baja-lite-field';
 import { XML } from './convert-xml.js';
 import { EnumMap } from './enum.js';
 import { ArrayList } from './list.js';
@@ -8,16 +9,7 @@ declare const _tableName: unique symbol;
 declare const _className: unique symbol;
 declare const _ClassName: unique symbol;
 declare const _vueName: unique symbol;
-declare const _ids: unique symbol;
-declare const _logicIds: unique symbol;
-declare const _columns: unique symbol;
-declare const _columnsNoId: unique symbol;
-declare const _fields: unique symbol;
-declare const _stateFileName: unique symbol;
-declare const _deleteState: unique symbol;
 declare const _transformer: unique symbol;
-declare const _index: unique symbol;
-declare const _def: unique symbol;
 declare const _comment: unique symbol;
 export declare const _sqlCache: unique symbol;
 export declare const _dao: unique symbol;
@@ -30,21 +22,11 @@ declare const _daoDB: unique symbol;
 declare const _sqliteRemoteName: unique symbol;
 declare const _SqlOption: unique symbol;
 export declare const _enums: unique symbol;
-export declare const _Hump: unique symbol;
 export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
 export declare const _path: unique symbol;
 export declare const _fs: unique symbol;
 export declare const logger: import("pino").Logger<never, boolean>;
-export declare enum DBType {
-    Mysql = 0,
-    Postgresql = 1,
-    Sqlite = 2,
-    Mongo = 3,
-    SqliteRemote = 4,
-    Redis = 5,
-    RedisLock = 6
-}
 export declare enum MapperIfUndefined {
     Null = 0,
     Skip = 1,
@@ -135,32 +117,6 @@ export declare enum SelectResult {
     /** 多行多列并封装ArrayList */
     RS_CS_List = 7
 }
-export declare enum SqlType {
-    tinyint = 0,
-    smallint = 1,
-    mediumint = 2,
-    int = 3,
-    bigint = 4,
-    float = 5,
-    double = 6,
-    decimal = 7,
-    date = 8,
-    time = 9,
-    year = 10,
-    datetime = 11,
-    timestamp = 12,
-    char = 13,
-    varchar = 14,
-    tinyblob = 15,
-    tinytext = 16,
-    blob = 17,
-    text = 18,
-    mediumblob = 19,
-    mediumtext = 20,
-    longblob = 21,
-    longtext = 22,
-    json = 23
-}
 export declare enum ColumnMode {
     NONE = 0,
     HUMP = 1
@@ -490,44 +446,6 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
      */
     jsMode?: boolean;
 }
-interface FieldOption extends Object {
-    type?: SqlType;
-    /** @deprecated 属性名称:TS注解不需要，JS手动注入需要 */
-    P?: string;
-    length?: number;
-    scale?: number;
-    def?: any;
-    index?: boolean;
-    id?: boolean;
-    logicDelete?: string | number;
-    /** 是否逻辑唯一，用于导入时检测数据是否存在 */
-    logicId?: boolean;
-    /** 仅在生成 表时有效 */
-    notNull?: boolean;
-    /** 注释，影响到默认导出导入标题 */
-    comment?: string;
-    /** 可以导入的字段,默认TRUE,ID默认FALSE */
-    importable?: boolean;
-    /** 可以导出的字段,默认TRUE,ID默认FALSE */
-    exportable?: boolean;
-    /** sqlite 无效,与UUID只能有一个 */
-    uuidShort?: boolean;
-    /** 与uuidShort只能有一个 */
-    uuid?: boolean;
-}
-interface AField extends FieldOption {
-    /** 安全列名 */
-    C2: () => string;
-    /** @deprecated 数据列名称 */
-    C?: () => string;
-    /** 查询用：b_id bId */
-    C3: () => string;
-    [DBType.Postgresql]: () => string;
-    [DBType.Mysql]: () => string;
-    [DBType.Sqlite]: () => string;
-    [DBType.SqliteRemote]: () => string;
-    Data2SQL: (data: any) => any;
-}
 export interface PageQuery<L> {
     sum?: Record<string, number>;
     total?: number;
@@ -743,7 +661,6 @@ export declare class SqlCache {
         [k: string]: any;
     }): string;
 }
-export declare const Field: (config: FieldOption) => (object: object, propertyName: string) => void;
 export declare const DB: (config: ServiceOption) => <C extends {
     new (...args: any[]): {};
 }>(constructor: C) => {
@@ -1447,6 +1364,11 @@ declare class StreamQuery<T extends object> {
     reset(): this;
     /** 为下次链条执行提供条件判断：非异步方法跳过，异步方法不执行并返回默认值 */
     if(condition: boolean): this;
+    eqs(keys: (keyof T)[], value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
+    }): this;
     eq(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
@@ -1778,6 +1700,7 @@ declare class StreamQuery<T extends object> {
     }): number;
     private _where;
     private _;
+    private __;
     private _null;
     private _key;
     private _between;

package/sql.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _b, _c, _d, _e;
 var _f, _g, _h, _j;
 import { decode, DecodeError, encode, ExtensionCodec } from "@msgpack/msgpack";
+import { _columns, _columnsNoId, _def, _deleteState, _fields, _Hump, _ids, _index, _logicIds, _stateFileName, DBType, Field } from 'baja-lite-field';
 import HTML from 'html-parse-stringify';
 import * as ite from 'iterare';
 import LGet from 'lodash.get';
@@ -57,16 +58,7 @@ const _tableName = Symbol('tableName');
 const _className = Symbol('className');
 const _ClassName = Symbol('ClassName');
 const _vueName = Symbol('vueName');
-const _ids = Symbol('ids');
-const _logicIds = Symbol('logicIds');
-const _columns = Symbol('columns');
-const _columnsNoId = Symbol('columnsNoId');
-const _fields = Symbol('fields');
-const _stateFileName = Symbol('stateFileName');
-const _deleteState = Symbol('deleteState');
 const _transformer = Symbol('transformer');
-const _index = Symbol('index');
-const _def = Symbol('def');
 const _comment = Symbol('comment');
 export const _sqlCache = Symbol('sqlMap');
 export const _dao = Symbol('dao');
@@ -81,7 +73,6 @@ const _SqlOption = Symbol('SqlOption');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
 export const _enums = Symbol('_enums');
-export const _Hump = Symbol('Hump');
 export const _GlobalSqlOption = Symbol('GlobalSqlOption');
 export const _EventBus = Symbol('EventBus');
 export const _path = Symbol('path');
@@ -95,17 +86,6 @@ export const logger = process.env['NODE_ENV'] !== 'production' ? pino({
 globalThis[_resultMap_SQLID] = {};
 // #endregion
 // #region 可选配置
-export var DBType;
-(function (DBType) {
-    DBType[DBType["Mysql"] = 0] = "Mysql";
-    DBType[DBType["Postgresql"] = 1] = "Postgresql";
-    DBType[DBType["Sqlite"] = 2] = "Sqlite";
-    DBType[DBType["Mongo"] = 3] = "Mongo";
-    DBType[DBType["SqliteRemote"] = 4] = "SqliteRemote";
-    DBType[DBType["Redis"] = 5] = "Redis";
-    DBType[DBType["RedisLock"] = 6] = "RedisLock";
-})(DBType || (DBType = {}));
-;
 export var MapperIfUndefined;
 (function (MapperIfUndefined) {
     MapperIfUndefined[MapperIfUndefined["Null"] = 0] = "Null";
@@ -214,33 +194,6 @@ export var SelectResult;
     /** 多行多列并封装ArrayList */
     SelectResult[SelectResult["RS_CS_List"] = 7] = "RS_CS_List";
 })(SelectResult || (SelectResult = {}));
-export var SqlType;
-(function (SqlType) {
-    SqlType[SqlType["tinyint"] = 0] = "tinyint";
-    SqlType[SqlType["smallint"] = 1] = "smallint";
-    SqlType[SqlType["mediumint"] = 2] = "mediumint";
-    SqlType[SqlType["int"] = 3] = "int";
-    SqlType[SqlType["bigint"] = 4] = "bigint";
-    SqlType[SqlType["float"] = 5] = "float";
-    SqlType[SqlType["double"] = 6] = "double";
-    SqlType[SqlType["decimal"] = 7] = "decimal";
-    SqlType[SqlType["date"] = 8] = "date";
-    SqlType[SqlType["time"] = 9] = "time";
-    SqlType[SqlType["year"] = 10] = "year";
-    SqlType[SqlType["datetime"] = 11] = "datetime";
-    SqlType[SqlType["timestamp"] = 12] = "timestamp";
-    SqlType[SqlType["char"] = 13] = "char";
-    SqlType[SqlType["varchar"] = 14] = "varchar";
-    SqlType[SqlType["tinyblob"] = 15] = "tinyblob";
-    SqlType[SqlType["tinytext"] = 16] = "tinytext";
-    SqlType[SqlType["blob"] = 17] = "blob";
-    SqlType[SqlType["text"] = 18] = "text";
-    SqlType[SqlType["mediumblob"] = 19] = "mediumblob";
-    SqlType[SqlType["mediumtext"] = 20] = "mediumtext";
-    SqlType[SqlType["longblob"] = 21] = "longblob";
-    SqlType[SqlType["longtext"] = 22] = "longtext";
-    SqlType[SqlType["json"] = 23] = "json";
-})(SqlType || (SqlType = {}));
 export var ColumnMode;
 (function (ColumnMode) {
     ColumnMode[ColumnMode["NONE"] = 0] = "NONE";
@@ -1974,233 +1927,6 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     }
     return [ret, V];
 };
-const MYSQLCHARSET = `CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci`;
-const POSTGRESCHARSET = `COLLATE "pg_catalog"."default"`;
-export const Field = (config) => {
-    config.type ?? (config.type = SqlType.varchar);
-    return (object, propertyName) => {
-        const field = config;
-        field.P = propertyName;
-        field.C = () => P2C(propertyName, globalThis[_Hump]);
-        field.C2 = () => P2C(propertyName, globalThis[_Hump]);
-        field.C3 = () => `${P2C(propertyName, globalThis[_Hump])} ${propertyName}`;
-        const hasDef = field.hasOwnProperty('def') === true;
-        switch (field.type) {
-            case SqlType.tinyint: {
-                field[DBType.Mysql] = () => `${field.C2()} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} int2 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
-                break;
-            }
-            case SqlType.smallint: {
-                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} int2 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
-                break;
-            }
-            case SqlType.mediumint: {
-                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} int4 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
-                break;
-            }
-            case SqlType.int: {
-                field[DBType.Mysql] = () => `${field.C2()} int ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} int4 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
-                break;
-            }
-            case SqlType.bigint: {
-                field[DBType.Mysql] = () => `${field.C2()} bigint ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} int8 ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
-                field.Data2SQL = (data) => BigInt(data ?? 0);
-                break;
-            }
-            case SqlType.float: {
-                field[DBType.Mysql] = () => `${field.C2()} float4(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
-                field[DBType.Postgresql] = () => `${field.C2()} float4(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
-                break;
-            }
-            case SqlType.double: {
-                field[DBType.Mysql] = () => `${field.C2()} double(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
-                field[DBType.Postgresql] = () => `${field.C2()} float8(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
-                break;
-            }
-            case SqlType.decimal: {
-                field[DBType.Mysql] = () => `${field.C2()} decimal(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
-                field[DBType.Postgresql] = () => `${field.C2()} numeric(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
-                break;
-            }
-            case SqlType.longtext: {
-                field[DBType.Mysql] = () => `${field.C2()} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.mediumtext: {
-                field[DBType.Mysql] = () => `${field.C2()} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.text: {
-                field[DBType.Mysql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.date: {
-                field[DBType.Mysql] = () => `${field.C2()} date ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} date ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                field.Data2SQL = (data) => typeof data === 'string' ? new Date(data) : data;
-                break;
-            }
-            case SqlType.time: {
-                field[DBType.Mysql] = () => `${field.C2()} time ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} time ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                field.Data2SQL = (data) => typeof data === 'string' ? new Date(data) : data;
-                break;
-            }
-            case SqlType.year: {
-                field[DBType.Mysql] = () => `${field.C2()} year ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} int4 ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                field.Data2SQL = (data) => typeof data === 'string' ? new Date(data) : data;
-                break;
-            }
-            case SqlType.datetime: {
-                field[DBType.Mysql] = () => `${field.C2()} datetime ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                field.Data2SQL = (data) => typeof data === 'string' ? new Date(data) : data;
-                break;
-            }
-            case SqlType.timestamp: {
-                field[DBType.Mysql] = () => `${field.C2()} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
-                field.Data2SQL = (data) => typeof data === 'string' ? +new Date(data) : data;
-                break;
-            }
-            case SqlType.char: {
-                field[DBType.Mysql] = () => `${field.C2()} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.varchar: {
-                field[DBType.Mysql] = () => `${field.C2()} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.tinyblob: {
-                field[DBType.Mysql] = () => `${field.C2()} tinyblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.tinytext: {
-                field[DBType.Mysql] = () => `${field.C2()} tinytext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.blob: {
-                field[DBType.Mysql] = () => `${field.C2()} binary ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.text: {
-                field[DBType.Mysql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.mediumblob: {
-                field[DBType.Mysql] = () => `${field.C2()} mediumblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.mediumtext: {
-                field[DBType.Mysql] = () => `${field.C2()} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.longblob: {
-                field[DBType.Mysql] = () => `${field.C2()} longblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.longtext: {
-                field[DBType.Mysql] = () => `${field.C2()} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.json: {
-                field[DBType.Mysql] = () => `${field.C2()} json ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.Postgresql] = () => `${field.C2()} jsonb ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-        }
-        ;
-        let __fields = Reflect.getMetadata(_fields, object);
-        let __columns = Reflect.getMetadata(_columns, object);
-        let __columnsNoId = Reflect.getMetadata(_columnsNoId, object);
-        let __ids = Reflect.getMetadata(_ids, object);
-        let __logicIds = Reflect.getMetadata(_logicIds, object);
-        let __index = Reflect.getMetadata(_index, object);
-        let __def = Reflect.getMetadata(_def, object);
-        if (!__fields) {
-            __fields = {};
-            __columns = [];
-            __columnsNoId = [];
-            __ids = [];
-            __index = [];
-            __def = {};
-        }
-        __fields[propertyName] = field;
-        __columns.push(propertyName);
-        if (field.id === true) {
-            __ids.push(propertyName);
-        }
-        else {
-            __columnsNoId.push(propertyName);
-        }
-        if (field.logicId === true) {
-            __logicIds.push(propertyName);
-        }
-        if (field.index === true) {
-            __index.push(propertyName);
-        }
-        if (hasDef) {
-            __def[propertyName] = field.def;
-        }
-        Reflect.defineMetadata(_fields, __fields, object);
-        Reflect.defineMetadata(_columns, __columns, object);
-        Reflect.defineMetadata(_columnsNoId, __columnsNoId, object);
-        Reflect.defineMetadata(_ids, __ids, object);
-        Reflect.defineMetadata(_logicIds, __logicIds, object);
-        Reflect.defineMetadata(_index, __index, object);
-        Reflect.defineMetadata(_def, __def, object);
-        if (field.hasOwnProperty('logicDelete')) {
-            Reflect.defineMetadata(_deleteState, field.logicDelete, object);
-            Reflect.defineMetadata(_stateFileName, propertyName, object);
-        }
-    };
-};
 const formatDialects = {
     [DBType.Mysql]: mysql,
     [DBType.Sqlite]: sqlite,
@@ -3677,6 +3403,7 @@ class StreamQuery {
         this.if_proceed = condition;
         return this;
     }
+    eqs(keys, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this.__(keys, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     eq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._(key, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     eqT(t, { name: paramName = '', breakExcuteIfSkip = false } = {}) {
         let exe = false;
@@ -4052,7 +3779,6 @@ class StreamQuery {
             this._param[this._paramKeys[paramName]] = value;
         }
         else {
-            paramName;
             const pkey = `p${this._prefix}${this._index++}`;
             this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `);
             this._param[pkey] = value;
@@ -4062,6 +3788,28 @@ class StreamQuery {
         }
         return this;
     }
+    __(keys, value, op, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
+            if (breakExcuteIfSkip === true) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND (${keys.map(key => `${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `).join(' OR ')})`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
     _null(key, not = '') {
         this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS ${not} NULL`);
         return this;
@@ -4233,6 +3981,12 @@ __decorate([
     __metadata("design:paramtypes", [Boolean]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "if", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "eqs", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),

package/test-mysql.js

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { Field, SqlType } from 'baja-lite-field';
 import 'reflect-metadata';
 import { Boot } from './boot.js';
-import { ColumnMode, DB, Field, SqlService, SqlType } from './sql.js';
+import { ColumnMode, DB, SqlService } from './sql.js';
 class BaseAuditUser {
 }
 __decorate([

package/test-postgresql.js

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { DBType, Field, SqlType } from 'baja-lite-field';
 import 'reflect-metadata';
 import { Boot } from './boot.js';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql.js';
+import { ColumnMode, DB, SelectResult, SqlService, } from './sql.js';
 class AmaFuck2 {
 }
 __decorate([