@live-change/dao 0.4.4 → 0.4.7

package/lib/DaoProxy.js

@@ -57,10 +57,12 @@ class DaoProxy extends EventEmitter {
       const newObservable = this.observables.get(spath)
       if(newObservable && newObservable !== observable) {
         observable.observable = newObservable
-      } else if(this.dao) {
-        observable.observable = this.dao.observable(what)
-      } else {
-        observable.observable = null
+      } else if(!observable.observable || observable.observable.isDisposed()) {
+        if(this.dao) {
+          observable.observable = this.dao.observable(what)
+        } else {
+          observable.observable = null
+        }
       }
       oldRespawn.call(observable, ...args)
     }

package/lib/ObservableProxy.js

@@ -91,13 +91,18 @@ class ObservableProxy extends Observable {
   }
 
   bindProperty(object, property) {
-    if(this.isDisposed()) this.respawn()
+    if(this.isDisposed()) {
+      debugger
+      this.respawn()
+    }
     this.properties.push([object, property])
-    if(this.observable) this.observable.bindProperty(object, property)
+    if(this.observable) {
+      this.observable.bindProperty(object, property)
+    }
   }
   unbindProperty(object, property) {
-    for(var i = 0; i < this.properties.length; i++) {
-      var prop = this.properties[i]
+    for(let i = 0; i < this.properties.length; i++) {
+      const prop = this.properties[i]
       if(prop[0] === object && prop[1] === property) {
         this.properties.splice(i, 1)
         if(this.observable) this.observable.unbindProperty(object, property)

package/lib/ReactiveServerConnection.js

@@ -3,6 +3,7 @@ const ObservableList = require("./ObservableList.js")
 const utils = require('./utils.js')
 const collectPointers = require('./collectPointers.js')
 const debug = require("debug")("reactive-dao")
+const debugPot = require("debug")("reactive-dao:pot")
 
 class PushObservableTrigger {
   constructor(po, what, more) {
@@ -28,44 +29,43 @@ class PushObservableTrigger {
         ),
         remove: (value) => {
           const valueJson = JSON.stringify(value)
-          this.removePointers(
-              this.findPointers(
-                  localList.list.filter(v => JSON.stringify(v) == valueJson)
-              )
-          )
+          const existingElements = localList.list.filter(v => JSON.stringify(v) == valueJson)
+          const oldPointers = this.findPointers(existingElements)
+          this.removePointers(oldPointers, [])
         },
         removeByField: (fieldName, value) => {
           const valueJson = JSON.stringify(value)
-          this.removePointers(
-              this.findPointers(
-                  localList.list.filter(v => JSON.stringify(v[fieldName]) == valueJson)
-              )
-          )
+          const existingElements = localList.list.filter(v => JSON.stringify(v[fieldName]) == valueJson)
+          const oldPointers = this.findPointers(existingElements)
+          this.removePointers(oldPointers, [])
         },
         update: (value, update) => {
           const valueJson = JSON.stringify(value)
-          this.replacePointers(
-              this.findPointers(
-                  localList.list.filter(v => JSON.stringify(v) == valueJson)
-              ),
-              this.findPointers(
-                  localList.list.filter(v => JSON.stringify(v) == valueJson).map(u => update)
-              )
-          )
+          const existingElements = localList.list.filter(v => JSON.stringify(v) == valueJson)
+          const oldPointers = this.findPointers(existingElements)
+          const newPointers = this.findPointers(existingElements.map(u => update))
+          this.replacePointers(oldPointers, newPointers)
         },
         updateByField: (fieldName, value, update) => {
           const valueJson = JSON.stringify(value)
-          this.replacePointers(
-              this.findPointers(
-                  localList.list.filter(v => JSON.stringify(v[fieldName]) == valueJson)
-              ),
-              this.findPointers(
-                  localList.list.filter(v => JSON.stringify(v[fieldName]) == valueJson).map(u => update)
-              )
+          const existingElements = localList.list.filter(v => JSON.stringify(v[fieldName]) == valueJson)
+          const oldPointers = this.findPointers(existingElements)
+          const newPointers = this.findPointers(existingElements.map(u => update))
+          this.replacePointers(oldPointers, newPointers)
+        },
+        putByField: (fieldName, value, update) => {
+          const valueJson = JSON.stringify(value)
+          const existingElements = localList.list.filter(v => JSON.stringify(v[fieldName]) == valueJson)
+          const oldPointers = this.findPointers(existingElements)
+          const newPointers = this.findPointers(
+              existingElements.length > 0 ? existingElements.map(u => update) : [ update ]
           )
+          console.log()
+          this.replacePointers(oldPointers, newPointers)
         }
       }
       this.observer = (signal, ...args) => {
+        debugPot("POT", this.what, "UPDATE SIGNAL", signal, args)
         if(this.pointerMethods[signal]) this.pointerMethods[signal](...args)
         if(localList[signal]) localList[signal](...JSON.parse(JSON.stringify(args)))
       }
@@ -74,6 +74,7 @@ class PushObservableTrigger {
     }
   }
   findPointers(value) {
+    debugPot("FIND POINTERS IN", value)
     let depsPointers = []
     let count = 0
     for(let dep of this.more) {
@@ -87,6 +88,7 @@ class PushObservableTrigger {
       what: pt,
       more: dep.more
     })
+    debugPot("FOUND POINTERS", allPointers)
     return allPointers
   }
   setPointers(allPointers) {
@@ -100,6 +102,7 @@ class PushObservableTrigger {
     this.commitPointersUpdate(added, removed)
   }
   replacePointers(oldPointers, newPointers) {
+    debugPot("REPLACE POINTERS", oldPointers, newPointers)
     let added = []
     let removed = []
     for(let pointer of newPointers) {

package/package.json

@@ -13,7 +13,7 @@
     "url": "https://github.com/live-change/live-change-dao.git"
   },
   "dependencies": {
-    "debug": "^4.3.2"
+    "debug": "^4.3.4"
   },
   "description": "live data access object",
   "devDependencies": {
@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.4.4",
-  "gitHead": "9ddc0d69695d818a2b3a57bf0ff36a2b36133ea4"
+  "version": "0.4.7",
+  "gitHead": "6ee48a9d467ee4d00e66cc4db5bb0591cb793287"
 }