@liveblocks/client 0.16.9 → 0.16.12

package/index.d.ts

@@ -28,4 +28,16 @@ export { B as BroadcastOptions, a as Client, H as History, J as Json, d as JsonO
  */
 declare function createClient(options: ClientOptions): Client;
 
-export { createClient };
+/**
+ * Helper type to help users adopt to Lson types from interface definitions.
+ * You should only use this to wrap interfaces you don't control. For more
+ * information, see
+ * https://liveblocks.io/docs/guides/limits#lson-constraint-and-interfaces
+ */
+declare type EnsureJson<T> = [
+    unknown
+] extends [T] ? T : T extends (...args: any[]) => any ? T : {
+    [K in keyof T]: EnsureJson<T[K]>;
+};
+
+export { EnsureJson, createClient };

package/index.js

@@ -78,10 +78,10 @@ function makeStateMachine(state, context, mockedEffects) {
    })), notify(apply(LiveObject.getTreesDiffOperations(currentItems, new Map(items)), !1).updates);
   }(message.items) : state.root = (items = message.items, _buildRootAndParentTo = function(items) {
    for (var _step2, parentToChildren = new Map, root = null, _iterator2 = LiveObject._createForOfIteratorHelperLoose(items); !(_step2 = _iterator2()).done; ) {
-    var tuple = _step2.value, parentId = tuple[1].parentId;
-    if (null == parentId) root = tuple; else {
-     var children = parentToChildren.get(parentId);
-     null != children ? children.push(tuple) : parentToChildren.set(parentId, [ tuple ]);
+    var _step2$value = _step2.value, id = _step2$value[0], crdt = _step2$value[1];
+    if (LiveObject.isRootCrdt(crdt)) root = [ id, crdt ]; else {
+     var tuple = [ id, crdt ], children = parentToChildren.get(crdt.parentId);
+     null != children ? children.push(tuple) : parentToChildren.set(crdt.parentId, [ tuple ]);
     }
    }
    if (null == root) throw new Error("Root can't be null");
@@ -324,7 +324,7 @@ function makeStateMachine(state, context, mockedEffects) {
  }
  function onMessage(event) {
   if ("pong" !== event.data) {
-   var text, data, messages = (text = event.data, void 0 === (data = LiveObject.parseJson(text)) ? null : LiveObject.isJsonArray(data) ? LiveObject.compact(data.map((function(item) {
+   var text, data, messages = (text = event.data, void 0 === (data = LiveObject.tryParseJson(text)) ? null : LiveObject.isJsonArray(data) ? LiveObject.compact(data.map((function(item) {
     return parseServerMessage(item);
    }))) : LiveObject.compact([ parseServerMessage(data) ]));
    if (null !== messages && 0 !== messages.length) {
@@ -758,7 +758,7 @@ var LiveblocksError = function(_Error) {
 function parseToken(token) {
  var tokenParts = token.split(".");
  if (3 !== tokenParts.length) throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
- var data = LiveObject.parseJson(atob(tokenParts[1]));
+ var data = LiveObject.tryParseJson(atob(tokenParts[1]));
  if (void 0 !== data && LiveObject.isJsonObject(data) && "number" == typeof data.actor && (void 0 === data.id || "string" == typeof data.id)) return {
   actor: data.actor,
   id: data.id,

package/index.mjs

@@ -1,6 +1,6 @@
-import { A as AbstractCrdt, r as remove, S as ServerMsgCode, m as mergeStorageUpdates, W as WebsocketCloseCodes, C as ClientMsgCode, i as isTokenValid, a as isSameNodeOrChildOf, L as LiveObject, g as getTreesDiffOperations, O as OpCode, b as LiveList, p as parseJson, c as isJsonArray, d as compact, e as isJsonObject, f as deprecateIf } from "./shared.mjs";
+import { A as AbstractCrdt, r as remove, S as ServerMsgCode, m as mergeStorageUpdates, W as WebsocketCloseCodes, C as ClientMsgCode, i as isTokenValid, a as isSameNodeOrChildOf, L as LiveObject, g as getTreesDiffOperations, O as OpCode, b as LiveList, t as tryParseJson, c as isJsonArray, d as compact, e as isJsonObject, f as isRootCrdt, h as deprecateIf } from "./shared.mjs";
 
-export { b as LiveList, h as LiveMap, L as LiveObject } from "./shared.mjs";
+export { b as LiveList, j as LiveMap, L as LiveObject } from "./shared.mjs";
 
 const BACKOFF_RETRY_DELAYS = [ 250, 500, 1e3, 2e3, 4e3, 8e3, 1e4 ], BACKOFF_RETRY_DELAYS_SLOW = [ 2e3, 3e4, 6e4, 3e5 ];
 
@@ -69,12 +69,9 @@ function makeStateMachine(state, context, mockedEffects) {
    const [root, parentToChildren] = function(items) {
     const parentToChildren = new Map;
     let root = null;
-    for (const tuple of items) {
-     const parentId = tuple[1].parentId;
-     if (null == parentId) root = tuple; else {
-      const children = parentToChildren.get(parentId);
-      null != children ? children.push(tuple) : parentToChildren.set(parentId, [ tuple ]);
-     }
+    for (const [id, crdt] of items) if (isRootCrdt(crdt)) root = [ id, crdt ]; else {
+     const tuple = [ id, crdt ], children = parentToChildren.get(crdt.parentId);
+     null != children ? children.push(tuple) : parentToChildren.set(crdt.parentId, [ tuple ]);
     }
     if (null == root) throw new Error("Root can't be null");
     return [ root, parentToChildren ];
@@ -305,7 +302,7 @@ function makeStateMachine(state, context, mockedEffects) {
  function onMessage(event) {
   if ("pong" === event.data) return void clearTimeout(state.timeoutHandles.pongTimeout);
   const messages = function(text) {
-   const data = parseJson(text);
+   const data = tryParseJson(text);
    return void 0 === data ? null : isJsonArray(data) ? compact(data.map((item => parseServerMessage(item)))) : compact([ parseServerMessage(data) ]);
   }(event.data);
   if (null === messages || 0 === messages.length) return;
@@ -713,7 +710,7 @@ class LiveblocksError extends Error {
 function parseToken(token) {
  const tokenParts = token.split(".");
  if (3 !== tokenParts.length) throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
- const data = parseJson(atob(tokenParts[1]));
+ const data = tryParseJson(atob(tokenParts[1]));
  if (void 0 !== data && isJsonObject(data) && "number" == typeof data.actor && (void 0 === data.id || "string" == typeof data.id)) return {
   actor: data.actor,
   id: data.id,

package/internal.d.ts

@@ -1,6 +1,18 @@
-import { d as JsonObject, J as Json, e as Lson, A as AbstractCrdt, f as LsonObject, L as LiveObject, S as StorageUpdate } from './shared';
+import { d as JsonObject, J as Json, g as Resolve, e as Lson, A as AbstractCrdt, f as LsonObject, L as LiveObject, S as StorageUpdate } from './shared';
 export { g as Resolve, h as RoomInitializers } from './shared';
 
+declare type IdTuple<T> = [id: string, value: T];
+/**
+ * Lookup table for nodes (= SerializedCrdt values) by their IDs.
+ */
+declare type NodeMap = Map<string, // Node ID
+SerializedCrdt>;
+/**
+ * Reverse lookup table for all child nodes (= list of SerializedCrdt values)
+ * by their parent node's IDs.
+ */
+declare type ParentToChildNodeMap = Map<string, // Parent's node ID
+IdTuple<SerializedChild>[]>;
 /**
  * Messages that can be sent from the server to the client.
  */
@@ -100,7 +112,6 @@ declare type BroadcastedEventServerMsg = {
      */
     event: Json;
 };
-declare type SerializedCrdtWithId = [id: string, crdt: SerializedCrdt];
 /**
  * Sent by the WebSocket server to a single client in response to the client
  * joining the Room, to provide the initial Storage state of the Room. The
@@ -108,7 +119,7 @@ declare type SerializedCrdtWithId = [id: string, crdt: SerializedCrdt];
  */
 declare type InitialDocumentStateServerMsg = {
     type: ServerMsgCode.INITIAL_STORAGE_STATE;
-    items: SerializedCrdtWithId[];
+    items: IdTuple<SerializedCrdt>[];
 };
 /**
  * Sent by the WebSocket server and broadcasted to all clients to announce that
@@ -121,22 +132,48 @@ declare type UpdateStorageServerMsg = {
     type: ServerMsgCode.UPDATE_STORAGE;
     ops: Op[];
 };
+/**
+ * Messages that can be sent from the client to the server.
+ */
+declare type ClientMsg<TPresence extends JsonObject> = BroadcastEventClientMsg | UpdatePresenceClientMsg<TPresence> | UpdateStorageClientMsg | FetchStorageClientMsg;
 declare enum ClientMsgCode {
     UPDATE_PRESENCE = 100,
     BROADCAST_EVENT = 103,
     FETCH_STORAGE = 200,
     UPDATE_STORAGE = 201
 }
+declare type BroadcastEventClientMsg = {
+    type: ClientMsgCode.BROADCAST_EVENT;
+    event: Json;
+};
+declare type UpdatePresenceClientMsg<TPresence extends JsonObject> = {
+    type: ClientMsgCode.UPDATE_PRESENCE;
+    data: TPresence;
+    targetActor?: number;
+};
+declare type UpdateStorageClientMsg = {
+    type: ClientMsgCode.UPDATE_STORAGE;
+    ops: Op[];
+};
+declare type FetchStorageClientMsg = {
+    type: ClientMsgCode.FETCH_STORAGE;
+};
 declare enum CrdtType {
     OBJECT = 0,
     LIST = 1,
     MAP = 2,
     REGISTER = 3
 }
+declare type SerializedRootObject = {
+    type: CrdtType.OBJECT;
+    data: JsonObject;
+    parentId?: never;
+    parentKey?: never;
+};
 declare type SerializedObject = {
     type: CrdtType.OBJECT;
-    parentId?: string;
-    parentKey?: string;
+    parentId: string;
+    parentKey: string;
     data: JsonObject;
 };
 declare type SerializedList = {
@@ -155,7 +192,10 @@ declare type SerializedRegister = {
     parentKey: string;
     data: Json;
 };
-declare type SerializedCrdt = SerializedObject | SerializedList | SerializedMap | SerializedRegister;
+declare type SerializedCrdt = SerializedRootObject | SerializedChild;
+declare type SerializedChild = SerializedObject | SerializedList | SerializedMap | SerializedRegister;
+declare function isRootCrdt(crdt: SerializedCrdt): crdt is SerializedRootObject;
+declare function isChildCrdt(crdt: SerializedCrdt): crdt is SerializedChild;
 declare enum OpCode {
     INIT = 0,
     SET_PARENT_KEY = 1,
@@ -171,7 +211,9 @@ declare enum OpCode {
  * These operations are the payload for {@link UpdateStorageServerMsg} messages
  * only.
  */
-declare type Op = CreateObjectOp | UpdateObjectOp | DeleteCrdtOp | CreateListOp | SetParentKeyOp | DeleteObjectKeyOp | CreateMapOp | CreateRegisterOp;
+declare type Op = CreateOp | UpdateObjectOp | DeleteCrdtOp | SetParentKeyOp | DeleteObjectKeyOp;
+declare type CreateOp = CreateRootObjectOp | CreateChildOp;
+declare type CreateChildOp = CreateObjectOp | CreateRegisterOp | CreateMapOp | CreateListOp;
 declare type UpdateObjectOp = {
     opId?: string;
     id: string;
@@ -183,10 +225,14 @@ declare type CreateObjectOp = {
     id: string;
     intent?: "set";
     type: OpCode.CREATE_OBJECT;
-    parentId?: string;
-    parentKey?: string;
+    parentId: string;
+    parentKey: string;
     data: JsonObject;
 };
+declare type CreateRootObjectOp = Resolve<Omit<CreateObjectOp, "parentId" | "parentKey"> & {
+    parentId?: never;
+    parentKey?: never;
+}>;
 declare type CreateListOp = {
     opId?: string;
     id: string;
@@ -278,4 +324,34 @@ declare function patchImmutableObject<T>(state: T, updates: StorageUpdate[]): T;
 declare function makePosition(before?: string, after?: string): string;
 declare function comparePosition(posA: string, posB: string): number;
 
-export { ClientMsgCode, CrdtType, CreateListOp, CreateMapOp, CreateObjectOp, CreateRegisterOp, DeleteCrdtOp, DeleteObjectKeyOp, Op, OpCode, RoomStateServerMsg, SerializedCrdt, SerializedCrdtWithId, SerializedList, SerializedMap, SerializedObject, SerializedRegister, ServerMsg, ServerMsgCode, SetParentKeyOp, UpdateObjectOp, UserJoinServerMsg, WebsocketCloseCodes, comparePosition, deprecate, deprecateIf, errorIf, lsonToJson, makePosition, patchImmutableObject, patchLiveObjectKey, throwUsageError };
+/**
+ * Helper function that can be used to implement exhaustive switch statements
+ * with TypeScript. Example usage:
+ *
+ *    type Fruit = "🍎" | "🍌";
+ *
+ *    switch (fruit) {
+ *      case "🍎":
+ *      case "🍌":
+ *        return doSomething();
+ *
+ *      default:
+ *        return assertNever(fruit, "Unknown fruit");
+ *    }
+ *
+ * If now the Fruit union is extended (i.e. add "🍒"), TypeScript will catch
+ * this *statically*, rather than at runtime, and force you to handle the
+ * 🍒 case.
+ */
+declare function assertNever(_value: never, errmsg: string): never;
+/**
+ * Alternative to JSON.parse() that will not throw in production. If the passed
+ * string cannot be parsed, this will return `undefined`.
+ */
+declare function tryParseJson(rawMessage: string): Json | undefined;
+/**
+ * Decode base64 string.
+ */
+declare function b64decode(b64value: string): string;
+
+export { BroadcastEventClientMsg, ClientMsg, ClientMsgCode, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateRegisterOp, CreateRootObjectOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, IdTuple, InitialDocumentStateServerMsg, NodeMap, Op, OpCode, ParentToChildNodeMap, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, UpdateObjectOp, UpdatePresenceClientMsg, UpdateStorageClientMsg, UserJoinServerMsg, WebsocketCloseCodes, assertNever, b64decode, comparePosition, deprecate, deprecateIf, errorIf, isChildCrdt, isRootCrdt, lsonToJson, makePosition, patchImmutableObject, patchLiveObjectKey, throwUsageError, tryParseJson };

package/internal.js

@@ -165,10 +165,13 @@ Object.defineProperty(exports, "ClientMsgCode", {
  get: function() {
   return LiveObject.WebsocketCloseCodes;
  }
-}), exports.comparePosition = LiveObject.comparePosition, exports.deprecate = LiveObject.deprecate, 
+}), exports.assertNever = LiveObject.assertNever, exports.b64decode = LiveObject.b64decode, 
+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.throwUsageError = LiveObject.throwUsageError, 
-exports.lsonToJson = lsonToJson, exports.patchImmutableObject = function(state, updates) {
+exports.tryParseJson = LiveObject.tryParseJson, exports.lsonToJson = lsonToJson, 
+exports.patchImmutableObject = function(state, updates) {
  return updates.reduce((function(state, update) {
   return function(state, update) {
    var path = function(node) {

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 ClientMsgCode, o as CrdtType, O as OpCode, S as ServerMsgCode, 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, x as b64decode, s as comparePosition, n as deprecate, h as deprecateIf, o as errorIf, v as isChildCrdt, f as isRootCrdt, u as makePosition, p as throwUsageError, t as tryParseJson } from "./shared.mjs";
 
 function lsonObjectToJson(obj) {
  const result = {};

package/package.json

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

package/shared.js

@@ -124,6 +124,10 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
 
 var ServerMsgCode, ClientMsgCode, CrdtType, OpCode, WebsocketCloseCodes;
 
+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", 
@@ -193,14 +197,6 @@ var AbstractCrdt = function() {
  } ]), AbstractCrdt;
 }();
 
-function parseJson(rawMessage) {
- try {
-  return JSON.parse(rawMessage);
- } catch (e) {
-  return;
- }
-}
-
 function isJsonArray(data) {
  return Array.isArray(data);
 }
@@ -216,9 +212,7 @@ 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;
@@ -328,8 +322,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;
  }
@@ -511,8 +505,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,
@@ -524,7 +518,7 @@ var LiveList = function(_AbstractCrdt) {
     } ]
    }), this._doc.dispatch(value._serialize(this._id, position, this._doc), [ {
     type: exports.OpCode.DELETE_CRDT,
-    id: _id
+    id: id
    } ], storageUpdates);
   }
  }, _proto.move = function(index, targetIndex) {
@@ -589,14 +583,13 @@ var LiveList = function(_AbstractCrdt) {
  }, _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.OpCode.DELETE_CRDT
-    }), reverseOps.push.apply(reverseOps, _item3[0]._serialize(this._id, _item3[1])), 
-    updateDelta.push({
+    }), reverseOps.push.apply(reverseOps, item[0]._serialize(this._id, item[1])), updateDelta.push({
      index: i,
      type: "delete"
     })), i++;
@@ -620,8 +613,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,
@@ -740,8 +733,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);
@@ -911,19 +904,20 @@ function creationOpToLiveStructure(op) {
  }
 }
 
-function deserialize(entry, parentToChildren, doc) {
- switch (entry[1].type) {
+function deserialize(_ref, parentToChildren, doc) {
+ var id = _ref[0], crdt = _ref[1];
+ switch (crdt.type) {
  case exports.CrdtType.OBJECT:
-  return LiveObject._deserialize(entry, parentToChildren, doc);
+  return LiveObject._deserialize([ id, crdt ], parentToChildren, doc);
 
  case exports.CrdtType.LIST:
-  return LiveList._deserialize(entry, parentToChildren, doc);
+  return LiveList._deserialize([ id, crdt ], parentToChildren, doc);
 
  case exports.CrdtType.MAP:
-  return LiveMap._deserialize(entry, parentToChildren, doc);
+  return LiveMap._deserialize([ id, crdt ], parentToChildren, doc);
 
  case exports.CrdtType.REGISTER:
-  return LiveRegister._deserialize(entry, parentToChildren, doc);
+  return LiveRegister._deserialize([ id, crdt ], parentToChildren, doc);
 
  default:
   throw new Error("Unexpected CRDT type");
@@ -960,6 +954,14 @@ function entries(obj) {
  return Object.entries(obj);
 }
 
+function tryParseJson(rawMessage) {
+ try {
+  return JSON.parse(rawMessage);
+ } catch (e) {
+  return;
+ }
+}
+
 var LiveObject = function(_AbstractCrdt) {
  function LiveObject(obj) {
   var _this;
@@ -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.OpCode.CREATE_OBJECT,
    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);
@@ -1088,11 +1094,14 @@ var LiveObject = function(_AbstractCrdt) {
    var _step7$value = _step7.value, key = _step7$value[0], value = _step7$value[1];
    value instanceof AbstractCrdt == !1 && (data[key] = value);
   }
-  return {
+  return void 0 !== (null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id) && void 0 !== this._parentKey ? {
    type: exports.CrdtType.OBJECT,
-   parentId: null == (_this$_parent = this._parent) ? void 0 : _this$_parent._id,
+   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 = {
@@ -1260,7 +1269,18 @@ 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.b64decode = function(b64value) {
+ try {
+  var formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
+  return decodeURIComponent(atob(formattedValue).split("").map((function(c) {
+   return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+  })).join(""));
+ } catch (err) {
+  return atob(b64value);
+ }
+}, exports.compact = function(items) {
  return items.filter((function(item) {
   return null != item;
  }));
@@ -1294,11 +1314,11 @@ exports.errorIf = function(condition, message) {
   });
  })), 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({
+  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({
+  })), crdt.parentKey !== currentCrdt.parentKey && ops.push({
    type: exports.OpCode.SET_PARENT_KEY,
    id: id,
    parentKey: crdt.parentKey
@@ -1323,12 +1343,16 @@ exports.errorIf = function(condition, message) {
    break;
 
   case exports.CrdtType.OBJECT:
-   ops.push({
+   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;
 
@@ -1341,12 +1365,15 @@ exports.errorIf = function(condition, message) {
    });
   }
  })), 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(".");
  if (3 !== tokenParts.length) return !1;
- var data = parseJson(atob(tokenParts[1]));
+ var data = tryParseJson(atob(tokenParts[1]));
  return !(void 0 === data || !isJsonObject(data) || "number" != typeof data.exp) && !(Date.now() / 1e3 > data.exp - 300);
 }, exports.makePosition = makePosition, exports.mergeStorageUpdates = function(first, second) {
  return first ? "LiveObject" === first.type && "LiveObject" === second.type ? function(first, second) {
@@ -1370,9 +1397,9 @@ exports.errorIf = function(condition, message) {
    updates: first.updates.concat(second.updates)
   });
  }(first, second) : second : second;
-}, exports.parseJson = parseJson, exports.remove = function(array, item) {
+}, exports.remove = function(array, item) {
  for (var i = 0; i < array.length; i++) if (array[i] === item) {
   array.splice(i, 1);
   break;
  }
-}, exports.throwUsageError = throwUsageError;
+}, exports.throwUsageError = throwUsageError, exports.tryParseJson = tryParseJson;

package/shared.mjs

@@ -1,5 +1,13 @@
 var ServerMsgCode, ClientMsgCode, CrdtType, OpCode, WebsocketCloseCodes;
 
+function isRootCrdt(crdt) {
+ return crdt.type === CrdtType.OBJECT && !isChildCrdt(crdt);
+}
+
+function isChildCrdt(crdt) {
+ return void 0 !== crdt.parentId && void 0 !== crdt.parentKey;
+}
+
 !function(ServerMsgCode) {
  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", 
@@ -62,14 +70,6 @@ class AbstractCrdt {
  }
 }
 
-function parseJson(rawMessage) {
- try {
-  return JSON.parse(rawMessage);
- } catch (e) {
-  return;
- }
-}
-
 function isJsonArray(data) {
  return Array.isArray(data);
 }
@@ -86,7 +86,6 @@ class LiveRegister extends AbstractCrdt {
   return this._data;
  }
  static _deserialize([id, item], _parentToChildren, doc) {
-  if (item.type !== CrdtType.REGISTER) throw new Error(`Tried to deserialize a map but item type is "${item.type}"`);
   const register = new LiveRegister(item.data);
   return register._attach(id, doc), register;
  }
@@ -587,8 +586,7 @@ class LiveMap extends AbstractCrdt {
   for (const [key, value] of this._map) ops.push(...value._serialize(this._id, key, doc));
   return ops;
  }
- static _deserialize([id, item], parentToChildren, doc) {
-  if (item.type !== CrdtType.MAP) throw new Error(`Tried to deserialize a map but item type is "${item.type}"`);
+ static _deserialize([id, _item], parentToChildren, doc) {
   const map = new LiveMap;
   map._attach(id, doc);
   const children = parentToChildren.get(id);
@@ -758,6 +756,10 @@ class LiveMap extends AbstractCrdt {
  }
 }
 
+function assertNever(_value, errmsg) {
+ throw new Error(errmsg);
+}
+
 function remove(array, item) {
  for (let i = 0; i < array.length; i++) if (array[i] === item) {
   array.splice(i, 1);
@@ -789,19 +791,19 @@ function isSameNodeOrChildOf(node, parent) {
  return node === parent || !!node._parent && isSameNodeOrChildOf(node._parent, parent);
 }
 
-function deserialize(entry, parentToChildren, doc) {
- switch (entry[1].type) {
+function deserialize([id, crdt], parentToChildren, doc) {
+ switch (crdt.type) {
  case CrdtType.OBJECT:
-  return LiveObject._deserialize(entry, parentToChildren, doc);
+  return LiveObject._deserialize([ id, crdt ], parentToChildren, doc);
 
  case CrdtType.LIST:
-  return LiveList._deserialize(entry, parentToChildren, doc);
+  return LiveList._deserialize([ id, crdt ], parentToChildren, doc);
 
  case CrdtType.MAP:
-  return LiveMap._deserialize(entry, parentToChildren, doc);
+  return LiveMap._deserialize([ id, crdt ], parentToChildren, doc);
 
  case CrdtType.REGISTER:
-  return LiveRegister._deserialize(entry, parentToChildren, doc);
+  return LiveRegister._deserialize([ id, crdt ], parentToChildren, doc);
 
  default:
   throw new Error("Unexpected CRDT type");
@@ -831,11 +833,11 @@ function getTreesDiffOperations(currentItems, newItems) {
   });
  })), newItems.forEach(((crdt, id) => {
   const currentCrdt = currentItems.get(id);
-  if (currentCrdt) crdt.type === CrdtType.OBJECT && JSON.stringify(crdt.data) !== JSON.stringify(currentCrdt.data) && ops.push({
+  if (currentCrdt) crdt.type === CrdtType.OBJECT && (currentCrdt.type === CrdtType.OBJECT && JSON.stringify(crdt.data) === JSON.stringify(currentCrdt.data) || ops.push({
    type: OpCode.UPDATE_OBJECT,
    id: id,
    data: crdt.data
-  }), crdt.parentKey !== currentCrdt.parentKey && ops.push({
+  })), crdt.parentKey !== currentCrdt.parentKey && ops.push({
    type: OpCode.SET_PARENT_KEY,
    id: id,
    parentKey: crdt.parentKey
@@ -860,12 +862,16 @@ function getTreesDiffOperations(currentItems, newItems) {
    break;
 
   case CrdtType.OBJECT:
-   ops.push({
+   ops.push(crdt.parentId ? {
     type: OpCode.CREATE_OBJECT,
     id: id,
     parentId: crdt.parentId,
     parentKey: crdt.parentKey,
     data: crdt.data
+   } : {
+    type: OpCode.CREATE_OBJECT,
+    id: id,
+    data: crdt.data
    });
    break;
 
@@ -936,7 +942,7 @@ function findNonSerializableValue(value, path = "") {
 function isTokenValid(token) {
  const tokenParts = token.split(".");
  if (3 !== tokenParts.length) return !1;
- const data = parseJson(atob(tokenParts[1]));
+ const data = tryParseJson(atob(tokenParts[1]));
  if (void 0 === data || !isJsonObject(data) || "number" != typeof data.exp) return !1;
  return !(Date.now() / 1e3 > data.exp - 300);
 }
@@ -945,6 +951,25 @@ function entries(obj) {
  return Object.entries(obj);
 }
 
+function tryParseJson(rawMessage) {
+ try {
+  return JSON.parse(rawMessage);
+ } catch (e) {
+  return;
+ }
+}
+
+function b64decode(b64value) {
+ try {
+  const formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
+  return decodeURIComponent(atob(formattedValue).split("").map((function(c) {
+   return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+  })).join(""));
+ } catch (err) {
+  return atob(b64value);
+ }
+}
+
 class LiveObject extends AbstractCrdt {
  constructor(obj = {}) {
   super(), this._propToLastUpdate = new Map;
@@ -956,21 +981,26 @@ class LiveObject extends AbstractCrdt {
  }
  _serialize(parentId, parentKey, doc, intent) {
   if (null == this._id) throw new Error("Cannot serialize item is not attached");
-  const ops = [], op = {
+  const opId = null == doc ? void 0 : doc.generateOpId(), ops = [], op = void 0 !== parentId && void 0 !== parentKey ? {
+   type: OpCode.CREATE_OBJECT,
    id: this._id,
-   opId: null == doc ? void 0 : doc.generateOpId(),
+   opId: opId,
    intent: intent,
-   type: OpCode.CREATE_OBJECT,
    parentId: parentId,
    parentKey: parentKey,
    data: {}
+  } : {
+   type: OpCode.CREATE_OBJECT,
+   id: this._id,
+   opId: opId,
+   intent: intent,
+   data: {}
   };
   ops.push(op);
   for (const [key, value] of this._map) value instanceof AbstractCrdt ? ops.push(...value._serialize(this._id, key, doc)) : op.data[key] = value;
   return ops;
  }
  static _deserialize([id, item], parentToChildren, doc) {
-  if (item.type !== CrdtType.OBJECT) throw new Error(`Tried to deserialize a record but item type is "${item.type}"`);
   const liveObj = new LiveObject(item.data);
   return liveObj._attach(id, doc), this._deserializeChildren(liveObj, parentToChildren, doc);
  }
@@ -1065,11 +1095,14 @@ class LiveObject extends AbstractCrdt {
   var _a;
   const data = {};
   for (const [key, value] of this._map) value instanceof AbstractCrdt == !1 && (data[key] = value);
-  return {
+  return void 0 !== (null === (_a = this._parent) || void 0 === _a ? void 0 : _a._id) && void 0 !== this._parentKey ? {
    type: CrdtType.OBJECT,
-   parentId: null === (_a = this._parent) || void 0 === _a ? void 0 : _a._id,
+   parentId: this._parent._id,
    parentKey: this._parentKey,
    data: data
+  } : {
+   type: CrdtType.OBJECT,
+   data: data
   };
  }
  _applyUpdate(op, isLocal) {
@@ -1240,4 +1273,4 @@ class LiveObject extends AbstractCrdt {
  }
 }
 
-export { AbstractCrdt as A, ClientMsgCode as C, LiveObject as L, OpCode as O, ServerMsgCode as S, WebsocketCloseCodes as W, isSameNodeOrChildOf as a, LiveList as b, isJsonArray as c, compact as d, isJsonObject as e, deprecateIf as f, getTreesDiffOperations as g, LiveMap as h, isTokenValid as i, LiveRegister as j, findNonSerializableValue as k, deprecate as l, mergeStorageUpdates as m, errorIf as n, CrdtType as o, parseJson as p, comparePosition as q, remove as r, makePosition as s, throwUsageError as t };
+export { AbstractCrdt as A, ClientMsgCode as C, LiveObject as L, OpCode as O, ServerMsgCode as S, WebsocketCloseCodes as W, isSameNodeOrChildOf as a, LiveList as b, isJsonArray as c, compact as d, isJsonObject as e, isRootCrdt as f, getTreesDiffOperations as g, deprecateIf as h, isTokenValid as i, LiveMap as j, LiveRegister as k, findNonSerializableValue as l, mergeStorageUpdates as m, deprecate as n, errorIf as o, throwUsageError as p, CrdtType as q, remove as r, comparePosition as s, tryParseJson as t, makePosition as u, isChildCrdt as v, assertNever as w, b64decode as x };