baja-lite 1.0.5 → 1.0.6

package/cjs/sql.d.ts

@@ -1,4 +1,5 @@
 import { XML } from './convert-xml';
+import { ArrayList } from './list';
 declare const _daoDBName: unique symbol;
 declare const _tableName: unique symbol;
 declare const _className: unique symbol;
@@ -37,6 +38,12 @@ export declare enum DBType {
     Redis = 4,
     RedisLock = 5
 }
+export declare enum MapperIfUndefined {
+    Null = 0,
+    Skip = 1,
+    Zero = 2,
+    EmptyString = 3
+}
 export declare enum SyncMode {
     /** 同步执行 */
     Sync = 0,
@@ -98,16 +105,28 @@ export declare enum TemplateResult {
     NotSureOne = 1,
     /** 返回多条记录 */
     Many = 2,
+    /** 返回多条记录并封装ArrayList */
+    ManyList = 3,
     /** 仅查询记录数量 */
-    Count = 3
+    Count = 4
 }
 export declare enum SelectResult {
-    One_Row_One_Column_Assert = 0,
-    One_Row_One_Column_NotSure = 1,
-    One_Row_Many_Column_Assert = 2,
-    One_Row_Many_Column_NotSure = 3,
-    Many_Row_One_Column = 4,
-    Many_Row_Many_Column = 5
+    /** 一行一列 确定非空 */
+    R_C_Assert = 0,
+    /** 一行一列 可能空 */
+    R_C_NotSure = 1,
+    /** 一行多列 确定非空 */
+    R_CS_Assert = 2,
+    /** 一行多列 可能空 */
+    R_CS_NotSure = 3,
+    /** 多行一列 */
+    RS_C = 4,
+    /** 多行一列并封装ArrayList */
+    RS_C_List = 5,
+    /** 多行多列 */
+    RS_CS = 6,
+    /** 多行多列并封装ArrayList */
+    RS_CS_List = 7
 }
 export declare enum SqlType {
     tinyint = 0,
@@ -207,7 +226,7 @@ interface ServiceOption {
     ```
     可以继承该接口来约束格式
  */
-export interface GlobalSqlOption2 {
+export interface GlobalSqlOptionForWeb {
     /** 增改忽略Undefined */
     skipUndefined?: boolean;
     /** 增改忽略NULL */
@@ -241,12 +260,20 @@ export interface GlobalSqlOption2 {
      作用与sqlDir类似，不同在于sqlMap`不需要`目录，而是直接指定一个sqlModel对象，对象的格式和sqlDir的文件内容一样。
      ** 适用于简单使用
      */
-    sqlMap?: SqlModel;
+    sqlMap?: _SqlModel;
     /**
      作用与sqlFnDir类似，不同在于sqlFNMap`不需要`目录，而是直接指定一个 Record<string, string>，对象的格式和sqlFnDir的文件内容一样。
      ** 适用于简单使用
      */
     sqlFNMap?: Record<string, string>;
+    /**
+    // 第一个元素=列名，第二个元素是属性路径，
+    [
+        ['dit_id', ['id']], // 列名ditid,对应属性id
+        ['event_id', ['eventMainInfo', 'id']] // 列名event_id对应属性eventMainInfo.id
+    ]
+     */
+    sqlMapperMap?: SqlMappers;
 }
 /**
  # 全局行为配置文件
@@ -260,7 +287,7 @@ export interface GlobalSqlOption2 {
     ```
     可以继承该接口来约束格式
  */
-export interface GlobalSqlOption extends GlobalSqlOption2 {
+export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
     /**
        初始化MYSQL链接 支持多数据源
        ## 单一数据源: 直接传入Mysql2的连接配置
@@ -336,9 +363,24 @@ export interface GlobalSqlOption extends GlobalSqlOption2 {
     sqlDir?: string;
     /**
     ## [mustache](https://mustache.github.io/) 编译时的[模板](https://github.com/janl/mustache.js#:~:text=requires%20only%20this%3A-,%7B%7B%3E%20next_more%7D%7D,-Why%3F%20Because%20the)
-      ** 文件名就是模板名
+      ## 文件名就是模板名
      */
     sqlFNDir?: string;
+    /**
+      ## 映射数据为对象，文件名就是模板名
+    ```
+    // 第一个元素=列名，第二个元素是属性路径，
+    // 该目录下可存放json文件，内容如下
+    //
+    // 可以在查询时使用，优先级高于hump
+    // 例如:
+    [
+        ['dit_id', ['id'], 可选的默认值], // 列名ditid,对应属性id,当未查询返回时，使用默认值
+        ['event_id', ['eventMainInfo', 'id']] // 列名event_id对应属性eventMainInfo.id,当未查询返回时，该属性不存在
+    ]
+    ```
+     */
+    sqlMapperDir?: string;
     /**
      [REDIS初始化文档](https://github.com/redis/ioredis?tab=readme-ov-file#:~:text=connect%20to%20by%3A-,new%20Redis()%3B,-//%20Connect%20to%20127.0.0.1)
     ```
@@ -378,6 +420,11 @@ export interface GlobalSqlOption extends GlobalSqlOption2 {
      * ```
      */
     columnMode?: ColumnMode;
+    /**
+     * 读取查询语句时，是否扫描JS文件？
+     * JS文件需要默认导出一个 SqlModel对象
+     */
+    jsMode?: boolean;
 }
 interface FieldOption extends Object {
     type?: SqlType;
@@ -542,6 +589,8 @@ export declare class SqliteRemote implements Dao {
     restore(sync: SyncMode.Sync, name: string): void;
     restore(sync: SyncMode.Async, name: string): Promise<void>;
 }
+export type SqlMapper = ([string, string[], any?])[];
+export type SqlMappers = Record<string, SqlMapper>;
 export type SqlModel = Record<string, string | ((options: {
     ctx: any;
     isCount?: boolean;
@@ -550,15 +599,49 @@ export type SqlModel = Record<string, string | ((options: {
     limitEnd?: number;
     orderBy?: string;
     [k: string]: any;
+}) => string)>;
+type _SqlModel = Record<string, string | ((options: {
+    ctx: any;
+    isCount?: boolean;
+    isSum?: boolean;
+    limitStart?: number;
+    limitEnd?: number;
+    orderBy?: string;
+    [k: string]: any;
 }) => string) | XML[]>;
+/**
+ * ifUndefined默认是MapperIfUndefined.Skip
+ */
+export declare function flatData<M>(options: {
+    data: any;
+    mapper: string | SqlMapper;
+    mapperIfUndefined?: MapperIfUndefined;
+}): M;
 export declare class SqlCache {
     private sqlMap;
     private sqlFNMap;
+    private _read;
+    /**
+     *
+     * ```
+    // 第一个元素=列名，第二个元素是属性路径，
+    [
+        ['dit_id', ['id']], // 列名ditid,对应属性id
+        ['event_id', ['eventMainInfo', 'id']] // 列名event_id对应属性eventMainInfo.id
+    ]
+     * ```
+     * @param am
+     * @param keys
+     */
+    private readResultMap;
     init(options: {
-        sqlMap?: SqlModel;
+        sqlMap?: _SqlModel;
         sqlDir?: string;
         sqlFNMap?: Record<string, string>;
         sqlFNDir?: string;
+        sqlMapperMap?: SqlMappers;
+        sqlMapperDir?: string;
+        jsMode?: boolean;
     }): Promise<void>;
     load(sqlids: string[], options: {
         ctx: any;
@@ -571,7 +654,9 @@ export declare class SqlCache {
     }): string;
 }
 export declare const Field: (config: FieldOption) => (object: object, propertyName: string) => void;
-export declare const DB: (config: ServiceOption) => <C extends new (...args: any[]) => {}>(constructor: C) => {
+export declare const DB: (config: ServiceOption) => <C extends {
+    new (...args: any[]): {};
+}>(constructor: C) => {
     new (...args: any[]): {
         [_tableName]: string | undefined;
         [_className]: string | undefined;
@@ -840,17 +925,6 @@ export declare class SqlService<T extends object> {
     8.  `dao`: 永远不需要传入该值
 
      */
-    template<L = T>(option: MethodOption & {
-        templateResult?: TemplateResult.AssertOne;
-        id?: string | number | Array<string | number>;
-        where?: Partial<L> | Array<Partial<L>>;
-        skipUndefined?: boolean;
-        skipNull?: boolean;
-        skipEmptyString?: boolean;
-        mode?: SelectMode;
-        error?: string;
-        columns?: (keyof L)[];
-    }): Promise<L>;
     template<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
         templateResult?: TemplateResult.AssertOne;
@@ -864,7 +938,7 @@ export declare class SqlService<T extends object> {
         columns?: (keyof L)[];
     }): L;
     template<L = T>(option: MethodOption & {
-        sync: SyncMode.Async;
+        sync?: SyncMode.Async;
         templateResult?: TemplateResult.AssertOne;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
@@ -875,17 +949,6 @@ export declare class SqlService<T extends object> {
         error?: string;
         columns?: (keyof L)[];
     }): Promise<L>;
-    template<L = T>(option: MethodOption & {
-        templateResult: TemplateResult.Count;
-        id?: string | number | Array<string | number>;
-        where?: Partial<L> | Array<Partial<L>>;
-        skipUndefined?: boolean;
-        skipNull?: boolean;
-        skipEmptyString?: boolean;
-        mode?: SelectMode;
-        error?: string;
-        columns?: (keyof L)[];
-    }): Promise<number>;
     template<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
         templateResult: TemplateResult.Count;
@@ -899,7 +962,7 @@ export declare class SqlService<T extends object> {
         columns?: (keyof L)[];
     }): number;
     template<L = T>(option: MethodOption & {
-        sync: SyncMode.Async;
+        sync?: SyncMode.Async;
         templateResult: TemplateResult.Count;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
@@ -911,6 +974,7 @@ export declare class SqlService<T extends object> {
         columns?: (keyof L)[];
     }): Promise<number>;
     template<L = T>(option: MethodOption & {
+        sync: SyncMode.Sync;
         templateResult: TemplateResult.NotSureOne;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
@@ -920,9 +984,9 @@ export declare class SqlService<T extends object> {
         mode?: SelectMode;
         error?: string;
         columns?: (keyof L)[];
-    }): Promise<L | null>;
+    }): L | null;
     template<L = T>(option: MethodOption & {
-        sync: SyncMode.Sync;
+        sync?: SyncMode.Async;
         templateResult: TemplateResult.NotSureOne;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
@@ -932,10 +996,10 @@ export declare class SqlService<T extends object> {
         mode?: SelectMode;
         error?: string;
         columns?: (keyof L)[];
-    }): L | null;
+    }): Promise<L | null>;
     template<L = T>(option: MethodOption & {
-        sync: SyncMode.Async;
-        templateResult: TemplateResult.NotSureOne;
+        sync: SyncMode.Sync;
+        templateResult: TemplateResult.Many;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
         skipUndefined?: boolean;
@@ -944,8 +1008,9 @@ export declare class SqlService<T extends object> {
         mode?: SelectMode;
         error?: string;
         columns?: (keyof L)[];
-    }): Promise<L | null>;
+    }): L[];
     template<L = T>(option: MethodOption & {
+        sync?: SyncMode.Async;
         templateResult: TemplateResult.Many;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
@@ -958,7 +1023,7 @@ export declare class SqlService<T extends object> {
     }): Promise<L[]>;
     template<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
-        templateResult: TemplateResult.Many;
+        templateResult: TemplateResult.ManyList;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
         skipUndefined?: boolean;
@@ -967,10 +1032,10 @@ export declare class SqlService<T extends object> {
         mode?: SelectMode;
         error?: string;
         columns?: (keyof L)[];
-    }): L[];
+    }): ArrayList<L>;
     template<L = T>(option: MethodOption & {
-        sync: SyncMode.Async;
-        templateResult: TemplateResult.Many;
+        sync?: SyncMode.Async;
+        templateResult: TemplateResult.ManyList;
         id?: string | number | Array<string | number>;
         where?: Partial<L> | Array<Partial<L>>;
         skipUndefined?: boolean;
@@ -979,25 +1044,24 @@ export declare class SqlService<T extends object> {
         mode?: SelectMode;
         error?: string;
         columns?: (keyof L)[];
-    }): Promise<L[]>;
+    }): Promise<ArrayList<L>>;
     private _select;
     /**
     # 自由查询
     0. `sync`: 同步（sqlite）或者异步（mysql、remote），影响返回值类型,默认`异步模式`
-    1. `templateResult`: 返回值类型断言，三种
-        1. One_Row_One_Column_Assert,
-        2. One_Row_One_Column_NotSure,
-        3. One_Row_Many_Column_Assert,
-        4. One_Row_Many_Column_NotSure,
-        5. Many_Row_One_Column,
-        6. Many_Row_Many_Column[默认]
+    1. `templateResult`: 返回值类型断言，6种, R表示行，C表示列，带S表示复数
+        1. R_C_Assert,
+        2. R_C_NotSure,
+        3. R_CS_Assert,
+        4. R_CS_NotSure,
+        5. RS_C,
+        6. RS_C_List
+        7. RS_CS[默认]
+        8. RS_CS_List
     2. `sql` 或者 `sqlid`
     3. `params`
     4. `defValue`: One_Row_One_Column 时有效
-    5. `multiple`: = true 时表示多重sql查询，且每个sql的结果都是相同的resultMode, 此时 `One_Row_One_Column` `Many_Row_One_Column` `One_Row_Many_Column` 将按多重数组解析，`Many_Row_Many_Column` 不变，此时需要自己手动指定返回类型.
-        此时 `One_Row_One_Column` 将返回多个单值组成的数组: `[1, 'ok', 3]`
-             `One_Row_Many_Column` 将返回多个对象组成的数组: `[{ob1}, {ob2}, {ob3}]`
-             `Many_Row_One_Column` 将返回多个单值数组组成的数组: `[[1,2,3],  ['a', 'b']]`
+    5. 禁止一次查询多个语句
     6. `dbName`: 默认使用service注解的`dbName`,可以在某个方法中覆盖
     7. `conn`: 仅在开启事务时需要主动传入,传入示例:
         ```
@@ -1006,85 +1070,121 @@ export declare class SqlService<T extends object> {
             });
         ```
     9.  `dao`: 永远不需要传入该值
+    10. `hump`: 是否将列名改为驼峰写法？默认情况下按照全局配置
+    11. `mapper`: 列名-属性 映射工具，优先级高于hump
 
      */
     select<L = T>(option: MethodOption & {
-        hump?: boolean;
         sync?: SyncMode.Async;
-        selectResult?: SelectResult.Many_Row_Many_Column | SelectResult.Many_Row_One_Column;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
         context?: any;
         isCount?: boolean;
         defValue?: L | null;
-        multiple?: boolean;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<L[]>;
     select<L = T>(option: MethodOption & {
+        sync?: SyncMode.Async;
+        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        isCount?: boolean;
+        defValue?: L | null;
+        errorMsg?: string;
         hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+    }): Promise<ArrayList<L>>;
+    select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
-        selectResult: SelectResult.One_Row_Many_Column_Assert | SelectResult.One_Row_One_Column_Assert;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
         context?: any;
         isCount?: boolean;
         defValue?: L | null;
-        multiple?: boolean;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<L>;
     select<L = T>(option: MethodOption & {
-        hump?: boolean;
         sync?: SyncMode.Async;
-        selectResult: SelectResult.One_Row_Many_Column_NotSure | SelectResult.One_Row_One_Column_NotSure;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
         context?: any;
         isCount?: boolean;
         defValue?: L | null;
-        multiple?: boolean;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<L | null>;
     select<L = T>(option: MethodOption & {
-        hump?: boolean;
         sync: SyncMode.Sync;
-        selectResult?: SelectResult.Many_Row_Many_Column | SelectResult.Many_Row_One_Column;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
         context?: any;
         isCount?: boolean;
         defValue?: L | null;
-        multiple?: boolean;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): L[];
     select<L = T>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        isCount?: boolean;
+        defValue?: L | null;
+        errorMsg?: string;
         hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+    }): ArrayList<L>;
+    select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
-        selectResult: SelectResult.One_Row_Many_Column_Assert | SelectResult.One_Row_One_Column_Assert;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
         context?: any;
         isCount?: boolean;
         defValue?: L | null;
-        multiple?: boolean;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): L;
     select<L = T>(option: MethodOption & {
-        hump?: boolean;
         sync: SyncMode.Sync;
-        selectResult: SelectResult.One_Row_Many_Column_NotSure | SelectResult.One_Row_One_Column_NotSure;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
         context?: any;
         isCount?: boolean;
         defValue?: L | null;
-        multiple?: boolean;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): L | null;
     /**
      # 自由执行sql
@@ -1099,7 +1199,7 @@ export declare class SqlService<T extends object> {
              });
          ```
      5.  `dao`: 永远不需要传入该值
- 
+     
       */
     excute<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
@@ -1148,10 +1248,13 @@ export declare class SqlService<T extends object> {
         params: Record<string, any>;
         pageSize: number;
         pageNumber: number;
-        limitSelf: boolean;
-        countSelf: boolean;
-        sumSelf: boolean;
+        limitSelf?: boolean;
+        countSelf?: boolean;
+        sumSelf?: boolean;
         orderBy?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<PageQuery<L>>;
     page<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -1160,10 +1263,13 @@ export declare class SqlService<T extends object> {
         params: Record<string, any>;
         pageSize: number;
         pageNumber: number;
-        limitSelf: boolean;
-        countSelf: boolean;
-        sumSelf: boolean;
+        limitSelf?: boolean;
+        countSelf?: boolean;
+        sumSelf?: boolean;
         orderBy?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): PageQuery<L>;
     /**
     #创建表
@@ -1207,168 +1313,222 @@ declare class StreamQuery<T extends object> {
     reset(): this;
     /** 为下次链条执行提供条件判断：非异步方法跳过，异步方法不执行并返回默认值 */
     if(condition: boolean): this;
-    eq(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    eq(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    eqT(t: Partial<T>, { name }?: {
-        name?: string;
+    eqT(t: Partial<T>, { name: paramName, breakExcuteIfSkip }?: {
+        name?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notEq(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    notEq(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     eqWith(key1: keyof T, key2: keyof T): this;
     notEqWith(key1: keyof T, key2: keyof T): this;
-    regexp(key: keyof T, regexp: string, { name }?: {
-        name?: string;
+    regexp(key: keyof T, regexp: string, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notRegexp(key: keyof T, regexp: string, { name }?: {
-        name?: string;
+    notRegexp(key: keyof T, regexp: string, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** (key1 << 8) + key2 = value */
-    shiftEq(key1: keyof T, key2: keyof T, value: number, { name }?: {
-        name?: string;
+    shiftEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** (key1 << 8) + key2 <> value */
-    shiftNotEq(key1: keyof T, key2: keyof T, value: number, { name }?: {
-        name?: string;
+    shiftNotEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    grate(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    grate(key: keyof T, value: string | number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    grateEq(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    grateEq(key: keyof T, value: string | number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     grateWith(key1: keyof T, key2: keyof T): this;
     grateEqWith(key1: keyof T, key2: keyof T): this;
-    less(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    less(key: keyof T, value: string | number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    lessEq(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    lessEq(key: keyof T, value: string | number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     lessWith(key1: keyof T, key2: keyof T): this;
     lessEqWith(key1: keyof T, key2: keyof T): this;
-    like(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    like(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    leftLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    leftLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notLeftLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notLeftLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    rightLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    rightLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notRightLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notRightLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    PreciseLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    PreciseLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notPreciseLike(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notPreciseLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    glob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    glob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    leftGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    leftGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notLeftGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notLeftGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    rightGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    rightGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notRightGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notRightGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    PreciseGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    PreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notPreciseGlob(key: keyof T, value: string | number, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notPreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    in(key: keyof T, value: Array<string | number>, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    in(key: keyof T, value: Array<string | number>, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notIn(key: keyof T, value: Array<string | number>, { name, force }?: {
-        name?: string;
-        force?: boolean;
+    notIn(key: keyof T, value: Array<string | number>, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     isNULL(key: keyof T): this;
     isNotNULL(key: keyof T): this;
-    between(key: keyof T, value1: string | number, value2: string | number, { name }?: {
-        name?: string;
+    between(key: keyof T, value1: string | number, value2: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notBetween(key: keyof T, value1: string | number, value2: string | number, { name }?: {
-        name?: string;
+    notBetween(key: keyof T, value1: string | number, value2: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    pow(key: keyof T, value: number, { name }?: {
-        name?: string;
+    pow(key: keyof T, value: number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notPow(key: keyof T, value: number, { name }?: {
-        name?: string;
+    notPow(key: keyof T, value: number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    powWith(key: keyof T, values: Array<number | string>, { name }?: {
-        name?: string;
+    powWith(key: keyof T, values: Array<number | string>, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notPowWith(key: keyof T, values: Array<number | string>, { name }?: {
-        name?: string;
+    notPowWith(key: keyof T, values: Array<number | string>, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** MATCH(key1, key2, key3) AGAINST (value) */
-    match(value: string, keys: (keyof T)[], { name }?: {
-        name?: string;
+    match(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** NOT MATCH(key1, key2, key3) AGAINST (value) */
-    notMatch(value: string, keys: (keyof T)[], { name }?: {
-        name?: string;
+    notMatch(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** MATCH(key1, key2, key3) AGAINST (value) IN BOOLEAN MODE*/
-    matchBoolean(value: string, keys: (keyof T)[], { name }?: {
-        name?: string;
+    matchBoolean(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** NOT MATCH(key1, key2, key3) AGAINST (value) IN BOOLEAN MODE */
-    notMatchBoolean(value: string, keys: (keyof T)[], { name }?: {
-        name?: string;
+    notMatchBoolean(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** MATCH(key1, key2, key3) AGAINST (value) WITH QUERY EXPANSION*/
-    matchQuery(value: string, keys: (keyof T)[], { name }?: {
-        name?: string;
+    matchQuery(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     /** NOT MATCH(key1, key2, key3) AGAINST (value) WITH QUERY EXPANSION*/
-    notMatchQuery(value: string, keys: (keyof T)[], { name }?: {
-        name?: string;
+    notMatchQuery(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    includes(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    includes(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
-    notIncludes(key: keyof T, value: string | number, { name }?: {
-        name?: string;
+    notIncludes(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
     }): this;
     and(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     or(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
@@ -1403,30 +1563,68 @@ declare class StreamQuery<T extends object> {
     replace(key: keyof T, valueToFind: T[keyof T], valueToReplace: T[keyof T]): this;
     excuteSelect<L = T>(option?: MethodOption & {
         sync?: SyncMode.Async;
-        selectResult?: SelectResult.Many_Row_Many_Column | SelectResult.Many_Row_One_Column;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<L[]>;
+    excuteSelect<L = T>(option?: MethodOption & {
+        sync?: SyncMode.Async;
+        selectResult?: SelectResult.RS_CS_List | SelectResult.RS_C_List;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+    }): Promise<ArrayList<L>>;
     excuteSelect<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
-        selectResult: SelectResult.One_Row_Many_Column_Assert | SelectResult.One_Row_One_Column_Assert;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<L>;
     excuteSelect<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
-        selectResult: SelectResult.One_Row_Many_Column_NotSure | SelectResult.One_Row_One_Column_NotSure;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): Promise<L | null>;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
-        selectResult: SelectResult.Many_Row_Many_Column | SelectResult.Many_Row_One_Column;
+        selectResult: SelectResult.RS_CS | SelectResult.RS_C;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): L[];
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
-        selectResult: SelectResult.One_Row_Many_Column_Assert | SelectResult.One_Row_One_Column_Assert;
+        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+    }): ArrayList<L>;
+    excuteSelect<L = T>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
         errorMsg?: string;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): L;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
-        selectResult: SelectResult.One_Row_Many_Column_NotSure | SelectResult.One_Row_One_Column_NotSure;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
     }): L | null;
+    excutePage<L = T>(option?: MethodOption & {
+        sync?: SyncMode;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+    }): PageQuery<L> | Promise<PageQuery<L>>;
     excuteUpdate(option?: MethodOption & {
         sync?: SyncMode.Async;
     }): Promise<number>;
@@ -1481,7 +1679,7 @@ export declare function excuteWithLock<T>(config: {
     lockMaxActive?: number;
     /** 单个锁多少【毫秒】后自动释放?默认：60*1000MS  */
     lockMaxTime?: number;
-}, fn__: () => Promise<T>): Promise<any>;
+}, fn__: () => Promise<T>): Promise<T>;
 /** 与缓存共用时，需要在缓存之前:有缓存则返回缓存,否则加锁执行并缓存,后续队列全部返回缓存,跳过执行 */
 export declare function MethodLock<T = any>(config: {
     /** 返回缓存key,参数=方法的参数[注意：必须和主方法的参数数量、完全一致，同时会追加一个当前用户对象]+当前用户对象，可以用来清空缓存。 */