@leafer/list 1.0.0-rc.6 → 1.0.0-rc.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/list",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.7",
   "description": "@leafer/list",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.6"
+    "@leafer/interface": "1.0.0-rc.7"
   }
 }

package/src/LeafLevelList.ts

@@ -11,7 +11,7 @@ export class LeafLevelList implements ILeafLevelList {
 
     constructor(item?: ILeaf | ILeaf[]) {
         this.reset()
-        if (item) item instanceof Array ? this.pushList(item) : this.push(item)
+        if (item) item instanceof Array ? this.addList(item) : this.add(item)
     }
 
     public has(leaf: ILeaf): boolean {
@@ -31,11 +31,11 @@ export class LeafLevelList implements ILeafLevelList {
         }
     }
 
-    public pushList(list: ILeaf[]): void {
-        list.forEach(leaf => { this.push(leaf) })
+    public addList(list: ILeaf[]): void {
+        list.forEach(leaf => { this.add(leaf) })
     }
 
-    public push(leaf: ILeaf): void {
+    public add(leaf: ILeaf): void {
         const { keys, levelMap } = this
         if (!keys[leaf.innerId]) {
             keys[leaf.innerId] = 1

package/src/LeafList.ts

@@ -9,7 +9,7 @@ export class LeafList implements ILeafList {
 
     constructor(item?: ILeaf | ILeaf[]) {
         this.reset()
-        if (item) item instanceof Array ? this.pushList(item) : this.push(item)
+        if (item) item instanceof Array ? this.addList(item) : this.add(item)
     }
 
     public has(leaf: ILeaf): boolean {
@@ -25,22 +25,8 @@ export class LeafList implements ILeafList {
         return index === undefined ? -1 : index
     }
 
-    public pushList(list: ILeaf[]): void {
-        list.forEach(leaf => { this.push(leaf) })
-    }
 
-    public unshift(leaf: ILeaf): void {
-        const { keys } = this
-        if (keys[leaf.innerId] === undefined) {
-            this.list.unshift(leaf)
-            Object.keys(keys).forEach(innerId => {
-                if (keys[innerId] !== undefined) keys[innerId]++
-            })
-            keys[leaf.innerId] = 0
-        }
-    }
-
-    public push(leaf: ILeaf): void {
+    public add(leaf: ILeaf): void {
         const { list, keys } = this
         if (keys[leaf.innerId] === undefined) {
             list.push(leaf)
@@ -48,15 +34,26 @@ export class LeafList implements ILeafList {
         }
     }
 
-    public sort(reverse?: boolean): void {
-        const { list } = this
-        if (reverse) {
-            list.sort((a, b) => b.__level - a.__level) // 倒序
-        } else {
-            list.sort((a, b) => a.__level - b.__level) // 顺序
+    public addAt(leaf: ILeaf, index = 0): void {
+        const { keys } = this
+        if (keys[leaf.innerId] === undefined) {
+            const { list } = this
+            for (let i = index, len = list.length; i < len; i++)  keys[list[i].innerId]++
+            if (index === 0) {
+                list.unshift(leaf)
+            } else {
+                if (index > list.length) index = list.length
+                list.splice(index, 0, leaf)
+            }
+            keys[leaf.innerId] = index
         }
     }
 
+    public addList(list: ILeaf[]): void {
+        for (let i = 0; i < list.length; i++) this.add(list[i])
+    }
+
+
     public remove(leaf: ILeaf): void {
         const { list } = this
         let findIndex: number
@@ -72,22 +69,40 @@ export class LeafList implements ILeafList {
         if (findIndex !== undefined) list.splice(findIndex, 1)
     }
 
+
+    public sort(reverse?: boolean): void {
+        const { list } = this
+        if (reverse) {
+            list.sort((a, b) => b.__level - a.__level) // 倒序
+        } else {
+            list.sort((a, b) => a.__level - b.__level) // 顺序
+        }
+    }
+
     public forEach(itemCallback: ILeafListItemCallback): void {
         this.list.forEach(itemCallback)
     }
 
     public clone(): ILeafList {
         const list = new LeafList()
-        this.list.forEach(item => { list.push(item) })
+        list.list = [...this.list]
+        list.keys = { ...this.keys }
         return list
     }
 
+
+    public update(): void {
+        this.keys = {}
+        const { list, keys } = this
+        for (let i = 0, len = list.length; i < len; i++)    keys[list[i].innerId] = i
+    }
+
     public reset(): void {
         this.list = []
         this.keys = {}
     }
 
     public destroy(): void {
-        this.list = null
+        this.reset()
     }
 }

package/types/index.d.ts

@@ -8,13 +8,14 @@ declare class LeafList implements ILeafList {
     has(leaf: ILeaf): boolean;
     indexAt(index: number): ILeaf;
     indexOf(leaf: ILeaf): number;
-    pushList(list: ILeaf[]): void;
-    unshift(leaf: ILeaf): void;
-    push(leaf: ILeaf): void;
-    sort(reverse?: boolean): void;
+    add(leaf: ILeaf): void;
+    addAt(leaf: ILeaf, index?: number): void;
+    addList(list: ILeaf[]): void;
     remove(leaf: ILeaf): void;
+    sort(reverse?: boolean): void;
     forEach(itemCallback: ILeafListItemCallback): void;
     clone(): ILeafList;
+    update(): void;
     reset(): void;
     destroy(): void;
 }
@@ -29,8 +30,8 @@ declare class LeafLevelList implements ILeafLevelList {
     has(leaf: ILeaf): boolean;
     without(leaf: ILeaf): boolean;
     sort(reverse?: boolean): void;
-    pushList(list: ILeaf[]): void;
-    push(leaf: ILeaf): void;
+    addList(list: ILeaf[]): void;
+    add(leaf: ILeaf): void;
     forEach(itemCallback: ILeafListItemCallback): void;
     reset(): void;
     destroy(): void;