@live-change/dao 0.9.84 → 0.9.86

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/lib/collectPointers.js

@@ -16,9 +16,10 @@ function flatMap(source, fun) {
   return out
 }
 
-function getPropertyValues(source, property) {
+function getPropertyValues(source, property) {  
   if(Array.isArray(source)) {
-    return flatMap(markMany(source), v => getPropertyValues(v, property))
+    const values = flatMap(markMany(source), v => getPropertyValues(v, property))    
+    return values
   } else {
     if(source === undefined) return []
     if(source === null) return []
@@ -52,7 +53,10 @@ function cross(lists) {
   }
   let out = new Array(count)
   out.many = many
-  if(count > 1 && !many) throw new Error("more than one result for non array fields")
+  if(count > 1 && !many) {
+    console.log("ERROR WHEN CROSSING", lists.map(l => JSON.stringify(l, null, 2)+' many:'+(!!l.many)).join('\n'))
+    throw new Error("more than one result for non array fields")
+  }
   for(let i = 0; i < count; i++) {
     let res = new Array(lists.length)
     let a = i
@@ -67,75 +71,84 @@ function cross(lists) {
 }
 
 function collect(source, schema, getSource) {
-  if(typeof schema == 'string') {
-    return [schema]
-  } else if(typeof schema != 'object') {
-    return [schema]
-  } else if(Array.isArray(schema)) {
-    let partValues = new Array(schema.length)
-    for(let i = 0; i < schema.length; i++) {
-      partValues[i] = collect(source, schema[i], getSource)
-    }
-    return cross(partValues)
-  } else {
-    if(schema.source) {
-      const sourcePointers = collect(source, schema.source, getSource)
-      return flatMap( sourcePointers, ptr => {
-        const source = getSource(ptr)
-        const results = collect(source, schema.schema, getSource)
-        return results
-      })
-    } else if(schema.nonEmpty) {
-      const collected = collect(source, schema.nonEmpty, getSource)
-      const result = collected.filter(x=>!!x)
-      result.many = collected.many
-      return result
-    } else if(schema.identity) {
-      if(typeof source == 'undefined' || source === null) return []
-      return Array.isArray(source) ? markMany(source) : [source]
-    } else if(schema.array) {
-      return [ collect(source, schema.array, getSource) ]
-    } else if(schema.property) {
-      if(typeof source == 'undefined' || source === null) return []
-      if(Array.isArray(schema.property)) {
-        let values = getNestedPropertyValues(source, schema.property)
-        return values
-      } else {
-        let values = getPropertyValues(source, schema.property)
-        return values
+  try {
+    if(typeof schema == 'string') {
+      return [schema]
+    } else if(typeof schema != 'object') {
+      return [schema]
+    } else if(Array.isArray(schema)) {
+      let partValues = new Array(schema.length)
+      for(let i = 0; i < schema.length; i++) {
+        partValues[i] = collect(source, schema[i], getSource)
       }
-    } else if(schema.switch) {
-      const values = collect(source, schema.value, getSource)
-      return flatMap(values, v => {
-        const found = schema.switch[v]
-        if(found) return collect(source, found, getSource)
-        if(schema.default) return collect(source, schema.default, getSource)
-        return []
-      })
-    } else if(schema.static) {
-      return [schema.static]
+      return cross(partValues)
     } else {
-      let objectSchema = schema.object ? schema.object : schema
-      let propValues = []
-      let propId = 0
-      for(let key in objectSchema) {
-        let values = collect(source, objectSchema[key], getSource)
-        propValues[propId] = values
-        propId++
-      }
-      let crossed = cross(propValues)
-      let results = new Array(crossed.length)
-      for(let i = 0; i < crossed.length; i++) {
-        let result = {}
-        let j = 0
+      if(schema.source) {
+        const sourcePointers = collect(source, schema.source, getSource)
+        return flatMap( sourcePointers, ptr => {
+          const source = getSource(ptr)
+          const results = collect(source, schema.schema, getSource)
+          return results
+        })
+      } else if(schema.nonEmpty) {
+        const collected = collect(source, schema.nonEmpty, getSource)
+        const result = collected.filter(x=>!!x)
+        result.many = collected.many
+        return result
+      } else if(schema.identity) {
+        if(typeof source == 'undefined' || source === null) return []
+        return Array.isArray(source) ? markMany(source) : [source]
+      } else if(schema.array) {
+        return [ collect(source, schema.array, getSource) ]
+      } else if(schema.property) {
+        if(typeof source == 'undefined' || source === null) return []
+        if(Array.isArray(schema.property)) {
+          let values = getNestedPropertyValues(source, schema.property)
+          return values
+        } else {
+          let values = getPropertyValues(source, schema.property)
+          return values
+        }
+      } else if(schema.switch) {
+        const values = collect(source, schema.value, getSource)
+        return flatMap(values, v => {
+          const found = schema.switch[v]
+          if(found) return collect(source, found, getSource)
+          if(schema.default) return collect(source, schema.default, getSource)
+          return []
+        })
+      } else if(schema.static) {
+        return [schema.static]
+      } else if(schema.or) {
+        const resultsFromOr = schema.or.map(orSchema => collect(source, orSchema, getSource))
+        return resultsFromOr.find(r => r.length > 0) || []
+      } else {
+        let objectSchema = schema.object ? schema.object : schema
+        let propValues = []
+        let propId = 0
         for(let key in objectSchema) {
-          result[key] = crossed[i][j++]
+          let values = collect(source, objectSchema[key], getSource)
+          propValues[propId] = values.filter(Boolean)
+          propValues[propId].many = values.many
+          propId++
+        }      
+        let crossed = cross(propValues)
+        let results = new Array(crossed.length)
+        for(let i = 0; i < crossed.length; i++) {
+          let result = {}
+          let j = 0
+          for(let key in objectSchema) {
+            result[key] = crossed[i][j++]
+          }
+          results[i] = result
         }
-        results[i] = result
+        results.many = crossed.many
+        return results
       }
-      results.many = crossed.many
-      return results
     }
+  } catch(e) {
+    console.log("ERROR WHEN COLLECTING", source, JSON.stringify(schema, null, 2), e)
+    throw e
   }
 }
 

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test tape tests/*"
   },
-  "version": "0.9.84",
-  "gitHead": "5881a5406e3a39e673034f172266409ddb306f2e"
+  "version": "0.9.86",
+  "gitHead": "7b0013ef101d9033402eeec45fd1be60e151aada"
 }