@liveblocks/core 3.14.0-pre3 → 3.14.0-pre5

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.14.0-pre3";
+var PKG_VERSION = "3.14.0-pre5";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -567,6 +567,9 @@ var SortedList = class _SortedList {
     this.#lt = lt;
     this.#data = alreadySortedList;
   }
+  /**
+   * Creates an empty SortedList with the given "less than" function.
+   */
   static with(lt) {
     return _SortedList.fromAlreadySorted([], lt);
   }
@@ -588,10 +591,12 @@ var SortedList = class _SortedList {
   }
   /**
    * Adds a new item to the sorted list, such that it remains sorted.
+   * Returns the index where the item was inserted.
    */
   add(value) {
     const idx = bisectRight(this.#data, value, this.#lt);
     this.#data.splice(idx, 0, value);
+    return idx;
   }
   /**
    * Removes all values from the sorted list, making it empty again.
@@ -636,6 +641,60 @@ var SortedList = class _SortedList {
     }
     return false;
   }
+  /**
+   * Removes the item at the given index.
+   * Returns the removed item, or undefined if index is out of bounds.
+   */
+  removeAt(index) {
+    if (index < 0 || index >= this.#data.length) {
+      return void 0;
+    }
+    const [removed] = this.#data.splice(index, 1);
+    return removed;
+  }
+  /**
+   * Repositions an item to maintain sorted order after its sort key has
+   * been mutated in-place. For example:
+   *
+   *   const item = sorted.at(3);
+   *   item.updatedAt = new Date();  // mutate the item's sort key in-place
+   *   sorted.reposition(item);      // restore sorted order
+   *
+   * Returns the new index of the item. Throws if the item is not in the list.
+   *
+   * Semantically equivalent to remove(value) + add(value), but optimized
+   * to avoid array shifting when the item only moves a short distance.
+   */
+  reposition(value) {
+    const oldIdx = this.#data.indexOf(value);
+    if (oldIdx < 0) {
+      throw new Error("Cannot reposition item that is not in the list");
+    }
+    const prev = this.#data[oldIdx - 1];
+    const next = this.#data[oldIdx + 1];
+    const validLeft = prev === void 0 || this.#lt(prev, value);
+    const validRight = next === void 0 || this.#lt(value, next);
+    if (validLeft && validRight) {
+      return oldIdx;
+    }
+    let newIdx = oldIdx;
+    while (newIdx > 0 && this.#lt(value, this.#data[newIdx - 1])) {
+      this.#data[newIdx] = this.#data[newIdx - 1];
+      newIdx--;
+    }
+    if (newIdx < oldIdx) {
+      this.#data[newIdx] = value;
+      return newIdx;
+    }
+    while (newIdx < this.#data.length - 1 && !this.#lt(value, this.#data[newIdx + 1])) {
+      this.#data[newIdx] = this.#data[newIdx + 1];
+      newIdx++;
+    }
+    if (newIdx !== oldIdx) {
+      this.#data[newIdx] = value;
+    }
+    return newIdx;
+  }
   at(index) {
     return this.#data[index];
   }
@@ -5898,16 +5957,68 @@ function before(pos) {
   }
   return ONE;
 }
+var VIEWPORT_START = 2;
+var VIEWPORT_STEP = 3;
 function after(pos) {
-  for (let i = 0; i <= pos.length - 1; i++) {
+  for (let i = 0; i < pos.length; i++) {
     const code = pos.charCodeAt(i);
-    if (code >= MAX_CODE) {
-      continue;
+    if (code < MIN_CODE || code > MAX_CODE) {
+      return pos + ONE;
     }
-    return pos.substring(0, i) + String.fromCharCode(code + 1);
+  }
+  while (pos.length > 1 && pos.charCodeAt(pos.length - 1) === MIN_CODE) {
+    pos = pos.slice(0, -1);
+  }
+  if (pos.length === 0 || pos === ZERO) {
+    return ONE;
+  }
+  let viewport = VIEWPORT_START;
+  if (pos.length > VIEWPORT_START) {
+    viewport = VIEWPORT_START + Math.ceil((pos.length - VIEWPORT_START) / VIEWPORT_STEP) * VIEWPORT_STEP;
+  }
+  const result = incrementWithinViewport(pos, viewport);
+  if (result !== null) {
+    return result;
+  }
+  viewport += VIEWPORT_STEP;
+  const extendedResult = incrementWithinViewport(pos, viewport);
+  if (extendedResult !== null) {
+    return extendedResult;
   }
   return pos + ONE;
 }
+function incrementWithinViewport(pos, viewport) {
+  const digits = [];
+  for (let i = 0; i < viewport; i++) {
+    if (i < pos.length) {
+      digits.push(pos.charCodeAt(i) - MIN_CODE);
+    } else {
+      digits.push(0);
+    }
+  }
+  let carry = 1;
+  for (let i = viewport - 1; i >= 0 && carry; i--) {
+    const sum = digits[i] + carry;
+    if (sum >= NUM_DIGITS) {
+      digits[i] = 0;
+      carry = 1;
+    } else {
+      digits[i] = sum;
+      carry = 0;
+    }
+  }
+  if (carry) {
+    return null;
+  }
+  let result = "";
+  for (const d of digits) {
+    result += String.fromCharCode(d + MIN_CODE);
+  }
+  while (result.length > 1 && result.charCodeAt(result.length - 1) === MIN_CODE) {
+    result = result.slice(0, -1);
+  }
+  return result;
+}
 function between(lo, hi) {
   if (lo < hi) {
     return _between(lo, hi);
@@ -6368,29 +6479,27 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
 };
 
 // src/crdts/LiveList.ts
-function compareNodePosition(itemA, itemB) {
-  const posA = itemA._parentPos;
-  const posB = itemB._parentPos;
-  return posA === posB ? 0 : posA < posB ? -1 : 1;
+function childNodeLt(a, b) {
+  return a._parentPos < b._parentPos;
 }
 var LiveList = class _LiveList extends AbstractCrdt {
-  // TODO: Naive array at first, find a better data structure. Maybe an Order statistics tree?
   #items;
   #implicitlyDeletedItems;
   #unacknowledgedSets;
   constructor(items) {
     super();
-    this.#items = [];
     this.#implicitlyDeletedItems = /* @__PURE__ */ new WeakSet();
     this.#unacknowledgedSets = /* @__PURE__ */ new Map();
-    let position = void 0;
+    const nodes = [];
+    let lastPos;
     for (const item of items) {
-      const newPosition = makePosition(position);
+      const pos = makePosition(lastPos);
       const node = lsonToLiveNode(item);
-      node._setParentLink(this, newPosition);
-      this.#items.push(node);
-      position = newPosition;
+      node._setParentLink(this, pos);
+      nodes.push(node);
+      lastPos = pos;
     }
+    this.#items = SortedList.fromAlreadySorted(nodes, childNodeLt);
   }
   /** @internal */
   static _deserialize([id, _], parentToChildren, pool) {
@@ -6404,7 +6513,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       const crdt = node[1];
       const child = deserialize(node, parentToChildren, pool);
       child._setParentLink(list, crdt.parentKey);
-      list._insertAndSort(child);
+      list.#insert(child);
     }
     return list;
   }
@@ -6440,19 +6549,33 @@ var LiveList = class _LiveList extends AbstractCrdt {
     return ops;
   }
   /**
-   * @internal
-   *
-   * Adds a new item into the sorted list, in the correct position.
+   * Inserts a new child into the list in the correct location (binary search
+   * finds correct position efficiently). Returns the insertion index.
    */
-  _insertAndSort(item) {
-    this.#items.push(item);
-    this._sortItems();
+  #insert(childNode) {
+    const index = this.#items.add(childNode);
+    this.invalidate();
+    return index;
   }
-  /** @internal */
-  _sortItems() {
-    this.#items.sort(compareNodePosition);
+  /**
+   * Updates an item's position and repositions it in the sorted list.
+   * Encapsulates the remove -> mutate -> add cycle needed when changing sort keys.
+   *
+   * IMPORTANT: Item must exist in this list. List count remains unchanged.
+   */
+  #updateItemPosition(item, newKey) {
+    item._setParentLink(this, newKey);
+    this.#items.reposition(item);
     this.invalidate();
   }
+  /**
+   * Updates an item's position by index. Safer than #updateItemPosition when you have
+   * an index, as it ensures the item exists and is from this list.
+   */
+  #updateItemPositionAt(index, newKey) {
+    const item = nn(this.#items.at(index));
+    this.#updateItemPosition(item, newKey);
+  }
   /** @internal */
   _indexOfPosition(position) {
     return this.#items.findIndex(
@@ -6484,10 +6607,12 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const deletedId = op.deletedId;
     const indexOfItemWithSamePosition = this._indexOfPosition(key);
     if (indexOfItemWithSamePosition !== -1) {
-      const itemWithSamePosition = this.#items[indexOfItemWithSamePosition];
+      const itemWithSamePosition = nn(
+        this.#items.removeAt(indexOfItemWithSamePosition)
+      );
       if (itemWithSamePosition._id === deletedId) {
         itemWithSamePosition._detach();
-        this.#items[indexOfItemWithSamePosition] = child;
+        this.#items.add(child);
         return {
           modified: makeUpdate(this, [
             setDelta(indexOfItemWithSamePosition, child)
@@ -6496,7 +6621,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       } else {
         this.#implicitlyDeletedItems.add(itemWithSamePosition);
-        this.#items[indexOfItemWithSamePosition] = child;
+        this.#items.remove(itemWithSamePosition);
+        this.#items.add(child);
         const delta = [
           setDelta(indexOfItemWithSamePosition, child)
         ];
@@ -6519,7 +6645,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (deleteDelta2) {
         updates.push(deleteDelta2);
       }
-      this._insertAndSort(child);
+      this.#insert(child);
       updates.push(insertDelta(this._indexOfPosition(key), child));
       return {
         reverse: [],
@@ -6554,16 +6680,15 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       }
       if (indexOfItemWithSamePosition !== -1) {
-        this.#implicitlyDeletedItems.add(
-          this.#items[indexOfItemWithSamePosition]
+        const itemAtPosition = nn(
+          this.#items.removeAt(indexOfItemWithSamePosition)
         );
-        const [prevNode] = this.#items.splice(indexOfItemWithSamePosition, 1);
-        delta.push(deleteDelta(indexOfItemWithSamePosition, prevNode));
+        this.#implicitlyDeletedItems.add(itemAtPosition);
+        delta.push(deleteDelta(indexOfItemWithSamePosition, itemAtPosition));
       }
-      const prevIndex = this.#items.indexOf(existingItem);
-      existingItem._setParentLink(this, op.parentKey);
-      this._sortItems();
-      const newIndex = this.#items.indexOf(existingItem);
+      const prevIndex = this.#items.findIndex((item) => item === existingItem);
+      this.#updateItemPosition(existingItem, op.parentKey);
+      const newIndex = this.#items.findIndex((item) => item === existingItem);
       if (newIndex !== prevIndex) {
         delta.push(moveDelta(prevIndex, newIndex, existingItem));
       }
@@ -6576,8 +6701,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (orphan && this.#implicitlyDeletedItems.has(orphan)) {
         orphan._setParentLink(this, op.parentKey);
         this.#implicitlyDeletedItems.delete(orphan);
-        this._insertAndSort(orphan);
-        const recreatedItemIndex = this.#items.indexOf(orphan);
+        const recreatedItemIndex = this.#insert(orphan);
         return {
           modified: makeUpdate(this, [
             // If there is an item at this position, update is a set, else it's an insert
@@ -6588,7 +6712,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       } else {
         if (indexOfItemWithSamePosition !== -1) {
-          this.#items.splice(indexOfItemWithSamePosition, 1);
+          nn(this.#items.removeAt(indexOfItemWithSamePosition));
         }
         const { newItem, newIndex } = this.#createAttachItemAndSort(
           op,
@@ -6647,12 +6771,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
           modified: false
         };
       } else {
-        const oldPositionIndex = this.#items.indexOf(existingItem);
+        const oldPositionIndex = this.#items.findIndex(
+          (item) => item === existingItem
+        );
         if (itemIndexAtPosition !== -1) {
           this.#shiftItemPosition(itemIndexAtPosition, key);
         }
-        existingItem._setParentLink(this, key);
-        this._sortItems();
+        this.#updateItemPosition(existingItem, key);
         const newIndex = this._indexOfPosition(key);
         if (newIndex === oldPositionIndex) {
           return { modified: false };
@@ -6669,7 +6794,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (orphan && this.#implicitlyDeletedItems.has(orphan)) {
         orphan._setParentLink(this, key);
         this.#implicitlyDeletedItems.delete(orphan);
-        this._insertAndSort(orphan);
+        this.#insert(orphan);
         const newIndex = this._indexOfPosition(key);
         return {
           modified: makeUpdate(this, [insertDelta(newIndex, orphan)]),
@@ -6698,12 +6823,12 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const existingItemIndex = this._indexOfPosition(key);
     let newKey = key;
     if (existingItemIndex !== -1) {
-      const before2 = this.#items[existingItemIndex]?._parentPos;
-      const after2 = this.#items[existingItemIndex + 1]?._parentPos;
+      const before2 = this.#items.at(existingItemIndex)?._parentPos;
+      const after2 = this.#items.at(existingItemIndex + 1)?._parentPos;
       newKey = makePosition(before2, after2);
       child._setParentLink(this, newKey);
     }
-    this._insertAndSort(child);
+    this.#insert(child);
     const newIndex = this._indexOfPosition(newKey);
     return {
       modified: makeUpdate(this, [insertDelta(newIndex, child)]),
@@ -6722,9 +6847,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
     child._setParentLink(this, key);
     const newKey = key;
     if (indexOfItemWithSameKey !== -1) {
-      const existingItem = this.#items[indexOfItemWithSameKey];
+      const existingItem = this.#items.at(indexOfItemWithSameKey);
       existingItem._detach();
-      this.#items[indexOfItemWithSameKey] = child;
+      this.#items.remove(existingItem);
+      this.#items.add(child);
       const reverse = HACK_addIntentAndDeletedIdToOperation(
         existingItem._toOps(nn(this._id), key),
         op.id
@@ -6741,7 +6867,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         reverse
       };
     } else {
-      this._insertAndSort(child);
+      this.#insert(child);
       this.#detachItemAssociatedToSetOperation(op.deletedId);
       const newIndex = this._indexOfPosition(newKey);
       return {
@@ -6783,13 +6909,14 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (child) {
       const parentKey = nn(child._parentKey);
       const reverse = child._toOps(nn(this._id), parentKey);
-      const indexToDelete = this.#items.indexOf(child);
+      const indexToDelete = this.#items.findIndex((item) => item === child);
       if (indexToDelete === -1) {
         return {
           modified: false
         };
       }
-      const [previousNode] = this.#items.splice(indexToDelete, 1);
+      const previousNode = this.#items.at(indexToDelete);
+      this.#items.remove(child);
       this.invalidate();
       child._detach();
       return {
@@ -6803,8 +6930,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (this.#implicitlyDeletedItems.has(child)) {
       this.#implicitlyDeletedItems.delete(child);
       child._setParentLink(this, newKey);
-      this._insertAndSort(child);
-      const newIndex = this.#items.indexOf(child);
+      const newIndex = this.#insert(child);
       return {
         modified: makeUpdate(this, [insertDelta(newIndex, child)]),
         reverse: []
@@ -6818,10 +6944,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     const existingItemIndex = this._indexOfPosition(newKey);
     if (existingItemIndex === -1) {
-      const previousIndex = this.#items.indexOf(child);
-      child._setParentLink(this, newKey);
-      this._sortItems();
-      const newIndex = this.#items.indexOf(child);
+      const previousIndex = this.#items.findIndex((item) => item === child);
+      this.#updateItemPosition(child, newKey);
+      const newIndex = this.#items.findIndex((item) => item === child);
       if (newIndex === previousIndex) {
         return {
           modified: false
@@ -6832,14 +6957,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
         reverse: []
       };
     } else {
-      this.#items[existingItemIndex]._setParentLink(
-        this,
-        makePosition(newKey, this.#items[existingItemIndex + 1]?._parentPos)
+      this.#updateItemPositionAt(
+        existingItemIndex,
+        makePosition(newKey, this.#items.at(existingItemIndex + 1)?._parentPos)
       );
-      const previousIndex = this.#items.indexOf(child);
-      child._setParentLink(this, newKey);
-      this._sortItems();
-      const newIndex = this.#items.indexOf(child);
+      const previousIndex = this.#items.findIndex((item) => item === child);
+      this.#updateItemPosition(child, newKey);
+      const newIndex = this.#items.findIndex((item) => item === child);
       if (newIndex === previousIndex) {
         return {
           modified: false
@@ -6857,14 +6981,18 @@ var LiveList = class _LiveList extends AbstractCrdt {
       const existingItemIndex = this._indexOfPosition(newKey);
       this.#implicitlyDeletedItems.delete(child);
       if (existingItemIndex !== -1) {
-        this.#items[existingItemIndex]._setParentLink(
+        const existingItem = this.#items.at(existingItemIndex);
+        existingItem._setParentLink(
           this,
-          makePosition(newKey, this.#items[existingItemIndex + 1]?._parentPos)
+          makePosition(
+            newKey,
+            this.#items.at(existingItemIndex + 1)?._parentPos
+          )
         );
+        this.#items.reposition(existingItem);
       }
       child._setParentLink(this, newKey);
-      this._insertAndSort(child);
-      const newIndex = this.#items.indexOf(child);
+      const newIndex = this.#insert(child);
       return {
         modified: makeUpdate(this, [insertDelta(newIndex, child)]),
         reverse: []
@@ -6875,17 +7003,19 @@ var LiveList = class _LiveList extends AbstractCrdt {
           modified: false
         };
       }
-      const previousIndex = this.#items.indexOf(child);
+      const previousIndex = this.#items.findIndex((item) => item === child);
       const existingItemIndex = this._indexOfPosition(newKey);
       if (existingItemIndex !== -1) {
-        this.#items[existingItemIndex]._setParentLink(
-          this,
-          makePosition(newKey, this.#items[existingItemIndex + 1]?._parentPos)
+        this.#updateItemPositionAt(
+          existingItemIndex,
+          makePosition(
+            newKey,
+            this.#items.at(existingItemIndex + 1)?._parentPos
+          )
         );
       }
-      child._setParentLink(this, newKey);
-      this._sortItems();
-      const newIndex = this.#items.indexOf(child);
+      this.#updateItemPosition(child, newKey);
+      const newIndex = this.#items.findIndex((item) => item === child);
       if (previousIndex === newIndex) {
         return {
           modified: false
@@ -6902,18 +7032,17 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   #applySetChildKeyUndoRedo(newKey, child) {
     const previousKey = nn(child._parentKey);
-    const previousIndex = this.#items.indexOf(child);
+    const previousIndex = this.#items.findIndex((item) => item === child);
     const existingItemIndex = this._indexOfPosition(newKey);
     let actualNewKey = newKey;
     if (existingItemIndex !== -1) {
       actualNewKey = makePosition(
         newKey,
-        this.#items[existingItemIndex + 1]?._parentPos
+        this.#items.at(existingItemIndex + 1)?._parentPos
       );
     }
-    child._setParentLink(this, actualNewKey);
-    this._sortItems();
-    const newIndex = this.#items.indexOf(child);
+    this.#updateItemPosition(child, actualNewKey);
+    const newIndex = this.#items.findIndex((item) => item === child);
     if (previousIndex === newIndex) {
       return {
         modified: false
@@ -6981,12 +7110,12 @@ var LiveList = class _LiveList extends AbstractCrdt {
         `Cannot insert list item at index "${index}". index should be between 0 and ${this.#items.length}`
       );
     }
-    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 before2 = this.#items.at(index - 1)?._parentPos;
+    const after2 = this.#items.at(index)?._parentPos;
     const position = makePosition(before2, after2);
     const value = lsonToLiveNode(element);
     value._setParentLink(this, position);
-    this._insertAndSort(value);
+    this.#insert(value);
     if (this._pool && this._id) {
       const id = this._pool.generateId();
       value._attach(id, this._pool);
@@ -7023,17 +7152,16 @@ var LiveList = class _LiveList extends AbstractCrdt {
     let beforePosition = null;
     let afterPosition = null;
     if (index < targetIndex) {
-      afterPosition = targetIndex === this.#items.length - 1 ? void 0 : this.#items[targetIndex + 1]._parentPos;
-      beforePosition = this.#items[targetIndex]._parentPos;
+      afterPosition = targetIndex === this.#items.length - 1 ? void 0 : this.#items.at(targetIndex + 1)?._parentPos;
+      beforePosition = this.#items.at(targetIndex)._parentPos;
     } else {
-      afterPosition = this.#items[targetIndex]._parentPos;
-      beforePosition = targetIndex === 0 ? void 0 : this.#items[targetIndex - 1]._parentPos;
+      afterPosition = this.#items.at(targetIndex)._parentPos;
+      beforePosition = targetIndex === 0 ? void 0 : this.#items.at(targetIndex - 1)?._parentPos;
     }
     const position = makePosition(beforePosition, afterPosition);
-    const item = this.#items[index];
+    const item = this.#items.at(index);
     const previousPosition = item._getParentKeyOrThrow();
-    item._setParentLink(this, position);
-    this._sortItems();
+    this.#updateItemPositionAt(index, position);
     if (this._pool && this._id) {
       const storageUpdates = /* @__PURE__ */ new Map([
         [this._id, makeUpdate(this, [moveDelta(index, targetIndex, item)])]
@@ -7069,9 +7197,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
         `Cannot delete list item at index "${index}". index should be between 0 and ${this.#items.length - 1}`
       );
     }
-    const item = this.#items[index];
+    const item = this.#items.at(index);
     item._detach();
-    const [prev] = this.#items.splice(index, 1);
+    this.#items.remove(item);
     this.invalidate();
     if (this._pool) {
       const childRecordId = item._id;
@@ -7079,7 +7207,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         const storageUpdates = /* @__PURE__ */ new Map();
         storageUpdates.set(
           nn(this._id),
-          makeUpdate(this, [deleteDelta(index, prev)])
+          makeUpdate(this, [deleteDelta(index, item)])
         );
         this._pool.dispatch(
           [
@@ -7116,7 +7244,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
           updateDelta.push(deleteDelta(0, item));
         }
       }
-      this.#items = [];
+      this.#items.clear();
       this.invalidate();
       const storageUpdates = /* @__PURE__ */ new Map();
       storageUpdates.set(nn(this._id), makeUpdate(this, updateDelta));
@@ -7125,7 +7253,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       for (const item of this.#items) {
         item._detach();
       }
-      this.#items = [];
+      this.#items.clear();
       this.invalidate();
     }
   }
@@ -7136,13 +7264,14 @@ var LiveList = class _LiveList extends AbstractCrdt {
         `Cannot set list item at index "${index}". index should be between 0 and ${this.#items.length - 1}`
       );
     }
-    const existingItem = this.#items[index];
+    const existingItem = this.#items.at(index);
     const position = existingItem._getParentKeyOrThrow();
     const existingId = existingItem._id;
     existingItem._detach();
     const value = lsonToLiveNode(item);
     value._setParentLink(this, position);
-    this.#items[index] = value;
+    this.#items.remove(existingItem);
+    this.#items.add(value);
     this.invalidate();
     if (this._pool && this._id) {
       const id = this._pool.generateId();
@@ -7165,11 +7294,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * Returns an Array of all the elements in the LiveList.
    */
   toArray() {
-    return this.#items.map(
-      (entry) => liveNodeToLson(entry)
-      //                               ^^^^^^^^
-      //                               FIXME! This isn't safe.
-    );
+    return Array.from(this.#items, (entry) => liveNodeToLson(entry));
   }
   /**
    * Tests whether all elements pass the test implemented by the provided function.
@@ -7219,7 +7344,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (index < 0 || index >= this.#items.length) {
       return void 0;
     }
-    return liveNodeToLson(this.#items[index]);
+    const item = this.#items.at(index);
+    return item ? liveNodeToLson(item) : void 0;
   }
   /**
    * Returns the first index at which a given element can be found in the LiveList, or -1 if it is not present.
@@ -7245,14 +7371,20 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @returns An array with each element being the result of the callback function.
    */
   map(callback) {
-    return this.#items.map(
-      (entry, i) => callback(
-        liveNodeToLson(entry),
-        //                    ^^^^^^^^
-        //                    FIXME! This isn't safe.
-        i
-      )
-    );
+    const result = [];
+    let i = 0;
+    for (const entry of this.#items) {
+      result.push(
+        callback(
+          liveNodeToLson(entry),
+          //                    ^^^^^^^^
+          //                    FIXME! This isn't safe.
+          i
+        )
+      );
+      i++;
+    }
+    return result;
   }
   /**
    * Tests whether at least one element in the LiveList passes the test implemented by the provided function.
@@ -7269,26 +7401,30 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const newItem = creationOpToLiveNode(op);
     newItem._attach(op.id, nn(this._pool));
     newItem._setParentLink(this, key);
-    this._insertAndSort(newItem);
+    this.#insert(newItem);
     const newIndex = this._indexOfPosition(key);
     return { newItem, newIndex };
   }
   #shiftItemPosition(index, key) {
     const shiftedPosition = makePosition(
       key,
-      this.#items.length > index + 1 ? this.#items[index + 1]?._parentPos : void 0
+      this.#items.length > index + 1 ? this.#items.at(index + 1)?._parentPos : void 0
     );
-    this.#items[index]._setParentLink(this, shiftedPosition);
+    this.#updateItemPositionAt(index, shiftedPosition);
   }
   /** @internal */
   _toTreeNode(key) {
+    const payload = [];
+    let index = 0;
+    for (const item of this.#items) {
+      payload.push(item.toTreeNode(index.toString()));
+      index++;
+    }
     return {
       type: "LiveList",
       id: this._id ?? nanoid(),
       key,
-      payload: this.#items.map(
-        (item, index) => item.toTreeNode(index.toString())
-      )
+      payload
     };
   }
   toImmutable() {
@@ -7296,11 +7432,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /** @internal */
   _toImmutable() {
-    const result = this.#items.map((node) => node.toImmutable());
+    const result = Array.from(this.#items, (node) => node.toImmutable());
     return process.env.NODE_ENV === "production" ? result : Object.freeze(result);
   }
   clone() {
-    return new _LiveList(this.#items.map((item) => item.clone()));
+    return new _LiveList(
+      Array.from(this.#items, (item) => item.clone())
+    );
   }
 };
 var LiveListIterator = class {
@@ -9241,8 +9379,17 @@ function createRoom(options, config) {
     (me) => me !== null ? userToTreeNode("Me", me) : null
   );
   function createOrUpdateRootFromMessage(nodes) {
+    if (nodes.size === 0) {
+      throw new Error("Internal error: cannot load storage without items");
+    }
     if (context.root !== void 0) {
-      updateRoot(nodes);
+      const currentItems = /* @__PURE__ */ new Map();
+      for (const [id, crdt] of context.pool.nodes) {
+        currentItems.set(id, crdt._serialize());
+      }
+      const ops = getTreesDiffOperations(currentItems, nodes);
+      const result = applyRemoteOps(ops);
+      notify(result.updates);
     } else {
       context.root = LiveObject._fromItems(
         nodes,
@@ -9264,21 +9411,6 @@ function createRoom(options, config) {
     }
     context.undoStack.length = stackSizeBefore;
   }
-  function updateRoot(nodes) {
-    if (nodes.size === 0) {
-      throw new Error("Internal error: cannot load storage without items");
-    }
-    if (context.root === void 0) {
-      return;
-    }
-    const currentItems = /* @__PURE__ */ new Map();
-    for (const [id, crdt] of context.pool.nodes) {
-      currentItems.set(id, crdt._serialize());
-    }
-    const ops = getTreesDiffOperations(currentItems, nodes);
-    const result = applyRemoteOps(ops);
-    notify(result.updates);
-  }
   function _addToRealUndoStack(frames) {
     if (context.undoStack.length >= 50) {
       context.undoStack.shift();