@liveblocks/client 0.13.2 → 0.14.1

package/lib/cjs/AbstractCrdt.d.ts

@@ -1,4 +1,4 @@
-import { Op } from "./live";
+import { Op, SerializedCrdt } from "./live";
 export declare type ApplyResult = {
     reverse: Op[];
     modified: AbstractCrdt;
@@ -33,7 +33,7 @@ export declare abstract class AbstractCrdt {
     /**
      * INTERNAL
      */
-    _apply(op: Op): ApplyResult;
+    _apply(op: Op, isLocal: boolean): ApplyResult;
     /**
      * INTERNAL
      */
@@ -45,7 +45,7 @@ export declare abstract class AbstractCrdt {
     /**
      * INTERNAL
      */
-    abstract _attachChild(id: string, key: string, crdt: AbstractCrdt): ApplyResult;
+    abstract _attachChild(id: string, key: string, crdt: AbstractCrdt, isLocal: boolean): ApplyResult;
     /**
      * INTERNAL
      */
@@ -57,5 +57,9 @@ export declare abstract class AbstractCrdt {
     /**
      * INTERNAL
      */
-    abstract _serialize(parentId: string, parentKey: string): Op[];
+    abstract _serialize(parentId: string, parentKey: string, doc?: Doc): Op[];
+    /**
+     * INTERNAL
+     */
+    abstract _toSerializedCrdt(): SerializedCrdt;
 }

package/lib/cjs/AbstractCrdt.js

@@ -48,12 +48,12 @@ class AbstractCrdt {
     /**
      * INTERNAL
      */
-    _apply(op) {
+    _apply(op, isLocal) {
         switch (op.type) {
             case live_1.OpType.DeleteCrdt: {
                 if (this._parent != null && this._parentKey != null) {
                     const parent = this._parent;
-                    const reverse = this._serialize(this._parent._id, this._parentKey);
+                    const reverse = this._serialize(this._parent._id, this._parentKey, __classPrivateFieldGet(this, _AbstractCrdt_doc, "f"));
                     this._parent._detachChild(this);
                     return { modified: parent, reverse };
                 }

package/lib/cjs/LiveList.d.ts

@@ -1,5 +1,5 @@
 import { AbstractCrdt, Doc, ApplyResult } from "./AbstractCrdt";
-import { SerializedList, SerializedCrdtWithId, Op } from "./live";
+import { SerializedList, SerializedCrdtWithId, Op, SerializedCrdt } from "./live";
 /**
  * The LiveList class represents an ordered collection of items that is synchorinized across clients.
  */
@@ -13,7 +13,7 @@ export declare class LiveList<T> extends AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId?: string, parentKey?: string): Op[];
+    _serialize(parentId?: string, parentKey?: string, doc?: Doc): Op[];
     /**
      * INTERNAL
      */
@@ -25,7 +25,7 @@ export declare class LiveList<T> extends AbstractCrdt {
     /**
      * INTERNAL
      */
-    _attachChild(id: string, key: string, child: AbstractCrdt): ApplyResult;
+    _attachChild(id: string, key: string, child: AbstractCrdt, isLocal: boolean): ApplyResult;
     /**
      * INTERNAL
      */
@@ -37,7 +37,11 @@ export declare class LiveList<T> extends AbstractCrdt {
     /**
      * INTERNAL
      */
-    _apply(op: Op): ApplyResult;
+    _apply(op: Op, isLocal: boolean): ApplyResult;
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt(): SerializedCrdt;
     /**
      * Returns the number of elements.
      */
@@ -64,6 +68,7 @@ export declare class LiveList<T> extends AbstractCrdt {
      * @param index The index of the element to delete
      */
     delete(index: number): void;
+    clear(): void;
     /**
      * Returns an Array of all the elements in the LiveList.
      */

package/lib/cjs/LiveList.js

@@ -54,7 +54,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId, parentKey) {
+    _serialize(parentId, parentKey, doc) {
         if (this._id == null) {
             throw new Error("Cannot serialize item is not attached");
         }
@@ -64,13 +64,14 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
         const ops = [];
         const op = {
             id: this._id,
+            opId: doc === null || doc === void 0 ? void 0 : doc.generateOpId(),
             type: live_1.OpType.CreateList,
             parentId,
             parentKey,
         };
         ops.push(op);
         for (const [value, key] of __classPrivateFieldGet(this, _LiveList_items, "f")) {
-            ops.push(...value._serialize(this._id, key));
+            ops.push(...value._serialize(this._id, key, doc));
         }
         return ops;
     }
@@ -95,7 +96,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _attachChild(id, key, child) {
+    _attachChild(id, key, child, isLocal) {
         var _a;
         if (this._doc == null) {
             throw new Error("Can't attach child if doc is not present");
@@ -103,11 +104,24 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
         child._attach(id, this._doc);
         child._setParentLink(this, key);
         const index = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[1] === key);
-        // Assign a temporary position until we get the fix from the backend
+        let newKey = key;
+        // If there is a conflict
         if (index !== -1) {
-            __classPrivateFieldGet(this, _LiveList_items, "f")[index][1] = (0, position_1.makePosition)(key, (_a = __classPrivateFieldGet(this, _LiveList_items, "f")[index + 1]) === null || _a === void 0 ? void 0 : _a[1]);
+            if (isLocal) {
+                // If change is local => assign a temporary position to newly attached child
+                let before = __classPrivateFieldGet(this, _LiveList_items, "f")[index] ? __classPrivateFieldGet(this, _LiveList_items, "f")[index][1] : undefined;
+                let after = __classPrivateFieldGet(this, _LiveList_items, "f")[index + 1]
+                    ? __classPrivateFieldGet(this, _LiveList_items, "f")[index + 1][1]
+                    : undefined;
+                newKey = (0, position_1.makePosition)(before, after);
+                child._setParentLink(this, newKey);
+            }
+            else {
+                // If change is remote => assign a temporary position to existing child until we get the fix from the backend
+                __classPrivateFieldGet(this, _LiveList_items, "f")[index][1] = (0, position_1.makePosition)(key, (_a = __classPrivateFieldGet(this, _LiveList_items, "f")[index + 1]) === null || _a === void 0 ? void 0 : _a[1]);
+            }
         }
-        __classPrivateFieldGet(this, _LiveList_items, "f").push([child, key]);
+        __classPrivateFieldGet(this, _LiveList_items, "f").push([child, newKey]);
         __classPrivateFieldGet(this, _LiveList_items, "f").sort((itemA, itemB) => (0, position_1.compare)(itemA[1], itemB[1]));
         return { reverse: [{ type: live_1.OpType.DeleteCrdt, id }], modified: this };
     }
@@ -141,8 +155,19 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _apply(op) {
-        return super._apply(op);
+    _apply(op, isLocal) {
+        return super._apply(op, isLocal);
+    }
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt() {
+        var _a;
+        return {
+            type: live_1.CrdtType.List,
+            parentId: (_a = this._parent) === null || _a === void 0 ? void 0 : _a._id,
+            parentKey: this._parentKey,
+        };
     }
     /**
      * Returns the number of elements.
@@ -176,7 +201,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
         if (this._doc && this._id) {
             const id = this._doc.generateId();
             value._attach(id, this._doc);
-            this._doc.dispatch(value._serialize(this._id, position), [{ type: live_1.OpType.DeleteCrdt, id }], [this]);
+            this._doc.dispatch(value._serialize(this._id, position, this._doc), [{ type: live_1.OpType.DeleteCrdt, id }], [this]);
         }
     }
     /**
@@ -222,6 +247,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
                 {
                     type: live_1.OpType.SetParentKey,
                     id: item[0]._id,
+                    opId: this._doc.generateOpId(),
                     parentKey: position,
                 },
             ], [
@@ -250,12 +276,35 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
                 this._doc.dispatch([
                     {
                         id: childRecordId,
+                        opId: this._doc.generateOpId(),
                         type: live_1.OpType.DeleteCrdt,
                     },
                 ], item[0]._serialize(this._id, item[1]), [this]);
             }
         }
     }
+    clear() {
+        if (this._doc) {
+            let ops = [];
+            let reverseOps = [];
+            for (const item of __classPrivateFieldGet(this, _LiveList_items, "f")) {
+                item[0]._detach();
+                const childId = item[0]._id;
+                if (childId) {
+                    ops.push({ id: childId, type: live_1.OpType.DeleteCrdt });
+                    reverseOps.push(...item[0]._serialize(this._id, item[1]));
+                }
+            }
+            __classPrivateFieldSet(this, _LiveList_items, [], "f");
+            this._doc.dispatch(ops, reverseOps, [this]);
+        }
+        else {
+            for (const item of __classPrivateFieldGet(this, _LiveList_items, "f")) {
+                item[0]._detach();
+            }
+            __classPrivateFieldSet(this, _LiveList_items, [], "f");
+        }
+    }
     /**
      * Returns an Array of all the elements in the LiveList.
      */

package/lib/cjs/LiveMap.d.ts

@@ -1,5 +1,5 @@
 import { AbstractCrdt, Doc, ApplyResult } from "./AbstractCrdt";
-import { Op, SerializedCrdtWithId } from "./live";
+import { Op, SerializedCrdtWithId, SerializedCrdt } from "./live";
 /**
  * The LiveMap class is similar to a JavaScript Map that is synchronized on all clients.
  * Keys should be a string, and values should be serializable to JSON.
@@ -11,7 +11,7 @@ export declare class LiveMap<TKey extends string, TValue> extends AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId?: string, parentKey?: string): Op[];
+    _serialize(parentId?: string, parentKey?: string, doc?: Doc): Op[];
     /**
      * INTERNAL
      */
@@ -23,7 +23,7 @@ export declare class LiveMap<TKey extends string, TValue> extends AbstractCrdt {
     /**
      * INTERNAL
      */
-    _attachChild(id: string, key: TKey, child: AbstractCrdt): ApplyResult;
+    _attachChild(id: string, key: TKey, child: AbstractCrdt, isLocal: boolean): ApplyResult;
     /**
      * INTERNAL
      */
@@ -32,6 +32,10 @@ export declare class LiveMap<TKey extends string, TValue> extends AbstractCrdt {
      * INTERNAL
      */
     _detachChild(child: AbstractCrdt): void;
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt(): SerializedCrdt;
     /**
      * Returns a specified element from the LiveMap.
      * @param key The key of the element to return.

package/lib/cjs/LiveMap.js

@@ -41,7 +41,7 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId, parentKey) {
+    _serialize(parentId, parentKey, doc) {
         if (this._id == null) {
             throw new Error("Cannot serialize item is not attached");
         }
@@ -51,13 +51,14 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
         const ops = [];
         const op = {
             id: this._id,
+            opId: doc === null || doc === void 0 ? void 0 : doc.generateOpId(),
             type: live_1.OpType.CreateMap,
             parentId,
             parentKey,
         };
         ops.push(op);
         for (const [key, value] of __classPrivateFieldGet(this, _LiveMap_map, "f")) {
-            ops.push(...value._serialize(this._id, key));
+            ops.push(...value._serialize(this._id, key, doc));
         }
         return ops;
     }
@@ -99,7 +100,7 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _attachChild(id, key, child) {
+    _attachChild(id, key, child, isLocal) {
         if (this._doc == null) {
             throw new Error("Can't attach child if doc is not present");
         }
@@ -137,6 +138,17 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
         }
         child._detach();
     }
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt() {
+        var _a;
+        return {
+            type: live_1.CrdtType.Map,
+            parentId: (_a = this._parent) === null || _a === void 0 ? void 0 : _a._id,
+            parentKey: this._parentKey,
+        };
+    }
     /**
      * Returns a specified element from the LiveMap.
      * @param key The key of the element to return.
@@ -165,7 +177,7 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
         if (this._doc && this._id) {
             const id = this._doc.generateId();
             item._attach(id, this._doc);
-            this._doc.dispatch(item._serialize(this._id, key), oldValue
+            this._doc.dispatch(item._serialize(this._id, key, this._doc), oldValue
                 ? oldValue._serialize(this._id, key)
                 : [{ type: live_1.OpType.DeleteCrdt, id }], [this]);
         }
@@ -195,7 +207,13 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
         }
         item._detach();
         if (this._doc && item._id) {
-            this._doc.dispatch([{ type: live_1.OpType.DeleteCrdt, id: item._id }], item._serialize(this._id, key), [this]);
+            this._doc.dispatch([
+                {
+                    type: live_1.OpType.DeleteCrdt,
+                    id: item._id,
+                    opId: this._doc.generateOpId(),
+                },
+            ], item._serialize(this._id, key), [this]);
         }
         __classPrivateFieldGet(this, _LiveMap_map, "f").delete(key);
         return true;

package/lib/cjs/LiveObject.d.ts

@@ -1,5 +1,5 @@
 import { AbstractCrdt, Doc, ApplyResult } from "./AbstractCrdt";
-import { Op, SerializedCrdtWithId } from "./live";
+import { Op, SerializedCrdt, SerializedCrdtWithId } from "./live";
 /**
  * The LiveObject class is similar to a JavaScript object that is synchronized on all clients.
  * Keys should be a string, and values should be serializable to JSON.
@@ -11,13 +11,15 @@ export declare class LiveObject<T extends Record<string, any> = Record<string, a
     /**
      * INTERNAL
      */
-    _serialize(parentId?: string, parentKey?: string): Op[];
+    _serialize(parentId?: string, parentKey?: string, doc?: Doc): Op[];
     /**
      * INTERNAL
      */
-    static _deserialize([id, item]: SerializedCrdtWithId, parentToChildren: Map<string, SerializedCrdtWithId[]>, doc: Doc): LiveObject<{
-        [key: string]: any;
-    }>;
+    static _deserialize([id, item]: SerializedCrdtWithId, parentToChildren: Map<string, SerializedCrdtWithId[]>, doc: Doc): LiveObject<Record<string, any>>;
+    /**
+     * INTERNAL
+     */
+    static _deserializeChildren(object: LiveObject, parentToChildren: Map<string, SerializedCrdtWithId[]>, doc: Doc): LiveObject<Record<string, any>>;
     /**
      * INTERNAL
      */
@@ -25,11 +27,15 @@ export declare class LiveObject<T extends Record<string, any> = Record<string, a
     /**
      * INTERNAL
      */
-    _attachChild(id: string, key: keyof T, child: AbstractCrdt): ApplyResult;
+    _attachChild(id: string, key: keyof T, child: AbstractCrdt, isLocal: boolean): ApplyResult;
     /**
      * INTERNAL
      */
     _detachChild(child: AbstractCrdt): void;
+    /**
+     * INTERNAL
+     */
+    _detachChildren(): void;
     /**
      * INTERNAL
      */
@@ -37,7 +43,11 @@ export declare class LiveObject<T extends Record<string, any> = Record<string, a
     /**
      * INTERNAL
      */
-    _apply(op: Op): ApplyResult;
+    _apply(op: Op, isLocal: boolean): ApplyResult;
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt(): SerializedCrdt;
     /**
      * Transform the LiveObject into a javascript object
      */

package/lib/cjs/LiveObject.js

@@ -38,13 +38,14 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId, parentKey) {
+    _serialize(parentId, parentKey, doc) {
         if (this._id == null) {
             throw new Error("Cannot serialize item is not attached");
         }
         const ops = [];
         const op = {
             id: this._id,
+            opId: doc === null || doc === void 0 ? void 0 : doc.generateOpId(),
             type: live_1.OpType.CreateObject,
             parentId,
             parentKey,
@@ -53,7 +54,7 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
         ops.push(op);
         for (const [key, value] of __classPrivateFieldGet(this, _LiveObject_map, "f")) {
             if (value instanceof AbstractCrdt_1.AbstractCrdt) {
-                ops.push(...value._serialize(this._id, key));
+                ops.push(...value._serialize(this._id, key, doc));
             }
             else {
                 op.data[key] = value;
@@ -70,7 +71,13 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
         }
         const object = new LiveObject(item.data);
         object._attach(id, doc);
-        const children = parentToChildren.get(id);
+        return this._deserializeChildren(object, parentToChildren, doc);
+    }
+    /**
+     * INTERNAL
+     */
+    static _deserializeChildren(object, parentToChildren, doc) {
+        const children = parentToChildren.get(object._id);
         if (children == null) {
             return object;
         }
@@ -99,7 +106,7 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _attachChild(id, key, child) {
+    _attachChild(id, key, child, isLocal) {
         if (this._doc == null) {
             throw new Error("Can't attach child if doc is not present");
         }
@@ -141,6 +148,15 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
             child._detach();
         }
     }
+    /**
+     * INTERNAL
+     */
+    _detachChildren() {
+        for (const [key, value] of __classPrivateFieldGet(this, _LiveObject_map, "f")) {
+            __classPrivateFieldGet(this, _LiveObject_map, "f").delete(key);
+            value._detach();
+        }
+    }
     /**
      * INTERNAL
      */
@@ -155,14 +171,26 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _apply(op) {
+    _apply(op, isLocal) {
         if (op.type === live_1.OpType.UpdateObject) {
-            return __classPrivateFieldGet(this, _LiveObject_instances, "m", _LiveObject_applyUpdate).call(this, op);
+            return __classPrivateFieldGet(this, _LiveObject_instances, "m", _LiveObject_applyUpdate).call(this, op, isLocal);
         }
         else if (op.type === live_1.OpType.DeleteObjectKey) {
             return __classPrivateFieldGet(this, _LiveObject_instances, "m", _LiveObject_applyDeleteObjectKey).call(this, op);
         }
-        return super._apply(op);
+        return super._apply(op, isLocal);
+    }
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt() {
+        var _a;
+        return {
+            type: live_1.CrdtType.Object,
+            parentId: (_a = this._parent) === null || _a === void 0 ? void 0 : _a._id,
+            parentKey: this._parentKey,
+            data: this.toObject(),
+        };
     }
     /**
      * Transform the LiveObject into a javascript object
@@ -218,7 +246,14 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
             ];
         }
         __classPrivateFieldGet(this, _LiveObject_map, "f").delete(keyAsString);
-        this._doc.dispatch([{ type: live_1.OpType.DeleteObjectKey, key: keyAsString, id: this._id }], reverse, [this]);
+        this._doc.dispatch([
+            {
+                type: live_1.OpType.DeleteObjectKey,
+                key: keyAsString,
+                id: this._id,
+                opId: this._doc.generateOpId(),
+            },
+        ], reverse, [this]);
     }
     /**
      * Adds or updates multiple properties at once with an object.
@@ -265,7 +300,7 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
             if (newValue instanceof AbstractCrdt_1.AbstractCrdt) {
                 newValue._setParentLink(this, key);
                 newValue._attach(this._doc.generateId(), this._doc);
-                ops.push(...newValue._serialize(this._id, key));
+                ops.push(...newValue._serialize(this._id, key, this._doc));
             }
             else {
                 updatedProps[key] = newValue;
@@ -287,7 +322,7 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
     }
 }
 exports.LiveObject = LiveObject;
-_LiveObject_map = new WeakMap(), _LiveObject_propToLastUpdate = new WeakMap(), _LiveObject_instances = new WeakSet(), _LiveObject_applyUpdate = function _LiveObject_applyUpdate(op) {
+_LiveObject_map = new WeakMap(), _LiveObject_propToLastUpdate = new WeakMap(), _LiveObject_instances = new WeakSet(), _LiveObject_applyUpdate = function _LiveObject_applyUpdate(op, isLocal) {
     let isModified = false;
     const reverse = [];
     const reverseUpdate = {
@@ -309,11 +344,6 @@ _LiveObject_map = new WeakMap(), _LiveObject_propToLastUpdate = new WeakMap(), _
             reverse.push({ type: live_1.OpType.DeleteObjectKey, id: this._id, key });
         }
     }
-    let isLocal = false;
-    if (op.opId == null) {
-        isLocal = true;
-        op.opId = this._doc.generateOpId();
-    }
     for (const key in op.data) {
         if (isLocal) {
             __classPrivateFieldGet(this, _LiveObject_propToLastUpdate, "f").set(key, op.opId);

package/lib/cjs/LiveRegister.d.ts

@@ -1,5 +1,5 @@
 import { AbstractCrdt, Doc, ApplyResult } from "./AbstractCrdt";
-import { SerializedCrdtWithId, Op } from "./live";
+import { SerializedCrdtWithId, Op, SerializedCrdt } from "./live";
 /**
  * INTERNAL
  */
@@ -14,8 +14,12 @@ export declare class LiveRegister<TValue = any> extends AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId: string, parentKey: string): Op[];
-    _attachChild(id: string, key: string, crdt: AbstractCrdt): ApplyResult;
+    _serialize(parentId: string, parentKey: string, doc?: Doc): Op[];
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt(): SerializedCrdt;
+    _attachChild(id: string, key: string, crdt: AbstractCrdt, isLocal: boolean): ApplyResult;
     _detachChild(crdt: AbstractCrdt): void;
-    _apply(op: Op): ApplyResult;
+    _apply(op: Op, isLocal: boolean): ApplyResult;
 }

package/lib/cjs/LiveRegister.js

@@ -41,13 +41,14 @@ class LiveRegister extends AbstractCrdt_1.AbstractCrdt {
     /**
      * INTERNAL
      */
-    _serialize(parentId, parentKey) {
+    _serialize(parentId, parentKey, doc) {
         if (this._id == null || parentId == null || parentKey == null) {
             throw new Error("Cannot serialize register if parentId or parentKey is undefined");
         }
         return [
             {
                 type: live_1.OpType.CreateRegister,
+                opId: doc === null || doc === void 0 ? void 0 : doc.generateOpId(),
                 id: this._id,
                 parentId,
                 parentKey,
@@ -55,14 +56,26 @@ class LiveRegister extends AbstractCrdt_1.AbstractCrdt {
             },
         ];
     }
-    _attachChild(id, key, crdt) {
+    /**
+     * INTERNAL
+     */
+    _toSerializedCrdt() {
+        var _a;
+        return {
+            type: live_1.CrdtType.Register,
+            parentId: (_a = this._parent) === null || _a === void 0 ? void 0 : _a._id,
+            parentKey: this._parentKey,
+            data: this.data,
+        };
+    }
+    _attachChild(id, key, crdt, isLocal) {
         throw new Error("Method not implemented.");
     }
     _detachChild(crdt) {
         throw new Error("Method not implemented.");
     }
-    _apply(op) {
-        return super._apply(op);
+    _apply(op, isLocal) {
+        return super._apply(op, isLocal);
     }
 }
 exports.LiveRegister = LiveRegister;

package/lib/cjs/client.js

@@ -29,11 +29,7 @@ const room_1 = require("./room");
  */
 function createClient(options) {
     const clientOptions = options;
-    if (typeof clientOptions.throttle === "number") {
-        if (clientOptions.throttle < 80 || clientOptions.throttle > 1000) {
-            throw new Error("Liveblocks client throttle should be between 80 and 1000 ms");
-        }
-    }
+    const throttleDelay = getThrottleDelayFromOptions(options);
     const rooms = new Map();
     function getRoom(roomId) {
         const internalRoom = rooms.get(roomId);
@@ -44,9 +40,21 @@ function createClient(options) {
         if (internalRoom) {
             return internalRoom.room;
         }
-        internalRoom = (0, room_1.createRoom)(roomId, Object.assign(Object.assign({}, clientOptions), options));
+        internalRoom = (0, room_1.createRoom)({
+            defaultPresence: options.defaultPresence,
+            defaultStorageRoot: options.defaultStorageRoot,
+        }, {
+            room: roomId,
+            throttleDelay,
+            WebSocketPolyfill: clientOptions.WebSocketPolyfill,
+            fetchPolyfill: clientOptions.fetchPolyfill,
+            liveblocksServer: clientOptions.liveblocksServer || "wss://liveblocks.net/v5",
+            authentication: prepareAuthentication(clientOptions),
+        });
         rooms.set(roomId, internalRoom);
-        internalRoom.connect();
+        if (!options.DO_NOT_USE_withoutConnecting) {
+            internalRoom.connect();
+        }
         return internalRoom.room;
     }
     function leave(roomId) {
@@ -78,3 +86,38 @@ function createClient(options) {
     };
 }
 exports.createClient = createClient;
+function getThrottleDelayFromOptions(options) {
+    if (options.throttle === undefined) {
+        return 100;
+    }
+    if (typeof options.throttle !== "number" ||
+        options.throttle < 80 ||
+        options.throttle > 1000) {
+        throw new Error("throttle should be a number between 80 and 1000.");
+    }
+    return options.throttle;
+}
+function prepareAuthentication(clientOptions) {
+    // TODO: throw descriptive errors for invalid options
+    if (typeof clientOptions.publicApiKey === "string") {
+        return {
+            type: "public",
+            publicApiKey: clientOptions.publicApiKey,
+            url: clientOptions.publicAuthorizeEndpoint ||
+                "https://liveblocks.io/api/public/authorize",
+        };
+    }
+    else if (typeof clientOptions.authEndpoint === "string") {
+        return {
+            type: "private",
+            url: clientOptions.authEndpoint,
+        };
+    }
+    else if (typeof clientOptions.authEndpoint === "function") {
+        return {
+            type: "custom",
+            callback: clientOptions.authEndpoint,
+        };
+    }
+    throw new Error("Invalid Liveblocks client options. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient");
+}