@liveblocks/client 0.16.7 → 0.16.10

package/internal.js

@@ -140,34 +140,36 @@ function patchImmutableNode(state, path, update) {
  _extends2));
 }
 
-Object.defineProperty(exports, "ClientMessageType", {
+Object.defineProperty(exports, "ClientMsgCode", {
  enumerable: !0,
  get: function() {
-  return LiveObject.ClientMessageType;
+  return LiveObject.ClientMsgCode;
  }
 }), Object.defineProperty(exports, "CrdtType", {
  enumerable: !0,
  get: function() {
   return LiveObject.CrdtType;
  }
-}), Object.defineProperty(exports, "OpType", {
+}), Object.defineProperty(exports, "OpCode", {
  enumerable: !0,
  get: function() {
-  return LiveObject.OpType;
+  return LiveObject.OpCode;
  }
-}), Object.defineProperty(exports, "ServerMessageType", {
+}), Object.defineProperty(exports, "ServerMsgCode", {
  enumerable: !0,
  get: function() {
-  return LiveObject.ServerMessageType;
+  return LiveObject.ServerMsgCode;
  }
 }), Object.defineProperty(exports, "WebsocketCloseCodes", {
  enumerable: !0,
  get: function() {
   return LiveObject.WebsocketCloseCodes;
  }
-}), exports.comparePosition = LiveObject.comparePosition, exports.deprecate = LiveObject.deprecate, 
-exports.deprecateIf = LiveObject.deprecateIf, exports.errorIf = LiveObject.errorIf, 
-exports.makePosition = LiveObject.makePosition, exports.throwUsageError = LiveObject.throwUsageError, 
+}), exports.assertNever = LiveObject.assertNever, exports.comparePosition = LiveObject.comparePosition, 
+exports.deprecate = LiveObject.deprecate, exports.deprecateIf = LiveObject.deprecateIf, 
+exports.errorIf = LiveObject.errorIf, exports.isChildCrdt = LiveObject.isChildCrdt, 
+exports.isRootCrdt = LiveObject.isRootCrdt, exports.makePosition = LiveObject.makePosition, 
+exports.parseJson = LiveObject.parseJson, exports.throwUsageError = LiveObject.throwUsageError, 
 exports.lsonToJson = lsonToJson, exports.patchImmutableObject = function(state, updates) {
  return updates.reduce((function(state, update) {
   return function(state, update) {

package/internal.mjs

@@ -1,6 +1,6 @@
-import { L as LiveObject, b as LiveList, h as LiveMap, j as LiveRegister, A as AbstractCrdt, k as findNonSerializableValue } from "./shared.mjs";
+import { L as LiveObject, b as LiveList, j as LiveMap, k as LiveRegister, A as AbstractCrdt, l as findNonSerializableValue } from "./shared.mjs";
 
-export { C as ClientMessageType, o as CrdtType, O as OpType, S as ServerMessageType, W as WebsocketCloseCodes, q as comparePosition, l as deprecate, f as deprecateIf, n as errorIf, s as makePosition, t as throwUsageError } from "./shared.mjs";
+export { C as ClientMsgCode, q as CrdtType, O as OpCode, S as ServerMsgCode, W as WebsocketCloseCodes, w as assertNever, s as comparePosition, n as deprecate, h as deprecateIf, o as errorIf, v as isChildCrdt, f as isRootCrdt, u as makePosition, p as parseJson, t as throwUsageError } from "./shared.mjs";
 
 function lsonObjectToJson(obj) {
  const result = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "0.16.7",
+  "version": "0.16.10",
   "description": "A client that lets you interact with Liveblocks servers.",
   "main": "./index.js",
   "module": "./index.mjs",

package/shared.d.ts

@@ -14,6 +14,11 @@ declare type JsonArray = Json[];
 declare type JsonObject = {
     [key: string]: Json | undefined;
 };
+/**
+ * Alternative to JSON.parse() that will not throw in production. If the passed
+ * string cannot be parsed, this will return `undefined`.
+ */
+declare function parseJson(rawMessage: string): Json | undefined;
 
 /**
  * The LiveMap class is similar to a JavaScript Map that is synchronized on all clients.
@@ -780,4 +785,4 @@ declare class LiveObject<O extends LsonObject = LsonObject> extends AbstractCrdt
     update(overrides: Partial<O>): void;
 }
 
-export { AbstractCrdt as A, BroadcastOptions as B, ClientOptions as C, History as H, Json as J, LiveObject as L, Others as O, Presence as P, Room as R, StorageUpdate as S, User as U, Client as a, LiveMap as b, LiveList as c, JsonObject as d, Lson as e, LsonObject as f, Resolve as g, RoomInitializers as h };
+export { AbstractCrdt as A, BroadcastOptions as B, ClientOptions as C, History as H, Json as J, LiveObject as L, Others as O, Presence as P, Room as R, StorageUpdate as S, User as U, Client as a, LiveMap as b, LiveList as c, JsonObject as d, Lson as e, LsonObject as f, Resolve as g, RoomInitializers as h, parseJson as p };

package/shared.js

@@ -122,23 +122,27 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-var ServerMessageType, ClientMessageType, CrdtType, OpType, WebsocketCloseCodes;
+var ServerMsgCode, ClientMsgCode, CrdtType, OpCode, WebsocketCloseCodes;
 
-exports.ServerMessageType = void 0, (ServerMessageType = exports.ServerMessageType || (exports.ServerMessageType = {}))[ServerMessageType.UpdatePresence = 100] = "UpdatePresence", 
-ServerMessageType[ServerMessageType.UserJoined = 101] = "UserJoined", ServerMessageType[ServerMessageType.UserLeft = 102] = "UserLeft", 
-ServerMessageType[ServerMessageType.Event = 103] = "Event", ServerMessageType[ServerMessageType.RoomState = 104] = "RoomState", 
-ServerMessageType[ServerMessageType.InitialStorageState = 200] = "InitialStorageState", 
-ServerMessageType[ServerMessageType.UpdateStorage = 201] = "UpdateStorage", exports.ClientMessageType = void 0, 
-(ClientMessageType = exports.ClientMessageType || (exports.ClientMessageType = {}))[ClientMessageType.UpdatePresence = 100] = "UpdatePresence", 
-ClientMessageType[ClientMessageType.ClientEvent = 103] = "ClientEvent", ClientMessageType[ClientMessageType.FetchStorage = 200] = "FetchStorage", 
-ClientMessageType[ClientMessageType.UpdateStorage = 201] = "UpdateStorage", exports.CrdtType = void 0, 
-(CrdtType = exports.CrdtType || (exports.CrdtType = {}))[CrdtType.Object = 0] = "Object", 
-CrdtType[CrdtType.List = 1] = "List", CrdtType[CrdtType.Map = 2] = "Map", CrdtType[CrdtType.Register = 3] = "Register", 
-exports.OpType = void 0, (OpType = exports.OpType || (exports.OpType = {}))[OpType.Init = 0] = "Init", 
-OpType[OpType.SetParentKey = 1] = "SetParentKey", OpType[OpType.CreateList = 2] = "CreateList", 
-OpType[OpType.UpdateObject = 3] = "UpdateObject", OpType[OpType.CreateObject = 4] = "CreateObject", 
-OpType[OpType.DeleteCrdt = 5] = "DeleteCrdt", OpType[OpType.DeleteObjectKey = 6] = "DeleteObjectKey", 
-OpType[OpType.CreateMap = 7] = "CreateMap", OpType[OpType.CreateRegister = 8] = "CreateRegister", 
+function isChildCrdt(crdt) {
+ return void 0 !== crdt.parentId && void 0 !== crdt.parentKey;
+}
+
+exports.ServerMsgCode = void 0, (ServerMsgCode = exports.ServerMsgCode || (exports.ServerMsgCode = {}))[ServerMsgCode.UPDATE_PRESENCE = 100] = "UPDATE_PRESENCE", 
+ServerMsgCode[ServerMsgCode.USER_JOINED = 101] = "USER_JOINED", ServerMsgCode[ServerMsgCode.USER_LEFT = 102] = "USER_LEFT", 
+ServerMsgCode[ServerMsgCode.BROADCASTED_EVENT = 103] = "BROADCASTED_EVENT", ServerMsgCode[ServerMsgCode.ROOM_STATE = 104] = "ROOM_STATE", 
+ServerMsgCode[ServerMsgCode.INITIAL_STORAGE_STATE = 200] = "INITIAL_STORAGE_STATE", 
+ServerMsgCode[ServerMsgCode.UPDATE_STORAGE = 201] = "UPDATE_STORAGE", exports.ClientMsgCode = void 0, 
+(ClientMsgCode = exports.ClientMsgCode || (exports.ClientMsgCode = {}))[ClientMsgCode.UPDATE_PRESENCE = 100] = "UPDATE_PRESENCE", 
+ClientMsgCode[ClientMsgCode.BROADCAST_EVENT = 103] = "BROADCAST_EVENT", ClientMsgCode[ClientMsgCode.FETCH_STORAGE = 200] = "FETCH_STORAGE", 
+ClientMsgCode[ClientMsgCode.UPDATE_STORAGE = 201] = "UPDATE_STORAGE", exports.CrdtType = void 0, 
+(CrdtType = exports.CrdtType || (exports.CrdtType = {}))[CrdtType.OBJECT = 0] = "OBJECT", 
+CrdtType[CrdtType.LIST = 1] = "LIST", CrdtType[CrdtType.MAP = 2] = "MAP", CrdtType[CrdtType.REGISTER = 3] = "REGISTER", 
+exports.OpCode = void 0, (OpCode = exports.OpCode || (exports.OpCode = {}))[OpCode.INIT = 0] = "INIT", 
+OpCode[OpCode.SET_PARENT_KEY = 1] = "SET_PARENT_KEY", OpCode[OpCode.CREATE_LIST = 2] = "CREATE_LIST", 
+OpCode[OpCode.UPDATE_OBJECT = 3] = "UPDATE_OBJECT", OpCode[OpCode.CREATE_OBJECT = 4] = "CREATE_OBJECT", 
+OpCode[OpCode.DELETE_CRDT = 5] = "DELETE_CRDT", OpCode[OpCode.DELETE_OBJECT_KEY = 6] = "DELETE_OBJECT_KEY", 
+OpCode[OpCode.CREATE_MAP = 7] = "CREATE_MAP", OpCode[OpCode.CREATE_REGISTER = 8] = "CREATE_REGISTER", 
 exports.WebsocketCloseCodes = void 0, (WebsocketCloseCodes = exports.WebsocketCloseCodes || (exports.WebsocketCloseCodes = {}))[WebsocketCloseCodes.CLOSE_ABNORMAL = 1006] = "CLOSE_ABNORMAL", 
 WebsocketCloseCodes[WebsocketCloseCodes.INVALID_MESSAGE_FORMAT = 4e3] = "INVALID_MESSAGE_FORMAT", 
 WebsocketCloseCodes[WebsocketCloseCodes.NOT_ALLOWED = 4001] = "NOT_ALLOWED", WebsocketCloseCodes[WebsocketCloseCodes.MAX_NUMBER_OF_MESSAGES_PER_SECONDS = 4002] = "MAX_NUMBER_OF_MESSAGES_PER_SECONDS", 
@@ -153,7 +157,7 @@ var AbstractCrdt = function() {
  }
  var _proto = AbstractCrdt.prototype;
  return _proto._apply = function(op, _isLocal) {
-  return op.type === exports.OpType.DeleteCrdt && null != this._parent && null != this._parentKey ? this._parent._detachChild(this) : {
+  return op.type === exports.OpCode.DELETE_CRDT && null != this._parent && null != this._parentKey ? this._parent._detachChild(this) : {
    modified: !1
   };
  }, _proto._setParentLink = function(parent, key) {
@@ -216,16 +220,14 @@ var _Symbol$iterator$1, _Symbol$iterator2, LiveRegister = function(_AbstractCrdt
   _this;
  }
  _inheritsLoose(LiveRegister, _AbstractCrdt), LiveRegister._deserialize = function(_ref, _parentToChildren, doc) {
-  var id = _ref[0], item = _ref[1];
-  if (item.type !== exports.CrdtType.Register) throw new Error('Tried to deserialize a map but item type is "' + item.type + '"');
-  var register = new LiveRegister(item.data);
+  var id = _ref[0], register = new LiveRegister(_ref[1].data);
   return register._attach(id, doc), register;
  };
  var _proto = LiveRegister.prototype;
  return _proto._serialize = function(parentId, parentKey, doc, intent) {
   if (null == this._id || null == parentId || null == parentKey) throw new Error("Cannot serialize register if parentId or parentKey is undefined");
   return [ {
-   type: exports.OpType.CreateRegister,
+   type: exports.OpCode.CREATE_REGISTER,
    opId: null == doc ? void 0 : doc.generateOpId(),
    id: this._id,
    intent: intent,
@@ -236,7 +238,7 @@ var _Symbol$iterator$1, _Symbol$iterator2, LiveRegister = function(_AbstractCrdt
  }, _proto._toSerializedCrdt = function() {
   var _this$_parent;
   return {
-   type: exports.CrdtType.Register,
+   type: exports.CrdtType.REGISTER,
    parentId: null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id,
    parentKey: this._parentKey,
    data: this.data
@@ -328,8 +330,8 @@ var LiveList = function(_AbstractCrdt) {
   void 0 === items && (items = []), (_this = _AbstractCrdt.call(this) || this)._items = void 0, 
   _this._items = [];
   for (var position = void 0, i = 0; i < items.length; i++) {
-   var newPosition = makePosition(position), _item = selfOrRegister(items[i]);
-   _this._items.push([ _item, newPosition ]), position = newPosition;
+   var newPosition = makePosition(position), item = selfOrRegister(items[i]);
+   _this._items.push([ item, newPosition ]), position = newPosition;
   }
   return _this;
  }
@@ -355,7 +357,7 @@ var LiveList = function(_AbstractCrdt) {
    id: this._id,
    opId: null == doc ? void 0 : doc.generateOpId(),
    intent: intent,
-   type: exports.OpType.CreateList,
+   type: exports.OpCode.CREATE_LIST,
    parentId: parentId,
    parentKey: parentKey
   };
@@ -423,7 +425,7 @@ var LiveList = function(_AbstractCrdt) {
   }));
   return {
    reverse: [ {
-    type: exports.OpType.DeleteCrdt,
+    type: exports.OpCode.DELETE_CRDT,
     id: id
    } ],
    modified: {
@@ -485,7 +487,7 @@ var LiveList = function(_AbstractCrdt) {
     } ]
    },
    reverse: [ {
-    type: exports.OpType.SetParentKey,
+    type: exports.OpCode.SET_PARENT_KEY,
     id: null == item ? void 0 : item[0]._id,
     parentKey: previousKey
    } ]
@@ -495,7 +497,7 @@ var LiveList = function(_AbstractCrdt) {
  }, _proto._toSerializedCrdt = function() {
   var _this$_parent;
   return {
-   type: exports.CrdtType.List,
+   type: exports.CrdtType.LIST,
    parentId: null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id,
    parentKey: this._parentKey
   };
@@ -511,8 +513,8 @@ var LiveList = function(_AbstractCrdt) {
    return entry[1] === position;
   }));
   if (this._doc && this._id) {
-   var _id = this._doc.generateId();
-   value._attach(_id, this._doc);
+   var id = this._doc.generateId();
+   value._attach(id, this._doc);
    var storageUpdates = new Map;
    storageUpdates.set(this._id, {
     node: this,
@@ -523,8 +525,8 @@ var LiveList = function(_AbstractCrdt) {
      type: "insert"
     } ]
    }), this._doc.dispatch(value._serialize(this._id, position, this._doc), [ {
-    type: exports.OpType.DeleteCrdt,
-    id: _id
+    type: exports.OpCode.DELETE_CRDT,
+    id: id
    } ], storageUpdates);
   }
  }, _proto.move = function(index, targetIndex) {
@@ -555,12 +557,12 @@ var LiveList = function(_AbstractCrdt) {
      type: "move"
     } ]
    }), this._doc.dispatch([ {
-    type: exports.OpType.SetParentKey,
+    type: exports.OpCode.SET_PARENT_KEY,
     id: item[0]._id,
     opId: this._doc.generateOpId(),
     parentKey: position
    } ], [ {
-    type: exports.OpType.SetParentKey,
+    type: exports.OpCode.SET_PARENT_KEY,
     id: item[0]._id,
     parentKey: previousPosition
    } ], storageUpdates);
@@ -582,21 +584,20 @@ var LiveList = function(_AbstractCrdt) {
     }), this._doc.dispatch([ {
      id: childRecordId,
      opId: this._doc.generateOpId(),
-     type: exports.OpType.DeleteCrdt
+     type: exports.OpCode.DELETE_CRDT
     } ], item[0]._serialize(this._id, item[1]), storageUpdates);
    }
   }
  }, _proto.clear = function() {
   if (this._doc) {
    for (var _step5, ops = [], reverseOps = [], updateDelta = [], i = 0, _iterator5 = _createForOfIteratorHelperLoose(this._items); !(_step5 = _iterator5()).done; ) {
-    var _item3 = _step5.value;
-    _item3[0]._detach();
-    var childId = _item3[0]._id;
+    var item = _step5.value;
+    item[0]._detach();
+    var childId = item[0]._id;
     childId && (ops.push({
      id: childId,
-     type: exports.OpType.DeleteCrdt
-    }), reverseOps.push.apply(reverseOps, _item3[0]._serialize(this._id, _item3[1])), 
-    updateDelta.push({
+     type: exports.OpCode.DELETE_CRDT
+    }), reverseOps.push.apply(reverseOps, item[0]._serialize(this._id, item[1])), updateDelta.push({
      index: i,
      type: "delete"
     })), i++;
@@ -620,8 +621,8 @@ var LiveList = function(_AbstractCrdt) {
   existingItem._detach();
   var value = selfOrRegister(item);
   if (value._setParentLink(this, position), this._items[index][0] = value, this._doc && this._id) {
-   var _id2 = this._doc.generateId();
-   value._attach(_id2, this._doc);
+   var id = this._doc.generateId();
+   value._attach(id, this._doc);
    var storageUpdates = new Map;
    storageUpdates.set(this._id, {
     node: this,
@@ -728,7 +729,7 @@ var LiveMap = function(_AbstractCrdt) {
   var ops = [], op = {
    id: this._id,
    opId: null == doc ? void 0 : doc.generateOpId(),
-   type: exports.OpType.CreateMap,
+   type: exports.OpCode.CREATE_MAP,
    intent: intent,
    parentId: parentId,
    parentKey: parentKey
@@ -740,8 +741,8 @@ var LiveMap = function(_AbstractCrdt) {
   }
   return ops;
  }, LiveMap._deserialize = function(_ref, parentToChildren, doc) {
-  var id = _ref[0], item = _ref[1];
-  if (item.type !== exports.CrdtType.Map) throw new Error('Tried to deserialize a map but item type is "' + item.type + '"');
+  var id = _ref[0];
+  _ref[1];
   var map = new LiveMap;
   map._attach(id, doc);
   var children = parentToChildren.get(id);
@@ -770,7 +771,7 @@ var LiveMap = function(_AbstractCrdt) {
   };
   var reverse, previousValue = this._map.get(key);
   return previousValue ? (reverse = previousValue._serialize(this._id, key), previousValue._detach()) : reverse = [ {
-   type: exports.OpType.DeleteCrdt,
+   type: exports.OpCode.DELETE_CRDT,
    id: id
   } ], child._setParentLink(this, key), child._attach(id, this._doc), this._map.set(key, child), 
   {
@@ -806,7 +807,7 @@ var LiveMap = function(_AbstractCrdt) {
  }, _proto._toSerializedCrdt = function() {
   var _this$_parent;
   return {
-   type: exports.CrdtType.Map,
+   type: exports.CrdtType.MAP,
    parentId: null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id,
    parentKey: this._parentKey
   };
@@ -828,7 +829,7 @@ var LiveMap = function(_AbstractCrdt) {
      type: "update"
     }, _updates3)
    }), this._doc.dispatch(item._serialize(this._id, key, this._doc), oldValue ? oldValue._serialize(this._id, key) : [ {
-    type: exports.OpType.DeleteCrdt,
+    type: exports.OpCode.DELETE_CRDT,
     id: id
    } ], storageUpdates);
   }
@@ -846,7 +847,7 @@ var LiveMap = function(_AbstractCrdt) {
      type: "delete"
     }, _updates4)
    }), this._doc.dispatch([ {
-    type: exports.OpType.DeleteCrdt,
+    type: exports.OpCode.DELETE_CRDT,
     id: item._id,
     opId: this._doc.generateOpId()
    } ], item._serialize(this._id, key), storageUpdates);
@@ -897,33 +898,34 @@ var LiveMap = function(_AbstractCrdt) {
 
 function creationOpToLiveStructure(op) {
  switch (op.type) {
- case exports.OpType.CreateRegister:
+ case exports.OpCode.CREATE_REGISTER:
   return new LiveRegister(op.data);
 
- case exports.OpType.CreateObject:
+ case exports.OpCode.CREATE_OBJECT:
   return new LiveObject(op.data);
 
- case exports.OpType.CreateMap:
+ case exports.OpCode.CREATE_MAP:
   return new LiveMap;
 
- case exports.OpType.CreateList:
+ case exports.OpCode.CREATE_LIST:
   return new LiveList;
  }
 }
 
-function deserialize(entry, parentToChildren, doc) {
- switch (entry[1].type) {
- case exports.CrdtType.Object:
-  return LiveObject._deserialize(entry, parentToChildren, doc);
+function deserialize(_ref, parentToChildren, doc) {
+ var id = _ref[0], crdt = _ref[1];
+ switch (crdt.type) {
+ case exports.CrdtType.OBJECT:
+  return LiveObject._deserialize([ id, crdt ], parentToChildren, doc);
 
- case exports.CrdtType.List:
-  return LiveList._deserialize(entry, parentToChildren, doc);
+ case exports.CrdtType.LIST:
+  return LiveList._deserialize([ id, crdt ], parentToChildren, doc);
 
- case exports.CrdtType.Map:
-  return LiveMap._deserialize(entry, parentToChildren, doc);
+ case exports.CrdtType.MAP:
+  return LiveMap._deserialize([ id, crdt ], parentToChildren, doc);
 
- case exports.CrdtType.Register:
-  return LiveRegister._deserialize(entry, parentToChildren, doc);
+ case exports.CrdtType.REGISTER:
+  return LiveRegister._deserialize([ id, crdt ], parentToChildren, doc);
 
  default:
   throw new Error("Unexpected CRDT type");
@@ -974,14 +976,20 @@ var LiveObject = function(_AbstractCrdt) {
  var _proto = LiveObject.prototype;
  return _proto._serialize = function(parentId, parentKey, doc, intent) {
   if (null == this._id) throw new Error("Cannot serialize item is not attached");
-  var ops = [], op = {
+  var opId = null == doc ? void 0 : doc.generateOpId(), ops = [], op = void 0 !== parentId && void 0 !== parentKey ? {
+   type: exports.OpCode.CREATE_OBJECT,
    id: this._id,
-   opId: null == doc ? void 0 : doc.generateOpId(),
+   opId: opId,
    intent: intent,
-   type: exports.OpType.CreateObject,
    parentId: parentId,
    parentKey: parentKey,
    data: {}
+  } : {
+   type: exports.OpCode.CREATE_OBJECT,
+   id: this._id,
+   opId: opId,
+   intent: intent,
+   data: {}
   };
   ops.push(op);
   for (var _step, _iterator = _createForOfIteratorHelperLoose(this._map); !(_step = _iterator()).done; ) {
@@ -990,9 +998,7 @@ var LiveObject = function(_AbstractCrdt) {
   }
   return ops;
  }, LiveObject._deserialize = function(_ref, parentToChildren, doc) {
-  var id = _ref[0], item = _ref[1];
-  if (item.type !== exports.CrdtType.Object) throw new Error('Tried to deserialize a record but item type is "' + item.type + '"');
-  var liveObj = new LiveObject(item.data);
+  var id = _ref[0], liveObj = new LiveObject(_ref[1].data);
   return liveObj._attach(id, doc), this._deserializeChildren(liveObj, parentToChildren, doc);
  }, LiveObject._deserializeChildren = function(liveObj, parentToChildren, doc) {
   var children = parentToChildren.get(liveObj._id);
@@ -1028,13 +1034,13 @@ var LiveObject = function(_AbstractCrdt) {
   };
   var reverse, previousValue = this._map.get(key);
   if (isCrdt(previousValue)) reverse = previousValue._serialize(this._id, key), previousValue._detach(); else if (void 0 === previousValue) reverse = [ {
-   type: exports.OpType.DeleteObjectKey,
+   type: exports.OpCode.DELETE_OBJECT_KEY,
    id: this._id,
    key: key
   } ]; else {
    var _data;
    reverse = [ {
-    type: exports.OpType.UpdateObject,
+    type: exports.OpCode.UPDATE_OBJECT,
     id: this._id,
     data: (_data = {}, _data[key] = previousValue, _data)
    } ];
@@ -1082,21 +1088,24 @@ var LiveObject = function(_AbstractCrdt) {
    isCrdt(value) && value._detach();
   }
  }, _proto._apply = function(op, isLocal) {
-  return op.type === exports.OpType.UpdateObject ? this._applyUpdate(op, isLocal) : op.type === exports.OpType.DeleteObjectKey ? this._applyDeleteObjectKey(op) : _AbstractCrdt.prototype._apply.call(this, op, isLocal);
+  return op.type === exports.OpCode.UPDATE_OBJECT ? this._applyUpdate(op, isLocal) : op.type === exports.OpCode.DELETE_OBJECT_KEY ? this._applyDeleteObjectKey(op) : _AbstractCrdt.prototype._apply.call(this, op, isLocal);
  }, _proto._toSerializedCrdt = function() {
   for (var _this$_parent, _step7, data = {}, _iterator7 = _createForOfIteratorHelperLoose(this._map); !(_step7 = _iterator7()).done; ) {
    var _step7$value = _step7.value, key = _step7$value[0], value = _step7$value[1];
    value instanceof AbstractCrdt == !1 && (data[key] = value);
   }
-  return {
-   type: exports.CrdtType.Object,
-   parentId: null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id,
+  return void 0 !== (null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id) && void 0 !== this._parentKey ? {
+   type: exports.CrdtType.OBJECT,
+   parentId: this._parent._id,
    parentKey: this._parentKey,
    data: data
+  } : {
+   type: exports.CrdtType.OBJECT,
+   data: data
   };
  }, _proto._applyUpdate = function(op, isLocal) {
   var isModified = !1, reverse = [], reverseUpdate = {
-   type: exports.OpType.UpdateObject,
+   type: exports.OpCode.UPDATE_OBJECT,
    id: this._id,
    data: {}
   };
@@ -1104,7 +1113,7 @@ var LiveObject = function(_AbstractCrdt) {
    var oldValue = this._map.get(key);
    oldValue instanceof AbstractCrdt ? (reverse.push.apply(reverse, oldValue._serialize(this._id, key)), 
    oldValue._detach()) : void 0 !== oldValue ? reverseUpdate.data[key] = oldValue : void 0 === oldValue && reverse.push({
-    type: exports.OpType.DeleteObjectKey,
+    type: exports.OpCode.DELETE_OBJECT_KEY,
     id: this._id,
     key: key
    });
@@ -1149,7 +1158,7 @@ var LiveObject = function(_AbstractCrdt) {
   if (isCrdt(oldValue)) reverse = oldValue._serialize(this._id, op.key), oldValue._detach(); else if (void 0 !== oldValue) {
    var _data2;
    reverse = [ {
-    type: exports.OpType.UpdateObject,
+    type: exports.OpCode.UPDATE_OBJECT,
     id: this._id,
     data: (_data2 = {}, _data2[key] = oldValue, _data2)
    } ];
@@ -1184,7 +1193,7 @@ var LiveObject = function(_AbstractCrdt) {
    void this._map.delete(keyAsString);
    var reverse, _data3;
    if (oldValue instanceof AbstractCrdt) oldValue._detach(), reverse = oldValue._serialize(this._id, keyAsString); else reverse = [ {
-    type: exports.OpType.UpdateObject,
+    type: exports.OpCode.UPDATE_OBJECT,
     data: (_data3 = {}, _data3[keyAsString] = oldValue, _data3),
     id: this._id
    } ];
@@ -1197,7 +1206,7 @@ var LiveObject = function(_AbstractCrdt) {
      type: "delete"
     }, _updates4)
    }), this._doc.dispatch([ {
-    type: exports.OpType.DeleteObjectKey,
+    type: exports.OpCode.DELETE_OBJECT_KEY,
     key: keyAsString,
     id: this._id,
     opId: this._doc.generateOpId()
@@ -1208,14 +1217,14 @@ var LiveObject = function(_AbstractCrdt) {
   if (null != this._doc && null != this._id) {
    var ops = [], reverseOps = [], opId = this._doc.generateOpId(), updatedProps = {}, reverseUpdateOp = {
     id: this._id,
-    type: exports.OpType.UpdateObject,
+    type: exports.OpCode.UPDATE_OBJECT,
     data: {}
    }, updateDelta = {};
    for (var _key3 in overrides) {
     var _oldValue2 = this._map.get(_key3);
     _oldValue2 instanceof AbstractCrdt ? (reverseOps.push.apply(reverseOps, _oldValue2._serialize(this._id, _key3)), 
     _oldValue2._detach()) : void 0 === _oldValue2 ? reverseOps.push({
-     type: exports.OpType.DeleteObjectKey,
+     type: exports.OpCode.DELETE_OBJECT_KEY,
      id: this._id,
      key: _key3
     }) : reverseUpdateOp.data[_key3] = _oldValue2;
@@ -1235,7 +1244,7 @@ var LiveObject = function(_AbstractCrdt) {
    0 !== Object.keys(updatedProps).length && ops.unshift({
     opId: opId,
     id: this._id,
-    type: exports.OpType.UpdateObject,
+    type: exports.OpCode.UPDATE_OBJECT,
     data: updatedProps
    });
    var storageUpdates = new Map;
@@ -1260,7 +1269,9 @@ exports._extends = _extends, exports._inheritsLoose = _inheritsLoose, exports._o
  var key, i, target = {}, sourceKeys = Object.keys(source);
  for (i = 0; i < sourceKeys.length; i++) key = sourceKeys[i], excluded.indexOf(key) >= 0 || (target[key] = source[key]);
  return target;
-}, exports._wrapNativeSuper = _wrapNativeSuper, exports.compact = function(items) {
+}, exports._wrapNativeSuper = _wrapNativeSuper, exports.assertNever = function(_value, errmsg) {
+ throw new Error(errmsg);
+}, exports.compact = function(items) {
  return items.filter((function(item) {
   return null != item;
  }));
@@ -1289,23 +1300,23 @@ exports.errorIf = function(condition, message) {
  var ops = [];
  return currentItems.forEach((function(_, id) {
   newItems.get(id) || ops.push({
-   type: exports.OpType.DeleteCrdt,
+   type: exports.OpCode.DELETE_CRDT,
    id: id
   });
  })), newItems.forEach((function(crdt, id) {
   var currentCrdt = currentItems.get(id);
-  if (currentCrdt) crdt.type === exports.CrdtType.Object && JSON.stringify(crdt.data) !== JSON.stringify(currentCrdt.data) && ops.push({
-   type: exports.OpType.UpdateObject,
+  if (currentCrdt) crdt.type === exports.CrdtType.OBJECT && (currentCrdt.type === exports.CrdtType.OBJECT && JSON.stringify(crdt.data) === JSON.stringify(currentCrdt.data) || ops.push({
+   type: exports.OpCode.UPDATE_OBJECT,
    id: id,
    data: crdt.data
-  }), crdt.parentKey !== currentCrdt.parentKey && ops.push({
-   type: exports.OpType.SetParentKey,
+  })), crdt.parentKey !== currentCrdt.parentKey && ops.push({
+   type: exports.OpCode.SET_PARENT_KEY,
    id: id,
    parentKey: crdt.parentKey
   }); else switch (crdt.type) {
-  case exports.CrdtType.Register:
+  case exports.CrdtType.REGISTER:
    ops.push({
-    type: exports.OpType.CreateRegister,
+    type: exports.OpCode.CREATE_REGISTER,
     id: id,
     parentId: crdt.parentId,
     parentKey: crdt.parentKey,
@@ -1313,35 +1324,42 @@ exports.errorIf = function(condition, message) {
    });
    break;
 
-  case exports.CrdtType.List:
+  case exports.CrdtType.LIST:
    ops.push({
-    type: exports.OpType.CreateList,
+    type: exports.OpCode.CREATE_LIST,
     id: id,
     parentId: crdt.parentId,
     parentKey: crdt.parentKey
    });
    break;
 
-  case exports.CrdtType.Object:
-   ops.push({
-    type: exports.OpType.CreateObject,
+  case exports.CrdtType.OBJECT:
+   ops.push(crdt.parentId ? {
+    type: exports.OpCode.CREATE_OBJECT,
     id: id,
     parentId: crdt.parentId,
     parentKey: crdt.parentKey,
     data: crdt.data
+   } : {
+    type: exports.OpCode.CREATE_OBJECT,
+    id: id,
+    data: crdt.data
    });
    break;
 
-  case exports.CrdtType.Map:
+  case exports.CrdtType.MAP:
    ops.push({
-    type: exports.OpType.CreateMap,
+    type: exports.OpCode.CREATE_MAP,
     id: id,
     parentId: crdt.parentId,
     parentKey: crdt.parentKey
    });
   }
  })), ops;
-}, exports.isJsonArray = isJsonArray, exports.isJsonObject = isJsonObject, exports.isSameNodeOrChildOf = function isSameNodeOrChildOf(node, parent) {
+}, exports.isChildCrdt = isChildCrdt, exports.isJsonArray = isJsonArray, exports.isJsonObject = isJsonObject, 
+exports.isRootCrdt = function(crdt) {
+ return crdt.type === exports.CrdtType.OBJECT && !isChildCrdt(crdt);
+}, exports.isSameNodeOrChildOf = function isSameNodeOrChildOf(node, parent) {
  return node === parent || !!node._parent && isSameNodeOrChildOf(node._parent, parent);
 }, exports.isTokenValid = function(token) {
  var tokenParts = token.split(".");