baja-lite 1.2.1 → 1.3.1

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/code.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import path from 'path';
 import fs from 'fs';
-import { start } from 'repl';
-import { createPool } from 'mysql2/promise';
 import mustache from 'mustache';
+import { createPool } from 'mysql2/promise';
+import path from 'path';
+import { start } from 'repl';
 import { mkdir } from 'shelljs';
 const lxMap = {
     tinyint: "number",

package/index.d.ts

@@ -10,3 +10,4 @@ export * from './snowflake.js';
 export * from './sql.js';
 export * from './sqlite.js';
 export * from './string.js';
+export * from './validate.js';

package/index.js

@@ -10,3 +10,4 @@ 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.1",
+  "version": "1.3.1",
   "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.1",
     "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.0",
-    "@typescript-eslint/parser": "8.26.0",
-    "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) => {
@@ -1418,6 +1335,8 @@ export declare class SqlService<T extends object> {
      */
     private _createTable;
     private _matchSqlid;
+    private _setParam;
+    private _generSql;
 }
 declare class StreamQuery<T extends object> {
     private _prefix;
@@ -1445,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;
@@ -1776,6 +1700,7 @@ declare class StreamQuery<T extends object> {
     }): number;
     private _where;
     private _;
+    private __;
     private _null;
     private _key;
     private _between;