@live-change/dao 0.3.11 → 0.3.12

package/lib/DaoCache.js

@@ -30,14 +30,17 @@ class CacheState {
 
   turnOff() {
     if(!this.cached) throw new Error("uncache of not cached")
+    if(!this.observable) throw new Error("race condition")
     this.cached = false
     this.cache.cachedCount --
-    this.observable.unobserve(this.cache.dummyObserver)
+    const observable = this.observable
     this.observable = null
+    observable.unobserve(this.cache.dummyObserver)
   }
 
   turnOn() {
     if(this.cached) throw new Error("already cached")
+    if(this.observable) throw new Error("race condition")
     this.cached = true
     this.cache.cachedCount ++
     this.cache.cache.push(this)
@@ -81,13 +84,7 @@ class CacheState {
     if(delta > 0) {
       this.score += delta * this.settings.singleReadScore
     }
-    this.updateCacheState()
-  }
-
-  dipose() {
-    if(this.cached) {
-      this.observable.unobserve(this.cache.dummyObserver)
-    }
+    setTimeout(() => this.updateCacheState(), 0)
   }
 }
 
@@ -140,10 +137,13 @@ class DaoCache extends EventEmitter {
   }
 
   clear() {
-    for(const [key, value] of this.cacheState.entries()) {
-      value.dispose()
-      this.cacheState.delete(key)
+    const now = Date.now()
+    for(const cacheState of this.cache) {
+      cacheState.score = 0
+      cacheState.scoreTime = now
+      if(cacheState.cached) cacheState.turnOff()
     }
+    this.cache = []
   }
 
   clean() {
@@ -177,7 +177,6 @@ class DaoCache extends EventEmitter {
     }
     for(const [key, value] of this.cacheState.entries()) {
       if(value.score < value.settings.deleteStatsScore) {
-        this.cacheState.dispose()
         this.cacheState.delete(key)
       }
     }
@@ -197,8 +196,9 @@ class DaoCache extends EventEmitter {
 
   noticeObserverCount(what, count, delta) {
     //console.log("OBSERVER COUNT", JSON.stringify(what), count, "D", delta)
-    const cacheState = this.getOrCreateCacheState(what)
-    if(!cacheState) return
+    let cacheState = this.getOrCreateCacheState(what)
+    if(!cacheState && delta <= 0) return
+    cacheState = this.getOrCreateCacheState(what)
     if(delta > 0) {
       //console.log("CACHE TEST", cacheState.cached)
       if(cacheState.observable) {

package/lib/DaoProxy.js

@@ -20,9 +20,11 @@ class DaoProxy extends EventEmitter {
     this.dao = dao
     if(this.dao) {
       for(let [id, observable] of this.observables.entries()) {
-        let what = JSON.parse(id)
-        const target = this.dao.observable(what)
-        observable.setTarget(target)
+        if(!observable.disposed) {
+          let what = JSON.parse(id)
+          const target = this.dao.observable(what)
+          observable.setTarget(target)
+        }
       }
       if(this.dao.on) {
         this.dao.on('connect', this.onConnect)
@@ -45,11 +47,23 @@ class DaoProxy extends EventEmitter {
     } else {
       observable = new ObservableProxy()
     }
-    /*const oldDispose = observable.dispose
+    const oldDispose = observable.dispose
     observable.dispose = (...args) => {
-      //this.observables.delete(spath)
+      this.observables.delete(spath)
       oldDispose.call(observable, ...args)
-    }*/
+    }
+    const oldRespawn = observable.respawn
+    observable.respawn = (...args) => {
+      const newObservable = this.observables.get(spath)
+      if(newObservable && newObservable !== observable) {
+        observable.target = newObservable
+      } else if(this.dao) {
+        observable.target = this.dao.observable(what)
+      } else {
+        observable.target = null
+      }
+      oldRespawn.call(observable, ...args)
+    }
     this.observables.set(JSON.stringify(what), observable)
     return observable
   }

package/lib/ObservableList.js

@@ -176,7 +176,7 @@ class ObservableList extends Observable {
         this.errorProperties.splice(i, 1)
         i--
         if(this.isUseless()) this.dispose()
-        return;
+        return
       }
     }
     throw new Error("cannot unbind not bound property "+property)

package/package.json

@@ -36,5 +36,5 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.3.11"
+  "version": "0.3.12"
 }