baja-lite 1.5.21 → 1.5.23

package/README.md

@@ -1,2 +1,2 @@
 
-[文档](https://deepwiki.com/void-soul/baja-lite)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/void-soul/baja-lite)

package/object.d.ts

@@ -111,6 +111,12 @@ export declare const arraySplit: <T = any>(datas: T[], { everyLength, groupCount
  * @returns
  */
 export declare const assginObject: <T extends Object>(source: T, ...os: T[]) => void;
+/**
+ * 去除数组中重复数据，同时可以通过each函数为每个数据执行某项操作
+ * @param source
+ * @param each
+ */
+export declare const distinctArray: <T extends Object>(source: T[], keys: (keyof T)[], each?: (data: T) => void) => 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[], hump?: boolean, convert?: Record<string, (data: any) => any>): T[];

package/object.js

@@ -1,3 +1,4 @@
+import { SetEx } from 'baja-lite-field';
 import * as ite from 'iterare';
 const iterate = ite.iterate;
 /**
@@ -246,6 +247,23 @@ export const arraySplit = (datas, { everyLength = 0, groupCount = 0 } = {}) => {
 export const assginObject = (source, ...os) => {
     os.forEach(o => Object.entries(o).forEach(([key, value]) => value !== null && value !== undefined && `${value}`.trim() !== '' && (source[key] = value)));
 };
+/**
+ * 去除数组中重复数据，同时可以通过each函数为每个数据执行某项操作
+ * @param source
+ * @param each
+ */
+export const distinctArray = (source, keys, each) => {
+    const set = new SetEx({ key: '___id' });
+    for (const item of source) {
+        const _item = item;
+        _item.___id = keys.map(key => item[key]).join('_');
+        if (each) {
+            each(item);
+        }
+        set.add(_item);
+    }
+    return set.toArray();
+};
 const P2CEX = /[A-Z]/g;
 export const P2C = (pro, IF = true) => (IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro);
 const C2PEX = /_([a-z])/g;

package/package.json

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

package/sql.js

@@ -1386,12 +1386,17 @@ class Build {
     }
     /**
      *
-     * beetween and
-     * etc.
-     * {{#between}} AND t.createtime | ({{createtime}}) {{/between}}
-     * createtime: 1,2
-     * ===
-     * AND t.createtime BETWEEN 1 AND 2
+     * # beetween and
+     * ## etc.
+     * ```
+     * {{#between}} AND t.createtime ({{createtime}}) {{/between}}
+     * // 其中：
+     * createtime = '1,2'
+     * // 或者
+     * createtime = ['1', '2']
+     * // 将生成：
+     * AND t.createtime BETWEEN '1' AND '2'
+     * ```
      * @returns
      * @memberof Build
      */
@@ -1401,8 +1406,13 @@ class Build {
             if (/\(([\w\W]+)\)/.exec(result)) {
                 return render(text).replace(/\(([\w\W]+)\)/, (a, b) => {
                     if (a && b) {
-                        const xx = b.split(',');
-                        return `'${xx[0]}' AND '${xx[1]}'`;
+                        if (typeof b === 'string') {
+                            const xx = b.split(',');
+                            return ` BETWEEN '${xx[0]}' AND '${xx[1]}'`;
+                        }
+                        else {
+                            return ` BETWEEN '${b[0]}' AND '${b[1]}'`;
+                        }
                     }
                     else {
                         return '';
@@ -3783,12 +3793,12 @@ class StreamQuery {
     page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
     distinct(on = true) { this._distinct = on; return this; }
     /** COUNT(DISTINCT key) */
-    countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT t.${this[_fields][String(key)]?.C2()}) ${countName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
+    countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT t.${this[_fields][String(key)]?.C2()}) ${countName || this[_fields][String(key)]?.C2()}`); return this; }
     count(countName) { this._columns.push(`COUNT(1) ${countName ?? 'ct'}`); return this; }
-    sum(key, legName, distinct) { this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
-    avg(key, legName, distinct) { this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
-    max(key, legName, distinct) { this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
-    min(key, legName, distinct) { this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
+    sum(key, legName, distinct) { this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || this[_fields][String(key)]?.C2()}`); return this; }
+    avg(key, legName, distinct) { this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || this[_fields][String(key)]?.C2()}`); return this; }
+    max(key, legName, distinct) { this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || this[_fields][String(key)]?.C2()}`); return this; }
+    min(key, legName, distinct) { this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || this[_fields][String(key)]?.C2()}`); return this; }
     /** GROUP_CONCAT([DISTINCT] key [ORDER BY :asc ASC] [ORDER BY :asc DESC] [SEPARATOR :separator]) */
     groupConcat(key, param) {
         this._columns.push(`GROUP_CONCAT(
@@ -3796,7 +3806,7 @@ class StreamQuery {
             ${param && param.asc && param.asc.length > 0 ? `ORDER BY ${param.asc.map(i => `t.${this[_fields][String(i)]?.C2()} ASC`)} ` : ''}
             ${param && param.desc && param.desc.length > 0 ? `${param && param.asc && param.asc.length > 0 ? '' : 'ORDER BY'} ${param.desc.map(i => `t.${this[_fields][String(i)]?.C2()} DESC`)} ` : ''}
             SEPARATOR '${param && param.separator || ','}'
-            ) ${param && param.groupName || `t.${this[_fields][String(key)]?.C2()}`}`);
+            ) ${param && param.groupName || this[_fields][String(key)]?.C2()}`);
         return this;
     }
     select(...key) { this._columns.push(...(key.map(k => `t.${this[_fields][String(k)].C3()}`))); return this; }