@liveblocks/client 0.15.11 → 0.16.2

package/{lib/index.js → index.js}

@@ -469,7 +469,7 @@ var LiveRegister = function (_AbstractCrdt) {
     return _this;
   }
 
-  LiveRegister._deserialize = function _deserialize(_ref, parentToChildren, doc) {
+  LiveRegister._deserialize = function _deserialize(_ref, _parentToChildren, doc) {
     var id = _ref[0],
         item = _ref[1];
 
@@ -486,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");
     }
@@ -495,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
@@ -512,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.");
   };
 
@@ -591,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");
     }
@@ -604,6 +605,7 @@ 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
@@ -648,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
@@ -670,7 +678,26 @@ var LiveList = function (_AbstractCrdt) {
     var newKey = key;
 
     if (index !== -1) {
-      if (isLocal) {
+      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);
@@ -1009,6 +1036,43 @@ var LiveList = function (_AbstractCrdt) {
     }
   };
 
+  _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 this._items.map(function (entry) {
       return selfOrRegisterValue(entry[0]);
@@ -1135,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");
     }
@@ -1149,6 +1213,7 @@ var LiveMap = function (_AbstractCrdt) {
       id: this._id,
       opId: doc == null ? void 0 : doc.generateOpId(),
       type: OpType.CreateMap,
+      intent: intent,
       parentId: parentId,
       parentKey: parentKey
     };
@@ -1214,13 +1279,18 @@ 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
@@ -1465,6 +1535,20 @@ var LiveMap = function (_AbstractCrdt) {
   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) {
@@ -1473,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;
@@ -1606,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;
 }
 
@@ -1681,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 {
@@ -1706,19 +1823,15 @@ function findNonSerializableValue(value, path) {
   return false;
 }
 function isTokenValid(token) {
-  if (token === null) {
-    return false;
-  }
-
   var tokenParts = token.split(".");
 
   if (tokenParts.length !== 3) {
     return false;
   }
 
-  var data = JSON.parse(atob(tokenParts[1]));
+  var data = parseJson(atob(tokenParts[1]));
 
-  if (typeof data.exp !== "number") {
+  if (data === undefined || !isJsonObject(data) || typeof data.exp !== "number") {
     return false;
   }
 
@@ -1730,6 +1843,9 @@ function isTokenValid(token) {
 
   return true;
 }
+function entries(obj) {
+  return Object.entries(obj);
+}
 
 var LiveObject = function (_AbstractCrdt) {
   _inheritsLoose(LiveObject, _AbstractCrdt);
@@ -1758,7 +1874,7 @@ var LiveObject = function (_AbstractCrdt) {
 
   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");
     }
@@ -1767,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,
@@ -1843,13 +1960,19 @@ 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 (this._propToLastUpdate.get(key) === opId) {
         this._propToLastUpdate.delete(key);
@@ -2353,12 +2476,14 @@ function makeOthers(userMap) {
 function makeStateMachine(state, context, mockedEffects) {
   var effects = mockedEffects || {
     authenticate: function authenticate(auth, createWebSocket) {
-      if (isTokenValid(state.token)) {
-        var parsedToken = parseToken(state.token);
-        var socket = createWebSocket(state.token);
+      var token = state.token;
+
+      if (token && isTokenValid(token)) {
+        var parsedToken = parseToken(token);
+        var socket = createWebSocket(token);
         authenticationSuccess(parsedToken, socket);
       } else {
-        return auth(context.room).then(function (_ref2) {
+        return auth(context.roomId).then(function (_ref2) {
           var token = _ref2.token;
 
           if (state.connection.state !== "authenticating") {
@@ -2435,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]);
       }
     }
   }
@@ -2496,7 +2621,7 @@ function makeStateMachine(state, context, mockedEffects) {
       generateId: generateId,
       generateOpId: generateOpId,
       dispatch: storageDispatch,
-      roomId: context.room
+      roomId: context.roomId
     });
   }
 
@@ -2621,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);
@@ -2630,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;
           }
         }
 
@@ -2706,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);
         }
     }
 
@@ -2823,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);
@@ -2937,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,
@@ -2994,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 = {
@@ -3014,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));
@@ -3026,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);
@@ -3037,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);
@@ -3054,14 +3162,14 @@ function makeStateMachine(state, context, mockedEffects) {
 
         case ServerMessageType.RoomState:
           {
-            updates.others.push(onRoomStateMessage(subMessage));
+            updates.others.push(onRoomStateMessage(message));
             break;
           }
 
         case ServerMessageType.InitialStorageState:
           {
             var offlineOps = new Map(state.offlineOperations);
-            createOrUpdateRootFromMessage(subMessage);
+            createOrUpdateRootFromMessage(message);
             applyAndSendOfflineOps(offlineOps);
             _getInitialStateResolver == null ? void 0 : _getInitialStateResolver();
             break;
@@ -3069,7 +3177,7 @@ function makeStateMachine(state, context, mockedEffects) {
 
         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));
             });
@@ -3346,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] = [];
     }
   }
 
@@ -3629,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,
@@ -3681,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) {
@@ -3793,7 +3905,7 @@ function createClient(options) {
       defaultPresence: options.defaultPresence,
       defaultStorageRoot: options.defaultStorageRoot
     }, {
-      room: roomId,
+      roomId: roomId,
       throttleDelay: throttleDelay,
       WebSocketPolyfill: clientOptions.WebSocketPolyfill,
       fetchPolyfill: clientOptions.fetchPolyfill,
@@ -3879,33 +3991,46 @@ 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]);
+    var val = obj[_key];
+
+    if (val !== undefined) {
+      result[_key] = lsonToJson(val);
+    }
   }
 
   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) {
@@ -3914,13 +4039,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) {
@@ -4003,8 +4136,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++;
@@ -4015,9 +4147,11 @@ function patchLiveList(liveList, prev, next) {
       i++;
     }
 
-    while (i <= prevEnd) {
+    var _localI = i;
+
+    while (_localI <= prevEnd) {
       liveList.delete(i);
-      i++;
+      _localI++;
     }
   }
 }
@@ -4109,7 +4243,11 @@ 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));
+              var val = update.node.get(_key6);
+
+              if (val !== undefined) {
+                newState[_key6] = lsonToJson(val);
+              }
             } else if (((_update$updates$_key2 = update.updates[_key6]) == null ? void 0 : _update$updates$_key2.type) === "delete") {
               delete newState[_key6];
             }
@@ -4128,24 +4266,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;
@@ -4163,7 +4309,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];
             }
@@ -4187,7 +4333,7 @@ function patchImmutableNode(state, path, update) {
 
 var internals = {
   liveObjectToJson: liveObjectToJson,
-  liveNodeToJson: liveNodeToJson,
+  lsonToJson: lsonToJson,
   patchLiveList: patchLiveList,
   patchImmutableObject: patchImmutableObject,
   patchLiveObject: patchLiveObject,