@live-change/dao 0.3.14 → 0.4.0

package/lib/Observable.js

@@ -22,7 +22,10 @@ class Observable {
   fireObservers(signal, ...args) {
     if(this.disposed) return
     let handled = false
-    for(var observer of this.observers) handled = this.fireObserver(observer, signal, ...args) || handled
+    const observersToFire = this.observers.slice()
+    for(const observer of observersToFire) {
+      handled = this.fireObserver(observer, signal, ...args) || handled
+    }
     if(signal == 'error') {
       let error = args[0]
       handled = this.handleError(error) || handled
@@ -90,27 +93,38 @@ class Observable {
 
   wait() {
     let finished = false
+    let resultObserver
+    let errorObserver
 
     const waitPromise = new Promise((resolve, reject) => {
-      const resultObserver = (signal) => {
+      errorObserver = (error) => {
+        if(resultObserver) this.unobserve(resultObserver)
+        resultObserver = undefined
+        if(errorObserver) this.uncatch(errorObserver)
+        errorObserver = undefined
+        if(finished) return
         finished = true
-        this.unobserve(resultObserver)
-        this.uncatch(errorObserver)
-        resolve(signal)
-      }
-      const errorObserver = (error) => {
-        finished = true
-        this.unobserve(resultObserver)
-        this.uncatch(errorObserver)
         reject(error)
       }
       if(!finished) this.catch(errorObserver)
+      resultObserver = (signal) => {
+        if(resultObserver) this.unobserve(resultObserver)
+        resultObserver = undefined
+        if(errorObserver) this.uncatch(errorObserver)
+        errorObserver = undefined
+        if(finished) return
+        finished = true
+        resolve(signal)
+      }
       if(!finished) this.observe(resultObserver)
     })
     waitPromise.cancel = () => {
-      finished = true
       this.unobserve(resultObserver)
+      resultObserver = undefined
       this.uncatch(errorObserver)
+      errorObserver = undefined
+      if(finished) return
+      finished = true
       reject('canceled')
     }
     return waitPromise

package/lib/ObservableList.js

@@ -18,9 +18,9 @@ class ObservableList extends Observable {
   }
 
   set(list) {
-    if(list === this.list) return;
+    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)

package/lib/ObservableProxy.js

@@ -81,7 +81,7 @@ class ObservableProxy extends Observable {
     let beenDisposed = this.disposed
     Observable.prototype.observe.apply(this, args)
     if(!beenDisposed) {
-      if(this.observable.getValue) {
+      if(this.observable && this.observable.getValue) {
         const value = this.observable.getValue()
         if(value !== undefined) this.fireObserver(args[0], 'set', value)
       } else {

package/package.json

@@ -4,13 +4,13 @@
     "name": "Michał Łaszczewski",
     "url": "https://www.viamage.com/"
   },
-  "homepage": "https://github.com/live-change/dao",
+  "homepage": "https://github.com/live-change/live-change-dao",
   "bugs": {
-    "url": "https://github.com/live-change/dao/issues"
+    "url": "https://github.com/live-change/live-change-dao/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/live-change/dao.git"
+    "url": "https://github.com/live-change/live-change-dao.git"
   },
   "dependencies": {
     "debug": "^4.1.1"
@@ -31,10 +31,10 @@
     }
   ],
   "name": "@live-change/dao",
-  "optionalDependencies": {},
   "readme": "README.md",
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.3.14"
+  "version": "0.4.0",
+  "gitHead": "106431c736de8c92ba07cbba1bb85aac4925a93f"
 }