baja-lite 1.4.6 → 1.4.7

package/sql.js

@@ -26,7 +26,9 @@ 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,6 +74,7 @@ const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
 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');
@@ -101,7 +104,6 @@ export var MapperIfUndefined;
     MapperIfUndefined[MapperIfUndefined["Zero"] = 2] = "Zero";
     MapperIfUndefined[MapperIfUndefined["EmptyString"] = 3] = "EmptyString";
 })(MapperIfUndefined || (MapperIfUndefined = {}));
-;
 export var SyncMode;
 (function (SyncMode) {
     /** 同步执行 */
@@ -112,27 +114,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 = {}));
@@ -144,7 +146,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";
     /*
     ## 借助临时表
@@ -161,7 +163,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";
     /*
     ## 借助临时表
@@ -214,7 +216,6 @@ export const _defOption = {
     skipNull: true,
     skipEmptyString: true
 };
-;
 class MysqlConnection {
     constructor(conn) {
         this[_b] = false;
@@ -225,12 +226,10 @@ 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 ?? '')}`);
         }
@@ -258,12 +257,10 @@ 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 ?? '')}`);
         }
@@ -294,12 +291,10 @@ 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 ?? '')}`);
         }
@@ -328,12 +323,10 @@ 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 ?? '')}`);
         }
@@ -362,12 +355,10 @@ 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 ?? '')}`);
         }
@@ -397,7 +388,6 @@ class MysqlConnection {
             catch (error) {
             }
         }
-        ;
     }
 }
 _b = _inTransaction;
@@ -415,7 +405,6 @@ 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();
@@ -432,7 +421,6 @@ export class Mysql {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
-        ;
         return new Promise(async (resolve, reject) => {
             let needCommit = false;
             let newConn = false;
@@ -449,7 +437,7 @@ export class Mysql {
             conn[_inTransaction] = true;
             try {
                 const result = await fn(conn);
-                if (needCommit === true) {
+                if (needCommit) {
                     logger.debug('commit begin!');
                     await conn[_daoConnection].commit();
                     conn[_inTransaction] = false;
@@ -467,10 +455,10 @@ export class Mysql {
             }
             finally {
                 try {
-                    if (needCommit === true) {
+                    if (needCommit) {
                         conn[_inTransaction] = false;
                     }
-                    if (newConn === true) {
+                    if (newConn) {
                         logger.debug('release begin!');
                         conn[_daoConnection].release();
                         logger.debug('release end!');
@@ -485,7 +473,6 @@ export class Mysql {
         if (sync === SyncMode.Sync) {
             this[_daoDB]?.destroy();
         }
-        ;
     }
     backup(sync, name) {
     }
@@ -504,12 +491,10 @@ 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 ?? '')}`);
         }
@@ -541,12 +526,10 @@ 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 ?? '')}`);
         }
@@ -581,12 +564,10 @@ 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 ?? '')}`);
         }
@@ -619,12 +600,10 @@ 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 ?? '')}`);
         }
@@ -657,12 +636,10 @@ 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 ?? '')}`);
         }
@@ -696,7 +673,6 @@ class PostgresqlConnection {
             catch (error) {
             }
         }
-        ;
     }
 }
 _c = _inTransaction;
@@ -714,7 +690,6 @@ 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();
@@ -731,7 +706,6 @@ export class Postgresql {
             logger.warn('Postgresql not suppouted sync mode');
             return null;
         }
-        ;
         return new Promise(async (resolve, reject) => {
             let needCommit = false;
             let newConn = false;
@@ -748,7 +722,7 @@ export class Postgresql {
             conn[_inTransaction] = true;
             try {
                 const result = await fn(conn);
-                if (needCommit === true) {
+                if (needCommit) {
                     logger.debug('commit begin!');
                     await conn[_daoConnection].query('COMMIT');
                     conn[_inTransaction] = false;
@@ -766,10 +740,10 @@ export class Postgresql {
             }
             finally {
                 try {
-                    if (needCommit === true) {
+                    if (needCommit) {
                         conn[_inTransaction] = false;
                     }
-                    if (newConn === true) {
+                    if (newConn) {
                         logger.debug('release begin!');
                         conn[_daoConnection].release();
                         logger.debug('release end!');
@@ -784,7 +758,6 @@ export class Postgresql {
         if (sync === SyncMode.Sync) {
             this[_daoDB]?.end();
         }
-        ;
     }
     backup(sync, name) {
     }
@@ -804,12 +777,10 @@ 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 ?? '')}`);
             }
@@ -835,12 +806,10 @@ 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 ?? '')}`);
             }
@@ -861,11 +830,9 @@ class SqliteConnection {
             if (!sql) {
                 return null;
             }
-            ;
             if (sync === SyncMode.Async) {
                 return null;
             }
-            ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
                 logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
@@ -886,12 +853,10 @@ 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 ?? '')}`);
             }
@@ -912,12 +877,10 @@ 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 ?? '')}`);
             }
@@ -941,14 +904,37 @@ 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) {
@@ -956,7 +942,6 @@ export class Sqlite {
             logger.error(`SQLITE not suppoted async mode`);
             return null;
         }
-        ;
         return new SqliteConnection(this[_daoDB]);
     }
     transaction(sync, fn, conn) {
@@ -964,11 +949,10 @@ export class Sqlite {
             logger.warn(`SQLITE not suppoted async mode`);
             return null;
         }
-        ;
         if (!conn) {
             conn = this.createConnection(SyncMode.Sync) ?? undefined;
         }
-        if (conn[_inTransaction] !== true) {
+        if (!conn[_inTransaction]) {
             return this[_daoDB].transaction(() => {
                 conn[_inTransaction] = true;
                 const rt = fn(conn);
@@ -985,13 +969,11 @@ export class Sqlite {
         if (sync === SyncMode.Sync) {
             this[_daoDB].close();
         }
-        ;
     }
     backup(sync, name) {
         if (sync === SyncMode.Sync) {
             this[_daoDB].backup(name);
         }
-        ;
     }
     remove(sync) {
     }
@@ -1009,12 +991,10 @@ 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 ?? '')}`);
         }
@@ -1039,12 +1019,10 @@ 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 ?? '')}`);
         }
@@ -1069,12 +1047,10 @@ 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 ?? '')}`);
         }
@@ -1099,12 +1075,10 @@ 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 ?? '')}`);
         }
@@ -1129,12 +1103,10 @@ 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 ?? '')}`);
         }
@@ -1168,7 +1140,6 @@ 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]);
@@ -1189,13 +1160,11 @@ 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) {
     }
@@ -1203,13 +1172,12 @@ export class SqliteRemote {
         if (sync === SyncMode.Async) {
             return this[_daoDB]?.restore(this[_sqliteRemoteName], importPath);
         }
-        ;
     }
 }
 class Build {
     /**
      *
-     * @param count 是否是count查询
+     * @param isCount 是否是count查询
      * @param isSum  是否是sum查询
      * @param param
      */
@@ -1228,23 +1196,23 @@ class Build {
      */
     page() {
         return (text, render) => {
-            if (this.isCount === true) {
+            if (this.isCount) {
                 return Build.page;
             }
-            else if (this.isSum !== true) {
+            else if (!this.isSum) {
                 return render(text);
             }
         };
     }
     /**
-   *
-   * 包含的内容只在汇总查询时有效，否则是空白
-   * @returns
-   * @memberof Build
-   */
+     *
+     * 包含的内容只在汇总查询时有效，否则是空白
+     * @returns
+     * @memberof Build
+     */
     sum() {
         return (text, render) => {
-            if (this.isSum !== true) {
+            if (!this.isSum) {
                 return '';
             }
             else {
@@ -1260,7 +1228,7 @@ class Build {
      */
     notPage() {
         return (text, render) => {
-            if (this.isCount === true || this.isSum === true) {
+            if (this.isCount || this.isSum) {
                 return '';
             }
             else {
@@ -1314,7 +1282,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, c) => b.toUpperCase())}`;
+                    datas[i] = `${datas[i]} ${datas[i].replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b) => b.toUpperCase())}`;
                 }
             }
             return ` ${datas.join(',')} `;
@@ -1351,7 +1319,7 @@ class Build {
      */
     order() {
         return (text, render) => {
-            if (this.isCount === true || this.isSum === true) {
+            if (this.isCount || this.isSum) {
                 return '';
             }
             else {
@@ -1381,7 +1349,7 @@ class Build {
      */
     group() {
         return (text, render) => {
-            if (this.isCount === true || this.isSum === true) {
+            if (this.isCount || this.isSum) {
                 return '';
             }
             else {
@@ -1492,13 +1460,13 @@ class Build {
 }
 Build.page = 'COUNT(1) zccw1986 ';
 function replaceCdata(rawText) {
-    var cdataRegex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
-    var matches = rawText.match(cdataRegex);
+    const cdataRegex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
+    const matches = rawText.match(cdataRegex);
     if (matches != null && matches.length > 0) {
-        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];
+        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];
             cdataText = cdataText.replace(/\&/g, '&amp;');
             cdataText = cdataText.replace(/\</g, '&lt;');
             cdataText = cdataText.replace(/\>/g, '&gt;');
@@ -1508,7 +1476,7 @@ function replaceCdata(rawText) {
     }
     return rawText;
 }
-function _flatData(result, i, length, keys, V) {
+function _flatData(result, i, length, keys, V, convert) {
     var _f;
     const key = keys[i];
     if (i < length) {
@@ -1517,7 +1485,12 @@ function _flatData(result, i, length, keys, V) {
         _flatData(result[key], i, length, keys, V);
     }
     else {
-        result[key] = V;
+        if (convert) {
+            result[key] = convert(V);
+        }
+        else {
+            result[key] = V;
+        }
     }
 }
 /**
@@ -1532,7 +1505,7 @@ export function flatData(options) {
     options.mapperIfUndefined ?? (options.mapperIfUndefined = MapperIfUndefined.Skip);
     options.mapper = options.mapper;
     const result = {};
-    for (const [columnName, keys, def] of options.mapper) {
+    for (const { columnName, mapNames, def, convert } of options.mapper) {
         let V = options.data[columnName];
         if (V === undefined) {
             if (options.mapperIfUndefined === MapperIfUndefined.Null) {
@@ -1551,7 +1524,7 @@ export function flatData(options) {
                 continue;
             }
         }
-        _flatData(result, 0, keys.length - 1, keys, V);
+        _flatData(result, 0, mapNames.length - 1, mapNames, V, convert);
     }
     return result;
 }
@@ -1584,7 +1557,7 @@ export class SqlCache {
                     }
                     logger.debug(`sql: ${file} explain over[${ct}]!`);
                 }
-                else if (jsMode === true && extname === '.js') {
+                else if (jsMode && extname === '.js') {
                     logger.debug(`sql: ${file} start explain!`);
                     const obj = (await import(globalThis[_path].join(sqlDir, modeName))).default;
                     for (const [key, fn] of Object.entries(obj)) {
@@ -1610,8 +1583,8 @@ export class SqlCache {
                                             globalThis[_resultMap] ?? (globalThis[_resultMap] = {});
                                             const keys = [];
                                             this.readResultMap(am.children, keys, []);
-                                            globalThis[_resultMap][am.id] = keys;
-                                            logger.debug(`sql_resultMap: ${am.id} found!`);
+                                            globalThis[_resultMap][`${rootName || name}.${am.id}`] = keys;
+                                            logger.debug(`sql_resultMap: ${`${rootName || name}.${am.id}`} found!`);
                                         }
                                         else {
                                             this.sqlMap[`${rootName || name}.${am.id}`] = am.children;
@@ -1635,20 +1608,24 @@ 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 am
+     * @param ams
      * @param keys
+     * @param key
      */
     readResultMap(ams, keys, key) {
         for (const am of ams) {
             if (am.type === 'tag') {
                 if (am.name === 'result' || am.name === 'id') {
-                    keys.push([am.attrs['column'], [...key, am.attrs['property']]]);
+                    keys.push({
+                        columnName: am.attrs['column'],
+                        mapNames: [...key, am.attrs['property']]
+                    });
                 }
                 else {
                     this.readResultMap(am.children, keys, [...key, am.attrs['property']]);
@@ -1708,14 +1685,14 @@ export class SqlCache {
         if (typeof sqlSource === 'function') {
             const _sql = sqlSource(options);
             let sql = mustache.render(_sql, buildParam, this.sqlFNMap);
-            if (buildParam.OrderSeted === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+            if (!buildParam.OrderSeted && 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 === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+            if (!buildParam.OrderSeted && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
                 sql += ` ORDER BY ${buildParam.OrderBy}`;
             }
             return sql;
@@ -1723,7 +1700,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 === false && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
+            if (!buildParam.OrderSeted && buildParam.OrderBy && options.isCount !== true && options.isSum !== true) {
                 sql += ` ORDER BY ${buildParam.OrderBy}`;
             }
             return sql;
@@ -1734,18 +1711,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) => {
@@ -1771,7 +1748,7 @@ function P(skipConn = false) {
                 }
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
                 // 连接共享
-                if (skipConn === false && !option.conn) {
+                if (!skipConn && !option.conn) {
                     option.conn = option.dao.createConnection(SyncMode.Sync);
                 }
                 else {
@@ -1814,7 +1791,7 @@ function P(skipConn = false) {
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
                 return new Promise(async (resolve, reject) => {
                     // 连接共享
-                    if (skipConn === false && !option.conn) {
+                    if (!skipConn && !option.conn) {
                         (option).conn = await option.dao.createConnection(SyncMode.Async);
                     }
                     else {
@@ -1846,7 +1823,7 @@ function P(skipConn = false) {
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享
-                        if (skipConn === false && !option.conn) {
+                        if (!skipConn && !option.conn) {
                             (option).conn = await option.dao.createConnection(SyncMode.Async);
                         }
                         else {
@@ -1877,7 +1854,7 @@ function P(skipConn = false) {
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享
-                        if (skipConn === false && !option.conn) {
+                        if (!skipConn && !option.conn) {
                             (option).conn = await option.dao.createConnection(SyncMode.Async);
                         }
                         else {
@@ -1910,7 +1887,7 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     let ret = 0;
     // 如果是插入操作且字段是UUID，则不进行空值检查
     // 只有在非插入或者非UUID时，进行空置检查
-    if (option?.insert === true && uuidColumn === true) {
+    if (option?.insert === true && uuidColumn) {
         ret = 1;
         if (V === undefined || emptyString(`${V ?? ''}`)) {
             V = null;
@@ -2033,16 +2010,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) {
@@ -2053,13 +2030,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) {
@@ -2068,11 +2045,11 @@ export function DeclareService(clz, config) {
 /**
  ## 数据库服务
  ### 注解DB
- 
+
  ### 泛型 T，同DB注解中的clz
  ** 服务中所有方法默认以该类型为准
  **
- 
+
  */
 export class SqlService {
     _insert(datas, option) {
@@ -2140,13 +2117,14 @@ 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;
             }
@@ -2203,10 +2181,14 @@ 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;
@@ -2264,9 +2246,8 @@ 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 });
@@ -2331,15 +2312,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;
@@ -2446,7 +2427,8 @@ 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);
@@ -2540,32 +2522,54 @@ 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;
@@ -2575,13 +2579,18 @@ 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;
                 }
@@ -2665,8 +2674,9 @@ 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 ')}`;
@@ -2677,10 +2687,21 @@ 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) {
@@ -2715,10 +2736,17 @@ export class SqlService {
             });
         }
     }
-    _select(templateResult, result, def, errorMsg, hump, mapper, mapperIfUndefined) {
+    _select(templateResult, result, def, errorMsg, hump, mapper, mapperIfUndefined, dataConvert) {
         switch (templateResult) {
             case SelectResult.R_C_NotSure: {
                 try {
+                    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);
+                        }
+                    }
                     return Object.values(result[0])[0];
                 }
                 catch (error) {
@@ -2727,6 +2755,13 @@ export class SqlService {
             }
             case SelectResult.R_C_Assert: {
                 try {
+                    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);
+                        }
+                    }
                     return Object.values(result[0])[0];
                 }
                 catch (error) {
@@ -2739,11 +2774,15 @@ export class SqlService {
                 if (mapper) {
                     return flatData({ data: result[0], mapper, mapperIfUndefined });
                 }
-                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
-                    return C2P2(result[0]) ?? null;
-                }
                 else {
-                    return result[0] ?? null;
+                    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;
+                    }
+                    else {
+                        return result[0] ?? null;
+                    }
                 }
             }
             case SelectResult.R_CS_Assert: {
@@ -2752,15 +2791,25 @@ export class SqlService {
                 if (mapper) {
                     return flatData({ data, mapper, mapperIfUndefined });
                 }
-                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
-                    return C2P2(data) ?? null;
-                }
                 else {
-                    return data ?? null;
+                    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;
+                    }
+                    else {
+                        return data;
+                    }
                 }
             }
             case SelectResult.RS_C: {
                 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]));
+                        }
+                    }
                     return result.map((r) => Object.values(r)[0]);
                 }
                 catch (error) {
@@ -2771,15 +2820,25 @@ export class SqlService {
                 if (mapper) {
                     return iterate(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray();
                 }
-                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
-                    return iterate(result).map((r) => C2P2(r)).toArray();
-                }
                 else {
-                    return result;
+                    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();
+                    }
+                    else {
+                        return result;
+                    }
                 }
             }
             case SelectResult.RS_C_List: {
                 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])));
+                        }
+                    }
                     return new ArrayList(result.map((r) => Object.values(r)[0]));
                 }
                 catch (error) {
@@ -2788,13 +2847,21 @@ export class SqlService {
             }
             case SelectResult.RS_CS_List: {
                 if (mapper) {
-                    return new ArrayList(iterate(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray());
-                }
-                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
-                    return new ArrayList(iterate(result).map((r) => C2P2(r)).toArray());
+                    return new ArrayList(iterate(result).map((data) => flatData({
+                        data,
+                        mapper,
+                        mapperIfUndefined
+                    })).toArray());
                 }
                 else {
-                    return new ArrayList();
+                    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());
+                    }
+                    else {
+                        return new ArrayList();
+                    }
                 }
             }
         }
@@ -2807,17 +2874,20 @@ 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);
-            return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined);
+            return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert);
         }
         else {
             return new Promise(async (resolve, reject) => {
                 try {
                     const result = await option.conn.query(SyncMode.Async, sql, params);
-                    resolve(this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined));
+                    resolve(this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
                 }
                 catch (error) {
                     reject(error);
@@ -2883,11 +2953,18 @@ 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 });
+            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) {
@@ -2898,10 +2975,18 @@ 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 });
+                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) {
@@ -3024,6 +3109,7 @@ 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) {
                 // 旧版本
@@ -3038,7 +3124,8 @@ 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(',')})` : ''}
                         );
@@ -3048,8 +3135,12 @@ 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]);
@@ -3061,10 +3152,11 @@ 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) {
@@ -3083,7 +3175,10 @@ 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]);
@@ -3097,18 +3192,23 @@ 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]);
@@ -3120,11 +3220,12 @@ 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()}");`);
@@ -3150,16 +3251,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 = [];
@@ -3193,17 +3294,23 @@ export class SqlService {
         tableName = tableName ?? this[_tableName];
         switch (dbType) {
             case DBType.Mysql: {
-                let sql = formatDialect(`CREATE ${temp === true ? '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() : ''}`;
@@ -3217,9 +3324,12 @@ export class SqlService {
             }
             case DBType.Sqlite:
             case DBType.SqliteRemote: {
-                let sql = formatDialect(`CREATE ${temp === true ? '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) {
@@ -3232,7 +3342,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() : ''}`;
@@ -3266,7 +3376,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);
@@ -3351,7 +3461,7 @@ const IF_PROCEED = function () {
     return function (_target, _propertyKey, descriptor) {
         const fn = descriptor.value;
         descriptor.value = function () {
-            if (this.if_proceed === true) {
+            if (this.if_proceed) {
                 // eslint-disable-next-line prefer-rest-params
                 const args = Array.from(arguments);
                 fn.call(this, ...args);
@@ -3368,7 +3478,7 @@ const IF_EXEC = function (def) {
     return function (_target, _propertyKey, descriptor) {
         const fn = descriptor.value;
         descriptor.value = async function () {
-            if (this.if_proceed === true && this.if_exec === true) {
+            if (this.if_proceed && this.if_exec) {
                 // eslint-disable-next-line prefer-rest-params
                 const args = Array.from(arguments);
                 return await fn.call(this, ...args);
@@ -3425,10 +3535,16 @@ 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;
@@ -3462,113 +3578,272 @@ class StreamQuery {
                 exe = true;
             }
         }
-        if (breakExcuteIfSkip === true && exe === false) {
+        if (breakExcuteIfSkip && !exe) {
             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);
@@ -3604,29 +3879,76 @@ 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(
@@ -3637,10 +3959,25 @@ 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)) {
@@ -3649,6 +3986,7 @@ class StreamQuery {
         Object.assign(this._updates, t);
         return this;
     }
+    /** SET key = REPLACE(key, :valueToFind,  :valueToReplace) */
     replace(key, valueToFind, valueToReplace) {
         const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
         this._updateColumns.push(` ${this[_fields][String(key)]?.C2()} = REPLACE(${this[_fields][String(key)]?.C2()}, :${pkey1}, :${pkey2}) `);
@@ -3662,13 +4000,9 @@ 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}`;
@@ -3678,26 +4012,138 @@ 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
+                    });
             }
         }
     }
@@ -3711,13 +4157,9 @@ 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}`;
@@ -3727,11 +4169,8 @@ 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({
@@ -3798,9 +4237,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 });
@@ -3817,9 +4256,8 @@ 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 });
@@ -3857,8 +4295,8 @@ class StreamQuery {
     _(key, value, op, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value === null
             || value === undefined
-            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
-            if (breakExcuteIfSkip === true) {
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -3879,8 +4317,8 @@ class StreamQuery {
     __(keys, value, op, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value === null
             || value === undefined
-            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
-            if (breakExcuteIfSkip === true) {
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -3908,12 +4346,8 @@ class StreamQuery {
     }
     _between(key, value1, value2, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value1 === null
-            || value1 === undefined
-            || (emptyString(`${value1 ?? ''}`) && skipEmptyString === true)
-            || value2 === null
-            || value2 === undefined
-            || (emptyString(`${value2 ?? ''}`) && skipEmptyString === true)) {
-            if (breakExcuteIfSkip === true) {
+            || value1 === undefined || (emptyString(`${value1 ?? ''}`) && skipEmptyString) || value2 === null || value2 === undefined || (emptyString(`${value2 ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -3934,7 +4368,7 @@ class StreamQuery {
         return this;
     }
     _in(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        if (value && value.length > 0 && skipEmptyString === true) {
+        if (value && value.length > 0 && skipEmptyString) {
             value = value.filter(v => !emptyString(`${v ?? ''}`));
         }
         if (value && value.length > 0) {
@@ -3950,13 +4384,13 @@ class StreamQuery {
                 }
             }
         }
-        else if (breakExcuteIfSkip !== true) {
+        else if (!breakExcuteIfSkip) {
             this.if_exec = false;
         }
         return this;
     }
     _in2(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
-        const skip = emptyString(`${value ?? ''}`) && skipEmptyString === true;
+        const skip = emptyString(`${value ?? ''}`) && skipEmptyString;
         if (!skip) {
             if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
                 this._param[this._paramKeys[paramName]] = value;
@@ -3970,7 +4404,7 @@ class StreamQuery {
                 }
             }
         }
-        else if (breakExcuteIfSkip !== true) {
+        else if (!breakExcuteIfSkip) {
             this.if_exec = false;
         }
         return this;
@@ -3979,7 +4413,7 @@ class StreamQuery {
         if (value === null
             || value === undefined
             || emptyString(`${value ?? ''}`)) {
-            if (breakExcuteIfSkip === true) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4001,7 +4435,7 @@ class StreamQuery {
         if (value === null
             || value === undefined
             || emptyString(`${value ?? ''}`)) {
-            if (breakExcuteIfSkip === true) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4023,7 +4457,7 @@ class StreamQuery {
         if (value === null
             || value === undefined
             || emptyString(`${value ?? ''}`)) {
-            if (breakExcuteIfSkip === true) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4044,8 +4478,8 @@ class StreamQuery {
     _like(key, value, { not = '', left = '', right = '', paramName = '', op = 'LIKE', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value === null
             || value === undefined
-            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
-            if (breakExcuteIfSkip === true) {
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4066,8 +4500,8 @@ class StreamQuery {
     _includes(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = true } = {}) {
         if (value === null
             || value === undefined
-            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
-            if (breakExcuteIfSkip === true) {
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4638,7 +5072,6 @@ export async function GetRedisLock(key, lockMaxActive) {
         }
     }
 }
-;
 /** 对FN加锁、缓存执行 */
 export async function excuteWithLock(config, fn__) {
     const key = `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
@@ -4646,7 +5079,7 @@ export async function excuteWithLock(config, fn__) {
     let wait_time = 0;
     const fn = async () => {
         const lock = await GetRedisLock(key, config.lockMaxActive);
-        if (lock === false) {
+        if (!lock) {
             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);
@@ -4727,7 +5160,7 @@ export async function clearMethodCache(key) {
 }
 async function clearChild(key, skipDel = false) {
     const db = getRedisDB();
-    if (skipDel === false) {
+    if (!skipDel) {
         await db.del(`[cache]${key}`);
     }
     const childtype = await db.type(`[cache-child]${key}`);
@@ -4866,15 +5299,12 @@ class MUParser {
             if (line.startsWith('*')) {
                 // 注释符号
                 findComment = true;
-                continue;
             }
             else {
                 if (line.length === 0) {
-                    continue;
                 }
                 else if (line.startsWith('```') || line.startsWith('~~~')) {
                     // 忽略以code block开头的符号
-                    continue;
                 }
                 else {
                     // 注释结束