baja-lite 1.0.4 → 1.0.6

package/cjs/set-ex.d.ts

@@ -1,8 +1,11 @@
 export declare class SetEx<T> extends Set {
-    private uniqueKey;
-    private whenOnExist?;
-    private whenOnNotExist?;
-    private replaceItemWhenExits;
+    private _key;
+    private _onExist1?;
+    private _onNotExist1?;
+    private _replaceIfExits1;
+    private _onExist2?;
+    private _onNotExist2?;
+    private _replaceIfExits2;
     /**
      * @param key 识别是否存在的对象的属性名
      * @param onExist 当存在时作何操作? oldData/newData 哪个将添加到set,由replaceItemWhenExits决定,默认是oldData生效
@@ -10,13 +13,22 @@ export declare class SetEx<T> extends Set {
      * @param replaceWhenExits 当存在时是否覆盖？
      * @param values 初始数组
      */
-    constructor(key: keyof T | {
+    constructor(option: {
         key: keyof T;
-        onExist?: (oldData: T, newData: T) => void;
-        onNotExist?: (newData: T) => void;
-        replaceWhenExits?: boolean;
+        /** add&addAll触发 */
+        onExist1?: (oldData: T, newData: T) => void;
+        /** add&addAll触发 */
+        onNotExist1?: (newData: T) => void;
+        /** add&addAll触发 */
+        replaceIfExits1?: boolean;
+        /** add2&addAll2触发 */
+        onExist2?: (oldData: T, newData: T) => void;
+        /** add2&addAll2触发 */
+        onNotExist2?: (newData: T) => void;
+        /** add2&addAll2触发 */
+        replaceIfExits2?: boolean;
         values?: ReadonlyArray<T> | null;
-    }, onExist?: (oldData: T, newData: T) => void, replaceWhenExits?: boolean, values?: ReadonlyArray<T> | null, onNotExist?: (newData: T) => void);
+    });
     /**
      *
      * 添加返回
@@ -117,11 +129,21 @@ export declare class SetEx<T> extends Set {
      * @param {(oldData: T, newData: T) => void} [onExist]
      * @param {boolean} [replaceWhenExits=false]
      */
-    reset({ key, onExist, onNotExist, replaceWhenExits }: {
+    reset(option: {
         key?: keyof T;
-        onExist?: (oldData: T, newData: T) => void | null;
-        onNotExist?: (newData: T) => void | null;
-        replaceWhenExits?: boolean;
+        /** add&addAll触发 */
+        onExist1?: (oldData: T, newData: T) => void;
+        /** add&addAll触发 */
+        onNotExist1?: (newData: T) => void;
+        /** add&addAll触发 */
+        replaceIfExits1?: boolean;
+        /** add2&addAll2触发 */
+        onExist2?: (oldData: T, newData: T) => void;
+        /** add2&addAll2触发 */
+        onNotExist2?: (newData: T) => void;
+        /** add2&addAll2触发 */
+        replaceIfExits2?: boolean;
+        values?: ReadonlyArray<T> | null;
     }): this;
     /**
      *
@@ -165,7 +187,11 @@ export declare class SetEx<T> extends Set {
             name: T[keyof T];
         }[];
     };
-    set onExist(onExist: ((oldData: T, newData: T) => void) | undefined);
+    set onExist1(onExist1: ((oldData: T, newData: T) => void) | undefined);
+    set onExist2(onExist2: ((oldData: T, newData: T) => void) | undefined);
+    set onNotExist1(onNotExist1: ((newData: T) => void) | undefined);
+    set onNotExist2(onNotExist2: ((newData: T) => void) | undefined);
+    set replaceIfExits1(replaceIfExits1: boolean);
+    set replaceIfExits2(replaceIfExits2: boolean);
     set key(key: keyof T);
-    set replaceWhenExits(replaceWhenExits: boolean);
 }

package/cjs/set-ex.js

@@ -9,25 +9,17 @@ class SetEx extends Set {
      * @param replaceWhenExits 当存在时是否覆盖？
      * @param values 初始数组
      */
-    constructor(key, onExist, replaceWhenExits = false, values, onNotExist) {
+    constructor(option) {
         super();
-        if (typeof key === 'object') {
-            this.whenOnExist = key.onExist;
-            this.uniqueKey = key.key;
-            this.replaceItemWhenExits = key.replaceWhenExits === true;
-            this.whenOnNotExist = key.onNotExist;
-            if (key.values) {
-                this.addAll(...key.values);
-            }
-        }
-        else {
-            this.whenOnExist = onExist;
-            this.uniqueKey = key;
-            this.replaceItemWhenExits = replaceWhenExits;
-            this.whenOnNotExist = onNotExist;
-            if (values) {
-                this.addAll(...values);
-            }
+        this._key = option.key;
+        this._onExist1 = option.onExist1;
+        this._onNotExist1 = option.onNotExist1;
+        this._replaceIfExits1 = option.replaceIfExits1 === true;
+        this._onExist2 = option.onExist2;
+        this._onNotExist2 = option.onNotExist2;
+        this._replaceIfExits2 = option.replaceIfExits2 === true;
+        if (option.values) {
+            this.addAll(...option.values);
         }
     }
     /**
@@ -39,12 +31,12 @@ class SetEx extends Set {
     add(value) {
         let flag = false;
         this.forEach((item) => {
-            if (item[this.uniqueKey] === value[this.uniqueKey]) {
+            if (item[this._key] === value[this._key]) {
                 flag = true;
-                if (this.whenOnExist) {
-                    this.whenOnExist(item, value);
+                if (this._onExist1) {
+                    this._onExist1(item, value);
                 }
-                if (this.replaceItemWhenExits === true) {
+                if (this._replaceIfExits1 === true) {
                     super.delete(item);
                     flag = false;
                 }
@@ -53,8 +45,8 @@ class SetEx extends Set {
         });
         if (flag === false) {
             super.add(value);
-            if (this.whenOnNotExist) {
-                this.whenOnNotExist(value);
+            if (this._onNotExist1) {
+                this._onNotExist1(value);
             }
         }
         return this;
@@ -80,13 +72,13 @@ class SetEx extends Set {
         let flag = false;
         let tmp = value;
         this.forEach((item) => {
-            if (item[this.uniqueKey] === value[this.uniqueKey]) {
+            if (item[this._key] === value[this._key]) {
                 flag = true;
-                if (this.whenOnExist) {
-                    this.whenOnExist(item, value);
+                if (this._onExist2) {
+                    this._onExist2(item, value);
                 }
-                if (this.replaceItemWhenExits === true) {
-                    super.delete(item);
+                if (this._replaceIfExits2 === true) {
+                    super.delete(value);
                     flag = false;
                 }
                 else {
@@ -97,8 +89,8 @@ class SetEx extends Set {
         });
         if (flag === false) {
             super.add(value);
-            if (this.whenOnNotExist) {
-                this.whenOnNotExist(value);
+            if (this._onNotExist2) {
+                this._onNotExist2(value);
             }
         }
         return tmp;
@@ -123,7 +115,7 @@ class SetEx extends Set {
      */
     find(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 return item;
             }
         }
@@ -137,7 +129,7 @@ class SetEx extends Set {
     findAll(value) {
         const res = new Array();
         this.forEach((item) => {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 res.push(item);
             }
         });
@@ -180,7 +172,7 @@ class SetEx extends Set {
      */
     has(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 return true;
             }
         }
@@ -225,7 +217,7 @@ class SetEx extends Set {
      */
     delete(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 super.delete(item);
                 return true;
             }
@@ -239,20 +231,32 @@ class SetEx extends Set {
      * @param {(oldData: T, newData: T) => void} [onExist]
      * @param {boolean} [replaceWhenExits=false]
      */
-    reset({ key, onExist, onNotExist, replaceWhenExits }) {
-        if (onExist !== undefined) {
-            this.whenOnExist = onExist;
+    reset(option) {
+        this.clear();
+        if (option.key) {
+            this._key = option.key;
         }
-        if (onNotExist !== undefined) {
-            this.whenOnNotExist = onNotExist;
+        if (option.onExist1) {
+            this._onExist1 = option.onExist1;
         }
-        if (key) {
-            this.uniqueKey = key;
+        if (option.onNotExist1) {
+            this._onNotExist1 = option.onNotExist1;
         }
-        if (replaceWhenExits !== undefined) {
-            this.replaceItemWhenExits = replaceWhenExits;
+        if (option.replaceIfExits1) {
+            this._replaceIfExits1 = option.replaceIfExits1;
+        }
+        if (option.onExist2) {
+            this._onExist2 = option.onExist2;
+        }
+        if (option.onNotExist2) {
+            this._onNotExist2 = option.onNotExist2;
+        }
+        if (option.replaceIfExits2) {
+            this._replaceIfExits2 = option.replaceIfExits2;
+        }
+        if (option.values) {
+            this.addAll(...option.values);
         }
-        this.clear();
         return this;
     }
     /**
@@ -313,7 +317,7 @@ class SetEx extends Set {
         const result = {};
         const list = this.toArray({ sort, each, filter, map });
         for (const item of list) {
-            const name = item[this.uniqueKey];
+            const name = item[this._key];
             for (const key in item) {
                 if (!result[key]) {
                     result[key] = [];
@@ -323,14 +327,26 @@ class SetEx extends Set {
         }
         return result;
     }
-    set onExist(onExist) {
-        this.whenOnExist = onExist;
+    set onExist1(onExist1) {
+        this._onExist1 = onExist1;
     }
-    set key(key) {
-        this.uniqueKey = key;
+    set onExist2(onExist2) {
+        this._onExist2 = onExist2;
+    }
+    set onNotExist1(onNotExist1) {
+        this._onNotExist1 = onNotExist1;
     }
-    set replaceWhenExits(replaceWhenExits) {
-        this.replaceItemWhenExits = replaceWhenExits;
+    set onNotExist2(onNotExist2) {
+        this._onNotExist2 = onNotExist2;
+    }
+    set replaceIfExits1(replaceIfExits1) {
+        this._replaceIfExits1 = replaceIfExits1;
+    }
+    set replaceIfExits2(replaceIfExits2) {
+        this._replaceIfExits2 = replaceIfExits2;
+    }
+    set key(key) {
+        this._key = key;
     }
 }
 exports.SetEx = SetEx;