baja-lite 1.5.18 → 1.5.19

package/package.json

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

package/sql.d.ts

@@ -1,7 +1,6 @@
 import { ExtensionCodec } from "@msgpack/msgpack";
 import { _columns, _columnsNoId, _def, _deleteState, _fields, _ids, _index, _logicIds, _stateFileName, AField, DBType, EnumMap, FieldOption } from 'baja-lite-field';
 import { XML } from './convert-xml.js';
-import { ArrayList } from './list.js';
 export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
 declare const _tableName: unique symbol;
@@ -94,10 +93,8 @@ export declare enum TemplateResult {
     NotSureOne = 1,
     /** 返回多条记录 */
     Many = 2,
-    /** 返回多条记录并封装ArrayList */
-    ManyList = 3,
     /** 仅查询记录数量 */
-    Count = 4
+    Count = 3
 }
 export declare enum SelectResult {
     /** 一行一列 确定非空 */
@@ -110,12 +107,8 @@ export declare enum SelectResult {
     R_CS_NotSure = 3,
     /** 多行一列 */
     RS_C = 4,
-    /** 多行一列并封装ArrayList */
-    RS_C_List = 5,
     /** 多行多列 */
-    RS_CS = 6,
-    /** 多行多列并封装ArrayList */
-    RS_CS_List = 7
+    RS_CS = 5
 }
 export declare enum ColumnMode {
     NONE = 0,
@@ -1068,30 +1061,6 @@ export declare class SqlService<T extends object> {
         error?: string;
         columns?: (keyof L)[];
     }): Promise<L[]>;
-    template<L = T>(option: MethodOption & {
-        sync: SyncMode.Sync;
-        templateResult: TemplateResult.ManyList;
-        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)[];
-    }): ArrayList<L>;
-    template<L = T>(option: MethodOption & {
-        sync?: SyncMode.Async;
-        templateResult: TemplateResult.ManyList;
-        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<ArrayList<L>>;
     private _select;
     /**
     # 自由查询
@@ -1102,9 +1071,7 @@ export declare class SqlService<T extends object> {
         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 时有效
@@ -1151,21 +1118,6 @@ export declare class SqlService<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): 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;
-        dataConvert?: Record<string, string>;
-    }): Promise<ArrayList<L>>;
     select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1211,21 +1163,6 @@ export declare class SqlService<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): 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;
-        dataConvert?: Record<string, string>;
-    }): ArrayList<L>;
     select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1291,8 +1228,9 @@ export declare class SqlService<T extends object> {
     // qiniu 在开始时定义
      ```
      */
-    selectMuit<T extends any[] = []>(option: MethodOption & {
+    selectBatch<T extends any[] = []>(option: MethodOption & {
         sync?: SyncMode.Async;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
@@ -1304,8 +1242,37 @@ export declare class SqlService<T extends object> {
     }): Promise<{
         [K in keyof T]: T[K][];
     }>;
-    selectMuit<T extends any[] = []>(option: MethodOption & {
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync?: SyncMode.Async;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): Promise<{
+        [K in keyof T]: T[K];
+    }>;
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync?: SyncMode.Async;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): Promise<{
+        [K in keyof T]: T[K] | null;
+    }>;
+    selectBatch<T extends any[] = []>(option: MethodOption & {
         sync: SyncMode.Sync;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
@@ -1317,6 +1284,34 @@ export declare class SqlService<T extends object> {
     }): {
         [K in keyof T]: T[K][];
     };
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): {
+        [K in keyof T]: T[K];
+    };
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): {
+        [K in keyof T]: T[K] | null;
+    };
     /**
      # 自由执行sql
      0. `sync`: 同步（sqlite）或者异步（mysql、remote），影响返回值类型,默认`异步模式`
@@ -1605,72 +1600,72 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT LIKE :value */
+    /** AND key LIKE :value 注意：不会拼接% */
     PreciseLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key LIKE :value */
+    /** AND key NOT LIKE :value 注意：不会拼接%*/
     notPreciseLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB CONCAT('%', :value, '%') */
+    /** AND key GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like */
     glob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB CONCAT('%', :value, '%') */
+    /** AND key NOT GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like*/
     notGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB CONCAT('%', :value) */
+    /** AND key GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     leftGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB CONCAT('%', :value) */
+    /** AND key NOT GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     notLeftGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB CONCAT(:value, '%') */
+    /** AND key GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     rightGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB CONCAT(:value, '%') */
+    /** AND key NOT GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     notRightGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB :value */
+    /** AND key GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
     PreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB :value */
+    /** AND key NOT GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
     notPreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key IN :value */
+    /** AND key IN (:value) */
     in(key: keyof T, value: Array<string | number>, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT IN :value */
+    /** AND key NOT IN (:value) */
     notIn(key: keyof T, value: Array<string | number>, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
@@ -1838,14 +1833,6 @@ declare class StreamQuery<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): 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;
-        dataConvert?: Record<string, string>;
-    }): Promise<ArrayList<L>>;
     excuteSelect<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1871,14 +1858,6 @@ declare class StreamQuery<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): L[];
-    excuteSelect<L = T>(option: MethodOption & {
-        sync: SyncMode.Sync;
-        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
-        hump?: boolean;
-        mapper?: string | SqlMapper;
-        mapperIfUndefined?: MapperIfUndefined;
-        dataConvert?: Record<string, string>;
-    }): ArrayList<L>;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;

package/sql.js

@@ -21,7 +21,6 @@ import tslib from 'tslib';
 import { convert } from './convert-xml.js';
 import { Throw } from './error.js';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
-import { ArrayList } from './list.js';
 import { add, calc, ten2Any } from './math.js';
 import { C2P, C2P2, P2C } from './object.js';
 import { emptyString } from './string.js';
@@ -179,10 +178,8 @@ export var TemplateResult;
     TemplateResult[TemplateResult["NotSureOne"] = 1] = "NotSureOne";
     /** 返回多条记录 */
     TemplateResult[TemplateResult["Many"] = 2] = "Many";
-    /** 返回多条记录并封装ArrayList */
-    TemplateResult[TemplateResult["ManyList"] = 3] = "ManyList";
     /** 仅查询记录数量 */
-    TemplateResult[TemplateResult["Count"] = 4] = "Count";
+    TemplateResult[TemplateResult["Count"] = 3] = "Count";
 })(TemplateResult || (TemplateResult = {}));
 export var SelectResult;
 (function (SelectResult) {
@@ -196,12 +193,8 @@ export var SelectResult;
     SelectResult[SelectResult["R_CS_NotSure"] = 3] = "R_CS_NotSure";
     /** 多行一列 */
     SelectResult[SelectResult["RS_C"] = 4] = "RS_C";
-    /** 多行一列并封装ArrayList */
-    SelectResult[SelectResult["RS_C_List"] = 5] = "RS_C_List";
     /** 多行多列 */
-    SelectResult[SelectResult["RS_CS"] = 6] = "RS_CS";
-    /** 多行多列并封装ArrayList */
-    SelectResult[SelectResult["RS_CS_List"] = 7] = "RS_CS_List";
+    SelectResult[SelectResult["RS_CS"] = 5] = "RS_CS";
 })(SelectResult || (SelectResult = {}));
 export var ColumnMode;
 (function (ColumnMode) {
@@ -2649,9 +2642,6 @@ export class SqlService {
             case TemplateResult.Count: {
                 return result[0].ct;
             }
-            case TemplateResult.ManyList: {
-                return new ArrayList(result[0]);
-            }
         }
     }
     template(option) {
@@ -2823,39 +2813,6 @@ export class SqlService {
                     }
                 }
             }
-            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) {
-                    return new ArrayList();
-                }
-            }
-            case SelectResult.RS_CS_List: {
-                if (mapper) {
-                    return new ArrayList(iterate(result).map((data) => flatData({
-                        data,
-                        mapper,
-                        mapperIfUndefined
-                    })).toArray());
-                }
-                else {
-                    hump = hump === true || (hump === undefined && globalThis[_Hump] === true);
-                    const __dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map(([k, v]) => [k, globalThis[_DataConvert][v]])) : undefined;
-                    if (hump || __dataConvert) {
-                        return new ArrayList(iterate(result).map((r) => C2P2(r, hump, __dataConvert)).toArray());
-                    }
-                    else {
-                        return new ArrayList();
-                    }
-                }
-            }
         }
     }
     select(option) {
@@ -2884,8 +2841,9 @@ export class SqlService {
             });
         }
     }
-    selectMuit(option) {
+    selectBatch(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
+        option.selectResult ?? (option.selectResult = SelectResult.RS_CS);
         if (option.sqlId && globalThis[_resultMap_SQLID][option.sqlId] && !option.mapper) {
             option.mapper = globalThis[_resultMap_SQLID][option.sqlId];
         }
@@ -2894,13 +2852,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 result.map(item => this._select(SelectResult.RS_CS, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
+            return result.map(item => this._select(option.selectResult, result, null, undefined, 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(result.map(item => this._select(SelectResult.RS_CS, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
+                    resolve(result.map(item => this._select(option.selectResult, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
                 }
                 catch (error) {
                     reject(error);
@@ -3405,7 +3363,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
-], SqlService.prototype, "selectMuit", null);
+], SqlService.prototype, "selectBatch", null);
 __decorate([
     P(),
     __metadata("design:type", Function),
@@ -3599,29 +3557,29 @@ class StreamQuery {
     rightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfEmpty }); }
     /** AND key NOT LIKE CONCAT(:value, '%') */
     notRightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND key NOT LIKE :value */
+    /** AND key LIKE :value 注意：不会拼接% */
     PreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
-    /** AND key LIKE :value */
+    /** AND key NOT LIKE :value 注意：不会拼接%*/
     notPreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND key GLOB CONCAT('%', :value, '%') */
+    /** AND key GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like */
     glob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB CONCAT('%', :value, '%') */
+    /** AND key NOT GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like*/
     notGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key GLOB CONCAT('%', :value) */
+    /** AND key GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     leftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB CONCAT('%', :value) */
+    /** AND key NOT GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     notLeftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key GLOB CONCAT(:value, '%') */
+    /** AND key GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     rightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB CONCAT(:value, '%') */
+    /** AND key NOT GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     notRightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key GLOB :value */
+    /** AND key GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
     PreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB :value */
+    /** AND key NOT GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
     notPreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key IN :value */
+    /** AND key IN (:value) */
     in(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._in(key, value, { paramName, breakExcuteIfEmpty }); }
-    /** AND key NOT IN :value */
+    /** AND key NOT IN (:value) */
     notIn(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._in(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
     /** AND :value IN (key1, key2, ...) */
     in2(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._in2(key, value, { paramName, breakExcuteIfEmpty }); }
@@ -3827,8 +3785,6 @@ class StreamQuery {
             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 });
@@ -3839,8 +3795,6 @@ class StreamQuery {
             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 });

package/test-mysql.js

@@ -78,6 +78,12 @@ let BaseAuditUserService = class BaseAuditUserService extends SqlService {
 BaseAuditUserService = __decorate([
     DB({ tableName: 'base_audit_user', clz: BaseAuditUser })
 ], BaseAuditUserService);
+function select() {
+    return [];
+}
+function select2() {
+    return [];
+}
 export async function go2() {
     await Boot({
         Mysql: {
@@ -100,9 +106,10 @@ export async function go2() {
         }
     });
     const service = new BaseAuditUserService();
-    const data = await service.selectMuit({ sqlId: 'test.test', params: { realname: '张薇' } });
+    const data = await service.selectBatch({ sqlId: 'test.test', params: { realname: '张薇' } });
     console.log(11, data[0][0]?.userProvinceCode);
     console.log(11, data[1].length);
+    const dd = select2();
     // const list = await service.transaction<number>({
     //     fn: async conn => {
     //         await service.stream().eq('baseType', '0').in('auditId', ['162400829591265280', '162201628882247680']).excuteSelect();

package/list.d.ts

@@ -1,10 +0,0 @@
-export declare class ArrayList<T> extends Array<T> {
-    constructor(array?: Array<T> | T | undefined);
-    add(...items: T[]): void;
-    size(): number;
-    isEmpty(): boolean;
-    get(index: number): T | undefined;
-    clear(): void;
-    set(index: number, item: T): void;
-    remove(index: number): void;
-}

package/list.js

@@ -1,56 +0,0 @@
-export class ArrayList extends Array {
-    constructor(array) {
-        super();
-        if (array instanceof Array) {
-            super.push(...array);
-        }
-        else if (typeof array !== 'undefined') {
-            super.push(array);
-        }
-    }
-    add(...items) {
-        this.push(...items);
-    }
-    size() {
-        return this.length;
-    }
-    isEmpty() {
-        return this.length === 0;
-    }
-    get(index) {
-        return this[index];
-    }
-    clear() {
-        this.length = 0;
-    }
-    set(index, item) {
-        this[index] = item;
-    }
-    remove(index) {
-        this.splice(index, 1);
-    }
-}
-// export class ArrayMap<T> extends Array<T> {
-//     private _map: Map<string, T> = new Map();
-//     private key: keyof T;
-//     constructor(key: keyof T, array?: Array<T> | T | undefined) {
-//         super();
-//         this.key = key;
-//         if (array instanceof Array) {
-//             super.push(...array);
-//         } else if (typeof array !== 'undefined') {
-//             super.push(array);
-//         }
-//     }
-//     override push(...items: T[]): number {
-//         for (const item of items) {
-//             const key = item[this.key] as string;
-//             if (!this._map.has(key)) {
-//                 super.push(item);
-//                 this._map.set(key, item);
-//             }
-//         }
-//         return this.length;
-//     }
-//     override
-// }