@live-change/dao 0.9.83 → 0.9.85

package/index.js

@@ -86,5 +86,8 @@ import Path from "./lib/Path.js"
 rd.Path = Path
 export { Path }
 
+import { sourceSymbol } from "./lib/ReactiveConnection.js"
+rd.sourceSymbol = sourceSymbol
+export { sourceSymbol }
 
 export default rd

package/lib/DaoPrerenderCache.js

@@ -1,6 +1,7 @@
 import Debug from 'debug'
 const debug = Debug('reactive-dao:cache')
 import ObservableValue from "./ObservableValue.js"
+import { sourceSymbol } from "./ReactiveConnection.js"
 
 class DaoPrerenderCache {
 
@@ -22,9 +23,12 @@ class DaoPrerenderCache {
         }
       }
     }
-    for(const [what, observable] of this.observables.entries()) {
+    for(const [cacheKey, observable] of this.observables.entries()) {
       if(observable.isDisposed()) {
-        observable.set(this.cache.get(what))
+        observable.set(this.cache.get(cacheKey))
+        if(this.extendedCache.has(cacheKey)) {
+          observable.restore(this.extendedCache.get(cacheKey))
+        }
       }
     }
     this.observables.clear()
@@ -40,14 +44,19 @@ class DaoPrerenderCache {
     }
     if(this.mode === 'save') {
       observable = new ObservableValue()
-      this.get(what).then(value => observable.set(value)).catch(error => observable.error(error))
+      this.get(what).then(value => {
+        if(value && typeof value === 'object') value[sourceSymbol] = what
+        observable.set(value)      
+      }).catch(error => observable.error(error))
     } else {
       observable = this.dao.observable(what)
     }
     this.observables.set(cacheKey, observable)
     if(this.cache.has(cacheKey)) observable.restore(this.cache.get(cacheKey))
     if(this.extendedCache.has(cacheKey)) {
-      observable.restore(this.extendedCache.get(cacheKey))
+      const data = this.extendedCache.get(cacheKey)
+      if(data && typeof data === 'object') data[sourceSymbol] = what    
+      observable.restore(data)
       return observable
       // do not save extended values
     }
@@ -112,8 +121,11 @@ class DaoPrerenderCache {
         }
       })
     }
-
-    return promise
+    
+    return promise.then(data => {
+      if(data && typeof data === 'object') data[sourceSymbol] = what
+      return data
+    })
   }
 
   set(what, value) {

package/lib/ReactiveConnection.js

@@ -5,6 +5,8 @@ import * as utils from './utils.js'
 
 let lastUid = 0
 
+export const sourceSymbol = Symbol("source")
+
 class Observation {
   constructor(connection, what, pushed) {
     this.what = what
@@ -23,10 +25,15 @@ class Observation {
       this.connection.sendObserve(this)
     }
     //process.nextTick(() => { // next tick will replay events through all layer to the client - it's waste of resources
-      for(let { signal, args} of this.receivedSignals) {
+      for(let { signal, args } of this.receivedSignals) {
+        if(signal === "set" && args[0] && typeof args[0] === 'object') args[0][sourceSymbol] = this.what
         if(typeof observable == 'function') observable(signal, ...args)
         else if(observable.notify) observable.notify(signal, ...args)
         else observable[signal](...args)
+        if(signal === "set" && observable.getValue) {
+          const value = observable.getValue()
+          if(value && typeof value === 'object') value[sourceSymbol] = this.what
+        }
       }
     //})
   }
@@ -93,12 +100,17 @@ class Observation {
   }
   handleNotifyMessage({ signal, args }) {
     if(this.disposed) return
+    if(signal === "set" && args[0] && typeof args[0] === 'object') args[0][sourceSymbol] = this.what      
     this.receivedSignals.push({ signal, args })
     for(let observable of this.observables) {
-      utils.nextTick(function(){
+      utils.nextTick(() => {
         if(typeof observable == 'function') observable(signal, ...args)
           else if(observable.notify) observable.notify(signal, ...args)
-            else observable[signal](...args)
+            else observable[signal](...args)        
+        if(signal === "set" && observable.getValue) {
+          const value = observable.getValue()
+          if(value && typeof value === 'object') value[sourceSymbol] = this.what
+        }
       })
     }
   }
@@ -228,7 +240,10 @@ class Connection extends EventEmitter {
       type: 'get',
       what: what
     }
-    return this.sendRequest(msg)
+    return this.sendRequest(msg).then(data => {
+      if(data && typeof data === 'object') data[sourceSymbol] = what
+      return data
+    })
   }
   getMore(what, more) {
     const msg={

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test tape tests/*"
   },
-  "version": "0.9.83",
-  "gitHead": "db3fcd19e6e3a47dda84d3906e697623f057713a"
+  "version": "0.9.85",
+  "gitHead": "126afb0aad3ab6e03aa5742726f429c95c46783a"
 }