@nxtedition/deepstream.io-client-js 23.1.19 → 23.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "23.1.19",
+  "version": "23.1.21",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "bugs": {

package/src/record/json-path.js

@@ -36,6 +36,16 @@ function parse(value) {
   }
 }
 
+function stringify(value) {
+  if (value === EMPTY_OBJ) {
+    return '{}'
+  } else if (value === EMPTY_ARR) {
+    return '[]'
+  } else {
+    return JSON.stringify(value)
+  }
+}
+
 function set(data, path, value, isPlainJSON = false) {
   data = data || EMPTY
 
@@ -174,6 +184,7 @@ module.exports = {
   EMPTY_OBJ,
   EMPTY_ARR,
   parse,
+  stringify,
   get,
   set,
   jsonClone,

package/src/record/record.js

@@ -18,9 +18,7 @@ class Record {
     this._refs = 1
     this._subscribed = false
     this._subscriptions = []
-
     this._updating = null
-    this._patches = null
 
     this._subscribe()
   }
@@ -100,23 +98,14 @@ class Record {
       throw new Error('invalid argument: path')
     }
 
-    const prevData = this._data
-    const prevVersion = this._version
-    const prevState = this._state
+    if (!this._update(path, data, false)) {
+      return
+    }
+
+    this._emitUpdate()
 
     if (this._state < Record.STATE.SERVER) {
-      this._patches = this._patches && path ? this._patches : []
-      this._patches.push(path, jsonPath.jsonClone(data))
       this._handler._patch.add(this)
-
-      this._version = this._makeVersion(this._version ? parseInt(this._version) + 1 : 1)
-      this._data = jsonPath.set(this._data, path, data, true)
-    } else {
-      this._update(path, jsonPath.jsonClone(data), false)
-    }
-
-    if (this._data !== prevData || this._version !== prevVersion || this._state !== prevState) {
-      this._emitUpdate()
     }
   }
 
@@ -234,7 +223,7 @@ class Record {
 
   _unsubscribe() {
     invariant(!this._refs, this._name + ' must not have refs')
-    invariant(!this._patches, this._name + ' must not have patch queue')
+    invariant(this._version, this._name + ' must have version')
 
     const prevState = this._state
 
@@ -261,30 +250,29 @@ class Record {
     }
   }
 
-  _update(path, data, force) {
-    invariant(this._version, this._name + ' missing version')
-    invariant(this._data, this._name + ' missing data')
+  _update(path, data, isPlainObject) {
+    const prevVersion = this._version
+    const prevData = this._data
 
-    const connection = this._handler._connection
+    const nextVersion = this._makeVersion(parseInt(prevVersion) + 1)
+    const nextData = jsonPath.set(this._data, path, data, isPlainObject)
 
-    const prevData = this._data
-    const nextData = jsonPath.set(prevData, path, data, true)
+    if (nextData === prevData) {
+      return false
+    }
 
-    if (force || nextData !== prevData) {
-      const prevVersion = this._version
-      const nextVersion = this._makeVersion(parseInt(prevVersion) + 1)
+    const update = [this._name, nextVersion, jsonPath.stringify(data), prevVersion]
 
-      const update = [this._name, nextVersion, JSON.stringify(nextData), prevVersion]
+    this._handler._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
 
-      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
+    this._version = nextVersion
+    this._data = nextData
 
-      this._version = nextVersion
-      this._data = nextData
+    this._updating ??= new Map()
+    this._updating.set(nextVersion, update)
+    this._handler._stats.updating += 1
 
-      this._updating ??= new Map()
-      this._updating.set(nextVersion, update)
-      this._handler._stats.updating += 1
-    }
+    return true
   }
 
   _onUpdate([, version, data]) {
@@ -296,26 +284,20 @@ class Record {
       this._handler._stats.updating -= 1
     }
 
-    if (this._patches) {
-      this._data = jsonPath.set(this._data, null, jsonPath.parse(data), true)
+    if (!this._version) {
       this._version = version
+      this._data = jsonPath.parse(data)
 
       if (this._version.charAt(0) !== 'I') {
-        for (let i = 0; i < this._patches.length; i += 2) {
-          this._update(this._patches[i + 0], this._patches[i + 1], true)
-        }
-      } else if (this._patches.length) {
-        this._error(C.EVENT.USER_ERROR, 'cannot patch provided value')
+        this._update(null, prevData, true)
       }
-
-      this._patches = null
-      this._handler._patch.delete(this)
     } else if (version.charAt(0) === 'I' || utils.compareRev(version, this._version) > 0) {
-      this._data = jsonPath.set(this._data, null, jsonPath.parse(data), true)
       this._version = version
+      this._data = jsonPath.set(this._data, null, jsonPath.parse(data), true)
     }
 
     if (this._state < Record.STATE.SERVER) {
+      this._handler._patch.delete(this)
       this._state = this._version.charAt(0) === 'I' ? Record.STATE.STALE : Record.STATE.SERVER
     }