fix updateInheritance & persistence bug

mstdokumaci · Sep 6, 2019 · decff4b · decff4b
1 parent dd2f8b9
commit decff4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/extendable-set.js b/src/extendable-set.js
@@ -44,15 +44,17 @@ export default class ExtendableSet extends Set {
   }
 
   updateInheritance (inherits) {
-    super.forEach(item => {
-      if (inherits.has(item)) {
-        super.delete(item)
-      }
-    })
     if (this.inherits) {
       this.inherits.extenders.delete(this)
     }
+    if (inherits) {
+      inherits.forEach(value => {
+        if (!super.delete(value) && this.extenders.size) {
+          this.deleteFromExtenders(value)
+        }
+      })
+      inherits.extenders.add(this)
+    }
     this.inherits = inherits
-    inherits.extenders.add(this)
   }
 }
diff --git a/src/persist.js b/src/persist.js
@@ -13,7 +13,7 @@ const bindAllDataListener = (branch, persist) => {
   }
 
   branch.listeners.allData.persist = (type, _, item) => {
-    if (type !== 'remove' && item.id in branch.leaves) {
+    if (type !== 'remove' && Object.prototype.hasOwnProperty.call(branch.leaves, item.id)) {
       const leaf = branch.leaves[item.id]
       persist.store(
         String(item.id),