@liveblocks/core 1.0.6-test3 → 1.0.7-test1

package/dist/index.d.ts

@@ -1236,20 +1236,10 @@ declare function errorIf(condition: unknown, message: string): void;
  */
 declare const freeze: typeof Object.freeze;
 
-declare function makePosition(before?: string, after?: string): string;
-declare function comparePosition(posA: string, posB: string): number;
-
-/**
- * Shallowly compares two given values.
- *
- * - Two simple values are considered equal if they're strictly equal
- * - Two arrays are considered equal if their members are strictly equal
- * - Two objects are considered equal if their values are strictly equal
- *
- * Testing goes one level deep.
- */
-declare function shallow(a: unknown, b: unknown): boolean;
-
+declare const brand: unique symbol;
+declare type Brand<T, TBrand extends string> = T & {
+    [brand]: TBrand;
+};
 declare function isPlainObject(blob: unknown): blob is {
     [key: string]: unknown;
 };
@@ -1263,6 +1253,82 @@ declare function tryParseJson(rawMessage: string): Json | undefined;
  */
 declare function b64decode(b64value: string): string;
 
+/**
+ * Positions, aka the Pos type, are efficient encodings of "positions" in
+ * a list, using the following printable subset of the ASCII alphabet:
+ *
+ *    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+ *   ^                                                                                             ^
+ *   Lowest digit                                                                      Highest digit
+ *
+ * Each Pos is a sequence of characters from the above alphabet, conceptually
+ * codifying a floating point number 0 < n < 1. For example, the string "31007"
+ * would be used to represent the number 0.31007, except that this
+ * representation uses base 96.
+ *
+ *   0 ≃ ' '  (lowest digit)
+ *   1 ≃ '!'
+ *   2 ≃ '"'
+ *   ...
+ *   9 ≃ '~'  (highest digit)
+ *
+ * So think:
+ *   '!'    ≃ 0.1
+ *   '"'    ≃ 0.2
+ *   '!"~'  ≃ 0.129
+ *
+ * Three rules:
+ * - All "characters" in the string should be valid digits (from the above
+ *   alphabet)
+ * - The value 0.0 is not a valid Pos value
+ * - A Pos cannot have trailing "zeroes"
+ *
+ * This representation has the following benefits:
+ *
+ * 1. It's always possible to get a number that lies before, after, or between
+ *    two arbitrary Pos values.
+ * 2. Pos values can be compared using normal string comparison.
+ *
+ * Some examples:
+ * - '!'  < '"'   (like how .1  < .2)
+ * - '!'  < '~'   (like how .1  < .9)
+ * - '!!' < '!~'  (like how .11 < .19)
+ * - '~!' < '~~'  (like how .91 < .99)
+ * - '~'  < '~!'  (like how .9  < .91)
+ * - '!!' < '!O'  (like how .1  < .5)
+ * - '!O' < '!~'  (like how .5  < .9)
+ *
+ */
+
+/**
+ * A valid/verified "position" string. These values are used as "parentKey"s by
+ * LiveList children, and define their relative ordering.
+ */
+declare type Pos = Brand<string, "Pos">;
+/**
+ * Given two positions, returns the position value that lies in the middle.
+ * When given only a high bound, computes the canonical position "before" it.
+ * When given only a low bound, computes the canonical position "after" it.
+ * When given no bounds at all, returns the "first" canonical position.
+ */
+declare function makePosition(x?: Pos, y?: Pos): Pos;
+/**
+ * Checks that a str is a valid Pos, and converts it to the nearest valid one
+ * if not.
+ */
+declare function asPos(str: string): Pos;
+
+/**
+ * Shallowly compares two given values.
+ *
+ * - Two simple values are considered equal if they're strictly equal
+ * - Two arrays are considered equal if their members are strictly equal
+ * - Two objects are considered equal if their values are strictly equal
+ *
+ * Testing goes one level deep.
+ */
+declare function shallow(a: unknown, b: unknown): boolean;
+
 declare type IdTuple<T> = [id: string, value: T];
 declare enum CrdtType {
     OBJECT = 0,
@@ -1673,4 +1739,4 @@ declare type EnsureJson<T> = [
     [K in keyof T]: EnsureJson<T[K]>;
 };
 
-export { AckOp, AppOnlyAuthToken, AuthToken, BaseUserMeta, BroadcastEventClientMsg, BroadcastOptions, BroadcastedEventServerMsg, Client, ClientMsg, ClientMsgCode, ConnectionStatus, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, CreateRootObjectOp, DeleteCrdtOp, DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, EnsureJson, FetchStorageClientMsg, History, IdTuple, Immutable, InitialDocumentStateServerMsg, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveMap, LiveNode, LiveObject, LiveStructure, Lson, LsonObject, NodeMap, Op, OpCode, Others, ParentToChildNodeMap, PlainLson, PlainLsonFields, PlainLsonList, PlainLsonMap, PlainLsonObject, RejectedStorageOpServerMsg, Resolve, Room, RoomAuthToken, RoomInitializers, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, StorageStatus, StorageUpdate, ToImmutable, ToJson, UpdateObjectOp, UpdatePresenceClientMsg, UpdatePresenceServerMsg, UpdateStorageClientMsg, UpdateStorageServerMsg, User, UserJoinServerMsg, UserLeftServerMsg, WebsocketCloseCodes, asArrayWithLegacyMethods, assert, assertNever, b64decode, comparePosition, createClient, deprecate, deprecateIf, errorIf, freeze, isAppOnlyAuthToken, isAuthToken, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isPlainObject, isRoomAuthToken, isRootCrdt, legacy_patchImmutableObject, lsonToJson, makePosition, nn, patchLiveObjectKey, shallow, throwUsageError, tryParseJson };
+export { AckOp, AppOnlyAuthToken, AuthToken, BaseUserMeta, BroadcastEventClientMsg, BroadcastOptions, BroadcastedEventServerMsg, Client, ClientMsg, ClientMsgCode, ConnectionStatus, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, CreateRootObjectOp, DeleteCrdtOp, DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, EnsureJson, FetchStorageClientMsg, History, IdTuple, Immutable, InitialDocumentStateServerMsg, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveMap, LiveNode, LiveObject, LiveStructure, Lson, LsonObject, NodeMap, Op, OpCode, Others, ParentToChildNodeMap, PlainLson, PlainLsonFields, PlainLsonList, PlainLsonMap, PlainLsonObject, RejectedStorageOpServerMsg, Resolve, Room, RoomAuthToken, RoomInitializers, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, StorageStatus, StorageUpdate, ToImmutable, ToJson, UpdateObjectOp, UpdatePresenceClientMsg, UpdatePresenceServerMsg, UpdateStorageClientMsg, UpdateStorageServerMsg, User, UserJoinServerMsg, UserLeftServerMsg, WebsocketCloseCodes, asArrayWithLegacyMethods, asPos, assert, assertNever, b64decode, createClient, deprecate, deprecateIf, errorIf, freeze, isAppOnlyAuthToken, isAuthToken, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isPlainObject, isRoomAuthToken, isRootCrdt, legacy_patchImmutableObject, lsonToJson, makePosition, nn, patchLiveObjectKey, shallow, throwUsageError, tryParseJson };

package/dist/index.js

@@ -117,7 +117,7 @@ var onMessageFromPanel = eventSource.observable;
 // src/devtools/index.ts
 var VERSION = true ? (
   /* istanbul ignore next */
-  "1.0.6-test3"
+  "1.0.7-test1"
 ) : "dev";
 var _devtoolsSetupHasRun = false;
 function setupDevTools(getAllRooms) {
@@ -345,6 +345,132 @@ function nn(value, errmsg = "Expected value to be non-nullable") {
   return value;
 }
 
+// src/lib/position.ts
+var MIN_CODE = 32;
+var MAX_CODE = 126;
+var NUM_DIGITS = MAX_CODE - MIN_CODE + 1;
+var ZERO = nthDigit(0);
+var ONE = nthDigit(1);
+var ZERO_NINE = ZERO + nthDigit(-1);
+function nthDigit(n) {
+  const code = MIN_CODE + (n < 0 ? NUM_DIGITS + n : n);
+  if (code < MIN_CODE || code > MAX_CODE) {
+    throw new Error(`Invalid n value: ${n}`);
+  }
+  return String.fromCharCode(code);
+}
+function makePosition(x, y) {
+  if (x !== void 0 && y !== void 0) {
+    return between(x, y);
+  } else if (x !== void 0) {
+    return after(x);
+  } else if (y !== void 0) {
+    return before(y);
+  } else {
+    return ONE;
+  }
+}
+function before(pos) {
+  const lastIndex = pos.length - 1;
+  for (let i = 0; i <= lastIndex; i++) {
+    const code = pos.charCodeAt(i);
+    if (code <= MIN_CODE) {
+      continue;
+    }
+    if (i === lastIndex) {
+      if (code === MIN_CODE + 1) {
+        return pos.substring(0, i) + ZERO_NINE;
+      } else {
+        return pos.substring(0, i) + String.fromCharCode(code - 1);
+      }
+    } else {
+      return pos.substring(0, i + 1);
+    }
+  }
+  return ONE;
+}
+function after(pos) {
+  for (let i = 0; i <= pos.length - 1; i++) {
+    const code = pos.charCodeAt(i);
+    if (code >= MAX_CODE) {
+      continue;
+    }
+    return pos.substring(0, i) + String.fromCharCode(code + 1);
+  }
+  return pos + ONE;
+}
+function between(lo, hi) {
+  if (lo < hi) {
+    return _between(lo, hi);
+  } else if (lo > hi) {
+    return _between(hi, lo);
+  } else {
+    throw new Error("Cannot compute value between two equal positions");
+  }
+}
+function _between(lo, hi) {
+  let index = 0;
+  const loLen = lo.length;
+  const hiLen = hi.length;
+  while (true) {
+    const loCode = index < loLen ? lo.charCodeAt(index) : MIN_CODE;
+    const hiCode = index < hiLen ? hi.charCodeAt(index) : MAX_CODE;
+    if (loCode === hiCode) {
+      index++;
+      continue;
+    }
+    if (hiCode - loCode === 1) {
+      const prefix = lo.substring(0, index + 1);
+      const suffix = lo.substring(index + 1);
+      const nines = "";
+      return prefix + _between(suffix, nines);
+    } else {
+      return takeN(lo, index) + String.fromCharCode(hiCode + loCode >> 1);
+    }
+  }
+}
+function takeN(pos, n) {
+  return n < pos.length ? pos.substring(0, n) : pos + ZERO.repeat(n - pos.length);
+}
+var MIN_NON_ZERO_CODE = MIN_CODE + 1;
+function isPos(str) {
+  if (str === "") {
+    return false;
+  }
+  const lastIdx = str.length - 1;
+  const last = str.charCodeAt(lastIdx);
+  if (last < MIN_NON_ZERO_CODE || last > MAX_CODE) {
+    return false;
+  }
+  for (let i = 0; i < lastIdx; i++) {
+    const code = str.charCodeAt(i);
+    if (code < MIN_CODE || code > MAX_CODE) {
+      return false;
+    }
+  }
+  return true;
+}
+function convertToPos(str) {
+  const codes = [];
+  for (let i = 0; i < str.length; i++) {
+    const code = str.charCodeAt(i);
+    codes.push(code < MIN_CODE ? MIN_CODE : code > MAX_CODE ? MAX_CODE : code);
+  }
+  while (codes.length > 0 && codes[codes.length - 1] === MIN_CODE) {
+    codes.length--;
+  }
+  return codes.length > 0 ? String.fromCharCode(...codes) : (
+    // Edge case: the str was a 0-only string, which is invalid. Default back to .1
+    ONE
+  );
+}
+function asPos(str) {
+  return isPos(str) ? str : convertToPos(str);
+}
+function comparePosition(posA, posB) {
+  return posA === posB ? 0 : posA < posB ? -1 : 1;
+}
+
 // src/protocol/Op.ts
 var OpCode = /* @__PURE__ */ ((OpCode2) => {
   OpCode2[OpCode2["INIT"] = 0] = "INIT";
@@ -366,12 +492,12 @@ function isAckOp(op) {
 function crdtAsLiveNode(value) {
   return value;
 }
-function HasParent(node, key) {
-  return Object.freeze({ type: "HasParent", node, key });
+function HasParent(node, key, pos = asPos(key)) {
+  return Object.freeze({ type: "HasParent", node, key, pos });
 }
 var NoParent = Object.freeze({ type: "NoParent" });
-function Orphaned(oldKey) {
-  return Object.freeze({ type: "Orphaned", oldKey });
+function Orphaned(oldKey, oldPos = asPos(oldKey)) {
+  return Object.freeze({ type: "Orphaned", oldKey, oldPos });
 }
 var AbstractCrdt = class {
   constructor() {
@@ -392,6 +518,19 @@ var AbstractCrdt = class {
     }
   }
   /** @internal */
+  get _parentPos() {
+    switch (this.parent.type) {
+      case "HasParent":
+        return this.parent.pos;
+      case "NoParent":
+        throw new Error("Parent key is missing");
+      case "Orphaned":
+        return this.parent.oldPos;
+      default:
+        return assertNever(this.parent, "Unknown state");
+    }
+  }
+  /** @internal */
   get _pool() {
     return this.__pool;
   }
@@ -407,19 +546,6 @@ var AbstractCrdt = class {
     return this._parent;
   }
   /** @internal */
-  get _parentNode() {
-    switch (this.parent.type) {
-      case "HasParent":
-        return this.parent.node;
-      case "NoParent":
-        return null;
-      case "Orphaned":
-        return null;
-      default:
-        return assertNever(this.parent, "Unknown state");
-    }
-  }
-  /** @internal */
   get _parentKey() {
     switch (this.parent.type) {
       case "HasParent":
@@ -479,7 +605,7 @@ var AbstractCrdt = class {
     }
     switch (this.parent.type) {
       case "HasParent": {
-        this._parent = Orphaned(this.parent.key);
+        this._parent = Orphaned(this.parent.key, this.parent.pos);
         break;
       }
       case "NoParent": {
@@ -487,7 +613,6 @@ var AbstractCrdt = class {
         break;
       }
       case "Orphaned": {
-        this._parent = Orphaned(this.parent.oldKey);
         break;
       }
       default:
@@ -609,110 +734,6 @@ function nanoid(length = 7) {
   ).join("");
 }
 
-// src/lib/position.ts
-var min = 32;
-var max = 126;
-function makePosition(before, after) {
-  if (before !== void 0 && after !== void 0) {
-    return pos(makePositionFromCodes(posCodes(before), posCodes(after)));
-  } else if (before !== void 0) {
-    return getNextPosition(before);
-  } else if (after !== void 0) {
-    return getPreviousPosition(after);
-  }
-  return pos([min + 1]);
-}
-function getPreviousPosition(after) {
-  const result = [];
-  const afterCodes = posCodes(after);
-  for (let i = 0; i < afterCodes.length; i++) {
-    const code = afterCodes[i];
-    if (code <= min + 1) {
-      result.push(min);
-      if (afterCodes.length - 1 === i) {
-        result.push(max);
-        break;
-      }
-    } else {
-      result.push(code - 1);
-      break;
-    }
-  }
-  return pos(result);
-}
-function getNextPosition(before) {
-  const result = [];
-  const beforeCodes = posCodes(before);
-  for (let i = 0; i < beforeCodes.length; i++) {
-    const code = beforeCodes[i];
-    if (code === max) {
-      result.push(code);
-      if (beforeCodes.length - 1 === i) {
-        result.push(min + 1);
-        break;
-      }
-    } else {
-      result.push(code + 1);
-      break;
-    }
-  }
-  return pos(result);
-}
-function makePositionFromCodes(before, after) {
-  let index = 0;
-  const result = [];
-  while (true) {
-    const beforeDigit = before[index] || min;
-    const afterDigit = after[index] || max;
-    if (beforeDigit > afterDigit) {
-      throw new Error(
-        `Impossible to generate position between ${before} and ${after}`
-      );
-    }
-    if (beforeDigit === afterDigit) {
-      result.push(beforeDigit);
-      index++;
-      continue;
-    }
-    if (afterDigit - beforeDigit === 1) {
-      result.push(beforeDigit);
-      result.push(...makePositionFromCodes(before.slice(index + 1), []));
-      break;
-    }
-    const mid = afterDigit + beforeDigit >> 1;
-    result.push(mid);
-    break;
-  }
-  return result;
-}
-function posCodes(str) {
-  const codes = [];
-  for (let i = 0; i < str.length; i++) {
-    codes.push(str.charCodeAt(i));
-  }
-  return codes;
-}
-function pos(codes) {
-  return String.fromCharCode(...codes);
-}
-function comparePosition(posA, posB) {
-  const aCodes = posCodes(posA);
-  const bCodes = posCodes(posB);
-  const maxLength = Math.max(aCodes.length, bCodes.length);
-  for (let i = 0; i < maxLength; i++) {
-    const a = aCodes[i] === void 0 ? min : aCodes[i];
-    const b = bCodes[i] === void 0 ? min : bCodes[i];
-    if (a === b) {
-      continue;
-    } else {
-      return a - b;
-    }
-  }
-  throw new Error(
-    `Impossible to compare similar position "${posA}" and "${posB}"`
-  );
-}
-
 // src/crdts/LiveRegister.ts
 var LiveRegister = class extends AbstractCrdt {
   constructor(data) {
@@ -788,10 +809,7 @@ var LiveRegister = class extends AbstractCrdt {
 
 // src/crdts/LiveList.ts
 function compareNodePosition(itemA, itemB) {
-  return comparePosition(
-    itemA._getParentKeyOrThrow(),
-    itemB._getParentKeyOrThrow()
-  );
+  return comparePosition(itemA._parentPos, itemB._parentPos);
 }
 var LiveList = class extends AbstractCrdt {
   constructor(items = []) {
@@ -1033,7 +1051,7 @@ var LiveList = class extends AbstractCrdt {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
-    const key = op.parentKey;
+    const key = asPos(op.parentKey);
     const existingItemIndex = this._indexOfPosition(key);
     if (existingItemIndex !== -1) {
       this._shiftItemPosition(existingItemIndex, key);
@@ -1047,7 +1065,7 @@ var LiveList = class extends AbstractCrdt {
   /** @internal */
   _applyInsertAck(op) {
     const existingItem = this._items.find((item) => item._id === op.id);
-    const key = op.parentKey;
+    const key = asPos(op.parentKey);
     const itemIndexAtPosition = this._indexOfPosition(key);
     if (existingItem) {
       if (existingItem._parentKey === key) {
@@ -1108,9 +1126,9 @@ var LiveList = class extends AbstractCrdt {
     const existingItemIndex = this._indexOfPosition(key);
     let newKey = key;
     if (existingItemIndex !== -1) {
-      const before = (_b = this._items[existingItemIndex]) == null ? void 0 : _b._getParentKeyOrThrow();
-      const after = (_c = this._items[existingItemIndex + 1]) == null ? void 0 : _c._getParentKeyOrThrow();
-      newKey = makePosition(before, after);
+      const before2 = (_b = this._items[existingItemIndex]) == null ? void 0 : _b._parentPos;
+      const after2 = (_c = this._items[existingItemIndex + 1]) == null ? void 0 : _c._parentPos;
+      newKey = makePosition(before2, after2);
       child._setParentLink(this, newKey);
     }
     this._insertAndSort(child);
@@ -1248,10 +1266,7 @@ var LiveList = class extends AbstractCrdt {
     } else {
       this._items[existingItemIndex]._setParentLink(
         this,
-        makePosition(
-          newKey,
-          (_a = this._items[existingItemIndex + 1]) == null ? void 0 : _a._getParentKeyOrThrow()
-        )
+        makePosition(newKey, (_a = this._items[existingItemIndex + 1]) == null ? void 0 : _a._parentPos)
       );
       const previousIndex = this._items.indexOf(child);
       child._setParentLink(this, newKey);
@@ -1278,10 +1293,7 @@ var LiveList = class extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this._items[existingItemIndex]._setParentLink(
           this,
-          makePosition(
-            newKey,
-            (_a = this._items[existingItemIndex + 1]) == null ? void 0 : _a._getParentKeyOrThrow()
-          )
+          makePosition(newKey, (_a = this._items[existingItemIndex + 1]) == null ? void 0 : _a._parentPos)
         );
       }
       child._setParentLink(this, newKey);
@@ -1300,10 +1312,7 @@ var LiveList = class extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this._items[existingItemIndex]._setParentLink(
           this,
-          makePosition(
-            newKey,
-            (_b = this._items[existingItemIndex + 1]) == null ? void 0 : _b._getParentKeyOrThrow()
-          )
+          makePosition(newKey, (_b = this._items[existingItemIndex + 1]) == null ? void 0 : _b._parentPos)
         );
       }
       child._setParentLink(this, newKey);
@@ -1332,10 +1341,7 @@ var LiveList = class extends AbstractCrdt {
     if (existingItemIndex !== -1) {
       this._items[existingItemIndex]._setParentLink(
         this,
-        makePosition(
-          newKey,
-          (_a = this._items[existingItemIndex + 1]) == null ? void 0 : _a._getParentKeyOrThrow()
-        )
+        makePosition(newKey, (_a = this._items[existingItemIndex + 1]) == null ? void 0 : _a._parentPos)
       );
     }
     child._setParentLink(this, newKey);
@@ -1410,9 +1416,9 @@ var LiveList = class extends AbstractCrdt {
         `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
       );
     }
-    const before = this._items[index - 1] ? this._items[index - 1]._getParentKeyOrThrow() : void 0;
-    const after = this._items[index] ? this._items[index]._getParentKeyOrThrow() : void 0;
-    const position = makePosition(before, after);
+    const before2 = this._items[index - 1] ? this._items[index - 1]._parentPos : void 0;
+    const after2 = this._items[index] ? this._items[index]._parentPos : void 0;
+    const position = makePosition(before2, after2);
     const value = lsonToLiveNode(element);
     value._setParentLink(this, position);
     this._insertAndSort(value);
@@ -1453,11 +1459,11 @@ var LiveList = class extends AbstractCrdt {
     let beforePosition = null;
     let afterPosition = null;
     if (index < targetIndex) {
-      afterPosition = targetIndex === this._items.length - 1 ? void 0 : this._items[targetIndex + 1]._getParentKeyOrThrow();
-      beforePosition = this._items[targetIndex]._getParentKeyOrThrow();
+      afterPosition = targetIndex === this._items.length - 1 ? void 0 : this._items[targetIndex + 1]._parentPos;
+      beforePosition = this._items[targetIndex]._parentPos;
     } else {
-      afterPosition = this._items[targetIndex]._getParentKeyOrThrow();
-      beforePosition = targetIndex === 0 ? void 0 : this._items[targetIndex - 1]._getParentKeyOrThrow();
+      afterPosition = this._items[targetIndex]._parentPos;
+      beforePosition = targetIndex === 0 ? void 0 : this._items[targetIndex - 1]._parentPos;
     }
     const position = makePosition(beforePosition, afterPosition);
     const item = this._items[index];
@@ -1712,7 +1718,7 @@ var LiveList = class extends AbstractCrdt {
     var _a;
     const shiftedPosition = makePosition(
       key,
-      this._items.length > index + 1 ? (_a = this._items[index + 1]) == null ? void 0 : _a._getParentKeyOrThrow() : void 0
+      this._items.length > index + 1 ? (_a = this._items[index + 1]) == null ? void 0 : _a._parentPos : void 0
     );
     this._items[index]._setParentLink(this, shiftedPosition);
   }
@@ -2173,6 +2179,37 @@ var LiveObject = class extends AbstractCrdt {
     this._map = new Map(Object.entries(obj));
   }
   /** @internal */
+  static _buildRootAndParentToChildren(items) {
+    const parentToChildren = /* @__PURE__ */ new Map();
+    let root = null;
+    for (const [id, crdt] of items) {
+      if (isRootCrdt(crdt)) {
+        root = [id, crdt];
+      } else {
+        const tuple = [id, crdt];
+        const children = parentToChildren.get(crdt.parentId);
+        if (children !== void 0) {
+          children.push(tuple);
+        } else {
+          parentToChildren.set(crdt.parentId, [tuple]);
+        }
+      }
+    }
+    if (root === null) {
+      throw new Error("Root can't be null");
+    }
+    return [root, parentToChildren];
+  }
+  /** @internal */
+  static _fromItems(items, pool) {
+    const [root, parentToChildren] = LiveObject._buildRootAndParentToChildren(items);
+    return LiveObject._deserialize(
+      root,
+      parentToChildren,
+      pool
+    );
+  }
+  /** @internal */
   _toOps(parentId, parentKey, pool) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
@@ -3243,14 +3280,15 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     token: null,
     lastConnectionId: null,
     socket: null,
-    numberOfRetry: 0,
-    lastFlushTime: 0,
-    timeoutHandles: {
+    numRetries: 0,
+    timers: {
       flush: void 0,
       reconnect: void 0,
+      heartbeat: void 0,
       pongTimeout: void 0
     },
     buffer: {
+      lastFlushedAt: 0,
       me: (
         // Queue up the initial presence message as a Full Presence™ update
         {
@@ -3261,9 +3299,6 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       messages: [],
       storageOperations: []
     },
-    intervalHandles: {
-      heartbeat: void 0
-    },
     connection: new ValueRef({ status: "closed" }),
     me: new MeRef(initialPresence),
     others: new OthersRef(),
@@ -3296,16 +3331,16 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       if (process.env.NODE_ENV !== "production") {
         const stackTrace = captureStackTrace("Storage mutation", this.dispatch);
         if (stackTrace) {
-          ops.forEach((op) => {
+          for (const op of ops) {
             if (op.opId) {
               nn(context.opStackTraces).set(op.opId, stackTrace);
             }
-          });
+          }
         }
       }
       if (activeBatch) {
         activeBatch.ops.push(...ops);
-        storageUpdates.forEach((value, key) => {
+        for (const [key, value] of storageUpdates) {
           activeBatch.updates.storageUpdates.set(
             key,
             mergeStorageUpdates(
@@ -3313,7 +3348,7 @@ function makeStateMachine(config, initialPresence, initialStorage) {
               value
             )
           );
-        });
+        }
         activeBatch.reverseOps.unshift(...reverse);
       } else {
         batchUpdates(() => {
@@ -3372,18 +3407,10 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       }
       context.socket.send(JSON.stringify(messageOrMessages));
     },
-    delayFlush(delay) {
-      return setTimeout(tryFlushing, delay);
-    },
-    startHeartbeatInterval() {
-      return setInterval(heartbeat, HEARTBEAT_INTERVAL);
-    },
-    schedulePongTimeout() {
-      return setTimeout(pongTimeout, PONG_TIMEOUT);
-    },
-    scheduleReconnect(delay) {
-      return setTimeout(connect, delay);
-    }
+    scheduleFlush: (delay) => setTimeout(tryFlushing, delay),
+    scheduleReconnect: (delay) => setTimeout(connect, delay),
+    startHeartbeatInterval: () => setInterval(heartbeat, HEARTBEAT_INTERVAL),
+    schedulePongTimeout: () => setTimeout(pongTimeout, PONG_TIMEOUT)
   };
   const self = new DerivedRef(
     context.connection,
@@ -3407,7 +3434,7 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     if (context.root) {
       updateRoot(message.items, batchedUpdatesWrapper);
     } else {
-      context.root = load(message.items);
+      context.root = LiveObject._fromItems(message.items, pool);
     }
     for (const key in context.initialStorage) {
       if (context.root.get(key) === void 0) {
@@ -3415,43 +3442,18 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       }
     }
   }
-  function buildRootAndParentToChildren(items) {
-    const parentToChildren = /* @__PURE__ */ new Map();
-    let root = null;
-    for (const [id, crdt] of items) {
-      if (isRootCrdt(crdt)) {
-        root = [id, crdt];
-      } else {
-        const tuple = [id, crdt];
-        const children = parentToChildren.get(crdt.parentId);
-        if (children !== void 0) {
-          children.push(tuple);
-        } else {
-          parentToChildren.set(crdt.parentId, [tuple]);
-        }
-      }
-    }
-    if (root === null) {
-      throw new Error("Root can't be null");
-    }
-    return [root, parentToChildren];
-  }
   function updateRoot(items, batchedUpdatesWrapper) {
     if (!context.root) {
       return;
     }
     const currentItems = /* @__PURE__ */ new Map();
-    context.nodes.forEach((node, id) => {
+    for (const [id, node] of context.nodes) {
       currentItems.set(id, node._serialize());
-    });
+    }
     const ops = getTreesDiffOperations(currentItems, new Map(items));
     const result = applyOps(ops, false);
     notify(result.updates, batchedUpdatesWrapper);
   }
-  function load(items) {
-    const [root, parentToChildren] = buildRootAndParentToChildren(items);
-    return LiveObject._deserialize(root, parentToChildren, pool);
-  }
   function _addToRealUndoStack(historyOps, batchedUpdatesWrapper) {
     if (context.undoStack.length >= 50) {
       context.undoStack.shift();
@@ -3592,7 +3594,11 @@ function makeStateMachine(config, initialPresence, initialStorage) {
           return { modified: false };
         }
         if (node.parent.type === "HasParent" && isLiveList(node.parent.node)) {
-          return node.parent.node._setChildKey(op.parentKey, node, source);
+          return node.parent.node._setChildKey(
+            asPos(op.parentKey),
+            node,
+            source
+          );
         }
         return { modified: false };
       }
@@ -3692,10 +3698,9 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     }
     context.token = null;
     updateConnection({ status: "unavailable" }, batchUpdates);
-    context.numberOfRetry++;
-    context.timeoutHandles.reconnect = effects.scheduleReconnect(
-      getRetryDelay()
-    );
+    context.numRetries++;
+    clearTimeout(context.timers.reconnect);
+    context.timers.reconnect = effects.scheduleReconnect(getRetryDelay());
   }
   function onVisibilityChange(visibilityState) {
     if (visibilityState === "visible" && context.connection.current.status === "open") {
@@ -3758,6 +3763,12 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       reconnect();
     }
   }
+  function canUndo() {
+    return context.undoStack.length > 0;
+  }
+  function canRedo() {
+    return context.redoStack.length > 0;
+  }
   function onHistoryChange(batchedUpdatesWrapper) {
     batchedUpdatesWrapper(() => {
       eventHub.history.notify({ canUndo: canUndo(), canRedo: canRedo() });
@@ -3795,9 +3806,23 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       return compact([parseServerMessage(data)]);
     }
   }
+  function applyAndSendOps(offlineOps, batchedUpdatesWrapper) {
+    if (offlineOps.size === 0) {
+      return;
+    }
+    const messages = [];
+    const ops = Array.from(offlineOps.values());
+    const result = applyOps(ops, true);
+    messages.push({
+      type: 201 /* UPDATE_STORAGE */,
+      ops: result.ops
+    });
+    notify(result.updates, batchedUpdatesWrapper);
+    effects.send(messages);
+  }
   function onMessage(event) {
     if (event.data === "pong") {
-      clearTimeout(context.timeoutHandles.pongTimeout);
+      clearTimeout(context.timers.pongTimeout);
       return;
     }
     const messages = parseServerMessages(event.data);
@@ -3857,12 +3882,12 @@ function makeStateMachine(config, initialPresence, initialStorage) {
           }
           case 201 /* UPDATE_STORAGE */: {
             const applyResult = applyOps(message.ops, false);
-            applyResult.updates.storageUpdates.forEach((value, key) => {
+            for (const [key, value] of applyResult.updates.storageUpdates) {
               updates.storageUpdates.set(
                 key,
                 mergeStorageUpdates(updates.storageUpdates.get(key), value)
               );
-            });
+            }
             break;
           }
           case 299 /* REJECT_STORAGE_OP */: {
@@ -3899,12 +3924,10 @@ ${Array.from(traces).join("\n\n")}`
   }
   function onClose(event) {
     context.socket = null;
-    clearTimeout(context.timeoutHandles.pongTimeout);
-    clearInterval(context.intervalHandles.heartbeat);
-    if (context.timeoutHandles.flush) {
-      clearTimeout(context.timeoutHandles.flush);
-    }
-    clearTimeout(context.timeoutHandles.reconnect);
+    clearTimeout(context.timers.flush);
+    clearTimeout(context.timers.reconnect);
+    clearInterval(context.timers.heartbeat);
+    clearTimeout(context.timers.pongTimeout);
     context.others.clearOthers();
     batchUpdates(() => {
       notify({ others: [{ type: "reset" }] }, doNotBatchUpdates);
@@ -3913,26 +3936,28 @@ ${Array.from(traces).join("\n\n")}`
         const error2 = new LiveblocksError(event.reason, event.code);
         eventHub.error.notify(error2);
         const delay = getRetryDelay(true);
-        context.numberOfRetry++;
+        context.numRetries++;
         if (process.env.NODE_ENV !== "production") {
           error(
             `Connection to websocket server closed. Reason: ${error2.message} (code: ${error2.code}). Retrying in ${delay}ms.`
           );
         }
         updateConnection({ status: "unavailable" }, doNotBatchUpdates);
-        context.timeoutHandles.reconnect = effects.scheduleReconnect(delay);
+        clearTimeout(context.timers.reconnect);
+        context.timers.reconnect = effects.scheduleReconnect(delay);
       } else if (event.code === 4999 /* CLOSE_WITHOUT_RETRY */) {
         updateConnection({ status: "closed" }, doNotBatchUpdates);
       } else {
         const delay = getRetryDelay();
-        context.numberOfRetry++;
+        context.numRetries++;
         if (process.env.NODE_ENV !== "production") {
           warn(
             `Connection to Liveblocks websocket server closed (code: ${event.code}). Retrying in ${delay}ms.`
           );
         }
         updateConnection({ status: "unavailable" }, doNotBatchUpdates);
-        context.timeoutHandles.reconnect = effects.scheduleReconnect(delay);
+        clearTimeout(context.timers.reconnect);
+        context.timers.reconnect = effects.scheduleReconnect(delay);
       }
     });
   }
@@ -3944,21 +3969,21 @@ ${Array.from(traces).join("\n\n")}`
   }
   function getRetryDelay(slow = false) {
     if (slow) {
-      return BACKOFF_RETRY_DELAYS_SLOW[context.numberOfRetry < BACKOFF_RETRY_DELAYS_SLOW.length ? context.numberOfRetry : BACKOFF_RETRY_DELAYS_SLOW.length - 1];
+      return BACKOFF_RETRY_DELAYS_SLOW[context.numRetries < BACKOFF_RETRY_DELAYS_SLOW.length ? context.numRetries : BACKOFF_RETRY_DELAYS_SLOW.length - 1];
     }
-    return BACKOFF_RETRY_DELAYS[context.numberOfRetry < BACKOFF_RETRY_DELAYS.length ? context.numberOfRetry : BACKOFF_RETRY_DELAYS.length - 1];
+    return BACKOFF_RETRY_DELAYS[context.numRetries < BACKOFF_RETRY_DELAYS.length ? context.numRetries : BACKOFF_RETRY_DELAYS.length - 1];
   }
   function onError() {
   }
   function onOpen() {
-    clearInterval(context.intervalHandles.heartbeat);
-    context.intervalHandles.heartbeat = effects.startHeartbeatInterval();
+    clearInterval(context.timers.heartbeat);
+    context.timers.heartbeat = effects.startHeartbeatInterval();
     if (context.connection.current.status === "connecting") {
       updateConnection(
         __spreadProps(__spreadValues({}, context.connection.current), { status: "open" }),
         batchUpdates
       );
-      context.numberOfRetry = 0;
+      context.numRetries = 0;
       if (context.lastConnectionId !== void 0) {
         context.buffer.me = {
           type: "full",
@@ -3983,8 +4008,8 @@ ${Array.from(traces).join("\n\n")}`
     if (context.socket === null) {
       return;
     }
-    clearTimeout(context.timeoutHandles.pongTimeout);
-    context.timeoutHandles.pongTimeout = effects.schedulePongTimeout();
+    clearTimeout(context.timers.pongTimeout);
+    context.timers.pongTimeout = effects.schedulePongTimeout();
     if (context.socket.readyState === context.socket.OPEN) {
       context.socket.send("ping");
     }
@@ -3993,7 +4018,7 @@ ${Array.from(traces).join("\n\n")}`
     log("Pong timeout. Trying to reconnect.");
     reconnect();
   }
-  function reconnect() {
+  function disconnect() {
     if (context.socket) {
       context.socket.removeEventListener("open", onOpen);
       context.socket.removeEventListener("message", onMessage);
@@ -4002,35 +4027,41 @@ ${Array.from(traces).join("\n\n")}`
       context.socket.close();
       context.socket = null;
     }
-    updateConnection({ status: "unavailable" }, batchUpdates);
-    clearTimeout(context.timeoutHandles.pongTimeout);
-    if (context.timeoutHandles.flush) {
-      clearTimeout(context.timeoutHandles.flush);
+    clearTimeout(context.timers.flush);
+    clearTimeout(context.timers.reconnect);
+    clearInterval(context.timers.heartbeat);
+    clearTimeout(context.timers.pongTimeout);
+    batchUpdates(() => {
+      updateConnection({ status: "closed" }, doNotBatchUpdates);
+      context.others.clearOthers();
+      notify({ others: [{ type: "reset" }] }, doNotBatchUpdates);
+    });
+    for (const eventSource2 of Object.values(eventHub)) {
+      eventSource2.clear();
     }
-    clearTimeout(context.timeoutHandles.reconnect);
-    clearInterval(context.intervalHandles.heartbeat);
-    connect();
   }
-  function applyAndSendOps(offlineOps, batchedUpdatesWrapper) {
-    if (offlineOps.size === 0) {
-      return;
+  function reconnect() {
+    if (context.socket) {
+      context.socket.removeEventListener("open", onOpen);
+      context.socket.removeEventListener("message", onMessage);
+      context.socket.removeEventListener("close", onClose);
+      context.socket.removeEventListener("error", onError);
+      context.socket.close();
+      context.socket = null;
     }
-    const messages = [];
-    const ops = Array.from(offlineOps.values());
-    const result = applyOps(ops, true);
-    messages.push({
-      type: 201 /* UPDATE_STORAGE */,
-      ops: result.ops
-    });
-    notify(result.updates, batchedUpdatesWrapper);
-    effects.send(messages);
+    clearTimeout(context.timers.flush);
+    clearTimeout(context.timers.reconnect);
+    clearInterval(context.timers.heartbeat);
+    clearTimeout(context.timers.pongTimeout);
+    updateConnection({ status: "unavailable" }, batchUpdates);
+    connect();
   }
   function tryFlushing() {
     const storageOps = context.buffer.storageOperations;
     if (storageOps.length > 0) {
-      storageOps.forEach((op) => {
+      for (const op of storageOps) {
         context.unacknowledgedOps.set(nn(op.opId), op);
-      });
+      }
       notifyStorageStatus();
     }
     if (context.socket === null || context.socket.readyState !== context.socket.OPEN) {
@@ -4038,78 +4069,54 @@ ${Array.from(traces).join("\n\n")}`
       return;
     }
     const now = Date.now();
-    const elapsedTime = now - context.lastFlushTime;
-    if (elapsedTime > config.throttleDelay) {
-      const messages = flushDataToMessages(context);
-      if (messages.length === 0) {
+    const elapsedMillis = now - context.buffer.lastFlushedAt;
+    if (elapsedMillis > config.throttleDelay) {
+      const messagesToFlush = serializeBuffer();
+      if (messagesToFlush.length === 0) {
         return;
       }
-      effects.send(messages);
+      effects.send(messagesToFlush);
       context.buffer = {
+        lastFlushedAt: now,
         messages: [],
         storageOperations: [],
         me: null
       };
-      context.lastFlushTime = now;
     } else {
-      if (context.timeoutHandles.flush !== null) {
-        clearTimeout(context.timeoutHandles.flush);
-      }
-      context.timeoutHandles.flush = effects.delayFlush(
-        config.throttleDelay - (now - context.lastFlushTime)
+      clearTimeout(context.timers.flush);
+      context.timers.flush = effects.scheduleFlush(
+        config.throttleDelay - elapsedMillis
       );
     }
   }
-  function flushDataToMessages(state) {
+  function serializeBuffer() {
     const messages = [];
-    if (state.buffer.me) {
+    if (context.buffer.me) {
       messages.push(
-        state.buffer.me.type === "full" ? {
+        context.buffer.me.type === "full" ? {
           type: 100 /* UPDATE_PRESENCE */,
           // Populating the `targetActor` field turns this message into
           // a Full Presence™ update message (not a patch), which will get
           // interpreted by other clients as such.
           targetActor: -1,
-          data: state.buffer.me.data
+          data: context.buffer.me.data
         } : {
           type: 100 /* UPDATE_PRESENCE */,
-          data: state.buffer.me.data
+          data: context.buffer.me.data
         }
       );
     }
-    for (const event of state.buffer.messages) {
+    for (const event of context.buffer.messages) {
       messages.push(event);
     }
-    if (state.buffer.storageOperations.length > 0) {
+    if (context.buffer.storageOperations.length > 0) {
       messages.push({
         type: 201 /* UPDATE_STORAGE */,
-        ops: state.buffer.storageOperations
+        ops: context.buffer.storageOperations
       });
     }
     return messages;
   }
-  function disconnect() {
-    if (context.socket) {
-      context.socket.removeEventListener("open", onOpen);
-      context.socket.removeEventListener("message", onMessage);
-      context.socket.removeEventListener("close", onClose);
-      context.socket.removeEventListener("error", onError);
-      context.socket.close();
-      context.socket = null;
-    }
-    batchUpdates(() => {
-      updateConnection({ status: "closed" }, doNotBatchUpdates);
-      if (context.timeoutHandles.flush) {
-        clearTimeout(context.timeoutHandles.flush);
-      }
-      clearTimeout(context.timeoutHandles.reconnect);
-      clearTimeout(context.timeoutHandles.pongTimeout);
-      clearInterval(context.intervalHandles.heartbeat);
-      context.others.clearOthers();
-      notify({ others: [{ type: "reset" }] }, doNotBatchUpdates);
-      Object.values(eventHub).forEach((eventSource2) => eventSource2.clear());
-    });
-  }
   function broadcastEvent(event, options = {
     shouldQueueEventIfNotReady: false
   }) {
@@ -4183,9 +4190,6 @@ ${Array.from(traces).join("\n\n")}`
     }
     tryFlushing();
   }
-  function canUndo() {
-    return context.undoStack.length > 0;
-  }
   function redo() {
     if (context.activeBatch) {
       throw new Error("redo is not allowed during a batch");
@@ -4208,9 +4212,6 @@ ${Array.from(traces).join("\n\n")}`
     }
     tryFlushing();
   }
-  function canRedo() {
-    return context.redoStack.length > 0;
-  }
   function batch(callback) {
     if (context.activeBatch) {
       return callback();
@@ -4501,7 +4502,7 @@ function prepareCreateWebSocket(liveblocksServer, WebSocketPolyfill) {
       // @ts-ignore (__PACKAGE_VERSION__ will be injected by the build script)
       true ? (
         /* istanbul ignore next */
-        "1.0.6-test3"
+        "1.0.7-test1"
       ) : "dev"}`
     );
   };
@@ -5109,4 +5110,4 @@ function shallow(a, b) {
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.comparePosition = comparePosition; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.errorIf = errorIf; exports.freeze = freeze; exports.isAppOnlyAuthToken = isAppOnlyAuthToken; exports.isAuthToken = isAuthToken; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRoomAuthToken = isRoomAuthToken; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.tryParseJson = tryParseJson;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.errorIf = errorIf; exports.freeze = freeze; exports.isAppOnlyAuthToken = isAppOnlyAuthToken; exports.isAuthToken = isAuthToken; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRoomAuthToken = isRoomAuthToken; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.tryParseJson = tryParseJson;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/core",
-  "version": "1.0.6-test3",
+  "version": "1.0.7-test1",
   "description": "Shared code and foundational internals for Liveblocks",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",