@live-change/dao 0.5.6 → 0.5.7

package/lib/Path.js

@@ -83,7 +83,7 @@ class Path {
         }
         newMore.push(more)
       } else if(fetchObject.$toPath) { /// sourceProxy returned
-        console.log("FETCH OBJECT PROXY", fetchObject)
+        //console.log("FETCH OBJECT PROXY", fetchObject)
         const schema = JSON.parse(JSON.stringify(fetchObject.$toPath(), (key, value) => {
           if(value instanceof Path) {
             const path = value.what.slice(0, -1)

package/lib/ReactiveServerConnection.js

@@ -631,22 +631,34 @@ class ReactiveServerConnection extends EventEmitter {
         }
         return dataPromise.then(result => {
           if(!resultsMap.has(key)) {
-            results.push({
+            const resultInfo = {
               what,
               data: result
-            })
-            resultsMap.set(key, result)
+            }
+            results.push(resultInfo)
+            resultsMap.set(key, resultInfo)
           }
           if(path.more) {
             return fetchMore(result, path.more).then(m=>result)
           } else return Promise.resolve(result)
+        }).catch(error => {
+          if(!resultsMap.has(key)) {
+            const resultInfo = {
+              what,
+              error: error
+            }
+            results.push(resultInfo)
+            resultsMap.set(key, resultInfo)
+          }
         })
       } else if(path.schema) {
         return fetchDeps(undefined, path.schema).then(pointers => {
           //console.log("PTRS", pointers)
           return Promise.all(pointers.map(pointer => fetch({ what: pointer }))).then(results => {
+            const error = results.find(r => r.error)
+            if(error) return error
             if (path.more) {
-              return fetchMore(results, path.more).then(m=>results)
+              return fetchMore(results.map(r => r.data), path.more).then(m=>results)
             } else return Promise.resolve(results)
           })
         })

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.5.6",
-  "gitHead": "8a0894ea0f57b6e1c5a627258617b8353e70533d"
+  "version": "0.5.7",
+  "gitHead": "53cd3536a135bdfd31edc75538a3ea5a426d307e"
 }