baja-lite 1.4.6 → 1.4.8

package/boot.js

@@ -1,6 +1,6 @@
 import { _Hump, DBType, getEnums } from 'baja-lite-field';
 import events from 'events';
-import { _dao, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
+import { _dao, _DataConvert, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -16,12 +16,12 @@ export const Boot = async function (options) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }
     globalThis[_Hump] = options.columnMode === ColumnMode.HUMP;
+    logger.level = options.log ?? 'info';
+    globalThis[_sqlCache] = new SqlCache();
     if (options.sqlDir) {
         globalThis[_path] = await import('path');
         globalThis[_fs] = await import('fs');
     }
-    logger.level = options.log ?? 'info';
-    globalThis[_sqlCache] = new SqlCache();
     if (options.sqlMap || options.sqlDir) {
         await globalThis[_sqlCache].init(options);
     }
@@ -36,6 +36,9 @@ export const Boot = async function (options) {
     if (options.enums) {
         globalThis[_enum] = getEnums(options.enums);
     }
+    if (options.dataConvert) {
+        globalThis[_DataConvert] = options.dataConvert;
+    }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');
         if (options.Mysql['host']) {
@@ -55,7 +58,7 @@ export const Boot = async function (options) {
                     decimalNumbers: true,
                     supportBigNumbers: true
                 }));
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Mysql][_primaryDB] = db;
                     flag = true;
                 }
@@ -71,7 +74,7 @@ export const Boot = async function (options) {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
                 const db = new Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Sqlite][_primaryDB] = db;
                     flag = true;
                 }
@@ -89,7 +92,7 @@ export const Boot = async function (options) {
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
                 options.SqliteRemote.service.initDB(fileName);
                 const db = new SqliteRemote(options.SqliteRemote.service, fileName);
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
                     flag = true;
                 }
@@ -107,7 +110,7 @@ export const Boot = async function (options) {
             let flag = false;
             for (const [key, option] of Object.entries(options.Redis)) {
                 const db = new Redis(option);
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Redis][_primaryDB] = db;
                     flag = true;
                 }
@@ -149,7 +152,7 @@ export const Boot = async function (options) {
             let flag = false;
             for (const [key, option] of Object.entries(options.Postgresql)) {
                 const db = new Postgresql(new Pool.default(option));
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Postgresql][_primaryDB] = db;
                     flag = true;
                 }

package/object.d.ts

@@ -77,8 +77,8 @@ export declare const arraySplit: <T = any>(datas: T[], { everyLength, groupCount
 }) => T[][];
 export declare const P2C: (pro: string, IF?: boolean) => string;
 export declare const C2P: (pro: string, IF?: boolean) => string;
-export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L[]): T[];
-export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L): T;
+export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L[], hump?: boolean, convert?: Record<string, (data: any) => any>): T[];
+export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L, hump?: boolean, convert?: Record<string, (data: any) => any>): T;
 export declare function P2C2<T extends Object = any, L extends Object = T>(datas: L[]): T[];
 export declare function P2C2<T extends Object = any, L extends Object = T>(datas: L): T;
 export declare function fillArrayToMinLength<T>(arr: T[], minLength: number, fillValue: T): T[];

package/object.js

@@ -198,12 +198,34 @@ const P2CEX = /[A-Z]/g;
 export const P2C = (pro, IF = true) => IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro;
 const C2PEX = /_([a-z])/g;
 export const C2P = (pro, IF = true) => IF ? pro.replace(C2PEX, (a, b) => `${b.toUpperCase()}`) : pro;
-export function C2P2(datas) {
+export function C2P2(datas, hump, convert) {
     if (datas instanceof Array) {
-        return iterate(datas).map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => [C2P(K), V]))).toArray();
+        return iterate(datas)
+            .map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => {
+            if (hump) {
+                K = C2P(K);
+            }
+            if (convert && convert[K]) {
+                return [K, convert[K](V)];
+            }
+            else {
+                return [K, V];
+            }
+        })))
+            .toArray();
     }
     else if (datas) {
-        return Object.fromEntries(Object.entries(datas).map(([K, V]) => [C2P(K), V]));
+        return Object.fromEntries(Object.entries(datas).map(([K, V]) => {
+            if (hump) {
+                K = C2P(K);
+            }
+            if (convert && convert[K]) {
+                return [K, convert[K](V)];
+            }
+            else {
+                return [K, V];
+            }
+        }));
     }
     else {
         return datas;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {

package/sql.d.ts

@@ -20,6 +20,7 @@ declare const _inTransaction: unique symbol;
 declare const _daoDB: unique symbol;
 declare const _sqliteRemoteName: unique symbol;
 declare const _SqlOption: unique symbol;
+export declare const _DataConvert: unique symbol;
 export declare const _enum: unique symbol;
 export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
@@ -247,6 +248,17 @@ export interface GlobalSqlOptionForWeb {
     columnMode?: ColumnMode;
     /** 对于WEB模式，默认为SqliteRemote */
     dbType?: DBType;
+    /**
+     * * 数据转换器，用于service的select、page方法，以及stream查询
+     * * 例如
+     * ```
+     * dataConvert: {
+     *      // 使用时，传入qiniu和列名，将根据列名对应的值生成URL
+     *      qiniu: data => qiniuConvertUrl(data)
+     * }
+     * ```
+     */
+    dataConvert?: Record<string, (data: any) => any>;
 }
 /**
  # 全局行为配置文件
@@ -398,6 +410,19 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
       ## 文件名就是模板名
      */
     sqlFNDir?: string;
+    /**
+     *  #TODO 未完成读取 sqlMapDir
+     *  # sqlMapDir 目录定义如下，
+     *      `test.ts`
+     *      ```
+     *         export const dict:SqlMappers = [
+     *             {columnName: 'dit_id', mapNames: ['DTID'], def: 0, convert: 转换函数},  // 列名ditid,对应属性DTID,如果没有值，将返回默认值0,其中默认值0是可选的
+     *             {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def: 0,  convert: 转换函数},// 列名event_id对应属性eventMainInfo.id,这种方式将返回嵌套的json对象,其中默认值null是可选的
+     *         ]
+     *      ```
+     *      将得到 test.dict 这个map
+     */
+    sqlMapDir?: string;
     /**
       ## 映射数据为对象，文件名就是模板名
     ```
@@ -596,7 +621,12 @@ export declare class SqliteRemote implements Dao {
     restore(sync: SyncMode.Sync, importPath: string): void;
     restore(sync: SyncMode.Async, importPath: string): Promise<void>;
 }
-export type SqlMapper = ([string, string[], any?])[];
+export type SqlMapper = {
+    columnName: string;
+    mapNames: string[];
+    def?: any;
+    convert?: (data: any) => any;
+}[];
 export type SqlMappers = Record<string, SqlMapper>;
 export type SqlModel = Record<string, string | ((options: {
     ctx?: any;
@@ -1084,7 +1114,33 @@ export declare class SqlService<T extends object> {
     9.  `dao`: 永远不需要传入该值
     10. `hump`: 是否将列名改为驼峰写法？默认情况下按照全局配置
     11. `mapper`: 列名-属性 映射工具，优先级高于hump
-
+     ```
+     //    该属性支持传入mybatis.xml中定义的resultMap块ID，或者读取sqlMapDir目录下的JSON文件.
+     //    注意：resultMap块ID与sql语句逻辑一致，同样是 目录.ID
+     //    或者自定义Mapper,自定义Mapper格式如下:
+     [
+     {columnName: 'dit_id', mapNames: ['DTID'], def: 0, convert: 转换函数},  // 列名ditid,对应属性DTID,如果没有值，将返回默认值0,其中默认值0是可选的
+     {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def: 0,  convert: 转换函数},// 列名event_id对应属性eventMainInfo.id,这种方式将返回嵌套的json对象,其中默认值null是可选的
+     ]
+     ```
+     #TODO 未完成读取 sqlMapDir
+     #### sqlMapDir 目录定义如下，
+     `test.ts`
+     ```
+     export const dict:SqlMappers = [
+     {columnName: 'dit_id', mapNames: ['DTID'], def: 0, convert: 转换函数},  // 列名ditid,对应属性DTID,如果没有值，将返回默认值0,其中默认值0是可选的
+     {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def: 0,  convert: 转换函数},// 列名event_id对应属性eventMainInfo.id,这种方式将返回嵌套的json对象,其中默认值null是可选的
+     ]
+     ```
+     将得到 test.dict 这个map
+     12. dataConvert 数据转换器
+     ```
+     dataConvert: {
+         fileName: 'qiniu'
+     }
+         // 表示列 fileName 按 qiniu的函数格式化
+         // qiniu 在开始时定义
+     ```
      */
     select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1099,6 +1155,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<L[]>;
     select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1113,6 +1170,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<ArrayList<L>>;
     select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1127,6 +1185,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<L>;
     select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1141,6 +1200,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<L | null>;
     select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1155,6 +1215,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): L[];
     select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1169,6 +1230,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): ArrayList<L>;
     select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1183,6 +1245,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): L;
     select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1197,6 +1260,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): L | null;
     /**
      # 自由执行sql
@@ -1268,6 +1332,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<PageQuery<L>>;
     page<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1284,6 +1349,7 @@ export declare class SqlService<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): PageQuery<L>;
     /**
      * 导出数据，可以为EJS-EXCEL直接使用
@@ -1689,6 +1755,7 @@ declare class StreamQuery<T extends object> {
     update(key: keyof T, value: T[keyof T]): this;
     update2(sql: string, param?: Record<string, any>): this;
     updateT(t: Partial<T>): this;
+    /** SET key = REPLACE(key, :valueToFind,  :valueToReplace) */
     replace(key: keyof T, valueToFind: T[keyof T], valueToReplace: T[keyof T]): this;
     excuteSelect<L = T>(option?: MethodOption & {
         sync?: SyncMode.Async;
@@ -1696,6 +1763,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<L[]>;
     excuteSelect<L = T>(option?: MethodOption & {
         sync?: SyncMode.Async;
@@ -1703,6 +1771,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<ArrayList<L>>;
     excuteSelect<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1711,6 +1780,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<L>;
     excuteSelect<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1718,6 +1788,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): Promise<L | null>;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1725,6 +1796,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): L[];
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1732,6 +1804,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): ArrayList<L>;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1740,6 +1813,7 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): L;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1747,12 +1821,14 @@ declare class StreamQuery<T extends object> {
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): L | null;
     excutePage<L = T>(option?: MethodOption & {
         sync?: SyncMode;
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
     }): PageQuery<L> | Promise<PageQuery<L>>;
     excuteUpdate(option?: MethodOption & {
         sync?: SyncMode.Async;

package/sql.js

@@ -70,6 +70,7 @@ const _inTransaction = Symbol('inTransaction');
 const _daoDB = Symbol('daoDB');
 const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
+export const _DataConvert = Symbol('DataConvert');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
 export const _enum = Symbol('_enum');
@@ -449,7 +450,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 +468,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!');
@@ -748,7 +749,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 +767,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!');
@@ -1228,7 +1229,7 @@ class Build {
      */
     page() {
         return (text, render) => {
-            if (this.isCount === true) {
+            if (this.isCount) {
                 return Build.page;
             }
             else if (this.isSum !== true) {
@@ -1260,7 +1261,7 @@ class Build {
      */
     notPage() {
         return (text, render) => {
-            if (this.isCount === true || this.isSum === true) {
+            if (this.isCount || this.isSum) {
                 return '';
             }
             else {
@@ -1351,7 +1352,7 @@ class Build {
      */
     order() {
         return (text, render) => {
-            if (this.isCount === true || this.isSum === true) {
+            if (this.isCount || this.isSum) {
                 return '';
             }
             else {
@@ -1381,7 +1382,7 @@ class Build {
      */
     group() {
         return (text, render) => {
-            if (this.isCount === true || this.isSum === true) {
+            if (this.isCount || this.isSum) {
                 return '';
             }
             else {
@@ -1463,7 +1464,7 @@ class Build {
      * * t.problemtype = 列名
      *
      * ```
-     * {{#enum}} PROBLEM_TYPE(t.problemtype) {{/enum}}
+     * {{#enumTag}} PROBLEM_TYPE(t.problemtype) {{/enumTag}}
      * ```
      */
     enum() {
@@ -1508,7 +1509,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 +1518,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 +1538,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 +1557,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 +1590,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 +1616,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;
@@ -1648,7 +1654,10 @@ export class SqlCache {
         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']]);
@@ -1783,12 +1792,7 @@ function P(skipConn = false) {
                     return result;
                 }
                 catch (error) {
-                    try {
-                        console.error(`service ${propertyKey} have an error:${error}`);
-                    }
-                    catch (error) {
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}`);
-                    }
+                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
                     throw error;
                 }
                 finally {
@@ -1827,7 +1831,6 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        // console.error(`${(option as any).sqlId ?? option!.tableName} service ${propertyKey} have an error:${error}`)
                         reject(error);
                     }
                     finally {
@@ -1858,7 +1861,6 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        // console.error(`${(option as any).sqlId ?? option!.tableName} service ${propertyKey} have an error:${error}`)
                         reject(error);
                     }
                     finally {
@@ -1889,7 +1891,6 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        // console.error(`${(option as any).sqlId ?? option!.tableName} service ${propertyKey} have an error:${error}`)
                         reject(error);
                     }
                     finally {
@@ -1910,7 +1911,7 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     let ret = 0;
     // 如果是插入操作且字段是UUID，则不进行空值检查
     // 只有在非插入或者非UUID时，进行空置检查
-    if (option?.insert === true && uuidColumn === true) {
+    if (option?.insert && uuidColumn) {
         ret = 1;
         if (V === undefined || emptyString(`${V ?? ''}`)) {
             V = null;
@@ -1920,19 +1921,19 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
         if (V === null) {
             if (option?.skipNull !== true) {
                 ret = 1;
-                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : null;
+                V = option?.insert && def && def.hasOwnProperty(K) ? def[K] : null;
             }
         }
         else if (V === undefined) {
             if (option?.skipUndefined !== true) {
                 ret = 1;
-                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : null;
+                V = option?.insert && def && def.hasOwnProperty(K) ? def[K] : null;
             }
         }
         else if (emptyString(`${V ?? ''}`)) {
             if (option?.skipEmptyString !== true) {
                 ret = 1;
-                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : '';
+                V = option?.insert && def && def.hasOwnProperty(K) ? def[K] : '';
             }
         }
         else {
@@ -1989,8 +1990,8 @@ export const DB = (config) => {
                     this[_x] = __stateFileName;
                     this[_y] = __deleteState;
                     this[_z] = (data, option) => {
-                        return Object.fromEntries(iterate(option?.skipId === true ? __columnsNoId : __columns)
-                            .map(K => [K, FieldFilter(K, data[K], __def, __fields[K].uuid === true || __fields[K].uuidShort === true, option)])
+                        return Object.fromEntries(iterate(option?.skipId ? __columnsNoId : __columns)
+                            .map(K => [K, FieldFilter(K, data[K], __def, __fields[K].uuid || __fields[K].uuidShort, option)])
                             .filter(data => {
                             if (data[1][0] === 1) {
                                 if (__fields[data[0]].Data2SQL) {
@@ -2365,13 +2366,13 @@ export class SqlService {
                         }
                     }
                     return result;
-                }, { everyLength: option?.every === true ? 1 : option?.maxDeal });
+                }, { everyLength: option?.every ? 1 : option?.maxDeal });
                 if (isArray)
                     return result;
                 else
                     return result[0];
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2390,10 +2391,10 @@ export class SqlService {
                         }
                     }
                     return result;
-                }, { everyLength: option?.every === true ? 1 : option?.maxDeal });
+                }, { everyLength: option?.every ? 1 : option?.maxDeal });
                 return result;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2415,7 +2416,7 @@ export class SqlService {
                 }, { everyLength: 1 });
                 return result[0];
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2476,7 +2477,7 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 return result.length > 0 ? result.reduce((a, b) => a + b) : 0;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2498,7 +2499,7 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 return result.length > 0 ? result.reduce((a, b) => a + b) : 0;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2597,7 +2598,7 @@ export class SqlService {
                 }
                 return result;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2613,7 +2614,7 @@ export class SqlService {
                 }
                 return result;
             };
-            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction]) {
                 return fn();
             }
             else {
@@ -2715,10 +2716,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 +2735,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 +2754,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 +2771,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 +2800,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 +2827,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();
+                    }
                 }
             }
         }
@@ -2811,13 +2858,13 @@ export class SqlService {
         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);
@@ -2874,7 +2921,7 @@ export class SqlService {
         };
         option.pageNumber ?? (option.pageNumber = 1);
         option.pageSize ?? (option.pageSize = 0);
-        if (option.hump === true || (option.hump === undefined && globalThis[_Hump] === true) && option.sortName) {
+        if (option.hump || (option.hump === undefined && globalThis[_Hump]) && option.sortName) {
             option.sortName = P2C(option.sortName);
         }
         Object.assign(option.params, {
@@ -2886,7 +2933,7 @@ export class SqlService {
         let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ...option.params });
         let sqlSum = '';
         let sqlCount = '';
-        if (option.sumSelf === true) {
+        if (option.sumSelf) {
             sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
         }
         if (option.limitSelf !== true) {
@@ -2897,7 +2944,7 @@ export class SqlService {
             }
         }
         if (option.pageSize > 0) {
-            if (option.countSelf === true) {
+            if (option.countSelf) {
                 sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx: option.context, isCount: true, isSum: false, ...option.params });
             }
             else {
@@ -3193,7 +3240,7 @@ export class SqlService {
         tableName = tableName ?? this[_tableName];
         switch (dbType) {
             case DBType.Mysql: {
-                let sql = formatDialect(`CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                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(',')} ` : ''}
@@ -3217,7 +3264,7 @@ export class SqlService {
             }
             case DBType.Sqlite:
             case DBType.SqliteRemote: {
-                let sql = formatDialect(`CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                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 });
@@ -3351,7 +3398,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 +3415,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);
@@ -3462,7 +3509,7 @@ class StreamQuery {
                 exe = true;
             }
         }
-        if (breakExcuteIfSkip === true && exe === false) {
+        if (breakExcuteIfSkip && exe === false) {
             this.if_exec = false;
         }
         return this;
@@ -3649,6 +3696,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}) `);
@@ -3857,8 +3905,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 +3927,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;
@@ -3909,11 +3957,11 @@ class StreamQuery {
     _between(key, value1, value2, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value1 === null
             || value1 === undefined
-            || (emptyString(`${value1 ?? ''}`) && skipEmptyString === true)
+            || (emptyString(`${value1 ?? ''}`) && skipEmptyString)
             || value2 === null
             || value2 === undefined
-            || (emptyString(`${value2 ?? ''}`) && skipEmptyString === true)) {
-            if (breakExcuteIfSkip === true) {
+            || (emptyString(`${value2 ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -3934,7 +3982,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) {
@@ -3956,7 +4004,7 @@ class StreamQuery {
         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;
@@ -3979,7 +4027,7 @@ class StreamQuery {
         if (value === null
             || value === undefined
             || emptyString(`${value ?? ''}`)) {
-            if (breakExcuteIfSkip === true) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4001,7 +4049,7 @@ class StreamQuery {
         if (value === null
             || value === undefined
             || emptyString(`${value ?? ''}`)) {
-            if (breakExcuteIfSkip === true) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4023,7 +4071,7 @@ class StreamQuery {
         if (value === null
             || value === undefined
             || emptyString(`${value ?? ''}`)) {
-            if (breakExcuteIfSkip === true) {
+            if (breakExcuteIfSkip) {
                 this.if_exec = false;
             }
             return this;
@@ -4044,8 +4092,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 +4114,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;