@live-change/dao 0.9.29 → 0.9.31

package/lib/Observable.js

@@ -27,7 +27,7 @@ class Observable {
     for(const observer of observersToFire) {
       handled = this.fireObserver(observer, signal, ...args) || handled
     }
-    if(signal == 'error') {
+    if(signal === 'error') {
       let error = args[0]
       handled = this.handleError(error) || handled
       if(!handled) {
@@ -57,7 +57,7 @@ class Observable {
 
   uncatch(errorObserver) {
     let id = this.errorObservers.indexOf(errorObserver)
-    if(id == -1) throw new Error("error observer not found")
+    if(id === -1) throw new Error("error observer not found")
     this.errorObservers.splice(id, 1)
   }
 
@@ -67,13 +67,13 @@ class Observable {
   }
   unobserve(observer) {
     let id = this.observers.indexOf(observer)
-    if(id == -1) throw new Error("observer not found")
+    if(id === -1) throw new Error("observer not found")
     this.observers.splice(id, 1)
     if(this.isUseless()) this.dispose()
   }
 
   isUseless() {
-    return this.observers.length == 0
+    return this.observers.length === 0
   }
 
   isDisposed() {
@@ -102,16 +102,16 @@ class Observable {
     let errorObserver
 
     const waitPromise = new Promise((resolve, reject) => {
-      errorObserver = (error) => {
-        console.log("ERROR SIGNAL", error)
-        console.trace("WEER")
+      errorObserver = (signal, error) => {
+        console.log("ERROR SIGNAL", error ?? signal)
+        console.trace("ERROR SIGNAL")
         if(resultObserver) this.unobserve(resultObserver)
         resultObserver = undefined
         if(errorObserver) this.uncatch(errorObserver)
         errorObserver = undefined
         if(finished) return
         finished = true
-        reject(error)
+        reject(error ?? signal)
       }
       if(!finished) this.catch(errorObserver)
       resultObserver = (signal) => {

package/lib/ObservableList.js

@@ -21,7 +21,7 @@ class ObservableList extends Observable {
     this.handleError(null)
     if(list === this.list) return
     try {
-      if (JSON.stringify(list) == JSON.stringify(this.list)) return
+      if (JSON.stringify(list) === JSON.stringify(this.list)) return
     } catch(e) {}
     this.list = this.valueActivator ? this.valueActivator(list) : list
     this.fireObservers('set', list)
@@ -60,7 +60,7 @@ class ObservableList extends Observable {
     if(!reverse) {
       let i, l
       for(i = 0, l = this.list.length; i < l; i++) {
-        if(this.list[i][field] == value) {
+        if(this.list[i][field] === value) {
           oldElement = this.list[i]
           this.list.splice(i, 1, element)
           break
@@ -69,11 +69,11 @@ class ObservableList extends Observable {
           break
         }
       }
-      if(i == l) this.list.push(element)
+      if(i === l) this.list.push(element)
     } else {
       let i
       for(i = this.list.length - 1; i >= 0; i--) {
-        if(this.list[i][field] == value) {
+        if(this.list[i][field] === value) {
           oldElement = this.list[i]
           this.list.splice(i, 1, element)
           break
@@ -90,7 +90,7 @@ class ObservableList extends Observable {
     this.handleError(null)
     let json = JSON.stringify(exact)
     for(let i = 0, l = this.list.length; i < l; i++) {
-      if(JSON.stringify(this.list[i]) == json) this.list.splice(i, 1)
+      if(JSON.stringify(this.list[i]) === json) this.list.splice(i, 1)
     }
     this.fireObservers('remove', exact)
   }
@@ -98,7 +98,7 @@ class ObservableList extends Observable {
     this.handleError(null)
     let json = JSON.stringify(value)
     for(let i = 0, l = this.list.length; i < l; i++) {
-      if(JSON.stringify(this.list[i][field]) == json) {
+      if(JSON.stringify(this.list[i][field]) === json) {
         oldElement = this.list[i]
         this.list.splice(i, 1)
         i--
@@ -116,7 +116,7 @@ class ObservableList extends Observable {
     for(let i = 0, l = this.list.length; i < l; i++) {
       let found = true
       for(let [key, json] of jsonf) {
-        found = found && (JSON.stringify(this.list[i][key]) == json)
+        found = found && (JSON.stringify(this.list[i][key]) === json)
       }
       if(found) {
         this.list.splice(i, 1)
@@ -131,7 +131,7 @@ class ObservableList extends Observable {
     this.handleError(null)
     let json = JSON.stringify(exact)
     for(let i = 0, l = this.list.length; i < l; i++) {
-      if(JSON.stringify(this.list[i]) == json) this.list.splice(i, 1, element)
+      if(JSON.stringify(this.list[i]) === json) this.list.splice(i, 1, element)
     }
     this.fireObservers('update', exact, element)
   }
@@ -139,7 +139,7 @@ class ObservableList extends Observable {
     this.handleError(null)
     let json = JSON.stringify(value)
     for(let i = 0, l = this.list.length; i < l; i++) {
-      if(JSON.stringify(this.list[i][field]) == json) this.list.splice(i, 1, element)
+      if(JSON.stringify(this.list[i][field]) === json) this.list.splice(i, 1, element)
     }
     this.fireObservers('updateByField', field, value, element)
   }
@@ -152,7 +152,7 @@ class ObservableList extends Observable {
     for(let i = 0, l = this.list.length; i < l; i++) {
       let found = true
       for(let [key, json] of jsonf) {
-        found = found && (JSON.stringify(this.list[i][key]) == json)
+        found = found && (JSON.stringify(this.list[i][key]) === json)
       }
       if(found) this.list.splice(i, 1, element)
     }
@@ -167,7 +167,7 @@ class ObservableList extends Observable {
   unbindProperty(object, property) {
     for(let i = 0; i < this.properties.length; i++) {
       const prop = this.properties[i]
-      if(prop[0] == object && prop[1] == property) {
+      if(prop[0] === object && prop[1] === property) {
         this.properties.splice(i, 1)
         i--
         if(this.isUseless()) this.dispose()
@@ -185,7 +185,7 @@ class ObservableList extends Observable {
   unbindErrorProperty(object, property) {
     for(let i = 0; i < this.errorProperties.length; i++) {
       const prop = this.errorProperties[i]
-      if(prop[0] == object && prop[1] == property) {
+      if(prop[0] === object && prop[1] === property) {
         this.errorProperties.splice(i, 1)
         i--
         if(this.isUseless()) this.dispose()
@@ -206,8 +206,8 @@ class ObservableList extends Observable {
   }
 
   isUseless() {
-    return (this.observers.length == 0) && (this.properties.length == 0)
-        && (this.errorProperties.length == 0)
+    return (this.observers.length === 0) && (this.properties.length === 0)
+        && (this.errorProperties.length === 0)
   }
 
   save() {
@@ -298,6 +298,13 @@ class ObservableList extends Observable {
   getError() {
     return this.savedError
   }
+
+  dispose() {
+    this.savedError = null
+    this.list = undefined
+    super.dispose()
+  }
+
 }
 
 export default ObservableList

package/lib/ObservableProxy.js

@@ -61,8 +61,8 @@ class ObservableProxy extends Observable {
   }
 
   isUseless() {
-    return (this.observers.length == 0) && (this.properties.length == 0)
-        && (this.errorProperties.length == 0)
+    return (this.observers.length === 0) && (this.properties.length === 0)
+        && (this.errorProperties.length === 0)
   }
 
   catch(...args) {
@@ -121,7 +121,7 @@ class ObservableProxy extends Observable {
   unbindErrorProperty(object, property) {
     for(var i = 0; i < this.errorProperties.length; i++) {
       var prop = this.errorProperties[i]
-      if(prop[0] == object && prop[1] == property) {
+      if(prop[0] === object && prop[1] === property) {
         this.errorProperties.splice(i,1)
         if(this.observable) this.observable.unbindErrorProperty(object, property)
         if(this.isUseless()) this.dispose()

package/lib/ObservableValue.js

@@ -20,7 +20,7 @@ class ObservableValue extends Observable {
     this.handleError(null)
     if(value === this.value) return;
     try {
-      if (JSON.stringify(value) == JSON.stringify(this.value)) return;
+      if (JSON.stringify(value) === JSON.stringify(this.value)) return;
     } catch(e) {}
     this.value = value
     this.fireObservers('set', value)
@@ -37,7 +37,7 @@ class ObservableValue extends Observable {
   unbindProperty(object, property) {
     for(let i = 0; i < this.properties.length; i++) {
       let prop = this.properties[i]
-      if(prop[0] == object && prop[1] == property) {
+      if(prop[0] === object && prop[1] === property) {
         this.properties.splice(i,1)
         if(this.isUseless()) this.dispose()
         return;
@@ -54,7 +54,7 @@ class ObservableValue extends Observable {
   unbindErrorProperty(object, property) {
     for(let i = 0; i < this.errorProperties.length; i++) {
       let prop = this.errorProperties[i]
-      if(prop[0] == object && prop[1] == property) {
+      if(prop[0] === object && prop[1] === property) {
         this.errorProperties.splice(i,1)
         if(this.isUseless()) this.dispose()
         return;
@@ -74,8 +74,8 @@ class ObservableValue extends Observable {
   }
 
   isUseless() {
-    return (this.observers.length == 0) && (this.properties.length == 0)
-        && (this.errorProperties.length == 0)
+    return (this.observers.length === 0) && (this.properties.length === 0)
+        && (this.errorProperties.length === 0)
   }
 
   save() {
@@ -165,6 +165,12 @@ class ObservableValue extends Observable {
   getError() {
     return this.savedError
   }
+
+  dispose() {
+    this.savedError = null
+    this.value = undefined
+    super.dispose()
+  }
 }
 
 export default ObservableValue

package/lib/ReactiveServerConnection.js

@@ -292,7 +292,7 @@ class PushObservable extends ObservableList {
     if(observationInfo.uses === 0) {
       this.observations.delete(whatId)
       observationInfo.observation.unpush()
-      this.remove(what)
+      if(!this.disposed) this.remove(what)
     }
   }
   dispose() {

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test tape tests/*"
   },
-  "version": "0.9.29",
-  "gitHead": "425e1d43a7359693059b41692d1fe04e12d5f0b1"
+  "version": "0.9.31",
+  "gitHead": "4e12be9d3f339492bb9ddc3c6c77581e52d1ba60"
 }