baja-lite 1.4.7 → 1.4.9

package/sql.js

@@ -26,9 +26,7 @@ import { add, calc, ten2Any } from './math.js';
 import { C2P, C2P2, P2C } from './object.js';
 import { emptyString } from './string.js';
 const iterate = ite.iterate;
-BigInt.prototype.toJSON = function () {
-    return this.toString();
-};
+BigInt.prototype.toJSON = function () { return this.toString(); };
 const BIGINT_EXT_TYPE = 0;
 export const extensionCodec = new ExtensionCodec();
 extensionCodec.register({
@@ -72,9 +70,9 @@ const _inTransaction = Symbol('inTransaction');
 const _daoDB = Symbol('daoDB');
 const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
+export const _DataConvert = Symbol('DataConvert');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
-export const _dataConvert = Symbol('dataConvert');
 export const _enum = Symbol('_enum');
 export const _GlobalSqlOption = Symbol('GlobalSqlOption');
 export const _EventBus = Symbol('EventBus');
@@ -104,6 +102,7 @@ export var MapperIfUndefined;
     MapperIfUndefined[MapperIfUndefined["Zero"] = 2] = "Zero";
     MapperIfUndefined[MapperIfUndefined["EmptyString"] = 3] = "EmptyString";
 })(MapperIfUndefined || (MapperIfUndefined = {}));
+;
 export var SyncMode;
 (function (SyncMode) {
     /** 同步执行 */
@@ -114,27 +113,27 @@ export var SyncMode;
 export var InsertMode;
 (function (InsertMode) {
     /**
-     # 默认使用
-     ** 支持单个、批量,语法 `INSERT INTO XX VALUES (第一条数据), (第二条数据);`
-     ** 批量执行有性能优势，但无法利用数据库的sql预编译功能
-     */
+    # 默认使用
+    ** 支持单个、批量,语法 `INSERT INTO XX VALUES (第一条数据), (第二条数据);`
+    ** 批量执行有性能优势，但无法利用数据库的sql预编译功能
+    */
     InsertMode[InsertMode["Insert"] = 0] = "Insert";
     /**
-     # 利用临时表
-     ## 执行步骤
-     1. 建立临时表(从正式表复制)
-     2. 数据全部进入临时表
-     3. 临时表数据转移到正式表: `INSERT INTO 正式表 SELECT * FROM 临时表`
-     4. 删除临时表
-     ## 注意
-     1. 适用于：主键不会冲突、非自增
-     2. 临时表的结构复制正式表
+    # 利用临时表
+    ## 执行步骤
+    1. 建立临时表(从正式表复制)
+    2. 数据全部进入临时表
+    3. 临时表数据转移到正式表: `INSERT INTO 正式表 SELECT * FROM 临时表`
+    4. 删除临时表
+    ## 注意
+    1. 适用于：主键不会冲突、非自增
+    2. 临时表的结构复制正式表
      */
     InsertMode[InsertMode["InsertWithTempTable"] = 1] = "InsertWithTempTable";
     InsertMode[InsertMode["InsertIfNotExists"] = 2] = "InsertIfNotExists";
     /**
-     # 插入或者更新
-     1. 判断依据是主键
+    # 插入或者更新
+    1. 判断依据是主键
      */
     InsertMode[InsertMode["Replace"] = 3] = "Replace";
 })(InsertMode || (InsertMode = {}));
@@ -146,7 +145,7 @@ export var DeleteMode;
      `DELETE FROM WHERE (id = 1) OR (id = 2)`
      ### 例二
      `DELETE FROM WHERE (id = 1 AND idx = 11) OR (id = 2 AND idx = 22)`
-     */
+    */
     DeleteMode[DeleteMode["Common"] = 0] = "Common";
     /*
     ## 借助临时表
@@ -163,7 +162,7 @@ export var SelectMode;
      `SELECT * FROM WHERE (id = 1) OR (id = 2)`
      ### 例二
      `SELECT * FROM WHERE (id = 1 AND idx = 11) OR (id = 2 AND idx = 22)`
-     */
+    */
     SelectMode[SelectMode["Common"] = 0] = "Common";
     /*
     ## 借助临时表
@@ -216,6 +215,7 @@ export const _defOption = {
     skipNull: true,
     skipEmptyString: true
 };
+;
 class MysqlConnection {
     constructor(conn) {
         this[_b] = false;
@@ -226,10 +226,12 @@ class MysqlConnection {
         if (!sql) {
             return { affectedRows: 0, insertId: 0n };
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -257,10 +259,12 @@ class MysqlConnection {
         if (!sql) {
             return null;
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -291,10 +295,12 @@ class MysqlConnection {
         if (!sql) {
             return null;
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -323,10 +329,12 @@ class MysqlConnection {
         if (!sql) {
             return [];
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return [];
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -355,10 +363,12 @@ class MysqlConnection {
         if (!sql) {
             return [];
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return [];
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -388,6 +398,7 @@ class MysqlConnection {
             catch (error) {
             }
         }
+        ;
     }
 }
 _b = _inTransaction;
@@ -405,6 +416,7 @@ export class Mysql {
             logger.error('MYSQL not suppouted sync mode');
             return null;
         }
+        ;
         return new Promise(async (resolve, reject) => {
             try {
                 const connection = await this[_daoDB].getConnection();
@@ -421,6 +433,7 @@ export class Mysql {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
+        ;
         return new Promise(async (resolve, reject) => {
             let needCommit = false;
             let newConn = false;
@@ -473,6 +486,7 @@ export class Mysql {
         if (sync === SyncMode.Sync) {
             this[_daoDB]?.destroy();
         }
+        ;
     }
     backup(sync, name) {
     }
@@ -491,10 +505,12 @@ class PostgresqlConnection {
         if (!sql) {
             return { affectedRows: 0, insertId: 0n };
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('Postgresql not suppouted sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -526,10 +542,12 @@ class PostgresqlConnection {
         if (!sql) {
             return null;
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('Postgresql not suppouted sync mode');
             return null;
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -564,10 +582,12 @@ class PostgresqlConnection {
         if (!sql) {
             return null;
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('Postgresql not suppouted sync mode');
             return null;
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -600,10 +620,12 @@ class PostgresqlConnection {
         if (!sql) {
             return [];
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('Postgresql not suppouted sync mode');
             return [];
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -636,10 +658,12 @@ class PostgresqlConnection {
         if (!sql) {
             return [];
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('Postgresql not suppouted sync mode');
             return [];
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -673,6 +697,7 @@ class PostgresqlConnection {
             catch (error) {
             }
         }
+        ;
     }
 }
 _c = _inTransaction;
@@ -690,6 +715,7 @@ export class Postgresql {
             logger.error('Postgresql not suppouted sync mode');
             return null;
         }
+        ;
         return new Promise(async (resolve, reject) => {
             try {
                 const connection = await this[_daoDB].connect();
@@ -706,6 +732,7 @@ export class Postgresql {
             logger.warn('Postgresql not suppouted sync mode');
             return null;
         }
+        ;
         return new Promise(async (resolve, reject) => {
             let needCommit = false;
             let newConn = false;
@@ -758,6 +785,7 @@ export class Postgresql {
         if (sync === SyncMode.Sync) {
             this[_daoDB]?.end();
         }
+        ;
     }
     backup(sync, name) {
     }
@@ -777,10 +805,12 @@ class SqliteConnection {
             if (!sql) {
                 return { affectedRows: 0, insertId: 0n };
             }
+            ;
             if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return { affectedRows: 0, insertId: 0n };
             }
+            ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
                 logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
@@ -806,10 +836,12 @@ class SqliteConnection {
             if (!sql) {
                 return null;
             }
+            ;
             if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return null;
             }
+            ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
                 logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
@@ -830,9 +862,11 @@ class SqliteConnection {
             if (!sql) {
                 return null;
             }
+            ;
             if (sync === SyncMode.Async) {
                 return null;
             }
+            ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
                 logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
@@ -853,10 +887,12 @@ class SqliteConnection {
             if (!sql) {
                 return [];
             }
+            ;
             if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return [];
             }
+            ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
                 logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
@@ -877,10 +913,12 @@ class SqliteConnection {
             if (!sql) {
                 return [];
             }
+            ;
             if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return [];
             }
+            ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
                 logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
@@ -904,37 +942,14 @@ export class Sqlite {
         this[_daoDB] = db;
         this[_daoDB].pragma('journal_mode = WAL');
         this[_daoDB].exec(`
-            CREATE TABLE IF NOT EXISTS DUAL
-            (
-                ______id
-                INTEGER
-                NOT
-                NULL,
-                PRIMARY
-                KEY
-            (
-                ______id
-            ));
-            DELETE
-            FROM DUAL;
-            INSERT INTO DUAL (______id)
-            VALUES (1);
-            CREATE TABLE IF NOT EXISTS TABLE_VERSION
-            (
-                ______tableName
-                text
-                NOT
-                NULL,
-                ______version
-                text
-                NOT
-                NULL,
-                PRIMARY
-                KEY
-            (
-                ______tableName
-            )
-                );
+            CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
+            DELETE FROM DUAL;
+            INSERT INTO DUAL (______id ) VALUES ( 1 );
+            CREATE TABLE IF NOT EXISTS TABLE_VERSION (
+            ______tableName text NOT NULL,
+            ______version text NOT NULL,
+            PRIMARY KEY ( ______tableName )
+            );
         `);
     }
     createConnection(sync) {
@@ -942,6 +957,7 @@ export class Sqlite {
             logger.error(`SQLITE not suppoted async mode`);
             return null;
         }
+        ;
         return new SqliteConnection(this[_daoDB]);
     }
     transaction(sync, fn, conn) {
@@ -949,10 +965,11 @@ export class Sqlite {
             logger.warn(`SQLITE not suppoted async mode`);
             return null;
         }
+        ;
         if (!conn) {
             conn = this.createConnection(SyncMode.Sync) ?? undefined;
         }
-        if (!conn[_inTransaction]) {
+        if (conn[_inTransaction] !== true) {
             return this[_daoDB].transaction(() => {
                 conn[_inTransaction] = true;
                 const rt = fn(conn);
@@ -969,11 +986,13 @@ export class Sqlite {
         if (sync === SyncMode.Sync) {
             this[_daoDB].close();
         }
+        ;
     }
     backup(sync, name) {
         if (sync === SyncMode.Sync) {
             this[_daoDB].backup(name);
         }
+        ;
     }
     remove(sync) {
     }
@@ -991,10 +1010,12 @@ export class SqliteRemoteConnection {
         if (!sql) {
             return { affectedRows: 0, insertId: 0n };
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -1019,10 +1040,12 @@ export class SqliteRemoteConnection {
         if (!sql) {
             return null;
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return null;
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -1047,10 +1070,12 @@ export class SqliteRemoteConnection {
         if (!sql) {
             return null;
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return null;
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -1075,10 +1100,12 @@ export class SqliteRemoteConnection {
         if (!sql) {
             return [];
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return [];
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -1103,10 +1130,12 @@ export class SqliteRemoteConnection {
         if (!sql) {
             return [];
         }
+        ;
         if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return [];
         }
+        ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
@@ -1140,6 +1169,7 @@ export class SqliteRemote {
             logger.error('SQLITEREMOTE not suppouted sync mode');
             return null;
         }
+        ;
         return new Promise(async (resolve, reject) => {
             if (!this.connection) {
                 this.connection = new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]);
@@ -1160,11 +1190,13 @@ export class SqliteRemote {
         if (sync === SyncMode.Async) {
             return this[_daoDB]?.close(this[_sqliteRemoteName]);
         }
+        ;
     }
     backup(sync, exportPath) {
         if (sync === SyncMode.Async) {
             return this[_daoDB]?.export(this[_sqliteRemoteName], exportPath);
         }
+        ;
     }
     remove(sync) {
     }
@@ -1172,12 +1204,13 @@ export class SqliteRemote {
         if (sync === SyncMode.Async) {
             return this[_daoDB]?.restore(this[_sqliteRemoteName], importPath);
         }
+        ;
     }
 }
 class Build {
     /**
      *
-     * @param isCount 是否是count查询
+     * @param count 是否是count查询
      * @param isSum  是否是sum查询
      * @param param
      */
@@ -1199,20 +1232,20 @@ class Build {
             if (this.isCount) {
                 return Build.page;
             }
-            else if (!this.isSum) {
+            else if (this.isSum !== true) {
                 return render(text);
             }
         };
     }
     /**
-     *
-     * 包含的内容只在汇总查询时有效，否则是空白
-     * @returns
-     * @memberof Build
-     */
+   *
+   * 包含的内容只在汇总查询时有效，否则是空白
+   * @returns
+   * @memberof Build
+   */
     sum() {
         return (text, render) => {
-            if (!this.isSum) {
+            if (this.isSum !== true) {
                 return '';
             }
             else {
@@ -1282,7 +1315,7 @@ class Build {
             const datas = data.split(',');
             for (let i = 0; i < datas.length; i++) {
                 if (datas[i]?.match(/\s|\t/) === null) {
-                    datas[i] = `${datas[i]} ${datas[i].replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b) => b.toUpperCase())}`;
+                    datas[i] = `${datas[i]} ${datas[i].replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b, c) => b.toUpperCase())}`;
                 }
             }
             return ` ${datas.join(',')} `;
@@ -1431,7 +1464,7 @@ class Build {
      * * t.problemtype = 列名
      *
      * ```
-     * {{#enum}} PROBLEM_TYPE(t.problemtype) {{/enum}}
+     * {{#enumTag}} PROBLEM_TYPE(t.problemtype) {{/enumTag}}
      * ```
      */
     enum() {
@@ -1460,13 +1493,13 @@ class Build {
 }
 Build.page = 'COUNT(1) zccw1986 ';
 function replaceCdata(rawText) {
-    const cdataRegex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
-    const matches = rawText.match(cdataRegex);
+    var cdataRegex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
+    var matches = rawText.match(cdataRegex);
     if (matches != null && matches.length > 0) {
-        for (let z = 0; z < matches.length; z++) {
-            const regex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
-            const m = regex.exec(matches[z]);
-            let cdataText = m[2];
+        for (var z = 0; z < matches.length; z++) {
+            var regex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
+            var m = regex.exec(matches[z]);
+            var cdataText = m[2];
             cdataText = cdataText.replace(/\&/g, '&amp;');
             cdataText = cdataText.replace(/\</g, '&lt;');
             cdataText = cdataText.replace(/\>/g, '&gt;');
@@ -1608,15 +1641,14 @@ export class SqlCache {
     /**
      *
      * ```
-     // 第一个元素=列名，第二个元素是属性路径，
-     [
-     ['dit_id', ['id']], // 列名ditid,对应属性id
-     ['event_id', ['eventMainInfo', 'id']] // 列名event_id对应属性eventMainInfo.id
-     ]
+    // 第一个元素=列名，第二个元素是属性路径，
+    [
+        ['dit_id', ['id']], // 列名ditid,对应属性id
+        ['event_id', ['eventMainInfo', 'id']] // 列名event_id对应属性eventMainInfo.id
+    ]
      * ```
-     * @param ams
+     * @param am
      * @param keys
-     * @param key
      */
     readResultMap(ams, keys, key) {
         for (const am of ams) {
@@ -1685,14 +1717,14 @@ export class SqlCache {
         if (typeof sqlSource === 'function') {
             const _sql = sqlSource(options);
             let sql = mustache.render(_sql, buildParam, this.sqlFNMap);
-            if (!buildParam.OrderSeted && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
                 sql += ` ORDER BY ${buildParam.OrderBy}`;
             }
             return sql;
         }
         else if (typeof sqlSource === 'string') {
             let sql = mustache.render(sqlSource, buildParam, this.sqlFNMap);
-            if (!buildParam.OrderSeted && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
                 sql += ` ORDER BY ${buildParam.OrderBy}`;
             }
             return sql;
@@ -1700,7 +1732,7 @@ export class SqlCache {
         else if (typeof sqlSource === 'object') {
             const _sql = convert(sqlSource, options, matchSqlid, this.sqlMap);
             let sql = mustache.render(_sql, buildParam, this.sqlFNMap);
-            if (!buildParam.OrderSeted && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
                 sql += ` ORDER BY ${buildParam.OrderBy}`;
             }
             return sql;
@@ -1711,18 +1743,18 @@ export class SqlCache {
 // #endregion
 /**
 
- ## 所有service中内置方法定义规则
+## 所有service中内置方法定义规则
  ** 方法第一个参数必须是 sync: SyncMode
  ** 方法最后一个参数必须是 option
 
- ## sync 表示是否是同步方法
+## sync 表示是否是同步方法
 
- 因为mysql是异步、sqlite是同步，导致必须通过一个标识来区分，否则将必须为两种数据库设置不同的service，失去了意义
+因为mysql是异步、sqlite是同步，导致必须通过一个标识来区分，否则将必须为两种数据库设置不同的service，失去了意义
 
- ## option 额外控制参数
+## option 额外控制参数
 
- ## length
- 方法的参数数量
+## length
+方法的参数数量
  */
 function P(skipConn = false) {
     return (_target, propertyKey, descriptor) => {
@@ -1748,7 +1780,7 @@ function P(skipConn = false) {
                 }
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
                 // 连接共享
-                if (!skipConn && !option.conn) {
+                if (skipConn === false && !option.conn) {
                     option.conn = option.dao.createConnection(SyncMode.Sync);
                 }
                 else {
@@ -1760,12 +1792,7 @@ function P(skipConn = false) {
                     return result;
                 }
                 catch (error) {
-                    try {
-                        console.error(`service ${propertyKey} have an error:${error}`);
-                    }
-                    catch (error) {
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}`);
-                    }
+                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
                     throw error;
                 }
                 finally {
@@ -1791,7 +1818,7 @@ function P(skipConn = false) {
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
                 return new Promise(async (resolve, reject) => {
                     // 连接共享
-                    if (!skipConn && !option.conn) {
+                    if (skipConn === false && !option.conn) {
                         (option).conn = await option.dao.createConnection(SyncMode.Async);
                     }
                     else {
@@ -1804,7 +1831,6 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        // console.error(`${(option as any).sqlId ?? option!.tableName} service ${propertyKey} have an error:${error}`)
                         reject(error);
                     }
                     finally {
@@ -1823,7 +1849,7 @@ function P(skipConn = false) {
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享
-                        if (!skipConn && !option.conn) {
+                        if (skipConn === false && !option.conn) {
                             (option).conn = await option.dao.createConnection(SyncMode.Async);
                         }
                         else {
@@ -1835,7 +1861,6 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        // console.error(`${(option as any).sqlId ?? option!.tableName} service ${propertyKey} have an error:${error}`)
                         reject(error);
                     }
                     finally {
@@ -1854,7 +1879,7 @@ function P(skipConn = false) {
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享
-                        if (!skipConn && !option.conn) {
+                        if (skipConn === false && !option.conn) {
                             (option).conn = await option.dao.createConnection(SyncMode.Async);
                         }
                         else {
@@ -1866,7 +1891,6 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        // console.error(`${(option as any).sqlId ?? option!.tableName} service ${propertyKey} have an error:${error}`)
                         reject(error);
                     }
                     finally {
@@ -1887,7 +1911,7 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     let ret = 0;
     // 如果是插入操作且字段是UUID，则不进行空值检查
     // 只有在非插入或者非UUID时，进行空置检查
-    if (option?.insert === true && uuidColumn) {
+    if (option?.insert && uuidColumn) {
         ret = 1;
         if (V === undefined || emptyString(`${V ?? ''}`)) {
             V = null;
@@ -1897,19 +1921,19 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
         if (V === null) {
             if (option?.skipNull !== true) {
                 ret = 1;
-                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : null;
+                V = option?.insert && def && def.hasOwnProperty(K) ? def[K] : null;
             }
         }
         else if (V === undefined) {
             if (option?.skipUndefined !== true) {
                 ret = 1;
-                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : null;
+                V = option?.insert && def && def.hasOwnProperty(K) ? def[K] : null;
             }
         }
         else if (emptyString(`${V ?? ''}`)) {
             if (option?.skipEmptyString !== true) {
                 ret = 1;
-                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : '';
+                V = option?.insert && def && def.hasOwnProperty(K) ? def[K] : '';
             }
         }
         else {
@@ -1966,8 +1990,8 @@ export const DB = (config) => {
                     this[_x] = __stateFileName;
                     this[_y] = __deleteState;
                     this[_z] = (data, option) => {
-                        return Object.fromEntries(iterate(option?.skipId === true ? __columnsNoId : __columns)
-                            .map(K => [K, FieldFilter(K, data[K], __def, __fields[K].uuid === true || __fields[K].uuidShort === true, option)])
+                        return Object.fromEntries(iterate(option?.skipId ? __columnsNoId : __columns)
+                            .map(K => [K, FieldFilter(K, data[K], __def, __fields[K].uuid || __fields[K].uuidShort, option)])
                             .filter(data => {
                             if (data[1][0] === 1) {
                                 if (__fields[data[0]].Data2SQL) {
@@ -2010,16 +2034,16 @@ export const DB = (config) => {
     };
 };
 /**
- js项目中实体类注解替代品，只要确保函数被执行即可,举例：
- ```
- // 声明一个class
- export class AmaFuck {}
- DeclareClass(AmaFuck, [
- { type: "String", name: "SellerSKU" },
- { type: "String", name: "SellerSKU2" },
- { type: "String", name: "site" }
- ]);
- ```
+  js项目中实体类注解替代品，只要确保函数被执行即可,举例：
+  ```
+  // 声明一个class
+    export class AmaFuck {}
+    DeclareClass(AmaFuck, [
+        { type: "String", name: "SellerSKU" },
+        { type: "String", name: "SellerSKU2" },
+        { type: "String", name: "site" }
+    ]);
+  ```
  */
 export function DeclareClass(clz, FieldOptions) {
     for (const item of FieldOptions) {
@@ -2030,13 +2054,13 @@ export function DeclareClass(clz, FieldOptions) {
  JS项目中，service注解代替,举例：
  ```
  // 声明一个service,注意这里的let
- export let AmaService = class AmaService extends SqlService {};
- AmaService = DeclareService(AmaService, {
- tableName: "ama_fuck2",
- clz: AmaFuck,
- dbType: DBType.Sqlite,
- sqliteVersion: "0.0.3"
- });
+    export let AmaService = class AmaService extends SqlService {};
+    AmaService = DeclareService(AmaService, {
+        tableName: "ama_fuck2",
+        clz: AmaFuck,
+        dbType: DBType.Sqlite,
+        sqliteVersion: "0.0.3"
+    });
  ```
  */
 export function DeclareService(clz, config) {
@@ -2045,11 +2069,11 @@ export function DeclareService(clz, config) {
 /**
  ## 数据库服务
  ### 注解DB
-
+ 
  ### 泛型 T，同DB注解中的clz
  ** 服务中所有方法默认以该类型为准
  **
-
+ 
  */
 export class SqlService {
     _insert(datas, option) {
@@ -2117,14 +2141,13 @@ export class SqlService {
                                 ? this[_def][column]
                                 : null);
                     }
-                    return `SELECT ${questMark.join(',')}
-                                FROM DUAL
-                                WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`;
+                    return `SELECT ${questMark.join(',')} FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`;
                 });
                 const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
-                const sql = formatDialect(`INSERT INTO ${tableName}
-                                               (${columnNames})
-                                               ${questMarks.join(' UNION ALL ')};`, { dialect: formatDialects[option.dbType] });
+                const sql = formatDialect(`INSERT INTO
+                ${tableName}
+                (${columnNames})
+                ${questMarks.join(' UNION ALL ')};`, { dialect: formatDialects[option.dbType] });
                 sqls.push({ sql, params });
                 break;
             }
@@ -2181,14 +2204,10 @@ export class SqlService {
                 });
                 const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 const sql = formatDialect(`
-                    ${option.dbType === DBType.Mysql ? '' : 'INSERT OR'}
-                    REPLACE INTO
+                    ${option.dbType === DBType.Mysql ? '' : 'INSERT OR'} REPLACE INTO
                     ${tableName}
-                    (
-                    ${columnNames}
-                    )
-                    VALUES
-                    ${questMarks};
+                    (${columnNames})
+                    VALUES ${questMarks};
                 `, { dialect: formatDialects[option.dbType] });
                 sqls.push({ sql, params });
                 break;
@@ -2246,8 +2265,9 @@ export class SqlService {
                 });
                 const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 const sql = formatDialect(`
-                    INSERT INTO ${tableName}
-                        (${columnNames})
+                    INSERT INTO
+                    ${tableName}
+                    (${columnNames})
                     VALUES ${questMarks};
                 `, { dialect: formatDialects[option.dbType] });
                 sqls.push({ sql, params });
@@ -2312,15 +2332,15 @@ export class SqlService {
                 const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 sqls.push({
                     sql: formatDialect(`
-                        INSERT INTO ${tableTemp}
-                            (${columnNames})
+                        INSERT INTO
+                        ${tableTemp}
+                        (${columnNames})
                         VALUES ${questMarks};
                     `, { dialect: formatDialects[option.dbType] }), params
                 });
                 sqls.push({
                     sql: formatDialect(`INSERT INTO ${option.tableName} (${columnNames})
-                                        SELECT ${columnNames}
-                                        FROM ${tableTemp};`, { dialect: formatDialects[option.dbType] })
+                        SELECT ${columnNames} FROM ${tableTemp};`, { dialect: formatDialects[option.dbType] })
                 });
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
                 break;
@@ -2346,13 +2366,13 @@ export class SqlService {
                         }
                     }
                     return result;
-                }, { everyLength: option?.every === true ? 1 : option?.maxDeal });
+                }, { everyLength: option?.every ? 1 : option?.maxDeal });
                 if (isArray)
                     return result;
                 else
                     return result[0];
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2371,10 +2391,10 @@ export class SqlService {
                         }
                     }
                     return result;
-                }, { everyLength: option?.every === true ? 1 : option?.maxDeal });
+                }, { everyLength: option?.every ? 1 : option?.maxDeal });
                 return result;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2396,7 +2416,7 @@ export class SqlService {
                 }, { everyLength: 1 });
                 return result[0];
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2427,8 +2447,7 @@ export class SqlService {
                 }
             });
         }
-        const sql = formatDialect(`UPDATE ${tableName}
-                                   SET ${iterate(this[_columnsNoId])
+        const sql = formatDialect(`UPDATE ${tableName} SET ${iterate(this[_columnsNoId])
             .filter(K => columnMaps[K].where.length > 0)
             .map(K => {
             params.push(...columnMaps[K].params);
@@ -2458,7 +2477,7 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 return result.length > 0 ? result.reduce((a, b) => a + b) : 0;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2480,7 +2499,7 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 return result.length > 0 ? result.reduce((a, b) => a + b) : 0;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2522,54 +2541,32 @@ export class SqlService {
                 params.unshift(this[_deleteState]);
                 sqls.push({
                     sql: formatDialect(`
-                        UPDATE ${tableNameESC}
-                        SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
-                        WHERE ${whereSql};
-                    `, { dialect: formatDialects[option.dbType] }), params
+                    UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
+                    WHERE ${whereSql};
+                `, { dialect: formatDialects[option.dbType] }), params
                 });
             }
             else {
-                sqls.push({
-                    sql: formatDialect(`DELETE
-                                        FROM ${tableNameESC}
-                                        WHERE ${whereSql};`, { dialect: formatDialects[option.dbType] }), params
-                });
+                sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE ${whereSql};`, { dialect: formatDialects[option.dbType] }), params });
             }
         }
         else {
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
             const delWhere = Object.keys(wheres[0]);
-            const _sqls = this._createTable({
-                tableName: tableTemp,
-                temp: true,
-                columns: delWhere,
-                data: wheres,
-                index: 'all',
-                id: 'none'
-            });
+            const _sqls = this._createTable({ tableName: tableTemp, temp: true, columns: delWhere, data: wheres, index: 'all', id: 'none' });
             sqls.push(..._sqls);
             switch (option.dbType) {
                 case DBType.Mysql: {
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
-                            sql: formatDialect(`UPDATE ${tableNameESC} a INNER JOIN ${tableTempESC} b
-                                                ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')}
-                                                    SET a.${this[_fields][this[_stateFileName]]?.C2()} = ?;`, { dialect: formatDialects[option.dbType] }),
+                            sql: formatDialect(`UPDATE ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')}
+                            SET a.${this[_fields][this[_stateFileName]]?.C2()} = ?;`, { dialect: formatDialects[option.dbType] }),
                             params: [this[_deleteState]]
                         });
                     }
                     else {
                         sqls.push({
-                            sql: formatDialect(`DELETE
-                            a.* FROM
-                            ${tableNameESC}
-                            a
-                            INNER
-                            JOIN
-                            ${tableTempESC}
-                            b
-                            ON
-                            ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')};`, { dialect: formatDialects[option.dbType] })
+                            sql: formatDialect(`DELETE a.* FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')};`, { dialect: formatDialects[option.dbType] })
                         });
                     }
                     break;
@@ -2579,18 +2576,13 @@ export class SqlService {
                     const columnNames = iterate(delWhere).map(K => this[_fields][K]?.C2()).join(',');
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
-                            sql: formatDialect(`UPDATE ${tableNameESC}
-                                                SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
-                                                WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: formatDialects[option.dbType] }),
+                            sql: formatDialect(`UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
+                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: formatDialects[option.dbType] }),
                             params: [this[_deleteState]]
                         });
                     }
                     else {
-                        sqls.push({
-                            sql: formatDialect(`DELETE
-                                                FROM ${tableNameESC}
-                                                WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: formatDialects[option.dbType] })
-                        });
+                        sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: formatDialects[option.dbType] }) });
                     }
                     break;
                 }
@@ -2606,7 +2598,7 @@ export class SqlService {
                 }
                 return result;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2622,7 +2614,7 @@ export class SqlService {
                 }
                 return result;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2674,9 +2666,8 @@ export class SqlService {
         if (option.mode === SelectMode.Common) {
             const params = new Array();
             const whereSql = formatDialect(iterate(wheres).map(where => this[_transformer](where, option)).map(where => {
-                return `SELECT ${columns}
-                        FROM ${tableNameESC} a
-                        WHERE ${Object.entries(where).map(([K, V]) => {
+                return `SELECT ${columns} FROM ${tableNameESC} a WHERE
+                    ${Object.entries(where).map(([K, V]) => {
                     params.push(V);
                     return `${this[_fields][K]?.C2()} = ?`;
                 }).join(' AND ')}`;
@@ -2687,21 +2678,10 @@ export class SqlService {
         else {
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
             const delWhere = Object.keys(wheres[0]);
-            const _sqls = this._createTable({
-                tableName: tableTemp,
-                temp: true,
-                columns: delWhere,
-                data: wheres,
-                index: 'all',
-                id: 'none'
-            });
+            const _sqls = this._createTable({ tableName: tableTemp, temp: true, columns: delWhere, data: wheres, index: 'all', id: 'none' });
             sqls.push(..._sqls);
             resultIndex = sqls.length;
-            sqls.push({
-                sql: formatDialect(`SELECT ${columns}
-                                    FROM ${tableNameESC} a
-                                             INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')};`, { dialect: formatDialects[option.dbType] })
-            });
+            sqls.push({ sql: formatDialect(`SELECT ${columns} FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')};`, { dialect: formatDialects[option.dbType] }) });
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
         }
         if (option.sync === SyncMode.Sync) {
@@ -2743,8 +2723,8 @@ export class SqlService {
                     if (dataConvert) {
                         const key = Object.keys(result[0])[0];
                         const value = Object.values(result[0])[0];
-                        if (key && dataConvert[key] && globalThis[_dataConvert][dataConvert[key]]) {
-                            return globalThis[_dataConvert][dataConvert[key]](value);
+                        if (key && dataConvert[key] && globalThis[_DataConvert][dataConvert[key]]) {
+                            return globalThis[_DataConvert][dataConvert[key]](value);
                         }
                     }
                     return Object.values(result[0])[0];
@@ -2758,8 +2738,8 @@ export class SqlService {
                     if (dataConvert) {
                         const key = Object.keys(result[0])[0];
                         const value = Object.values(result[0])[0];
-                        if (key && dataConvert[key] && globalThis[_dataConvert][dataConvert[key]]) {
-                            return globalThis[_dataConvert][dataConvert[key]](value);
+                        if (key && dataConvert[key] && globalThis[_DataConvert][dataConvert[key]]) {
+                            return globalThis[_DataConvert][dataConvert[key]](value);
                         }
                     }
                     return Object.values(result[0])[0];
@@ -2776,9 +2756,9 @@ export class SqlService {
                 }
                 else {
                     hump = hump === true || (hump === undefined && globalThis[_Hump] === true);
-                    const _dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map((k, v) => [k, globalThis[_dataConvert][v]])) : undefined;
-                    if (hump || _dataConvert) {
-                        return C2P2(result[0], hump, _dataConvert) ?? null;
+                    const __dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map(([k, v]) => [k, globalThis[_DataConvert][v]])) : undefined;
+                    if (hump || __dataConvert) {
+                        return C2P2(result[0], hump, __dataConvert) ?? null;
                     }
                     else {
                         return result[0] ?? null;
@@ -2793,9 +2773,9 @@ export class SqlService {
                 }
                 else {
                     hump = hump === true || (hump === undefined && globalThis[_Hump] === true);
-                    const _dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map((k, v) => [k, globalThis[_dataConvert][v]])) : undefined;
-                    if (hump || _dataConvert) {
-                        return C2P2(data, hump, _dataConvert) ?? null;
+                    const __dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map(([k, v]) => [k, globalThis[_DataConvert][v]])) : undefined;
+                    if (hump || __dataConvert) {
+                        return C2P2(data, hump, __dataConvert) ?? null;
                     }
                     else {
                         return data;
@@ -2806,8 +2786,8 @@ export class SqlService {
                 try {
                     if (dataConvert) {
                         const key = Object.keys(result[0])[0];
-                        if (key && dataConvert[key] && globalThis[_dataConvert][dataConvert[key]]) {
-                            return result.map((r) => globalThis[_dataConvert][dataConvert[key]](Object.values(r)[0]));
+                        if (key && dataConvert[key] && globalThis[_DataConvert][dataConvert[key]]) {
+                            return result.map((r) => globalThis[_DataConvert][dataConvert[key]](Object.values(r)[0]));
                         }
                     }
                     return result.map((r) => Object.values(r)[0]);
@@ -2822,9 +2802,9 @@ export class SqlService {
                 }
                 else {
                     hump = hump === true || (hump === undefined && globalThis[_Hump] === true);
-                    const _dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map((k, v) => [k, globalThis[_dataConvert][v]])) : undefined;
-                    if (hump || _dataConvert) {
-                        return iterate(result).map((r) => C2P2(r, hump, _dataConvert)).toArray();
+                    const __dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map(([k, v]) => [k, globalThis[_DataConvert][v]])) : undefined;
+                    if (hump || __dataConvert) {
+                        return iterate(result).map((r) => C2P2(r, hump, __dataConvert)).toArray();
                     }
                     else {
                         return result;
@@ -2835,8 +2815,8 @@ export class SqlService {
                 try {
                     if (dataConvert) {
                         const key = Object.keys(result[0])[0];
-                        if (key && dataConvert[key] && globalThis[_dataConvert][dataConvert[key]]) {
-                            return new ArrayList(result.map((r) => globalThis[_dataConvert][dataConvert[key]](Object.values(r)[0])));
+                        if (key && dataConvert[key] && globalThis[_DataConvert][dataConvert[key]]) {
+                            return new ArrayList(result.map((r) => globalThis[_DataConvert][dataConvert[key]](Object.values(r)[0])));
                         }
                     }
                     return new ArrayList(result.map((r) => Object.values(r)[0]));
@@ -2855,9 +2835,9 @@ export class SqlService {
                 }
                 else {
                     hump = hump === true || (hump === undefined && globalThis[_Hump] === true);
-                    const _dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map((k, v) => [k, globalThis[_dataConvert][v]])) : undefined;
-                    if (hump || _dataConvert) {
-                        return new ArrayList(iterate(result).map((r) => C2P2(r, hump, _dataConvert)).toArray());
+                    const __dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map(([k, v]) => [k, globalThis[_DataConvert][v]])) : undefined;
+                    if (hump || __dataConvert) {
+                        return new ArrayList(iterate(result).map((r) => C2P2(r, hump, __dataConvert)).toArray());
                     }
                     else {
                         return new ArrayList();
@@ -2874,10 +2854,7 @@ export class SqlService {
             option.mapper = globalThis[_resultMap_SQLID][option.sqlId];
         }
         const _params = Object.assign({}, option.context, option.params);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), {
-            ctx: option.context,
-            isCount: option.isCount, ..._params
-        }));
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: option.isCount, ..._params }));
         const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.query(SyncMode.Sync, sql, params);
@@ -2944,7 +2921,7 @@ export class SqlService {
         };
         option.pageNumber ?? (option.pageNumber = 1);
         option.pageSize ?? (option.pageSize = 0);
-        if (option.hump === true || (option.hump === undefined && globalThis[_Hump] === true) && option.sortName) {
+        if (option.hump || (option.hump === undefined && globalThis[_Hump]) && option.sortName) {
             option.sortName = P2C(option.sortName);
         }
         Object.assign(option.params, {
@@ -2953,18 +2930,11 @@ export class SqlService {
             sortName: option.sortName ?? undefined,
             sortType: option.sortType ?? undefined
         });
-        let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), {
-            ctx: option.context,
-            isCount: false, ...option.params
-        });
+        let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ...option.params });
         let sqlSum = '';
         let sqlCount = '';
-        if (option.sumSelf === true) {
-            sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), {
-                ctx: option.context,
-                isCount: false,
-                isSum: true, ...option.params
-            });
+        if (option.sumSelf) {
+            sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
         }
         if (option.limitSelf !== true) {
             if (option.countSelf !== true) {
@@ -2974,19 +2944,11 @@ export class SqlService {
             }
         }
         if (option.pageSize > 0) {
-            if (option.countSelf === true) {
-                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), {
-                    ctx: option.context,
-                    isCount: true,
-                    isSum: false, ...option.params
-                });
+            if (option.countSelf) {
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx: option.context, isCount: true, isSum: false, ...option.params });
             }
             else {
-                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), {
-                    ctx: option.context,
-                    isCount: true,
-                    isSum: false, ...option.params
-                });
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: true, isSum: false, ...option.params });
             }
         }
         if (option.sync === SyncMode.Sync) {
@@ -3109,7 +3071,6 @@ export class SqlService {
             }
             const lastVersion = this[_sqlite_version] ?? '0.0.1';
             // 检查表
-            // language=SQL format=false
             const tableCheckResult = option.conn.pluck(SyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
             if (tableCheckResult) {
                 // 旧版本
@@ -3124,8 +3085,7 @@ export class SqlService {
                     option.conn.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
                     option.conn.execute(SyncMode.Sync, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
                     option.conn.execute(SyncMode.Sync, `
-                        CREATE TABLE IF NOT EXISTS ${tableES}
-                        (
+                        CREATE TABLE IF NOT EXISTS ${tableES}(
                             ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
                             ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
                         );
@@ -3135,12 +3095,8 @@ export class SqlService {
                             option.conn.execute(SyncMode.Sync, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
                         }
                     }
-                    option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns})
-                                                          SELECT ${columns}
-                                                          FROM ${rtable};`);
-                    option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns})
-                                                          SELECT ${columns}
-                                                          FROM ${rtable};`);
+                    option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                    option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
                     option.conn.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
                     // 更新完毕，保存版本号
                     option.conn.execute(SyncMode.Sync, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
@@ -3152,11 +3108,10 @@ export class SqlService {
             else { // 表不存在
                 // 创建表
                 option.conn.execute(SyncMode.Sync, `
-                    CREATE TABLE IF NOT EXISTS ${tableES}
-                    (
+                    CREATE TABLE IF NOT EXISTS ${tableES} (
                         ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
                         ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
-
+            
                     );
                 `);
                 if (this[_index] && this[_index].length) {
@@ -3175,10 +3130,7 @@ export class SqlService {
                     }
                     const lastVersion = this[_sqlite_version] ?? '0.0.1';
                     // 检查表
-                    const tableCheckResult = await option.conn.pluck(SyncMode.Async, `SELECT COUNT(1) t
-                                                                                                FROM sqlite_master
-                                                                                                WHERE TYPE = 'table'
-                                                                                                  AND name = ?`, [option.tableName]);
+                    const tableCheckResult = await option.conn.pluck(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
                     if (tableCheckResult) {
                         // 旧版本
                         const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
@@ -3192,23 +3144,18 @@ export class SqlService {
                             await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
                             await option.conn.execute(SyncMode.Async, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
                             await option.conn.execute(SyncMode.Async, `
-                                CREATE TABLE IF NOT EXISTS ${tableES}
-                                (
-                                    ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
-                                    ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
-                                );
-                            `);
+                            CREATE TABLE IF NOT EXISTS ${tableES}(
+                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
+                            );
+                        `);
                             if (this[_index] && this[_index].length) {
                                 for (const index of this[_index]) {
                                     await option.conn.execute(SyncMode.Async, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
                                 }
                             }
-                            await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns})
-                                                                         SELECT ${columns}
-                                                                         FROM ${rtable};`);
-                            await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns})
-                                                                         SELECT ${columns}
-                                                                         FROM ${rtable};`);
+                            await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                            await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
                             await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
                             // 更新完毕，保存版本号
                             await option.conn.execute(SyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
@@ -3220,12 +3167,11 @@ export class SqlService {
                     else { // 表不存在
                         // 创建表
                         await option.conn.execute(SyncMode.Async, `
-                            CREATE TABLE IF NOT EXISTS ${tableES}
-                            (
-                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
-                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
-                            );
-                        `);
+                        CREATE TABLE IF NOT EXISTS ${tableES}(
+                            ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                            ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
+                        );
+                    `);
                         if (this[_index] && this[_index].length) {
                             for (const index of this[_index]) {
                                 await option.conn.execute(SyncMode.Async, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${option.tableName} ("${this[_fields][index]?.C2()}");`);
@@ -3251,16 +3197,16 @@ export class SqlService {
         }
     }
     /**
-     #创建表
-     ** `tableName` 表名称
-     ** `temp` 是否是临时表，默认true
-     ** `columns` 字符串数组，默认是当前实体类全部字段，通过`columns` 可以创建部分字段临时表
-     ** `id` 表的主键设置 4种：
-     1. `auto`: `columns`中已经在当前实体类配置的ID作为主键 `默认`
-     2. `all`: `columns`中所有字段全部当主键
-     3. `none`: 没有主键
-     4. 自定义字段名称：字符串数组
-     ** `index` 表的索引，设置方式同ID
+    #创建表
+    ** `tableName` 表名称
+    ** `temp` 是否是临时表，默认true
+    ** `columns` 字符串数组，默认是当前实体类全部字段，通过`columns` 可以创建部分字段临时表
+    ** `id` 表的主键设置 4种：
+    1. `auto`: `columns`中已经在当前实体类配置的ID作为主键 `默认`
+    2. `all`: `columns`中所有字段全部当主键
+    3. `none`: 没有主键
+    4. 自定义字段名称：字符串数组
+    ** `index` 表的索引，设置方式同ID
      */
     _createTable({ tableName, temp = true, columns, data, id = 'auto', index = 'auto', dbType } = {}) {
         const sqls = [];
@@ -3294,23 +3240,17 @@ export class SqlService {
         tableName = tableName ?? this[_tableName];
         switch (dbType) {
             case DBType.Mysql: {
-                let sql = formatDialect(`CREATE
-                ${temp ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS
-                ${tableName}
-                (
-                ${columns.map(K => this[_fields][K][DBType.Mysql]()).join(',')}
-                ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.C2()).join(',')})  USING BTREE ` : ''}
-                ${indexs && indexs.length ? `,${indexs.map(i => `KEY ${this[_fields][i]?.C2()} (${this[_fields][i]?.C2()})`).join(',')} ` : ''}
-                )
-                ENGINE
-                =
-                MEMORY;`, { dialect: mysql });
+                let sql = formatDialect(`CREATE ${temp ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                    ${columns.map(K => this[_fields][K][DBType.Mysql]()).join(',')}
+                    ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.C2()).join(',')})  USING BTREE ` : ''}
+                    ${indexs && indexs.length ? `,${indexs.map(i => `KEY ${this[_fields][i]?.C2()} (${this[_fields][i]?.C2()})`).join(',')} ` : ''}
+                ) ENGINE=MEMORY;`, { dialect: mysql });
                 sqls.push({ sql });
                 if (data && data.length > 0) {
                     const params = [];
                     let first = true;
                     sql = formatDialect(`INSERT INTO ${tableName} (${columns.map(c => this[_fields][c]?.C2()).join(',')})
-                                             ${(data).map(d => {
+                    ${(data).map(d => {
                         const r = `SELECT ${Object.entries(d).map(([K, V]) => {
                             params.push(V);
                             return `? ${first ? this[_fields][K]?.C2() : ''}`;
@@ -3324,12 +3264,9 @@ export class SqlService {
             }
             case DBType.Sqlite:
             case DBType.SqliteRemote: {
-                let sql = formatDialect(`CREATE
-                ${temp ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS
-                ${tableName}
-                (
-                ${columns.map(K => this[_fields][K][DBType.Sqlite]()).join(',')}
-                ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.C2()).join(',')}) ` : ''}
+                let sql = formatDialect(`CREATE ${temp ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                    ${columns.map(K => this[_fields][K][DBType.Sqlite]()).join(',')}
+                    ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.C2()).join(',')}) ` : ''}
                 );`, { dialect: sqlite });
                 sqls.push({ sql });
                 if (indexs) {
@@ -3342,7 +3279,7 @@ export class SqlService {
                     const params = [];
                     let first = true;
                     sql = formatDialect(`INSERT INTO ${tableName} (${columns.map(c => this[_fields][c]?.C2()).join(',')})
-                                             ${(data).map(d => {
+                    ${(data).map(d => {
                         const r = `SELECT ${Object.entries(d).map(([K, V]) => {
                             params.push(V);
                             return `? ${first ? this[_fields][K]?.C2() : ''}`;
@@ -3376,7 +3313,7 @@ export class SqlService {
     }
     _generSql(dbType, _sql, _params) {
         const params = [];
-        const sql = formatDialect(_sql?.replace(/:(\w+)/g, (txt, key) => {
+        const sql = formatDialect(_sql?.replace(/\:(\w+)/g, (txt, key) => {
             let V = LGet(_params, key);
             if (V !== undefined) {
                 return this._setParam(V, params);
@@ -3535,16 +3472,10 @@ class StreamQuery {
     /**
      * AND(key1 = :value OR key2 = :value)
      * @param keys [key1, key2, ...]
-     * @param keys
-     * @param value
      */
-    eqs(keys, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this.__(keys, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    eqs(keys, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this.__(keys, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /*** AND key = :value */
-    eq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._(key, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    eq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._(key, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /*** AND key1 = :value1 AND  key2 = :value2 */
     eqT(t, { name: paramName = '', breakExcuteIfSkip = false } = {}) {
         let exe = false;
@@ -3578,272 +3509,113 @@ class StreamQuery {
                 exe = true;
             }
         }
-        if (breakExcuteIfSkip && !exe) {
+        if (breakExcuteIfSkip && exe === false) {
             this.if_exec = false;
         }
         return this;
     }
     /*** AND key <> :value */
-    notEq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._(key, value, '<>', { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    notEq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._(key, value, '<>', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /** AND key1 = key2 */
-    eqWith(key1, key2) {
-        return this._key(key1, key2, '=');
-    }
+    eqWith(key1, key2) { return this._key(key1, key2, '='); }
     /** AND key1 <> key2 */
-    notEqWith(key1, key2) {
-        return this._key(key1, key2, '<>');
-    }
+    notEqWith(key1, key2) { return this._key(key1, key2, '<>'); }
     /** AND key REGEXP :regexp */
-    regexp(key, regexp, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, breakExcuteIfSkip });
-    }
+    regexp(key, regexp, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     /** AND key NOT REGEXP :regexp */
-    notRegexp(key, regexp, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, not: 'NOT', breakExcuteIfSkip });
-    }
+    notRegexp(key, regexp, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, not: 'NOT', breakExcuteIfSkip }); }
     /** AND (key1 << 8) + key2 = value */
-    shiftEq(key1, key2, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._shift(key1, key2, value, '=', { paramName, breakExcuteIfSkip });
-    }
+    shiftEq(key1, key2, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._shift(key1, key2, value, '=', { paramName, breakExcuteIfSkip }); }
     /** AND (key1 << 8) + key2 <> value */
-    shiftNotEq(key1, key2, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._shift(key1, key2, value, '<>', { paramName, breakExcuteIfSkip });
-    }
+    shiftNotEq(key1, key2, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._shift(key1, key2, value, '<>', { paramName, breakExcuteIfSkip }); }
     /** AND key > :value */
-    grate(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._(key, value, '>', { paramName, skipEmptyString: true, breakExcuteIfSkip });
-    }
+    grate(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '>', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     /** AND key >= :value */
-    grateEq(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._(key, value, '>=', { paramName, skipEmptyString: true, breakExcuteIfSkip });
-    }
+    grateEq(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '>=', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     /** AND key1 > key2 */
-    grateWith(key1, key2) {
-        return this._key(key1, key2, '>');
-    }
+    grateWith(key1, key2) { return this._key(key1, key2, '>'); }
     /** AND key1 >= key2 */
-    grateEqWith(key1, key2) {
-        return this._key(key1, key2, '>=');
-    }
+    grateEqWith(key1, key2) { return this._key(key1, key2, '>='); }
     /** AND key < :value */
-    less(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._(key, value, '<', { paramName, skipEmptyString: true, breakExcuteIfSkip });
-    }
+    less(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '<', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     /** AND key <= :value */
-    lessEq(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._(key, value, '<=', { paramName, skipEmptyString: true, breakExcuteIfSkip });
-    }
+    lessEq(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '<=', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     /** AND key1 < key2 */
-    lessWith(key1, key2) {
-        return this._key(key1, key2, '<');
-    }
+    lessWith(key1, key2) { return this._key(key1, key2, '<'); }
     /** AND key1 <= key2 */
-    lessEqWith(key1, key2) {
-        return this._key(key1, key2, '<=');
-    }
+    lessEqWith(key1, key2) { return this._key(key1, key2, '<='); }
     /** AND key LIKE CONCAT('%', :value, '%') */
-    like(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfSkip });
-    }
+    like(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfSkip }); }
     /** AND key NOT LIKE CONCAT('%', :value, '%') */
-    notLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, {
-            paramName,
-            skipEmptyString,
-            left: '%',
-            right: '%',
-            not: 'NOT',
-            breakExcuteIfSkip
-        });
-    }
+    notLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfSkip }); }
     /** AND key NOT LIKE CONCAT('%', :value) */
-    leftLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfSkip });
-    }
+    leftLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfSkip }); }
     /** AND key LIKE CONCAT('%', :value) */
-    notLeftLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfSkip });
-    }
+    notLeftLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfSkip }); }
     /** AND key LIKE CONCAT(:value, '%') */
-    rightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfSkip });
-    }
+    rightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfSkip }); }
     /** AND key NOT LIKE CONCAT(:value, '%') */
-    notRightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfSkip });
-    }
+    notRightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfSkip }); }
     /** AND key NOT LIKE :value */
-    PreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    PreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /** AND key LIKE :value */
-    notPreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip });
-    }
+    notPreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     /** AND key GLOB CONCAT('%', :value, '%') */
-    glob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, {
-            paramName,
-            skipEmptyString,
-            left: '%',
-            right: '%',
-            breakExcuteIfSkip,
-            op: 'GLOB'
-        });
-    }
+    glob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key NOT GLOB CONCAT('%', :value, '%') */
-    notGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, {
-            paramName,
-            skipEmptyString,
-            left: '%',
-            right: '%',
-            not: 'NOT',
-            breakExcuteIfSkip,
-            op: 'GLOB'
-        });
-    }
+    notGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key GLOB CONCAT('%', :value) */
-    leftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfSkip, op: 'GLOB' });
-    }
+    leftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key NOT GLOB CONCAT('%', :value) */
-    notLeftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, {
-            paramName,
-            skipEmptyString,
-            left: '%',
-            not: 'NOT',
-            breakExcuteIfSkip,
-            op: 'GLOB'
-        });
-    }
+    notLeftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key GLOB CONCAT(:value, '%') */
-    rightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfSkip, op: 'GLOB' });
-    }
+    rightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key NOT GLOB CONCAT(:value, '%') */
-    notRightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, {
-            paramName,
-            skipEmptyString,
-            right: '%',
-            not: 'NOT',
-            breakExcuteIfSkip,
-            op: 'GLOB'
-        });
-    }
+    notRightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key GLOB :value */
-    PreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfSkip, op: 'GLOB' });
-    }
+    PreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key NOT GLOB :value */
-    notPreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip, op: 'GLOB' });
-    }
+    notPreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
     /** AND key IN :value */
-    in(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._in(key, value, { paramName, breakExcuteIfSkip });
-    }
+    in(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._in(key, value, { paramName, breakExcuteIfSkip }); }
     /** AND key NOT IN :value */
-    notIn(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._in(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip });
-    }
+    notIn(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._in(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     /** AND :value IN (key1, key2, ...) */
-    in2(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._in2(key, value, { paramName, breakExcuteIfSkip });
-    }
+    in2(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._in2(key, value, { paramName, breakExcuteIfSkip }); }
     /** AND :value NOT IN (key1, key2, ...) */
-    notIn2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._in2(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip });
-    }
+    notIn2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._in2(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     /** AND key IS NULL */
-    isNULL(key) {
-        return this._null(key);
-    }
+    isNULL(key) { return this._null(key); }
     /** AND key IS NOT NULL */
-    isNotNULL(key) {
-        return this._null(key, 'NOT');
-    }
+    isNotNULL(key) { return this._null(key, 'NOT'); }
     /** AND key BETWEEN :value1 AND :value2 */
-    between(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._between(key, value1, value2, { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    between(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /** AND key NOT BETWEEN :value1 AND :value2 */
-    notBetween(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._between(key, value1, value2, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip });
-    }
+    notBetween(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     /** AND POW(2, key) & :value */
-    pow(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._pow(key, value, { paramName, breakExcuteIfSkip });
-    }
+    pow(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, value, { paramName, breakExcuteIfSkip }); }
     /** AND NOT POW(2, key) & :value */
-    notPow(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._pow(key, value, { paramName, not: 'NOT', breakExcuteIfSkip });
-    }
+    notPow(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, value, { paramName, not: 'NOT', breakExcuteIfSkip }); }
     /** AND POW(2, key1) & key2 */
-    powWith(key, values, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, breakExcuteIfSkip });
-    }
+    powWith(key, values, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, breakExcuteIfSkip }); }
     /** AND NOT POW(2, key1) & key2 */
-    notPowWith(key, values, { paramName = '', breakExcuteIfSkip = false } = {}) {
-        return this._pow(key, add(...values.map(value => Math.pow(2, +value))), {
-            paramName,
-            not: 'NOT',
-            breakExcuteIfSkip
-        });
-    }
+    notPowWith(key, values, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, not: 'NOT', breakExcuteIfSkip }); }
     /** AND MATCH(key1, key2, key3) AGAINST (:value) */
-    match(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    match(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) */
-    notMatch(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._match(value, keys, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip });
-    }
+    notMatch(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     /** AND MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE*/
-    matchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, append: 'IN BOOLEAN MODE' });
-    }
+    matchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, append: 'IN BOOLEAN MODE' }); }
     /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE */
-    notMatchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._match(value, keys, {
-            paramName,
-            skipEmptyString,
-            breakExcuteIfSkip,
-            not: 'NOT',
-            append: 'IN BOOLEAN MODE'
-        });
-    }
+    notMatchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, not: 'NOT', append: 'IN BOOLEAN MODE' }); }
     /** AND MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
-    matchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._match(value, keys, {
-            paramName,
-            skipEmptyString,
-            breakExcuteIfSkip,
-            append: 'WITH QUERY EXPANSION'
-        });
-    }
+    matchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, append: 'WITH QUERY EXPANSION' }); }
     /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
-    notMatchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._match(value, keys, {
-            paramName,
-            skipEmptyString,
-            breakExcuteIfSkip,
-            not: 'NOT',
-            append: 'WITH QUERY EXPANSION'
-        });
-    }
+    notMatchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, not: 'NOT', append: 'WITH QUERY EXPANSION' }); }
     /** AND NOT LOCATE(key, :value) > 0 */
-    includes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._includes(key, value, { paramName, skipEmptyString, breakExcuteIfSkip });
-    }
+    includes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._includes(key, value, { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /** AND NOT LOCATE(key, :value) = 0 */
-    notIncludes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        return this._includes(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip });
-    }
+    notIncludes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._includes(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     and(fn) {
         if (fn instanceof StreamQuery) {
             this._andQuerys.push(fn);
@@ -3879,76 +3651,29 @@ class StreamQuery {
         return this;
     }
     /** GROUP BY key1, key2, ... */
-    groupBy(...keys) {
-        this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`));
-        return this;
-    }
+    groupBy(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
     /** GROUP BY key1, key2, ... */
-    groupBy2(...keys) {
-        this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`));
-        return this;
-    }
+    groupBy2(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
     /** ORDER BY key1 ASC, key2 ASC, ... */
-    asc(...keys) {
-        this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`));
-        return this;
-    }
+    asc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     /** ORDER BY key1 ASC, key2 ASC, ... */
-    asc2(...keys) {
-        this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`));
-        return this;
-    }
+    asc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     /** ORDER BY key1 DESC, key2 DESC, ... */
-    desc(...keys) {
-        this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} DESC`));
-        return this;
-    }
+    desc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} DESC`)); return this; }
     /** ORDER BY key1 DESC, key2 DESC, ... */
-    desc2(...keys) {
-        this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`));
-        return this;
-    }
+    desc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     /** LIMIT :startRow, :pageSize */
-    limit(startRow, pageSize) {
-        this._startRow = startRow;
-        this._pageSize = pageSize;
-        return this;
-    }
+    limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
     /** LIMIT ((:pageNumber || 1) - 1) * :pageSize, :pageSize */
-    page(pageNumber, pageSize) {
-        this._startRow = ((pageNumber || 1) - 1) * pageSize;
-        this._pageSize = pageSize;
-        return this;
-    }
-    distinct(on = true) {
-        this._distinct = on;
-        return this;
-    }
+    page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
+    distinct(on = true) { this._distinct = on; return this; }
     /** COUNT(DISTINCT key) */
-    countDistinct(key, countName) {
-        this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${this[_fields][String(key)]?.C2()}`}`);
-        return this;
-    }
-    count(countName) {
-        this._columns.push(`COUNT(1) ${countName ?? 'ct'}`);
-        return this;
-    }
-    sum(key, legName, distinct) {
-        this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`);
-        return this;
-    }
-    avg(key, legName, distinct) {
-        this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`);
-        return this;
-    }
-    max(key, legName, distinct) {
-        this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`);
-        return this;
-    }
-    min(key, legName, distinct) {
-        this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`);
-        return this;
-    }
+    countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
+    count(countName) { this._columns.push(`COUNT(1) ${countName ?? 'ct'}`); return this; }
+    sum(key, legName, distinct) { this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
+    avg(key, legName, distinct) { this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
+    max(key, legName, distinct) { this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
+    min(key, legName, distinct) { this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
     /** GROUP_CONCAT([DISTINCT] key [ORDER BY :asc ASC] [ORDER BY :asc DESC] [SEPARATOR :separator]) */
     groupConcat(key, param) {
         this._columns.push(`GROUP_CONCAT(
@@ -3959,25 +3684,10 @@ class StreamQuery {
             ) ${param && param.groupName || `${this[_fields][String(key)]?.C2()}`}`);
         return this;
     }
-    select(...key) {
-        this._columns.push(...(key.map(k => this[_fields][String(k)].C3())));
-        return this;
-    }
-    select2(sql, param) {
-        this._columns.push(`${sql}`);
-        Object.assign(this._param, param);
-        return this;
-    }
-    update(key, value) {
-        this._updates ?? (this._updates = {});
-        this._updates[this[_fields][String(key)]?.C2()] = value;
-        return this;
-    }
-    update2(sql, param) {
-        this._updateColumns.push(sql);
-        Object.assign(this._param, param);
-        return this;
-    }
+    select(...key) { this._columns.push(...(key.map(k => this[_fields][String(k)].C3()))); return this; }
+    select2(sql, param) { this._columns.push(`${sql}`); Object.assign(this._param, param); return this; }
+    update(key, value) { this._updates ?? (this._updates = {}); this._updates[this[_fields][String(key)]?.C2()] = value; return this; }
+    update2(sql, param) { this._updateColumns.push(sql); Object.assign(this._param, param); return this; }
     updateT(t) {
         this._updates ?? (this._updates = {});
         for (const [key, value] of Object.entries(t)) {
@@ -4000,9 +3710,13 @@ class StreamQuery {
         option.selectResult ?? (option.selectResult = SelectResult.RS_CS);
         const { where, params } = this._where();
         let sql = `
-            SELECT ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${option.tableName ?? this._service[_tableName]} ${where ? ' WHERE ' : ''} ${where} ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
-                ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
+            SELECT
+            ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
+            FROM ${option.tableName ?? this._service[_tableName]}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
+            ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
         `;
         if (this._startRow && this._pageSize) {
             sql += `LIMIT ${this._startRow}, ${this._pageSize}`;
@@ -4012,138 +3726,26 @@ class StreamQuery {
         }
         if (option.sync === SyncMode.Async) {
             switch (option.selectResult) {
-                case SelectResult.RS_CS:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.RS_CS,
-                        sql,
-                        params
-                    });
-                case SelectResult.RS_C:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.RS_C,
-                        sql,
-                        params
-                    });
-                case SelectResult.RS_CS_List:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.RS_CS_List,
-                        sql,
-                        params
-                    });
-                case SelectResult.RS_C_List:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.RS_C_List,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_CS_Assert:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.R_CS_Assert,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_C_Assert:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.R_C_Assert,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_CS_NotSure:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.R_CS_NotSure,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_C_NotSure:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.R_C_NotSure,
-                        sql,
-                        params
-                    });
+                case SelectResult.RS_CS: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_CS, sql, params });
+                case SelectResult.RS_C: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_C, sql, params });
+                case SelectResult.RS_CS_List: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_CS_List, sql, params });
+                case SelectResult.RS_C_List: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_C_List, sql, params });
+                case SelectResult.R_CS_Assert: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_CS_Assert, sql, params });
+                case SelectResult.R_C_Assert: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_C_Assert, sql, params });
+                case SelectResult.R_CS_NotSure: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_CS_NotSure, sql, params });
+                case SelectResult.R_C_NotSure: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_C_NotSure, sql, params });
             }
         }
         else {
             switch (option.selectResult) {
-                case SelectResult.RS_CS:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.RS_CS,
-                        sql,
-                        params
-                    });
-                case SelectResult.RS_C:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.RS_C,
-                        sql,
-                        params
-                    });
-                case SelectResult.RS_CS_List:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.RS_CS_List,
-                        sql,
-                        params
-                    });
-                case SelectResult.RS_C_List:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.RS_C_List,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_CS_Assert:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.R_CS_Assert,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_C_Assert:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.R_C_Assert,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_CS_NotSure:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.R_CS_NotSure,
-                        sql,
-                        params
-                    });
-                case SelectResult.R_C_NotSure:
-                    return this._service.select({
-                        ...option,
-                        sync: SyncMode.Sync,
-                        selectResult: SelectResult.R_C_NotSure,
-                        sql,
-                        params
-                    });
+                case SelectResult.RS_CS: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_CS, sql, params });
+                case SelectResult.RS_C: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_C, sql, params });
+                case SelectResult.RS_CS_List: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_CS_List, sql, params });
+                case SelectResult.RS_C_List: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_C_List, sql, params });
+                case SelectResult.R_CS_Assert: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_CS_Assert, sql, params });
+                case SelectResult.R_C_Assert: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_C_Assert, sql, params });
+                case SelectResult.R_CS_NotSure: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_CS_NotSure, sql, params });
+                case SelectResult.R_C_NotSure: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_C_NotSure, sql, params });
             }
         }
     }
@@ -4157,9 +3759,13 @@ class StreamQuery {
             total: 0
         };
         let sql = `
-            SELECT ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${option.tableName ?? this._service[_tableName]} ${where ? ' WHERE ' : ''} ${where} ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
-                ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
+            SELECT
+            ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
+            FROM ${option.tableName ?? this._service[_tableName]}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
+            ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
         `;
         if (this._startRow && this._pageSize) {
             sql += `LIMIT ${this._startRow}, ${this._pageSize}`;
@@ -4169,8 +3775,11 @@ class StreamQuery {
         }
         const sqlCount = `
             SELECT COUNT(1)
-            FROM ${option.tableName ?? this._service[_tableName]} ${where ? ' WHERE ' : ''} ${where} ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
-                ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
+            FROM ${option.tableName ?? this._service[_tableName]}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
+            ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
         `;
         if (option.sync === SyncMode.Sync) {
             result.total = this._service.select({
@@ -4237,9 +3846,9 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]}
-                         SET ${sets.join(',')}
-                                 ${where ? ' WHERE ' : ''} ${where}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
+            ${where ? ' WHERE ' : ''}
+            ${where}
             `;
             if (option.sync === SyncMode.Async) {
                 return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
@@ -4256,8 +3865,9 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE
-                     FROM ${option.tableName ?? this._service[_tableName]} ${where ? ' WHERE ' : ''} ${where}
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
+            ${where ? ' WHERE ' : ''}
+            ${where}
         `;
         if (option.sync === SyncMode.Async) {
             return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
@@ -4346,7 +3956,11 @@ class StreamQuery {
     }
     _between(key, value1, value2, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value1 === null
-            || value1 === undefined || (emptyString(`${value1 ?? ''}`) && skipEmptyString) || value2 === null || value2 === undefined || (emptyString(`${value2 ?? ''}`) && skipEmptyString)) {
+            || value1 === undefined
+            || (emptyString(`${value1 ?? ''}`) && skipEmptyString)
+            || value2 === null
+            || value2 === undefined
+            || (emptyString(`${value2 ?? ''}`) && skipEmptyString)) {
             if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
@@ -4384,7 +3998,7 @@ class StreamQuery {
                 }
             }
         }
-        else if (!breakExcuteIfSkip) {
+        else if (breakExcuteIfSkip !== true) {
             this.if_exec = false;
         }
         return this;
@@ -4404,7 +4018,7 @@ class StreamQuery {
                 }
             }
         }
-        else if (!breakExcuteIfSkip) {
+        else if (breakExcuteIfSkip !== true) {
             this.if_exec = false;
         }
         return this;
@@ -5072,6 +4686,7 @@ export async function GetRedisLock(key, lockMaxActive) {
         }
     }
 }
+;
 /** 对FN加锁、缓存执行 */
 export async function excuteWithLock(config, fn__) {
     const key = `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
@@ -5079,7 +4694,7 @@ export async function excuteWithLock(config, fn__) {
     let wait_time = 0;
     const fn = async () => {
         const lock = await GetRedisLock(key, config.lockMaxActive);
-        if (!lock) {
+        if (lock === false) {
             if (config.lockWait !== false && ((config.lockMaxWaitTime ?? 0) === 0 || (wait_time + (config.lockRetryInterval ?? 100)) <= (config.lockMaxWaitTime ?? 0))) {
                 logger.debug(`get lock ${key} fail, retry after ${config.lockRetryInterval ?? 100}ms...`);
                 await sleep(config.lockRetryInterval ?? 100);
@@ -5160,7 +4775,7 @@ export async function clearMethodCache(key) {
 }
 async function clearChild(key, skipDel = false) {
     const db = getRedisDB();
-    if (!skipDel) {
+    if (skipDel === false) {
         await db.del(`[cache]${key}`);
     }
     const childtype = await db.type(`[cache-child]${key}`);
@@ -5299,12 +4914,15 @@ class MUParser {
             if (line.startsWith('*')) {
                 // 注释符号
                 findComment = true;
+                continue;
             }
             else {
                 if (line.length === 0) {
+                    continue;
                 }
                 else if (line.startsWith('```') || line.startsWith('~~~')) {
                     // 忽略以code block开头的符号
+                    continue;
                 }
                 else {
                     // 注释结束