@liveblocks/client 0.15.11-test.1 → 0.16.1

package/lib/index.js

@@ -192,48 +192,6 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   return it.next.bind(it);
 }
 
-function _classPrivateFieldGet(receiver, privateMap) {
-  var descriptor = privateMap.get(receiver);
-
-  if (!descriptor) {
-    throw new TypeError("attempted to get private field on non-instance");
-  }
-
-  if (descriptor.get) {
-    return descriptor.get.call(receiver);
-  }
-
-  return descriptor.value;
-}
-
-function _classPrivateFieldSet(receiver, privateMap, value) {
-  var descriptor = privateMap.get(receiver);
-
-  if (!descriptor) {
-    throw new TypeError("attempted to set private field on non-instance");
-  }
-
-  if (descriptor.set) {
-    descriptor.set.call(receiver, value);
-  } else {
-    if (!descriptor.writable) {
-      throw new TypeError("attempted to set read only private field");
-    }
-
-    descriptor.value = value;
-  }
-
-  return value;
-}
-
-function _classPrivateMethodGet(receiver, privateSet, fn) {
-  if (!privateSet.has(receiver)) {
-    throw new TypeError("attempted to get private field on non-instance");
-  }
-
-  return fn;
-}
-
 var ServerMessageType;
 
 (function (ServerMessageType) {
@@ -291,36 +249,8 @@ var WebsocketCloseCodes;
   WebsocketCloseCodes[WebsocketCloseCodes["CLOSE_WITHOUT_RETRY"] = 4999] = "CLOSE_WITHOUT_RETRY";
 })(WebsocketCloseCodes || (WebsocketCloseCodes = {}));
 
-var _parent = new WeakMap();
-
-var _doc = new WeakMap();
-
-var _id = new WeakMap();
-
-var _parentKey = new WeakMap();
-
 var AbstractCrdt = function () {
-  function AbstractCrdt() {
-    _parent.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _doc.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _id.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _parentKey.set(this, {
-      writable: true,
-      value: void 0
-    });
-  }
+  function AbstractCrdt() {}
 
   var _proto = AbstractCrdt.prototype;
 
@@ -344,61 +274,57 @@ var AbstractCrdt = function () {
   };
 
   _proto._setParentLink = function _setParentLink(parent, key) {
-    if (_classPrivateFieldGet(this, _parent) != null && _classPrivateFieldGet(this, _parent) !== parent) {
+    if (this.__parent != null && this.__parent !== parent) {
       throw new Error("Cannot attach parent if it already exist");
     }
 
-    _classPrivateFieldSet(this, _parentKey, key);
-
-    _classPrivateFieldSet(this, _parent, parent);
+    this.__parentKey = key;
+    this.__parent = parent;
   };
 
   _proto._attach = function _attach(id, doc) {
-    if (_classPrivateFieldGet(this, _id) || _classPrivateFieldGet(this, _doc)) {
+    if (this.__id || this.__doc) {
       throw new Error("Cannot attach if CRDT is already attached");
     }
 
     doc.addItem(id, this);
-
-    _classPrivateFieldSet(this, _id, id);
-
-    _classPrivateFieldSet(this, _doc, doc);
+    this.__id = id;
+    this.__doc = doc;
   };
 
   _proto._detach = function _detach() {
-    if (_classPrivateFieldGet(this, _doc) && _classPrivateFieldGet(this, _id)) {
-      _classPrivateFieldGet(this, _doc).deleteItem(_classPrivateFieldGet(this, _id));
+    if (this.__doc && this.__id) {
+      this.__doc.deleteItem(this.__id);
     }
 
-    _classPrivateFieldSet(this, _parent, undefined);
-
-    _classPrivateFieldSet(this, _doc, undefined);
+    this.__parent = undefined;
+    this.__doc = undefined;
   };
 
   _createClass(AbstractCrdt, [{
     key: "_doc",
     get: function get() {
-      return _classPrivateFieldGet(this, _doc);
+      return this.__doc;
     }
   }, {
     key: "roomId",
     get: function get() {
-      return _classPrivateFieldGet(this, _doc) ? _classPrivateFieldGet(this, _doc).roomId : null;
+      return this.__doc ? this.__doc.roomId : null;
     }
   }, {
     key: "_id",
     get: function get() {
-      return _classPrivateFieldGet(this, _id);
+      return this.__id;
     }
   }, {
     key: "_parent",
     get: function get() {
-      return _classPrivateFieldGet(this, _parent);
+      return this.__parent;
     }
   }, {
     key: "_parentKey",
     get: function get() {
-      return _classPrivateFieldGet(this, _parentKey);
+      return this.__parentKey;
     }
   }]);
 
@@ -532,8 +458,6 @@ function compare(posA, posB) {
   throw new Error("Impossible to compare similar position \"" + posA + "\" and \"" + posB + "\"");
 }
 
-var _data = new WeakMap();
-
 var LiveRegister = function (_AbstractCrdt) {
   _inheritsLoose(LiveRegister, _AbstractCrdt);
 
@@ -541,18 +465,11 @@ var LiveRegister = function (_AbstractCrdt) {
     var _this;
 
     _this = _AbstractCrdt.call(this) || this;
-
-    _data.set(_assertThisInitialized(_this), {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldSet(_assertThisInitialized(_this), _data, data);
-
+    _this._data = data;
     return _this;
   }
 
-  LiveRegister._deserialize = function _deserialize(_ref, parentToChildren, doc) {
+  LiveRegister._deserialize = function _deserialize(_ref, _parentToChildren, doc) {
     var id = _ref[0],
         item = _ref[1];
 
@@ -569,7 +486,7 @@ var LiveRegister = function (_AbstractCrdt) {
 
   var _proto = LiveRegister.prototype;
 
-  _proto._serialize = function _serialize(parentId, parentKey, doc) {
+  _proto._serialize = function _serialize(parentId, parentKey, doc, intent) {
     if (this._id == null || parentId == null || parentKey == null) {
       throw new Error("Cannot serialize register if parentId or parentKey is undefined");
     }
@@ -578,6 +495,7 @@ var LiveRegister = function (_AbstractCrdt) {
       type: OpType.CreateRegister,
       opId: doc == null ? void 0 : doc.generateOpId(),
       id: this._id,
+      intent: intent,
       parentId: parentId,
       parentKey: parentKey,
       data: this.data
@@ -595,7 +513,7 @@ var LiveRegister = function (_AbstractCrdt) {
     };
   };
 
-  _proto._attachChild = function _attachChild(_id, _key, _crdt, _opId, _isLocal) {
+  _proto._attachChild = function _attachChild(_op, _isLocal) {
     throw new Error("Method not implemented.");
   };
 
@@ -610,18 +528,13 @@ var LiveRegister = function (_AbstractCrdt) {
   _createClass(LiveRegister, [{
     key: "data",
     get: function get() {
-      return _classPrivateFieldGet(this, _data);
+      return this._data;
     }
   }]);
 
   return LiveRegister;
 }(AbstractCrdt);
 
-var _Symbol$iterator$1, _Symbol$iterator2;
-
-var _items = new WeakMap();
-
-_Symbol$iterator$1 = Symbol.iterator;
 var LiveList = function (_AbstractCrdt) {
   _inheritsLoose(LiveList, _AbstractCrdt);
 
@@ -633,12 +546,7 @@ var LiveList = function (_AbstractCrdt) {
     }
 
     _this = _AbstractCrdt.call(this) || this;
-
-    _items.set(_assertThisInitialized(_this), {
-      writable: true,
-      value: []
-    });
-
+    _this._items = [];
     var position = undefined;
 
     for (var i = 0; i < items.length; i++) {
@@ -646,7 +554,7 @@ var LiveList = function (_AbstractCrdt) {
 
       var _item = selfOrRegister(items[i]);
 
-      _classPrivateFieldGet(_assertThisInitialized(_this), _items).push([_item, newPosition]);
+      _this._items.push([_item, newPosition]);
 
       position = newPosition;
     }
@@ -672,9 +580,9 @@ var LiveList = function (_AbstractCrdt) {
 
       child._setParentLink(list, entry[1].parentKey);
 
-      _classPrivateFieldGet(list, _items).push([child, entry[1].parentKey]);
+      list._items.push([child, entry[1].parentKey]);
 
-      _classPrivateFieldGet(list, _items).sort(function (itemA, itemB) {
+      list._items.sort(function (itemA, itemB) {
         return compare(itemA[1], itemB[1]);
       });
     }
@@ -684,7 +592,7 @@ var LiveList = function (_AbstractCrdt) {
 
   var _proto = LiveList.prototype;
 
-  _proto._serialize = function _serialize(parentId, parentKey, doc) {
+  _proto._serialize = function _serialize(parentId, parentKey, doc, intent) {
     if (this._id == null) {
       throw new Error("Cannot serialize item is not attached");
     }
@@ -697,13 +605,14 @@ var LiveList = function (_AbstractCrdt) {
     var op = {
       id: this._id,
       opId: doc == null ? void 0 : doc.generateOpId(),
+      intent: intent,
       type: OpType.CreateList,
       parentId: parentId,
       parentKey: parentKey
     };
     ops.push(op);
 
-    for (var _iterator2 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _items)), _step2; !(_step2 = _iterator2()).done;) {
+    for (var _iterator2 = _createForOfIteratorHelperLoose(this._items), _step2; !(_step2 = _iterator2()).done;) {
       var _step2$value = _step2.value,
           _value = _step2$value[0],
           key = _step2$value[1];
@@ -714,7 +623,7 @@ var LiveList = function (_AbstractCrdt) {
   };
 
   _proto._indexOfPosition = function _indexOfPosition(position) {
-    return _classPrivateFieldGet(this, _items).findIndex(function (item) {
+    return this._items.findIndex(function (item) {
       return item[1] === position;
     });
   };
@@ -722,7 +631,7 @@ var LiveList = function (_AbstractCrdt) {
   _proto._attach = function _attach(id, doc) {
     _AbstractCrdt.prototype._attach.call(this, id, doc);
 
-    for (var _iterator3 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _items)), _step3; !(_step3 = _iterator3()).done;) {
+    for (var _iterator3 = _createForOfIteratorHelperLoose(this._items), _step3; !(_step3 = _iterator3()).done;) {
       var _step3$value = _step3.value,
           _item2 = _step3$value[0];
 
@@ -733,7 +642,7 @@ var LiveList = function (_AbstractCrdt) {
   _proto._detach = function _detach() {
     _AbstractCrdt.prototype._detach.call(this);
 
-    for (var _iterator4 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _items)), _step4; !(_step4 = _iterator4()).done;) {
+    for (var _iterator4 = _createForOfIteratorHelperLoose(this._items), _step4; !(_step4 = _iterator4()).done;) {
       var _step4$value = _step4.value,
           _value2 = _step4$value[0];
 
@@ -741,11 +650,17 @@ var LiveList = function (_AbstractCrdt) {
     }
   };
 
-  _proto._attachChild = function _attachChild(id, key, child, _opId, isLocal) {
+  _proto._attachChild = function _attachChild(op, isLocal) {
     if (this._doc == null) {
       throw new Error("Can't attach child if doc is not present");
     }
 
+    var id = op.id,
+        parentKey = op.parentKey,
+        intent = op.intent;
+    var key = parentKey;
+    var child = creationOpToLiveStructure(op);
+
     if (this._doc.getItem(id) !== undefined) {
       return {
         modified: false
@@ -756,33 +671,52 @@ var LiveList = function (_AbstractCrdt) {
 
     child._setParentLink(this, key);
 
-    var index = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var index = this._items.findIndex(function (entry) {
       return entry[1] === key;
     });
 
     var newKey = key;
 
     if (index !== -1) {
-      if (isLocal) {
-        var before = _classPrivateFieldGet(this, _items)[index] ? _classPrivateFieldGet(this, _items)[index][1] : undefined;
-        var after = _classPrivateFieldGet(this, _items)[index + 1] ? _classPrivateFieldGet(this, _items)[index + 1][1] : undefined;
+      if (intent === "set") {
+        var existingItem = this._items[index][0];
+
+        existingItem._detach();
+
+        var storageUpdate = {
+          node: this,
+          type: "LiveList",
+          updates: [{
+            index: index,
+            type: "set",
+            item: child instanceof LiveRegister ? child.data : child
+          }]
+        };
+        this._items[index][0] = child;
+        return {
+          modified: storageUpdate,
+          reverse: existingItem._serialize(this._id, key, this._doc, "set")
+        };
+      } else if (isLocal) {
+        var before = this._items[index] ? this._items[index][1] : undefined;
+        var after = this._items[index + 1] ? this._items[index + 1][1] : undefined;
         newKey = makePosition(before, after);
 
         child._setParentLink(this, newKey);
       } else {
-        var _classPrivateFieldGet2;
+        var _this$_items;
 
-        _classPrivateFieldGet(this, _items)[index][1] = makePosition(key, (_classPrivateFieldGet2 = _classPrivateFieldGet(this, _items)[index + 1]) == null ? void 0 : _classPrivateFieldGet2[1]);
+        this._items[index][1] = makePosition(key, (_this$_items = this._items[index + 1]) == null ? void 0 : _this$_items[1]);
       }
     }
 
-    _classPrivateFieldGet(this, _items).push([child, newKey]);
+    this._items.push([child, newKey]);
 
-    _classPrivateFieldGet(this, _items).sort(function (itemA, itemB) {
+    this._items.sort(function (itemA, itemB) {
       return compare(itemA[1], itemB[1]);
     });
 
-    var newIndex = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var newIndex = this._items.findIndex(function (entry) {
       return entry[1] === newKey;
     });
 
@@ -807,11 +741,11 @@ var LiveList = function (_AbstractCrdt) {
     if (child) {
       var reverse = child._serialize(this._id, child._parentKey, this._doc);
 
-      var indexToDelete = _classPrivateFieldGet(this, _items).findIndex(function (item) {
+      var indexToDelete = this._items.findIndex(function (item) {
         return item[0] === child;
       });
 
-      _classPrivateFieldGet(this, _items).splice(indexToDelete, 1);
+      this._items.splice(indexToDelete, 1);
 
       child._detach();
 
@@ -837,21 +771,21 @@ var LiveList = function (_AbstractCrdt) {
   _proto._setChildKey = function _setChildKey(key, child, previousKey) {
     child._setParentLink(this, key);
 
-    var previousIndex = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var previousIndex = this._items.findIndex(function (entry) {
       return entry[0]._id === child._id;
     });
 
-    var index = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var index = this._items.findIndex(function (entry) {
       return entry[1] === key;
     });
 
     if (index !== -1) {
-      var _classPrivateFieldGet3;
+      var _this$_items2;
 
-      _classPrivateFieldGet(this, _items)[index][1] = makePosition(key, (_classPrivateFieldGet3 = _classPrivateFieldGet(this, _items)[index + 1]) == null ? void 0 : _classPrivateFieldGet3[1]);
+      this._items[index][1] = makePosition(key, (_this$_items2 = this._items[index + 1]) == null ? void 0 : _this$_items2[1]);
     }
 
-    var item = _classPrivateFieldGet(this, _items).find(function (item) {
+    var item = this._items.find(function (item) {
       return item[0] === child;
     });
 
@@ -859,11 +793,11 @@ var LiveList = function (_AbstractCrdt) {
       item[1] = key;
     }
 
-    _classPrivateFieldGet(this, _items).sort(function (itemA, itemB) {
+    this._items.sort(function (itemA, itemB) {
       return compare(itemA[1], itemB[1]);
     });
 
-    var newIndex = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var newIndex = this._items.findIndex(function (entry) {
       return entry[0]._id === child._id;
     });
 
@@ -906,24 +840,24 @@ var LiveList = function (_AbstractCrdt) {
   };
 
   _proto.insert = function insert(element, index) {
-    if (index < 0 || index > _classPrivateFieldGet(this, _items).length) {
-      throw new Error("Cannot insert list item at index \"\x1D" + index + "\". index should be between 0 and " + _classPrivateFieldGet(this, _items).length);
+    if (index < 0 || index > this._items.length) {
+      throw new Error("Cannot insert list item at index \"\x1D" + index + "\". index should be between 0 and " + this._items.length);
     }
 
-    var before = _classPrivateFieldGet(this, _items)[index - 1] ? _classPrivateFieldGet(this, _items)[index - 1][1] : undefined;
-    var after = _classPrivateFieldGet(this, _items)[index] ? _classPrivateFieldGet(this, _items)[index][1] : undefined;
+    var before = this._items[index - 1] ? this._items[index - 1][1] : undefined;
+    var after = this._items[index] ? this._items[index][1] : undefined;
     var position = makePosition(before, after);
     var value = selfOrRegister(element);
 
     value._setParentLink(this, position);
 
-    _classPrivateFieldGet(this, _items).push([value, position]);
+    this._items.push([value, position]);
 
-    _classPrivateFieldGet(this, _items).sort(function (itemA, itemB) {
+    this._items.sort(function (itemA, itemB) {
       return compare(itemA[1], itemB[1]);
     });
 
-    var newIndex = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var newIndex = this._items.findIndex(function (entry) {
       return entry[1] === position;
     });
 
@@ -955,7 +889,7 @@ var LiveList = function (_AbstractCrdt) {
       throw new Error("targetIndex cannot be less than 0");
     }
 
-    if (targetIndex >= _classPrivateFieldGet(this, _items).length) {
+    if (targetIndex >= this._items.length) {
       throw new Error("targetIndex cannot be greater or equal than the list length");
     }
 
@@ -963,7 +897,7 @@ var LiveList = function (_AbstractCrdt) {
       throw new Error("index cannot be less than 0");
     }
 
-    if (index >= _classPrivateFieldGet(this, _items).length) {
+    if (index >= this._items.length) {
       throw new Error("index cannot be greater or equal than the list length");
     }
 
@@ -971,27 +905,25 @@ var LiveList = function (_AbstractCrdt) {
     var afterPosition = null;
 
     if (index < targetIndex) {
-      afterPosition = targetIndex === _classPrivateFieldGet(this, _items).length - 1 ? undefined : _classPrivateFieldGet(this, _items)[targetIndex + 1][1];
-      beforePosition = _classPrivateFieldGet(this, _items)[targetIndex][1];
+      afterPosition = targetIndex === this._items.length - 1 ? undefined : this._items[targetIndex + 1][1];
+      beforePosition = this._items[targetIndex][1];
     } else {
-      afterPosition = _classPrivateFieldGet(this, _items)[targetIndex][1];
-      beforePosition = targetIndex === 0 ? undefined : _classPrivateFieldGet(this, _items)[targetIndex - 1][1];
+      afterPosition = this._items[targetIndex][1];
+      beforePosition = targetIndex === 0 ? undefined : this._items[targetIndex - 1][1];
     }
 
     var position = makePosition(beforePosition, afterPosition);
-
-    var item = _classPrivateFieldGet(this, _items)[index];
-
+    var item = this._items[index];
     var previousPosition = item[1];
     item[1] = position;
 
     item[0]._setParentLink(this, position);
 
-    _classPrivateFieldGet(this, _items).sort(function (itemA, itemB) {
+    this._items.sort(function (itemA, itemB) {
       return compare(itemA[1], itemB[1]);
     });
 
-    var newIndex = _classPrivateFieldGet(this, _items).findIndex(function (entry) {
+    var newIndex = this._items.findIndex(function (entry) {
       return entry[1] === position;
     });
 
@@ -1022,15 +954,15 @@ var LiveList = function (_AbstractCrdt) {
   };
 
   _proto.delete = function _delete(index) {
-    if (index < 0 || index >= _classPrivateFieldGet(this, _items).length) {
-      throw new Error("Cannot delete list item at index \"\x1D" + index + "\". index should be between 0 and " + (_classPrivateFieldGet(this, _items).length - 1));
+    if (index < 0 || index >= this._items.length) {
+      throw new Error("Cannot delete list item at index \"\x1D" + index + "\". index should be between 0 and " + (this._items.length - 1));
     }
 
-    var item = _classPrivateFieldGet(this, _items)[index];
+    var item = this._items[index];
 
     item[0]._detach();
 
-    _classPrivateFieldGet(this, _items).splice(index, 1);
+    this._items.splice(index, 1);
 
     if (this._doc) {
       var childRecordId = item[0]._id;
@@ -1062,7 +994,7 @@ var LiveList = function (_AbstractCrdt) {
       var updateDelta = [];
       var i = 0;
 
-      for (var _iterator5 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _items)), _step5; !(_step5 = _iterator5()).done;) {
+      for (var _iterator5 = _createForOfIteratorHelperLoose(this._items), _step5; !(_step5 = _iterator5()).done;) {
         var _item3 = _step5.value;
 
         _item3[0]._detach();
@@ -1084,8 +1016,7 @@ var LiveList = function (_AbstractCrdt) {
         i++;
       }
 
-      _classPrivateFieldSet(this, _items, []);
-
+      this._items = [];
       var storageUpdates = new Map();
       storageUpdates.set(this._id, {
         node: this,
@@ -1095,18 +1026,55 @@ var LiveList = function (_AbstractCrdt) {
 
       this._doc.dispatch(ops, reverseOps, storageUpdates);
     } else {
-      for (var _iterator6 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _items)), _step6; !(_step6 = _iterator6()).done;) {
+      for (var _iterator6 = _createForOfIteratorHelperLoose(this._items), _step6; !(_step6 = _iterator6()).done;) {
         var _item4 = _step6.value;
 
         _item4[0]._detach();
       }
 
-      _classPrivateFieldSet(this, _items, []);
+      this._items = [];
+    }
+  };
+
+  _proto.set = function set(index, item) {
+    if (index < 0 || index >= this._items.length) {
+      throw new Error("Cannot set list item at index \"\x1D" + index + "\". index should be between 0 and " + (this._items.length - 1));
+    }
+
+    var _this$_items$index = this._items[index],
+        existingItem = _this$_items$index[0],
+        position = _this$_items$index[1];
+
+    existingItem._detach();
+
+    var value = selfOrRegister(item);
+
+    value._setParentLink(this, position);
+
+    this._items[index][0] = value;
+
+    if (this._doc && this._id) {
+      var _id2 = this._doc.generateId();
+
+      value._attach(_id2, this._doc);
+
+      var storageUpdates = new Map();
+      storageUpdates.set(this._id, {
+        node: this,
+        type: "LiveList",
+        updates: [{
+          index: index,
+          item: value instanceof LiveRegister ? value.data : value,
+          type: "set"
+        }]
+      });
+
+      this._doc.dispatch(value._serialize(this._id, position, this._doc, "set"), existingItem._serialize(this._id, position, undefined, "set"), storageUpdates);
     }
   };
 
   _proto.toArray = function toArray() {
-    return _classPrivateFieldGet(this, _items).map(function (entry) {
+    return this._items.map(function (entry) {
       return selfOrRegisterValue(entry[0]);
     });
   };
@@ -1132,11 +1100,11 @@ var LiveList = function (_AbstractCrdt) {
   };
 
   _proto.get = function get(index) {
-    if (index < 0 || index >= _classPrivateFieldGet(this, _items).length) {
+    if (index < 0 || index >= this._items.length) {
       return undefined;
     }
 
-    return selfOrRegisterValue(_classPrivateFieldGet(this, _items)[index][0]);
+    return selfOrRegisterValue(this._items[index][0]);
   };
 
   _proto.indexOf = function indexOf(searchElement, fromIndex) {
@@ -1148,7 +1116,7 @@ var LiveList = function (_AbstractCrdt) {
   };
 
   _proto.map = function map(callback) {
-    return _classPrivateFieldGet(this, _items).map(function (entry, i) {
+    return this._items.map(function (entry, i) {
       return callback(selfOrRegisterValue(entry[0]), i);
     });
   };
@@ -1157,42 +1125,33 @@ var LiveList = function (_AbstractCrdt) {
     return this.toArray().some(predicate);
   };
 
-  _proto[_Symbol$iterator$1] = function () {
-    return new LiveListIterator(_classPrivateFieldGet(this, _items));
+  _proto[Symbol.iterator] = function () {
+    return new LiveListIterator(this._items);
   };
 
   _createClass(LiveList, [{
     key: "length",
     get: function get() {
-      return _classPrivateFieldGet(this, _items).length;
+      return this._items.length;
     }
   }]);
 
   return LiveList;
 }(AbstractCrdt);
 
-var _innerIterator = new WeakMap();
-
-_Symbol$iterator2 = Symbol.iterator;
-
 var LiveListIterator = function () {
   function LiveListIterator(items) {
-    _innerIterator.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldSet(this, _innerIterator, items[Symbol.iterator]());
+    this._innerIterator = items[Symbol.iterator]();
   }
 
   var _proto2 = LiveListIterator.prototype;
 
-  _proto2[_Symbol$iterator2] = function () {
+  _proto2[Symbol.iterator] = function () {
     return this;
   };
 
   _proto2.next = function next() {
-    var result = _classPrivateFieldGet(this, _innerIterator).next();
+    var result = this._innerIterator.next();
 
     if (result.done) {
       return {
@@ -1209,11 +1168,6 @@ var LiveListIterator = function () {
   return LiveListIterator;
 }();
 
-var _Symbol$iterator;
-
-var _map$1 = new WeakMap();
-
-_Symbol$iterator = Symbol.iterator;
 var LiveMap = function (_AbstractCrdt) {
   _inheritsLoose(LiveMap, _AbstractCrdt);
 
@@ -1222,11 +1176,6 @@ var LiveMap = function (_AbstractCrdt) {
 
     _this = _AbstractCrdt.call(this) || this;
 
-    _map$1.set(_assertThisInitialized(_this), {
-      writable: true,
-      value: void 0
-    });
-
     if (entries) {
       var mappedEntries = [];
 
@@ -1240,9 +1189,9 @@ var LiveMap = function (_AbstractCrdt) {
         mappedEntries.push([entry[0], _value]);
       }
 
-      _classPrivateFieldSet(_assertThisInitialized(_this), _map$1, new Map(mappedEntries));
+      _this._map = new Map(mappedEntries);
     } else {
-      _classPrivateFieldSet(_assertThisInitialized(_this), _map$1, new Map());
+      _this._map = new Map();
     }
 
     return _this;
@@ -1250,7 +1199,7 @@ var LiveMap = function (_AbstractCrdt) {
 
   var _proto = LiveMap.prototype;
 
-  _proto._serialize = function _serialize(parentId, parentKey, doc) {
+  _proto._serialize = function _serialize(parentId, parentKey, doc, intent) {
     if (this._id == null) {
       throw new Error("Cannot serialize item is not attached");
     }
@@ -1264,12 +1213,13 @@ var LiveMap = function (_AbstractCrdt) {
       id: this._id,
       opId: doc == null ? void 0 : doc.generateOpId(),
       type: OpType.CreateMap,
+      intent: intent,
       parentId: parentId,
       parentKey: parentKey
     };
     ops.push(op);
 
-    for (var _iterator2 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map$1)), _step2; !(_step2 = _iterator2()).done;) {
+    for (var _iterator2 = _createForOfIteratorHelperLoose(this._map), _step2; !(_step2 = _iterator2()).done;) {
       var _step2$value = _step2.value,
           _key2 = _step2$value[0],
           _value2 = _step2$value[1];
@@ -1309,7 +1259,7 @@ var LiveMap = function (_AbstractCrdt) {
 
       child._setParentLink(map, crdt.parentKey);
 
-      _classPrivateFieldGet(map, _map$1).set(crdt.parentKey, child);
+      map._map.set(crdt.parentKey, child);
     }
 
     return map;
@@ -1318,7 +1268,7 @@ var LiveMap = function (_AbstractCrdt) {
   _proto._attach = function _attach(id, doc) {
     _AbstractCrdt.prototype._attach.call(this, id, doc);
 
-    for (var _iterator4 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map$1)), _step4; !(_step4 = _iterator4()).done;) {
+    for (var _iterator4 = _createForOfIteratorHelperLoose(this._map), _step4; !(_step4 = _iterator4()).done;) {
       var _step4$value = _step4.value;
           _step4$value[0];
           var _value3 = _step4$value[1];
@@ -1329,20 +1279,25 @@ var LiveMap = function (_AbstractCrdt) {
     }
   };
 
-  _proto._attachChild = function _attachChild(id, key, child, _opId, _isLocal) {
+  _proto._attachChild = function _attachChild(op, _isLocal) {
     var _updates;
 
     if (this._doc == null) {
       throw new Error("Can't attach child if doc is not present");
     }
 
+    var id = op.id,
+        parentKey = op.parentKey;
+    var key = parentKey;
+    var child = creationOpToLiveStructure(op);
+
     if (this._doc.getItem(id) !== undefined) {
       return {
         modified: false
       };
     }
 
-    var previousValue = _classPrivateFieldGet(this, _map$1).get(key);
+    var previousValue = this._map.get(key);
 
     var reverse;
 
@@ -1361,7 +1316,7 @@ var LiveMap = function (_AbstractCrdt) {
 
     child._attach(id, this._doc);
 
-    _classPrivateFieldGet(this, _map$1).set(key, child);
+    this._map.set(key, child);
 
     return {
       modified: {
@@ -1378,7 +1333,7 @@ var LiveMap = function (_AbstractCrdt) {
   _proto._detach = function _detach() {
     _AbstractCrdt.prototype._detach.call(this);
 
-    for (var _iterator5 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map$1).values()), _step5; !(_step5 = _iterator5()).done;) {
+    for (var _iterator5 = _createForOfIteratorHelperLoose(this._map.values()), _step5; !(_step5 = _iterator5()).done;) {
       var item = _step5.value;
 
       item._detach();
@@ -1390,13 +1345,13 @@ var LiveMap = function (_AbstractCrdt) {
 
     var reverse = child._serialize(this._id, child._parentKey, this._doc);
 
-    for (var _iterator6 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map$1)), _step6; !(_step6 = _iterator6()).done;) {
+    for (var _iterator6 = _createForOfIteratorHelperLoose(this._map), _step6; !(_step6 = _iterator6()).done;) {
       var _step6$value = _step6.value,
           _key3 = _step6$value[0],
           _value4 = _step6$value[1];
 
       if (_value4 === child) {
-        _classPrivateFieldGet(this, _map$1).delete(_key3);
+        this._map.delete(_key3);
       }
     }
 
@@ -1426,7 +1381,7 @@ var LiveMap = function (_AbstractCrdt) {
   };
 
   _proto.get = function get(key) {
-    var value = _classPrivateFieldGet(this, _map$1).get(key);
+    var value = this._map.get(key);
 
     if (value == undefined) {
       return undefined;
@@ -1436,7 +1391,7 @@ var LiveMap = function (_AbstractCrdt) {
   };
 
   _proto.set = function set(key, value) {
-    var oldValue = _classPrivateFieldGet(this, _map$1).get(key);
+    var oldValue = this._map.get(key);
 
     if (oldValue) {
       oldValue._detach();
@@ -1446,7 +1401,7 @@ var LiveMap = function (_AbstractCrdt) {
 
     item._setParentLink(this, key);
 
-    _classPrivateFieldGet(this, _map$1).set(key, item);
+    this._map.set(key, item);
 
     if (this._doc && this._id) {
       var _updates3;
@@ -1472,11 +1427,11 @@ var LiveMap = function (_AbstractCrdt) {
   };
 
   _proto.has = function has(key) {
-    return _classPrivateFieldGet(this, _map$1).has(key);
+    return this._map.has(key);
   };
 
   _proto.delete = function _delete(key) {
-    var item = _classPrivateFieldGet(this, _map$1).get(key);
+    var item = this._map.get(key);
 
     if (item == null) {
       return false;
@@ -1484,7 +1439,7 @@ var LiveMap = function (_AbstractCrdt) {
 
     item._detach();
 
-    _classPrivateFieldGet(this, _map$1).delete(key);
+    this._map.delete(key);
 
     if (this._doc && item._id) {
       var _updates4;
@@ -1511,7 +1466,7 @@ var LiveMap = function (_AbstractCrdt) {
   _proto.entries = function entries() {
     var _ref2;
 
-    var innerIterator = _classPrivateFieldGet(this, _map$1).entries();
+    var innerIterator = this._map.entries();
 
     return _ref2 = {}, _ref2[Symbol.iterator] = function () {
       return this;
@@ -1532,18 +1487,18 @@ var LiveMap = function (_AbstractCrdt) {
     }, _ref2;
   };
 
-  _proto[_Symbol$iterator] = function () {
+  _proto[Symbol.iterator] = function () {
     return this.entries();
   };
 
   _proto.keys = function keys() {
-    return _classPrivateFieldGet(this, _map$1).keys();
+    return this._map.keys();
   };
 
   _proto.values = function values() {
     var _ref3;
 
-    var innerIterator = _classPrivateFieldGet(this, _map$1).values();
+    var innerIterator = this._map.values();
 
     return _ref3 = {}, _ref3[Symbol.iterator] = function () {
       return this;
@@ -1573,13 +1528,27 @@ var LiveMap = function (_AbstractCrdt) {
   _createClass(LiveMap, [{
     key: "size",
     get: function get() {
-      return _classPrivateFieldGet(this, _map$1).size;
+      return this._map.size;
     }
   }]);
 
   return LiveMap;
 }(AbstractCrdt);
 
+function parseJson(rawMessage) {
+  try {
+    return JSON.parse(rawMessage);
+  } catch (e) {
+    return undefined;
+  }
+}
+function isJsonArray(data) {
+  return Array.isArray(data);
+}
+function isJsonObject(data) {
+  return data !== null && typeof data === "object" && !isJsonArray(data);
+}
+
 function remove(array, item) {
   for (var i = 0; i < array.length; i++) {
     if (array[i] === item) {
@@ -1588,6 +1557,26 @@ function remove(array, item) {
     }
   }
 }
+function compact(items) {
+  return items.filter(function (item) {
+    return item != null;
+  });
+}
+function creationOpToLiveStructure(op) {
+  switch (op.type) {
+    case OpType.CreateRegister:
+      return new LiveRegister(op.data);
+
+    case OpType.CreateObject:
+      return new LiveObject(op.data);
+
+    case OpType.CreateMap:
+      return new LiveMap();
+
+    case OpType.CreateList:
+      return new LiveList();
+  }
+}
 function isSameNodeOrChildOf(node, parent) {
   if (node === parent) {
     return true;
@@ -1721,44 +1710,57 @@ function getTreesDiffOperations(currentItems, newItems) {
   });
   return ops;
 }
-function mergeStorageUpdates(first, second) {
-  if (!first) {
-    return second;
+
+function mergeObjectStorageUpdates(first, second) {
+  var updates = first.updates;
+
+  for (var _iterator = _createForOfIteratorHelperLoose(entries(second.updates)), _step; !(_step = _iterator()).done;) {
+    var _step$value = _step.value,
+        _key = _step$value[0],
+        value = _step$value[1];
+    updates[_key] = value;
   }
 
-  if (second.type === "LiveObject") {
-    var updates = first.updates;
+  return _extends({}, second, {
+    updates: updates
+  });
+}
 
-    for (var _i = 0, _Object$entries = Object.entries(second.updates); _i < _Object$entries.length; _i++) {
-      var _Object$entries$_i = _Object$entries[_i],
-          key = _Object$entries$_i[0],
-          value = _Object$entries$_i[1];
-      updates[key] = value;
-    }
+function mergeMapStorageUpdates(first, second) {
+  var updates = first.updates;
 
-    return _extends({}, second, {
-      updates: updates
-    });
-  } else if (second.type === "LiveMap") {
-    var _updates = first.updates;
+  for (var _iterator2 = _createForOfIteratorHelperLoose(entries(second.updates)), _step2; !(_step2 = _iterator2()).done;) {
+    var _step2$value = _step2.value,
+        _key2 = _step2$value[0],
+        value = _step2$value[1];
+    updates[_key2] = value;
+  }
 
-    for (var _i2 = 0, _Object$entries2 = Object.entries(second.updates); _i2 < _Object$entries2.length; _i2++) {
-      var _Object$entries2$_i = _Object$entries2[_i2],
-          _key = _Object$entries2$_i[0],
-          _value = _Object$entries2$_i[1];
-      _updates[_key] = _value;
-    }
+  return _extends({}, second, {
+    updates: updates
+  });
+}
 
-    return _extends({}, second, {
-      updates: _updates
-    });
-  } else if (second.type === "LiveList") {
-    var _updates2 = first.updates;
-    return _extends({}, second, {
-      updates: _updates2.concat(second.updates)
-    });
+function mergeListStorageUpdates(first, second) {
+  var updates = first.updates;
+  return _extends({}, second, {
+    updates: updates.concat(second.updates)
+  });
+}
+
+function mergeStorageUpdates(first, second) {
+  if (!first) {
+    return second;
   }
 
+  if (first.type === "LiveObject" && second.type === "LiveObject") {
+    return mergeObjectStorageUpdates(first, second);
+  } else if (first.type === "LiveMap" && second.type === "LiveMap") {
+    return mergeMapStorageUpdates(first, second);
+  } else if (first.type === "LiveList" && second.type === "LiveList") {
+    return mergeListStorageUpdates(first, second);
+  } else ;
+
   return second;
 }
 
@@ -1796,11 +1798,11 @@ function findNonSerializableValue(value, path) {
     return false;
   }
 
-  for (var _i3 = 0, _Object$entries3 = Object.entries(value); _i3 < _Object$entries3.length; _i3++) {
-    var _Object$entries3$_i = _Object$entries3[_i3],
-        key = _Object$entries3$_i[0],
-        nestedValue = _Object$entries3$_i[1];
-    var nestedPath = path ? path + "." + key : key;
+  for (var _i = 0, _Object$entries = Object.entries(value); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _Object$entries[_i],
+        _key3 = _Object$entries$_i[0],
+        nestedValue = _Object$entries$_i[1];
+    var nestedPath = path ? path + "." + _key3 : _key3;
 
     if (!isPlain(nestedValue)) {
       return {
@@ -1820,14 +1822,30 @@ function findNonSerializableValue(value, path) {
 
   return false;
 }
+function isTokenValid(token) {
+  var tokenParts = token.split(".");
+
+  if (tokenParts.length !== 3) {
+    return false;
+  }
 
-var _map = new WeakMap();
+  var data = parseJson(atob(tokenParts[1]));
+
+  if (data === undefined || !isJsonObject(data) || typeof data.exp !== "number") {
+    return false;
+  }
 
-var _propToLastUpdate = new WeakMap();
+  var now = Date.now();
 
-var _applyUpdate = new WeakSet();
+  if (now / 1000 > data.exp - 300) {
+    return false;
+  }
 
-var _applyDeleteObjectKey = new WeakSet();
+  return true;
+}
+function entries(obj) {
+  return Object.entries(obj);
+}
 
 var LiveObject = function (_AbstractCrdt) {
   _inheritsLoose(LiveObject, _AbstractCrdt);
@@ -1840,20 +1858,7 @@ var LiveObject = function (_AbstractCrdt) {
     }
 
     _this = _AbstractCrdt.call(this) || this;
-
-    _applyDeleteObjectKey.add(_assertThisInitialized(_this));
-
-    _applyUpdate.add(_assertThisInitialized(_this));
-
-    _map.set(_assertThisInitialized(_this), {
-      writable: true,
-      value: void 0
-    });
-
-    _propToLastUpdate.set(_assertThisInitialized(_this), {
-      writable: true,
-      value: new Map()
-    });
+    _this._propToLastUpdate = new Map();
 
     for (var key in object) {
       var value = object[key];
@@ -1863,14 +1868,13 @@ var LiveObject = function (_AbstractCrdt) {
       }
     }
 
-    _classPrivateFieldSet(_assertThisInitialized(_this), _map, new Map(Object.entries(object)));
-
+    _this._map = new Map(Object.entries(object));
     return _this;
   }
 
   var _proto = LiveObject.prototype;
 
-  _proto._serialize = function _serialize(parentId, parentKey, doc) {
+  _proto._serialize = function _serialize(parentId, parentKey, doc, intent) {
     if (this._id == null) {
       throw new Error("Cannot serialize item is not attached");
     }
@@ -1879,6 +1883,7 @@ var LiveObject = function (_AbstractCrdt) {
     var op = {
       id: this._id,
       opId: doc == null ? void 0 : doc.generateOpId(),
+      intent: intent,
       type: OpType.CreateObject,
       parentId: parentId,
       parentKey: parentKey,
@@ -1886,7 +1891,7 @@ var LiveObject = function (_AbstractCrdt) {
     };
     ops.push(op);
 
-    for (var _iterator = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map)), _step; !(_step = _iterator()).done;) {
+    for (var _iterator = _createForOfIteratorHelperLoose(this._map), _step; !(_step = _iterator()).done;) {
       var _step$value = _step.value,
           key = _step$value[0],
           value = _step$value[1];
@@ -1935,7 +1940,7 @@ var LiveObject = function (_AbstractCrdt) {
 
       child._setParentLink(object, crdt.parentKey);
 
-      _classPrivateFieldGet(object, _map).set(crdt.parentKey, child);
+      object._map.set(crdt.parentKey, child);
     }
 
     return object;
@@ -1944,7 +1949,7 @@ var LiveObject = function (_AbstractCrdt) {
   _proto._attach = function _attach(id, doc) {
     _AbstractCrdt.prototype._attach.call(this, id, doc);
 
-    for (var _iterator3 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map)), _step3; !(_step3 = _iterator3()).done;) {
+    for (var _iterator3 = _createForOfIteratorHelperLoose(this._map), _step3; !(_step3 = _iterator3()).done;) {
       var _step3$value = _step3.value;
           _step3$value[0];
           var value = _step3$value[1];
@@ -1955,16 +1960,22 @@ var LiveObject = function (_AbstractCrdt) {
     }
   };
 
-  _proto._attachChild = function _attachChild(id, key, child, opId, isLocal) {
+  _proto._attachChild = function _attachChild(op, isLocal) {
     var _updates;
 
     if (this._doc == null) {
       throw new Error("Can't attach child if doc is not present");
     }
 
+    var id = op.id,
+        parentKey = op.parentKey,
+        opId = op.opId;
+    var key = parentKey;
+    var child = creationOpToLiveStructure(op);
+
     if (this._doc.getItem(id) !== undefined) {
-      if (_classPrivateFieldGet(this, _propToLastUpdate).get(key) === opId) {
-        _classPrivateFieldGet(this, _propToLastUpdate).delete(key);
+      if (this._propToLastUpdate.get(key) === opId) {
+        this._propToLastUpdate.delete(key);
       }
 
       return {
@@ -1973,9 +1984,9 @@ var LiveObject = function (_AbstractCrdt) {
     }
 
     if (isLocal) {
-      _classPrivateFieldGet(this, _propToLastUpdate).set(key, opId);
-    } else if (_classPrivateFieldGet(this, _propToLastUpdate).get(key) === undefined) ; else if (_classPrivateFieldGet(this, _propToLastUpdate).get(key) === opId) {
-      _classPrivateFieldGet(this, _propToLastUpdate).delete(key);
+      this._propToLastUpdate.set(key, opId);
+    } else if (this._propToLastUpdate.get(key) === undefined) ; else if (this._propToLastUpdate.get(key) === opId) {
+      this._propToLastUpdate.delete(key);
 
       return {
         modified: false
@@ -1986,7 +1997,7 @@ var LiveObject = function (_AbstractCrdt) {
       };
     }
 
-    var previousValue = _classPrivateFieldGet(this, _map).get(key);
+    var previousValue = this._map.get(key);
 
     var reverse;
 
@@ -2010,7 +2021,7 @@ var LiveObject = function (_AbstractCrdt) {
       }];
     }
 
-    _classPrivateFieldGet(this, _map).set(key, child);
+    this._map.set(key, child);
 
     child._setParentLink(this, key);
 
@@ -2034,13 +2045,13 @@ var LiveObject = function (_AbstractCrdt) {
 
       var reverse = child._serialize(this._id, child._parentKey, this._doc);
 
-      for (var _iterator4 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map)), _step4; !(_step4 = _iterator4()).done;) {
+      for (var _iterator4 = _createForOfIteratorHelperLoose(this._map), _step4; !(_step4 = _iterator4()).done;) {
         var _step4$value = _step4.value,
             key = _step4$value[0],
             value = _step4$value[1];
 
         if (value === child) {
-          _classPrivateFieldGet(this, _map).delete(key);
+          this._map.delete(key);
         }
       }
 
@@ -2065,12 +2076,12 @@ var LiveObject = function (_AbstractCrdt) {
   };
 
   _proto._detachChildren = function _detachChildren() {
-    for (var _iterator5 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map)), _step5; !(_step5 = _iterator5()).done;) {
+    for (var _iterator5 = _createForOfIteratorHelperLoose(this._map), _step5; !(_step5 = _iterator5()).done;) {
       var _step5$value = _step5.value,
           key = _step5$value[0],
           value = _step5$value[1];
 
-      _classPrivateFieldGet(this, _map).delete(key);
+      this._map.delete(key);
 
       value._detach();
     }
@@ -2079,7 +2090,7 @@ var LiveObject = function (_AbstractCrdt) {
   _proto._detach = function _detach() {
     _AbstractCrdt.prototype._detach.call(this);
 
-    for (var _iterator6 = _createForOfIteratorHelperLoose(_classPrivateFieldGet(this, _map).values()), _step6; !(_step6 = _iterator6()).done;) {
+    for (var _iterator6 = _createForOfIteratorHelperLoose(this._map.values()), _step6; !(_step6 = _iterator6()).done;) {
       var value = _step6.value;
 
       if (isCrdt(value)) {
@@ -2090,9 +2101,9 @@ var LiveObject = function (_AbstractCrdt) {
 
   _proto._apply = function _apply(op, isLocal) {
     if (op.type === OpType.UpdateObject) {
-      return _classPrivateMethodGet(this, _applyUpdate, _applyUpdate2).call(this, op, isLocal);
+      return this._applyUpdate(op, isLocal);
     } else if (op.type === OpType.DeleteObjectKey) {
-      return _classPrivateMethodGet(this, _applyDeleteObjectKey, _applyDeleteObjectKey2).call(this, op);
+      return this._applyDeleteObjectKey(op);
     }
 
     return _AbstractCrdt.prototype._apply.call(this, op, isLocal);
@@ -2101,16 +2112,150 @@ var LiveObject = function (_AbstractCrdt) {
   _proto._toSerializedCrdt = function _toSerializedCrdt() {
     var _this$_parent;
 
+    var data = {};
+
+    for (var _iterator7 = _createForOfIteratorHelperLoose(this._map), _step7; !(_step7 = _iterator7()).done;) {
+      var _step7$value = _step7.value,
+          key = _step7$value[0],
+          value = _step7$value[1];
+
+      if (value instanceof AbstractCrdt === false) {
+        data[key] = value;
+      }
+    }
+
     return {
       type: CrdtType.Object,
       parentId: (_this$_parent = this._parent) == null ? void 0 : _this$_parent._id,
       parentKey: this._parentKey,
-      data: this.toObject()
+      data: data
+    };
+  };
+
+  _proto._applyUpdate = function _applyUpdate(op, isLocal) {
+    var isModified = false;
+    var reverse = [];
+    var reverseUpdate = {
+      type: OpType.UpdateObject,
+      id: this._id,
+      data: {}
+    };
+    reverse.push(reverseUpdate);
+
+    for (var key in op.data) {
+      var oldValue = this._map.get(key);
+
+      if (oldValue instanceof AbstractCrdt) {
+        reverse.push.apply(reverse, oldValue._serialize(this._id, key));
+
+        oldValue._detach();
+      } else if (oldValue !== undefined) {
+        reverseUpdate.data[key] = oldValue;
+      } else if (oldValue === undefined) {
+        reverse.push({
+          type: OpType.DeleteObjectKey,
+          id: this._id,
+          key: key
+        });
+      }
+    }
+
+    var updateDelta = {};
+
+    for (var _key2 in op.data) {
+      if (isLocal) {
+        this._propToLastUpdate.set(_key2, op.opId);
+      } else if (this._propToLastUpdate.get(_key2) == null) {
+        isModified = true;
+      } else if (this._propToLastUpdate.get(_key2) === op.opId) {
+        this._propToLastUpdate.delete(_key2);
+
+        continue;
+      } else {
+        continue;
+      }
+
+      var _oldValue = this._map.get(_key2);
+
+      if (isCrdt(_oldValue)) {
+        _oldValue._detach();
+      }
+
+      isModified = true;
+      updateDelta[_key2] = {
+        type: "update"
+      };
+
+      this._map.set(_key2, op.data[_key2]);
+    }
+
+    if (Object.keys(reverseUpdate.data).length !== 0) {
+      reverse.unshift(reverseUpdate);
+    }
+
+    return isModified ? {
+      modified: {
+        node: this,
+        type: "LiveObject",
+        updates: updateDelta
+      },
+      reverse: reverse
+    } : {
+      modified: false
+    };
+  };
+
+  _proto._applyDeleteObjectKey = function _applyDeleteObjectKey(op) {
+    var _updates3;
+
+    var key = op.key;
+
+    if (this._map.has(key) === false) {
+      return {
+        modified: false
+      };
+    }
+
+    if (this._propToLastUpdate.get(key) !== undefined) {
+      return {
+        modified: false
+      };
+    }
+
+    var oldValue = this._map.get(key);
+
+    var reverse = [];
+
+    if (isCrdt(oldValue)) {
+      reverse = oldValue._serialize(this._id, op.key);
+
+      oldValue._detach();
+    } else if (oldValue !== undefined) {
+      var _data2;
+
+      reverse = [{
+        type: OpType.UpdateObject,
+        id: this._id,
+        data: (_data2 = {}, _data2[key] = oldValue, _data2)
+      }];
+    }
+
+    this._map.delete(key);
+
+    return {
+      modified: {
+        node: this,
+        type: "LiveObject",
+        updates: (_updates3 = {}, _updates3[op.key] = {
+          type: "delete"
+        }, _updates3)
+      },
+      reverse: reverse
     };
   };
 
   _proto.toObject = function toObject() {
-    return Object.fromEntries(_classPrivateFieldGet(this, _map));
+    return Object.fromEntries(this._map);
   };
 
   _proto.set = function set(key, value) {
@@ -2120,15 +2265,15 @@ var LiveObject = function (_AbstractCrdt) {
   };
 
   _proto.get = function get(key) {
-    return _classPrivateFieldGet(this, _map).get(key);
+    return this._map.get(key);
   };
 
   _proto.delete = function _delete(key) {
-    var _updates3;
+    var _updates4;
 
     var keyAsString = key;
 
-    var oldValue = _classPrivateFieldGet(this, _map).get(keyAsString);
+    var oldValue = this._map.get(keyAsString);
 
     if (oldValue === undefined) {
       return;
@@ -2139,7 +2284,7 @@ var LiveObject = function (_AbstractCrdt) {
         oldValue._detach();
       }
 
-      _classPrivateFieldGet(this, _map).delete(keyAsString);
+      this._map.delete(keyAsString);
 
       return;
     }
@@ -2151,24 +2296,24 @@ var LiveObject = function (_AbstractCrdt) {
 
       reverse = oldValue._serialize(this._id, keyAsString);
     } else {
-      var _data2;
+      var _data3;
 
       reverse = [{
         type: OpType.UpdateObject,
-        data: (_data2 = {}, _data2[keyAsString] = oldValue, _data2),
+        data: (_data3 = {}, _data3[keyAsString] = oldValue, _data3),
         id: this._id
       }];
     }
 
-    _classPrivateFieldGet(this, _map).delete(keyAsString);
+    this._map.delete(keyAsString);
 
     var storageUpdates = new Map();
     storageUpdates.set(this._id, {
       node: this,
       type: "LiveObject",
-      updates: (_updates3 = {}, _updates3[key] = {
+      updates: (_updates4 = {}, _updates4[key] = {
         type: "delete"
-      }, _updates3)
+      }, _updates4)
     });
 
     this._doc.dispatch([{
@@ -2184,7 +2329,7 @@ var LiveObject = function (_AbstractCrdt) {
 
     if (this._doc == null || this._id == null) {
       for (var key in overrides) {
-        var oldValue = _classPrivateFieldGet(this, _map).get(key);
+        var oldValue = this._map.get(key);
 
         if (oldValue instanceof AbstractCrdt) {
           oldValue._detach();
@@ -2196,7 +2341,7 @@ var LiveObject = function (_AbstractCrdt) {
           newValue._setParentLink(this, key);
         }
 
-        _classPrivateFieldGet(this, _map).set(key, newValue);
+        this._map.set(key, newValue);
       }
 
       return;
@@ -2215,50 +2360,50 @@ var LiveObject = function (_AbstractCrdt) {
     };
     var updateDelta = {};
 
-    for (var _key2 in overrides) {
-      var _oldValue = _classPrivateFieldGet(this, _map).get(_key2);
+    for (var _key3 in overrides) {
+      var _oldValue2 = this._map.get(_key3);
 
-      if (_oldValue instanceof AbstractCrdt) {
-        reverseOps.push.apply(reverseOps, _oldValue._serialize(this._id, _key2));
+      if (_oldValue2 instanceof AbstractCrdt) {
+        reverseOps.push.apply(reverseOps, _oldValue2._serialize(this._id, _key3));
 
-        _oldValue._detach();
-      } else if (_oldValue === undefined) {
+        _oldValue2._detach();
+      } else if (_oldValue2 === undefined) {
         reverseOps.push({
           type: OpType.DeleteObjectKey,
           id: this._id,
-          key: _key2
+          key: _key3
         });
       } else {
-        reverseUpdateOp.data[_key2] = _oldValue;
+        reverseUpdateOp.data[_key3] = _oldValue2;
       }
 
-      var _newValue = overrides[_key2];
+      var _newValue = overrides[_key3];
 
       if (_newValue instanceof AbstractCrdt) {
-        _newValue._setParentLink(this, _key2);
+        _newValue._setParentLink(this, _key3);
 
         _newValue._attach(this._doc.generateId(), this._doc);
 
-        var newAttachChildOps = _newValue._serialize(this._id, _key2, this._doc);
+        var newAttachChildOps = _newValue._serialize(this._id, _key3, this._doc);
 
         var createCrdtOp = newAttachChildOps.find(function (op) {
           return op.parentId === _this2._id;
         });
 
         if (createCrdtOp) {
-          _classPrivateFieldGet(this, _propToLastUpdate).set(_key2, createCrdtOp.opId);
+          this._propToLastUpdate.set(_key3, createCrdtOp.opId);
         }
 
         ops.push.apply(ops, newAttachChildOps);
       } else {
-        updatedProps[_key2] = _newValue;
+        updatedProps[_key3] = _newValue;
 
-        _classPrivateFieldGet(this, _propToLastUpdate).set(_key2, opId);
+        this._propToLastUpdate.set(_key3, opId);
       }
 
-      _classPrivateFieldGet(this, _map).set(_key2, _newValue);
+      this._map.set(_key3, _newValue);
 
-      updateDelta[_key2] = {
+      updateDelta[_key3] = {
         type: "update"
       };
     }
@@ -2289,128 +2434,6 @@ var LiveObject = function (_AbstractCrdt) {
   return LiveObject;
 }(AbstractCrdt);
 
-function _applyUpdate2(op, isLocal) {
-  var isModified = false;
-  var reverse = [];
-  var reverseUpdate = {
-    type: OpType.UpdateObject,
-    id: this._id,
-    data: {}
-  };
-  reverse.push(reverseUpdate);
-
-  for (var key in op.data) {
-    var oldValue = _classPrivateFieldGet(this, _map).get(key);
-
-    if (oldValue instanceof AbstractCrdt) {
-      reverse.push.apply(reverse, oldValue._serialize(this._id, key));
-
-      oldValue._detach();
-    } else if (oldValue !== undefined) {
-      reverseUpdate.data[key] = oldValue;
-    } else if (oldValue === undefined) {
-      reverse.push({
-        type: OpType.DeleteObjectKey,
-        id: this._id,
-        key: key
-      });
-    }
-  }
-
-  var updateDelta = {};
-
-  for (var _key3 in op.data) {
-    if (isLocal) {
-      _classPrivateFieldGet(this, _propToLastUpdate).set(_key3, op.opId);
-    } else if (_classPrivateFieldGet(this, _propToLastUpdate).get(_key3) == null) {
-      isModified = true;
-    } else if (_classPrivateFieldGet(this, _propToLastUpdate).get(_key3) === op.opId) {
-      _classPrivateFieldGet(this, _propToLastUpdate).delete(_key3);
-
-      continue;
-    } else {
-      continue;
-    }
-
-    var _oldValue2 = _classPrivateFieldGet(this, _map).get(_key3);
-
-    if (isCrdt(_oldValue2)) {
-      _oldValue2._detach();
-    }
-
-    isModified = true;
-    updateDelta[_key3] = {
-      type: "update"
-    };
-
-    _classPrivateFieldGet(this, _map).set(_key3, op.data[_key3]);
-  }
-
-  if (Object.keys(reverseUpdate.data).length !== 0) {
-    reverse.unshift(reverseUpdate);
-  }
-
-  return isModified ? {
-    modified: {
-      node: this,
-      type: "LiveObject",
-      updates: updateDelta
-    },
-    reverse: reverse
-  } : {
-    modified: false
-  };
-}
-
-function _applyDeleteObjectKey2(op) {
-  var _updates4;
-
-  var key = op.key;
-
-  if (_classPrivateFieldGet(this, _map).has(key) === false) {
-    return {
-      modified: false
-    };
-  }
-
-  if (_classPrivateFieldGet(this, _propToLastUpdate).get(key) !== undefined) {
-    return {
-      modified: false
-    };
-  }
-
-  var oldValue = _classPrivateFieldGet(this, _map).get(key);
-
-  var reverse = [];
-
-  if (isCrdt(oldValue)) {
-    reverse = oldValue._serialize(this._id, op.key);
-
-    oldValue._detach();
-  } else if (oldValue !== undefined) {
-    var _data3;
-
-    reverse = [{
-      type: OpType.UpdateObject,
-      id: this._id,
-      data: (_data3 = {}, _data3[key] = oldValue, _data3)
-    }];
-  }
-
-  _classPrivateFieldGet(this, _map).delete(key);
-
-  return {
-    modified: {
-      node: this,
-      type: "LiveObject",
-      updates: (_updates4 = {}, _updates4[op.key] = {
-        type: "delete"
-      }, _updates4)
-    },
-    reverse: reverse
-  };
-}
-
 var BACKOFF_RETRY_DELAYS = [250, 500, 1000, 2000, 4000, 8000, 10000];
 var BACKOFF_RETRY_DELAYS_SLOW = [2000, 30000, 60000, 300000];
 var HEARTBEAT_INTERVAL = 30000;
@@ -2453,19 +2476,28 @@ function makeOthers(userMap) {
 function makeStateMachine(state, context, mockedEffects) {
   var effects = mockedEffects || {
     authenticate: function authenticate(auth, createWebSocket) {
-      return auth(context.room).then(function (_ref2) {
-        var token = _ref2.token;
-
-        if (state.connection.state !== "authenticating") {
-          return;
-        }
+      var token = state.token;
 
+      if (token && isTokenValid(token)) {
         var parsedToken = parseToken(token);
         var socket = createWebSocket(token);
         authenticationSuccess(parsedToken, socket);
-      }).catch(function (er) {
-        return authenticationFailure(er);
-      });
+      } else {
+        return auth(context.roomId).then(function (_ref2) {
+          var token = _ref2.token;
+
+          if (state.connection.state !== "authenticating") {
+            return;
+          }
+
+          var parsedToken = parseToken(token);
+          var socket = createWebSocket(token);
+          authenticationSuccess(parsedToken, socket);
+          state.token = token;
+        }).catch(function (er) {
+          return authenticationFailure(er);
+        });
+      }
     },
     send: function send(messageOrMessages) {
       if (state.socket == null) {
@@ -2528,9 +2560,9 @@ function makeStateMachine(state, context, mockedEffects) {
       state.root = load(message.items);
     }
 
-    for (var _key2 in state.defaultStorageRoot) {
-      if (state.root.get(_key2) == null) {
-        state.root.set(_key2, state.defaultStorageRoot[_key2]);
+    for (var _key in state.defaultStorageRoot) {
+      if (state.root.get(_key) == null) {
+        state.root.set(_key, state.defaultStorageRoot[_key]);
       }
     }
   }
@@ -2589,7 +2621,7 @@ function makeStateMachine(state, context, mockedEffects) {
       generateId: generateId,
       generateOpId: generateOpId,
       dispatch: storageDispatch,
-      roomId: context.room
+      roomId: context.roomId
     });
   }
 
@@ -2714,8 +2746,8 @@ function makeStateMachine(state, context, mockedEffects) {
           data: {}
         };
 
-        for (var _key3 in op.data) {
-          reverse.data[_key3] = state.me[_key3];
+        for (var _key2 in op.data) {
+          reverse.data[_key2] = state.me[_key2];
         }
 
         state.me = _extends({}, state.me, op.data);
@@ -2723,8 +2755,8 @@ function makeStateMachine(state, context, mockedEffects) {
         if (state.buffer.presence == null) {
           state.buffer.presence = op.data;
         } else {
-          for (var _key4 in op.data) {
-            state.buffer.presence[_key4] = op.data;
+          for (var _key3 in op.data) {
+            state.buffer.presence[_key3] = op.data;
           }
         }
 
@@ -2799,55 +2831,19 @@ function makeStateMachine(state, context, mockedEffects) {
         }
 
       case OpType.CreateObject:
-        {
-          var parent = state.items.get(op.parentId);
-
-          if (parent == null) {
-            return {
-              modified: false
-            };
-          }
-
-          return parent._attachChild(op.id, op.parentKey, new LiveObject(op.data), op.opId, isLocal);
-        }
-
       case OpType.CreateList:
-        {
-          var _parent = state.items.get(op.parentId);
-
-          if (_parent == null) {
-            return {
-              modified: false
-            };
-          }
-
-          return _parent._attachChild(op.id, op.parentKey, new LiveList(), op.opId, isLocal);
-        }
-
-      case OpType.CreateRegister:
-        {
-          var _parent2 = state.items.get(op.parentId);
-
-          if (_parent2 == null) {
-            return {
-              modified: false
-            };
-          }
-
-          return _parent2._attachChild(op.id, op.parentKey, new LiveRegister(op.data), op.opId, isLocal);
-        }
-
       case OpType.CreateMap:
+      case OpType.CreateRegister:
         {
-          var _parent3 = state.items.get(op.parentId);
+          var parent = state.items.get(op.parentId);
 
-          if (_parent3 == null) {
+          if (parent == null) {
             return {
               modified: false
             };
           }
 
-          return _parent3._attachChild(op.id, op.parentKey, new LiveMap(), op.opId, isLocal);
+          return parent._attachChild(op, isLocal);
         }
     }
 
@@ -2916,9 +2912,9 @@ function makeStateMachine(state, context, mockedEffects) {
       state.buffer.presence = {};
     }
 
-    for (var _key5 in overrides) {
-      state.buffer.presence[_key5] = overrides[_key5];
-      oldValues[_key5] = state.me[_key5];
+    for (var _key4 in overrides) {
+      state.buffer.presence[_key4] = overrides[_key4];
+      oldValues[_key4] = state.me[_key4];
     }
 
     state.me = _extends({}, state.me, overrides);
@@ -2968,6 +2964,7 @@ function makeStateMachine(state, context, mockedEffects) {
       console.error("Call to authentication endpoint failed", error);
     }
 
+    state.token = null;
     updateConnection({
       state: "unavailable"
     });
@@ -3029,10 +3026,10 @@ function makeStateMachine(state, context, mockedEffects) {
   function onRoomStateMessage(message) {
     var newUsers = {};
 
-    for (var _key6 in message.users) {
-      var _connectionId = Number.parseInt(_key6);
+    for (var _key5 in message.users) {
+      var _connectionId = Number.parseInt(_key5);
 
-      var user = message.users[_key6];
+      var user = message.users[_key5];
       newUsers[_connectionId] = {
         connectionId: _connectionId,
         info: user.info,
@@ -3086,19 +3083,38 @@ function makeStateMachine(state, context, mockedEffects) {
     };
   }
 
+  function parseServerMessage(data) {
+    if (!isJsonObject(data)) {
+      return null;
+    }
+
+    return data;
+  }
+
+  function parseServerMessages(text) {
+    var data = parseJson(text);
+
+    if (data === undefined) {
+      return null;
+    } else if (isJsonArray(data)) {
+      return compact(data.map(function (item) {
+        return parseServerMessage(item);
+      }));
+    } else {
+      return compact([parseServerMessage(data)]);
+    }
+  }
+
   function onMessage(event) {
     if (event.data === "pong") {
       clearTimeout(state.timeoutHandles.pongTimeout);
       return;
     }
 
-    var message = JSON.parse(event.data);
-    var subMessages = [];
+    var messages = parseServerMessages(event.data);
 
-    if (Array.isArray(message)) {
-      subMessages = message;
-    } else {
-      subMessages.push(message);
+    if (messages === null || messages.length === 0) {
+      return;
     }
 
     var updates = {
@@ -3106,10 +3122,10 @@ function makeStateMachine(state, context, mockedEffects) {
       others: []
     };
 
-    for (var _iterator9 = _createForOfIteratorHelperLoose(subMessages), _step9; !(_step9 = _iterator9()).done;) {
-      var subMessage = _step9.value;
+    for (var _iterator9 = _createForOfIteratorHelperLoose(messages), _step9; !(_step9 = _iterator9()).done;) {
+      var message = _step9.value;
 
-      switch (subMessage.type) {
+      switch (message.type) {
         case ServerMessageType.UserJoined:
           {
             updates.others.push(onUserJoinedMessage(message));
@@ -3118,7 +3134,7 @@ function makeStateMachine(state, context, mockedEffects) {
 
         case ServerMessageType.UpdatePresence:
           {
-            var othersPresenceUpdate = onUpdatePresenceMessage(subMessage);
+            var othersPresenceUpdate = onUpdatePresenceMessage(message);
 
             if (othersPresenceUpdate) {
               updates.others.push(othersPresenceUpdate);
@@ -3129,13 +3145,13 @@ function makeStateMachine(state, context, mockedEffects) {
 
         case ServerMessageType.Event:
           {
-            onEvent(subMessage);
+            onEvent(message);
             break;
           }
 
         case ServerMessageType.UserLeft:
           {
-            var _event = onUserLeftMessage(subMessage);
+            var _event = onUserLeftMessage(message);
 
             if (_event) {
               updates.others.push(_event);
@@ -3146,21 +3162,22 @@ function makeStateMachine(state, context, mockedEffects) {
 
         case ServerMessageType.RoomState:
           {
-            updates.others.push(onRoomStateMessage(subMessage));
+            updates.others.push(onRoomStateMessage(message));
             break;
           }
 
         case ServerMessageType.InitialStorageState:
           {
-            createOrUpdateRootFromMessage(subMessage);
-            applyAndSendOfflineOps();
+            var offlineOps = new Map(state.offlineOperations);
+            createOrUpdateRootFromMessage(message);
+            applyAndSendOfflineOps(offlineOps);
             _getInitialStateResolver == null ? void 0 : _getInitialStateResolver();
             break;
           }
 
         case ServerMessageType.UpdateStorage:
           {
-            var applyResult = apply(subMessage.ops, false);
+            var applyResult = apply(message.ops, false);
             applyResult.updates.storageUpdates.forEach(function (value, key) {
               updates.storageUpdates.set(key, mergeStorageUpdates(updates.storageUpdates.get(key), value));
             });
@@ -3325,13 +3342,13 @@ function makeStateMachine(state, context, mockedEffects) {
     connect();
   }
 
-  function applyAndSendOfflineOps() {
-    if (state.offlineOperations.size === 0) {
+  function applyAndSendOfflineOps(offlineOps) {
+    if (offlineOps.size === 0) {
       return;
     }
 
     var messages = [];
-    var ops = Array.from(state.offlineOperations.values());
+    var ops = Array.from(offlineOps.values());
     var result = apply(ops, true);
     messages.push({
       type: ClientMessageType.UpdateStorage,
@@ -3437,8 +3454,8 @@ function makeStateMachine(state, context, mockedEffects) {
   }
 
   function clearListeners() {
-    for (var _key7 in state.listeners) {
-      state.listeners[_key7] = [];
+    for (var _key6 in state.listeners) {
+      state.listeners[_key6] = [];
     }
   }
 
@@ -3664,6 +3681,7 @@ function defaultState(me, defaultStorageRoot) {
     connection: {
       state: "closed"
     },
+    token: null,
     lastConnectionId: null,
     socket: null,
     listeners: {
@@ -3719,7 +3737,7 @@ function createRoom(options, context) {
   var state = defaultState(options.defaultPresence, options.defaultStorageRoot);
   var machine = makeStateMachine(state, context);
   var room = {
-    id: context.room,
+    id: context.roomId,
     getConnectionState: machine.selectors.getConnectionState,
     getSelf: machine.selectors.getSelf,
     subscribe: machine.subscribe,
@@ -3771,13 +3789,17 @@ function parseToken(token) {
     throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
   }
 
-  var data = JSON.parse(atob(tokenParts[1]));
+  var data = parseJson(atob(tokenParts[1]));
 
-  if (typeof data.actor !== "number") {
-    throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
+  if (data !== undefined && isJsonObject(data) && typeof data.actor === "number" && (data.id === undefined || typeof data.id === "string")) {
+    return {
+      actor: data.actor,
+      id: data.id,
+      info: data.info
+    };
   }
 
-  return data;
+  throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
 }
 
 function prepareCreateWebSocket(liveblocksServer, WebSocketPolyfill) {
@@ -3883,7 +3905,7 @@ function createClient(options) {
       defaultPresence: options.defaultPresence,
       defaultStorageRoot: options.defaultStorageRoot
     }, {
-      room: roomId,
+      roomId: roomId,
       throttleDelay: throttleDelay,
       WebSocketPolyfill: clientOptions.WebSocketPolyfill,
       fetchPolyfill: clientOptions.fetchPolyfill,
@@ -3969,33 +3991,42 @@ function prepareAuthentication(clientOptions) {
   throw new Error("Invalid Liveblocks client options. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient");
 }
 
-function liveObjectToJson(liveObject) {
+function lsonObjectToJson(obj) {
   var result = {};
-  var obj = liveObject.toObject();
 
   for (var _key in obj) {
-    result[_key] = liveNodeToJson(obj[_key]);
+    result[_key] = lsonToJson(obj[_key]);
   }
 
   return result;
 }
 
+function liveObjectToJson(liveObject) {
+  return lsonObjectToJson(liveObject.toObject());
+}
+
 function liveMapToJson(map) {
   var result = {};
-  var obj = Object.fromEntries(map);
 
-  for (var _key2 in obj) {
-    result[_key2] = liveNodeToJson(obj[_key2]);
+  for (var _iterator = _createForOfIteratorHelperLoose(map.entries()), _step; !(_step = _iterator()).done;) {
+    var _step$value = _step.value,
+        _key2 = _step$value[0],
+        value = _step$value[1];
+    result[_key2] = lsonToJson(value);
   }
 
   return result;
 }
 
+function lsonListToJson(value) {
+  return value.map(lsonToJson);
+}
+
 function liveListToJson(value) {
-  return value.toArray().map(liveNodeToJson);
+  return lsonListToJson(value.toArray());
 }
 
-function liveNodeToJson(value) {
+function lsonToJson(value) {
   if (value instanceof LiveObject) {
     return liveObjectToJson(value);
   } else if (value instanceof LiveList) {
@@ -4004,13 +4035,21 @@ function liveNodeToJson(value) {
     return liveMapToJson(value);
   } else if (value instanceof LiveRegister) {
     return value.data;
+  } else if (value instanceof AbstractCrdt) {
+    throw new Error("Unhandled subclass of AbstractCrdt encountered");
+  }
+
+  if (Array.isArray(value)) {
+    return lsonListToJson(value);
+  } else if (isPlainObject(value)) {
+    return lsonObjectToJson(value);
   }
 
   return value;
 }
 
 function isPlainObject(obj) {
-  return Object.prototype.toString.call(obj) === "[object Object]";
+  return obj !== null && Object.prototype.toString.call(obj) === "[object Object]";
 }
 
 function anyToCrdt(obj) {
@@ -4093,8 +4132,7 @@ function patchLiveList(liveList, prev, next) {
       if (liveListNode instanceof LiveObject && isPlainObject(prevNode) && isPlainObject(nextNode)) {
         patchLiveObject(liveListNode, prevNode, nextNode);
       } else {
-        liveList.delete(i);
-        liveList.insert(anyToCrdt(nextNode), i);
+        liveList.set(i, anyToCrdt(nextNode));
       }
 
       i++;
@@ -4105,9 +4143,11 @@ function patchLiveList(liveList, prev, next) {
       i++;
     }
 
-    while (i <= prevEnd) {
+    var _localI = i;
+
+    while (_localI <= prevEnd) {
       liveList.delete(i);
-      i++;
+      _localI++;
     }
   }
 }
@@ -4199,7 +4239,7 @@ function patchImmutableNode(state, path, update) {
             var _update$updates$_key, _update$updates$_key2;
 
             if (((_update$updates$_key = update.updates[_key6]) == null ? void 0 : _update$updates$_key.type) === "update") {
-              newState[_key6] = liveNodeToJson(update.node.get(_key6));
+              newState[_key6] = lsonToJson(update.node.get(_key6));
             } else if (((_update$updates$_key2 = update.updates[_key6]) == null ? void 0 : _update$updates$_key2.type) === "delete") {
               delete newState[_key6];
             }
@@ -4218,24 +4258,32 @@ function patchImmutableNode(state, path, update) {
             return x;
           });
 
-          for (var _iterator = _createForOfIteratorHelperLoose(update.updates), _step; !(_step = _iterator()).done;) {
-            var listUpdate = _step.value;
+          var _loop = function _loop() {
+            var listUpdate = _step2.value;
 
-            if (listUpdate.type === "insert") {
+            if (listUpdate.type === "set") {
+              _newState = _newState.map(function (item, index) {
+                return index === listUpdate.index ? listUpdate.item : item;
+              });
+            } else if (listUpdate.type === "insert") {
               if (listUpdate.index === _newState.length) {
-                _newState.push(liveNodeToJson(listUpdate.item));
+                _newState.push(lsonToJson(listUpdate.item));
               } else {
-                _newState = [].concat(_newState.slice(0, listUpdate.index), [liveNodeToJson(listUpdate.item)], _newState.slice(listUpdate.index));
+                _newState = [].concat(_newState.slice(0, listUpdate.index), [lsonToJson(listUpdate.item)], _newState.slice(listUpdate.index));
               }
             } else if (listUpdate.type === "delete") {
               _newState.splice(listUpdate.index, 1);
             } else if (listUpdate.type === "move") {
               if (listUpdate.previousIndex > listUpdate.index) {
-                _newState = [].concat(_newState.slice(0, listUpdate.index), [liveNodeToJson(listUpdate.item)], _newState.slice(listUpdate.index, listUpdate.previousIndex), _newState.slice(listUpdate.previousIndex + 1));
+                _newState = [].concat(_newState.slice(0, listUpdate.index), [lsonToJson(listUpdate.item)], _newState.slice(listUpdate.index, listUpdate.previousIndex), _newState.slice(listUpdate.previousIndex + 1));
               } else {
-                _newState = [].concat(_newState.slice(0, listUpdate.previousIndex), _newState.slice(listUpdate.previousIndex + 1, listUpdate.index + 1), [liveNodeToJson(listUpdate.item)], _newState.slice(listUpdate.index + 1));
+                _newState = [].concat(_newState.slice(0, listUpdate.previousIndex), _newState.slice(listUpdate.previousIndex + 1, listUpdate.index + 1), [lsonToJson(listUpdate.item)], _newState.slice(listUpdate.index + 1));
               }
             }
+          };
+
+          for (var _iterator2 = _createForOfIteratorHelperLoose(update.updates), _step2; !(_step2 = _iterator2()).done;) {
+            _loop();
           }
 
           return _newState;
@@ -4253,7 +4301,7 @@ function patchImmutableNode(state, path, update) {
             var _update$updates$_key3, _update$updates$_key4;
 
             if (((_update$updates$_key3 = update.updates[_key7]) == null ? void 0 : _update$updates$_key3.type) === "update") {
-              _newState2[_key7] = liveNodeToJson(update.node.get(_key7));
+              _newState2[_key7] = lsonToJson(update.node.get(_key7));
             } else if (((_update$updates$_key4 = update.updates[_key7]) == null ? void 0 : _update$updates$_key4.type) === "delete") {
               delete _newState2[_key7];
             }
@@ -4277,7 +4325,7 @@ function patchImmutableNode(state, path, update) {
 
 var internals = {
   liveObjectToJson: liveObjectToJson,
-  liveNodeToJson: liveNodeToJson,
+  lsonToJson: lsonToJson,
   patchLiveList: patchLiveList,
   patchImmutableObject: patchImmutableObject,
   patchLiveObject: patchLiveObject,