baja-lite 1.4.12 → 1.5.0

package/object.d.ts

@@ -56,12 +56,41 @@ export declare const coverComplexBean: <T>(source: any, classType: any) => {
 export declare const fixEmptyPrototy: (target: any, source: {
     [key: string]: any;
 }) => Promise<void>;
+/**
+ * 1. 统计array中某个字段key的数量:{ [k: string]: number }
+ *
+ * @param array T组成的array,数据源
+ * @param key  返回结果{ [k: string]: number }的key
+ * @param defKey  如果array中某个对象没有key字段，则归类到默认key中
+ * @returns
+ */
 export declare const mixArray: <T>(array: T[], key: keyof T, defKey?: string) => {
     [key: string]: number;
 };
+/**
+ * 1. 将T组成的array按照某个字段(key)提取为{ [key: string]: V[] }
+ * @param array T组成的array,数据源
+ * @param key 返回结果{ [key: string]: V[] }的key
+ * @param value  返回结果{ [key: string]: V[] }中的V可以是T，也可以是T的某个字段(指定value参数)
+ * @param defKey 如果array中某个对象没有key字段，则归类到默认key中
+ * @returns
+ */
 export declare const mixList: <T, V = T>(array: T[], key: keyof T, value?: keyof T, defKey?: string) => {
     [key: string]: V[];
 };
+/**
+ * ## 仿照Object.assign的数组方法
+ * ### 1. 用法参照
+ * ```
+ *  // ID 是 数组中对象的关键字段，用来区分同一条记录.支持多个字段(联合主键场景)
+ *  // 与assign的逻辑相同，后面的数组会覆盖前面数组的相同对象的同名字段
+ *  const result = assignArray('ID', Array1, Array2, Array3...);
+ * ```
+ * @param key
+ * @param arrays
+ * @returns
+ */
+export declare const assignArray: <T>(key: keyof T | (keyof T)[] | ((t1: T, t2: T) => boolean), ...arrays: T[][]) => T[];
 export declare const array2map: <T = string | number>(array: string[], v: T) => {
     [key: string]: T;
 };

package/object.js

@@ -10,8 +10,7 @@ const iterate = ite.iterate;
 export const copyBean = (source, classType) => {
     const result = {};
     Object.keys(classType).forEach((key) => {
-        result[key] =
-            source[key] !== undefined ? source[key] : (result[key] = null);
+        result[key] = source[key] !== undefined ? source[key] : (result[key] = null);
     });
     return result;
 };
@@ -100,7 +99,7 @@ export const coverComplexBean = (source, classType) => {
     }
     return {
         data: convertBean(result, classType),
-        array: arrayData
+        array: arrayData,
     };
 };
 /**
@@ -120,8 +119,16 @@ export const fixEmptyPrototy = async (target, source) => {
         }
     }
 };
+/**
+ * 1. 统计array中某个字段key的数量:{ [k: string]: number }
+ *
+ * @param array T组成的array,数据源
+ * @param key  返回结果{ [k: string]: number }的key
+ * @param defKey  如果array中某个对象没有key字段，则归类到默认key中
+ * @returns
+ */
 export const mixArray = (array, key, defKey) => {
-    const obj = array.map(item => item[key]);
+    const obj = array.map((item) => item[key]);
     const result = {};
     for (const i of obj) {
         let ki = '';
@@ -138,6 +145,14 @@ export const mixArray = (array, key, defKey) => {
     }
     return result;
 };
+/**
+ * 1. 将T组成的array按照某个字段(key)提取为{ [key: string]: V[] }
+ * @param array T组成的array,数据源
+ * @param key 返回结果{ [key: string]: V[] }的key
+ * @param value  返回结果{ [key: string]: V[] }中的V可以是T，也可以是T的某个字段(指定value参数)
+ * @param defKey 如果array中某个对象没有key字段，则归类到默认key中
+ * @returns
+ */
 export const mixList = (array, key, value, defKey) => {
     const result = {};
     for (const i of array) {
@@ -160,6 +175,34 @@ export const mixList = (array, key, value, defKey) => {
     }
     return result;
 };
+/**
+ * ## 仿照Object.assign的数组方法
+ * ### 1. 用法参照
+ * ```
+ *  // ID 是 数组中对象的关键字段，用来区分同一条记录.支持多个字段(联合主键场景)
+ *  // 与assign的逻辑相同，后面的数组会覆盖前面数组的相同对象的同名字段
+ *  const result = assignArray('ID', Array1, Array2, Array3...);
+ * ```
+ * @param key
+ * @param arrays
+ * @returns
+ */
+export const assignArray = (key, ...arrays) => {
+    const result = [];
+    const match = key instanceof Function ? key : key instanceof Array ? (t1, t2) => key.every((k) => t1[k] === t2[k]) : (t1, t2) => t1[key] === t2[key];
+    for (const array of arrays) {
+        for (const item of array) {
+            const find = result.find((i) => match(i, item));
+            if (find) {
+                Object.assign(find, item);
+            }
+            else {
+                result.push(item);
+            }
+        }
+    }
+    return result;
+};
 export const array2map = (array, v) => {
     const ot = {};
     for (const item of array) {
@@ -195,9 +238,9 @@ export const arraySplit = (datas, { everyLength = 0, groupCount = 0 } = {}) => {
     }
 };
 const P2CEX = /[A-Z]/g;
-export const P2C = (pro, IF = true) => IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro;
+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 const C2P = (pro, IF = true) => (IF ? pro.replace(C2PEX, (a, b) => `${b.toUpperCase()}`) : pro);
 export function C2P2(datas, hump, convert) {
     if (datas instanceof Array) {
         return iterate(datas)
@@ -233,7 +276,9 @@ export function C2P2(datas, hump, convert) {
 }
 export function P2C2(datas) {
     if (datas instanceof Array) {
-        return iterate(datas).map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => [P2C(K), V]))).toArray();
+        return iterate(datas)
+            .map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => [P2C(K), V])))
+            .toArray();
     }
     else if (datas) {
         return Object.fromEntries(Object.entries(datas).map(([K, V]) => [P2C(K), V]));

package/package.json

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

package/sql.d.ts

@@ -918,7 +918,8 @@ export declare class SqlService<T extends object> {
     2. 支持实体类删除: 用于多个ID或者按实体类某些字段删除
     3. 两种模式：`mode`=`Common` 或者 `TempTable`
     3. 如果数据多，使用 `TempTable`模式
-    4. 当设置实体类的字段有 `logicDelete` ，将进行逻辑删除，除非设置 forceDelete = true
+    4. 当设置实体类的字段有 `logicDelete` ，将进行逻辑删除，除非设置 `forceDelete` = true
+    5. 支持`whereSql`直接拼接，此时必须传递`whereParams`,不建议直接使用这种方式！为了简化逻辑，它不会和ID、WHERE共存，且优先级更高。且不支持 `TempTable` Mode
     6. `tableName`: 默认使用service注解的`tableName`,可以在某个方法中覆盖
     7. `dbName`: 默认使用service注解的`dbName`,可以在某个方法中覆盖
     8. `conn`: 仅在开启事务时需要主动传入,传入示例:
@@ -935,6 +936,8 @@ export declare class SqlService<T extends object> {
         where?: Partial<T> | Array<Partial<T>>;
         mode?: DeleteMode;
         forceDelete?: boolean;
+        whereSql?: string;
+        whereParams?: Record<string, any>;
     }): Promise<number>;
     delete(option: MethodOption & {
         sync: SyncMode.Sync;
@@ -942,6 +945,8 @@ export declare class SqlService<T extends object> {
         where?: Partial<T> | Array<Partial<T>>;
         mode?: DeleteMode;
         forceDelete?: boolean;
+        whereSql?: string;
+        whereParams?: Record<string, any>;
     }): number;
     private _template;
     /**
@@ -1326,6 +1331,7 @@ export declare class SqlService<T extends object> {
         pageNumber?: number;
         limitSelf?: boolean;
         countSelf?: boolean;
+        sum?: boolean;
         sumSelf?: boolean;
         sortName?: string;
         sortType?: string;
@@ -1343,6 +1349,7 @@ export declare class SqlService<T extends object> {
         pageNumber?: number;
         limitSelf?: boolean;
         countSelf?: boolean;
+        sum?: boolean;
         sumSelf?: boolean;
         sortName?: string;
         sortType?: string;
@@ -1844,9 +1851,11 @@ declare class StreamQuery<T extends object> {
     }): number;
     excuteDelete(option?: MethodOption & {
         sync?: SyncMode.Async;
+        forceDelete?: boolean;
     }): Promise<number>;
     excuteDelete(option: MethodOption & {
         sync: SyncMode.Sync;
+        forceDelete?: boolean;
     }): number;
     private _where;
     private _;

package/sql.js

@@ -2523,20 +2523,32 @@ export class SqlService {
             option.where = ids.map(i => ({ [idName]: i }));
         }
         const wheres = option.where instanceof Array ? option.where : [option.where];
-        if (wheres.length === 0) {
+        if (wheres.length === 0 && (!option.whereSql || !option.whereParams)) {
             return 0;
         }
+        if (option.whereSql && option.whereParams) {
+            option.mode = DeleteMode.Common;
+        }
         const sqls = [];
         if (option.mode === DeleteMode.Common) {
-            const params = new Array();
-            const whereSql = iterate(wheres).map(where => {
-                return `(
-                    ${Object.entries(where).map(([K, V]) => {
-                    params.push(V);
-                    return `${this[_fields][K]?.C2()} = ?`;
-                }).join(' AND ')}
-                )`;
-            }).join(' OR ');
+            let params;
+            let whereSql;
+            if (option.whereSql && option.whereParams) {
+                const gen = this._generSql(option.dbType, option.whereSql, option.whereParams);
+                whereSql = gen.sql;
+                params = gen.params;
+            }
+            else {
+                params = new Array();
+                whereSql = iterate(wheres).map(where => {
+                    return `(
+                        ${Object.entries(where).map(([K, V]) => {
+                        params.push(V);
+                        return `${this[_fields][K]?.C2()} = ?`;
+                    }).join(' AND ')}
+                    )`;
+                }).join(' OR ');
+            }
             if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                 params.unshift(this[_deleteState]);
                 sqls.push({
@@ -2933,16 +2945,17 @@ 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) {
-            sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
-        }
-        if (option.limitSelf !== true) {
-            if (option.countSelf !== true) {
+        if (option.sum) {
+            if (option.sumSelf) {
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_sum`), { ctx: option.context, isCount: false, isSum: true, ...option.params });
             }
-            if (option.pageSize > 0) {
-                sql = `${sql} LIMIT ${option.params['limitStart']}, ${option.pageSize}`;
+            else {
+                sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
             }
         }
+        if (option.limitSelf !== true && option.pageSize > 0) {
+            sql = `${sql} LIMIT ${option.params['limitStart']}, ${option.pageSize}`;
+        }
         if (option.pageSize > 0) {
             if (option.countSelf) {
                 sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx: option.context, isCount: true, isSum: false, ...option.params });
@@ -3865,15 +3878,15 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
-            ${where ? ' WHERE ' : ''}
-            ${where}
-        `;
+        // const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
+        //     ${where ? ' WHERE ' : ''}
+        //     ${where}
+        // `;
         if (option.sync === SyncMode.Async) {
-            return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
+            return this._service.delete({ ...option, sync: SyncMode.Async, whereSql: where, whereParams: params });
         }
         else {
-            return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
+            return this._service.delete({ ...option, sync: SyncMode.Sync, whereSql: where, whereParams: params });
         }
     }
     _where() {