baja-lite 1.0.4 → 1.0.6

package/src/set-ex.ts

@@ -1,8 +1,11 @@
 export class SetEx<T> extends Set {
-  private uniqueKey: keyof T;
-  private whenOnExist?: (oldData: T, newData: T) => void | null;
-  private whenOnNotExist?: (newData: T) => void | null;
-  private replaceItemWhenExits: boolean;
+  private _key: keyof T;
+  private _onExist1?: (oldData: T, newData: T) => void | null;
+  private _onNotExist1?: (newData: T) => void | null;
+  private _replaceIfExits1: boolean;
+  private _onExist2?: (oldData: T, newData: T) => void | null;
+  private _onNotExist2?: (newData: T) => void | null;
+  private _replaceIfExits2: boolean;
   /**
    * @param key 识别是否存在的对象的属性名
    * @param onExist 当存在时作何操作? oldData/newData 哪个将添加到set,由replaceItemWhenExits决定,默认是oldData生效
@@ -11,35 +14,33 @@ export class SetEx<T> extends Set {
    * @param values 初始数组
    */
   constructor(
-    key: keyof T | {
+    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 = false,
-    values?: ReadonlyArray<T> | null,
-    onNotExist?: (newData: T) => void
+    }
   ) {
     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);
     }
   }
 
@@ -52,12 +53,12 @@ export class SetEx<T> extends Set {
   override add(value: T): this {
     let flag = false;
     this.forEach((item: T): any => {
-      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;
         }
@@ -66,8 +67,8 @@ export class SetEx<T> extends Set {
     });
     if (flag === false) {
       super.add(value);
-      if (this.whenOnNotExist) {
-        this.whenOnNotExist(value);
+      if (this._onNotExist1) {
+        this._onNotExist1(value);
       }
     }
     return this;
@@ -93,13 +94,13 @@ export class SetEx<T> extends Set {
     let flag = false;
     let tmp = value;
     this.forEach((item: T): any => {
-      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 {
           tmp = item;
@@ -109,8 +110,8 @@ export class SetEx<T> extends Set {
     });
     if (flag === false) {
       super.add(value);
-      if (this.whenOnNotExist) {
-        this.whenOnNotExist(value);
+      if (this._onNotExist2) {
+        this._onNotExist2(value);
       }
     }
     return tmp;
@@ -135,7 +136,7 @@ export class SetEx<T> extends Set {
    */
   find(value: T[keyof T]): T | null {
     for (const item of this) {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         return item;
       }
     }
@@ -149,7 +150,7 @@ export class SetEx<T> extends Set {
   findAll(value: T[keyof T]): T[] {
     const res = new Array<T>();
     this.forEach((item) => {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         res.push(item);
       }
     });
@@ -190,9 +191,9 @@ export class SetEx<T> extends Set {
    * @param {*} value 这是对象的关键属性,而非对象
    * @returns {boolean}
    */
-  override has(value: T[keyof T]): boolean {
+  override has(value: T[keyof T] ): boolean {
     for (const item of this) {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         return true;
       }
     }
@@ -239,7 +240,7 @@ export class SetEx<T> extends Set {
    */
   override delete(value: T[keyof T]): boolean {
     for (const item of this) {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         super.delete(item);
         return true;
       }
@@ -253,25 +254,33 @@ export 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 {
-    if (onExist !== undefined) {
-      this.whenOnExist = onExist;
-    }
-    if (onNotExist !== undefined) {
-      this.whenOnNotExist = onNotExist;
-    }
-    if (key) {
-      this.uniqueKey = key;
-    }
-    if (replaceWhenExits !== undefined) {
-      this.replaceItemWhenExits = replaceWhenExits;
-    }
     this.clear();
+    if (option.key) { this._key = option.key; }
+    if (option.onExist1) { this._onExist1 = option.onExist1; }
+    if (option.onNotExist1) { this._onNotExist1 = option.onNotExist1; }
+    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);
+    }
     return this;
   }
   /**
@@ -339,7 +348,7 @@ export class SetEx<T> extends Set {
     const result: { [k: string]: { value: T[keyof T], name: T[keyof T] }[] } = {};
     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] = [];
@@ -350,13 +359,25 @@ export class SetEx<T> extends Set {
     return result;
   }
 
-  set onExist(onExist: ((oldData: T, newData: T) => void) | undefined) {
-    this.whenOnExist = onExist;
+  set onExist1(onExist1: ((oldData: T, newData: T) => void) | undefined) {
+    this._onExist1 = onExist1;
   }
-  set key(key: keyof T) {
-    this.uniqueKey = key;
+  set onExist2(onExist2: ((oldData: T, newData: T) => void) | undefined) {
+    this._onExist2 = onExist2;
+  }
+  set onNotExist1(onNotExist1: ((newData: T) => void) | undefined) {
+    this._onNotExist1 = onNotExist1;
+  }
+  set onNotExist2(onNotExist2: ((newData: T) => void) | undefined) {
+    this._onNotExist2 = onNotExist2;
   }
-  set replaceWhenExits(replaceWhenExits: boolean) {
-    this.replaceItemWhenExits = replaceWhenExits;
+  set replaceIfExits1(replaceIfExits1: boolean) {
+    this._replaceIfExits1 = replaceIfExits1;
+  }
+  set replaceIfExits2(replaceIfExits2: boolean) {
+    this._replaceIfExits2 = replaceIfExits2;
+  }
+  set key(key: keyof T) {
+    this._key = key;
   }
 }