@live-change/dao 0.4.2 → 0.4.5

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) {
@@ -15,38 +16,65 @@ class PushObservableTrigger {
     this.triggers = new Map()
 
     if(this.more && this.more.length > 0) {
-      this.localList = new ObservableList()
+      const localList = new ObservableList()
       this.pointerMethods = {
         set: (value) => this.setPointers(this.findPointers(value)),
         push: (value) => this.addPointers(this.findPointers(value)),
         unshift: (value) => this.addPointers(this.findPointers(value)),
-        shift: () => this.removePointers(this.findPointers(this.localList.list[0])),
-        pop: () => this.removePointers(this.findPointers(this.localList.list[this.localList.list.length - 1])),
+        shift: () => this.removePointers(this.findPointers(localList.list[0])),
+        pop: () => this.removePointers(this.findPointers(localList.list[localList.list.length - 1])),
         splice: (at, count, ...add) => this.replacePointers(
-            this.findPointers(this.localList.list.slice(at, at + count)),
+            this.findPointers(localList.list.slice(at, at + count)),
             this.findPointers(add)
         ),
-        remove: (value) => this.removePointers(this.findPointers(this.localList.list.filter(v => v == value))),
-        removeByField: (fieldName, value) =>
-            this.removePointers(this.findPointers(this.localList.list.filter(v => v[fieldName] == value))),
-        update: (value, update) => this.replacePointers(
-            this.findPointers(this.localList.list.filter(v => v == value)),
-            this.findPointers(this.localList.list.filter(v => v == value).map(u => update))
-        ),
-        updateByField: (fieldName, value, update) => this.replacePointers(
-            this.findPointers(this.localList.list.filter(v => v[fieldName] == value)),
-            this.findPointers(this.localList.list.filter(v => v[fieldName] == value).map(u => update))
-        )
+        remove: (value) => {
+          const valueJson = JSON.stringify(value)
+          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)
+          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)
+          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)
+          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) => {
-        if (this.pointerMethods[signal]) this.pointerMethods[signal](...args)
-        if (this.localList[signal]) this.localList[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)))
       }
 
       this.observation.observable.observe(this.observer)
     }
   }
   findPointers(value) {
+    debugPot("FIND POINTERS IN", value)
     let depsPointers = []
     let count = 0
     for(let dep of this.more) {
@@ -60,6 +88,7 @@ class PushObservableTrigger {
       what: pt,
       more: dep.more
     })
+    debugPot("FOUND POINTERS", allPointers)
     return allPointers
   }
   setPointers(allPointers) {
@@ -73,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

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.4.2",
-  "gitHead": "d4e1b7c5a3f7000c7587c7f36261fd0775ab150c"
+  "version": "0.4.5",
+  "gitHead": "1473e5de44d17cb2fb9b048d44adf6a75df10ce8"
 }