@liveblocks/core 3.16.0 → 3.17.0-rc1

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.16.0";
+var PKG_VERSION = "3.17.0-rc1";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -6319,7 +6319,6 @@ var AbstractCrdt = class {
   }
   /**
    * @internal
-   *
    * Return an snapshot of this Live tree for use in DevTools.
    */
   toTreeNode(key) {
@@ -6329,6 +6328,14 @@ var AbstractCrdt = class {
     }
     return this.#cachedTreeNode;
   }
+  /**
+   * @private
+   * Returns true if the cached immutable snapshot exists and is
+   * reference-equal to the given value. Does not trigger a recompute.
+   */
+  immutableIs(value) {
+    return this.#cachedImmutable !== void 0 && this.#cachedImmutable === value;
+  }
   /**
    * Return an immutable snapshot of this Live node and its children.
    */
@@ -6728,7 +6735,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
         };
       } else {
         if (indexOfItemWithSamePosition !== -1) {
-          nn(this.#items.removeAt(indexOfItemWithSamePosition));
+          const displaced = nn(
+            this.#items.removeAt(indexOfItemWithSamePosition)
+          );
+          this.#implicitlyDeletedItems.add(displaced);
         }
         const { newItem, newIndex } = this.#createAttachItemAndSort(
           op,
@@ -7876,10 +7886,115 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
   }
 };
 
+// src/crdts/reconcile.ts
+function deepLiveify(value, config) {
+  if (Array.isArray(value)) {
+    return new LiveList(value.map((v) => deepLiveify(v, config)));
+  } else if (isPlainObject(value)) {
+    const init = {};
+    const locals = {};
+    for (const key in value) {
+      const val = value[key];
+      if (val === void 0) {
+        continue;
+      }
+      const subConfig = isPlainObject(config) ? config[key] : config;
+      if (subConfig === false) {
+        locals[key] = val;
+      } else if (subConfig === "atomic") {
+        init[key] = val;
+      } else {
+        init[key] = deepLiveify(val, subConfig);
+      }
+    }
+    const lo = new LiveObject(init);
+    for (const key in locals) {
+      lo.setLocal(key, locals[key]);
+    }
+    return lo;
+  } else {
+    return value;
+  }
+}
+function reconcile(live, json, config) {
+  if (isLiveObject(live) && isPlainObject(json)) {
+    return reconcileLiveObject(live, json, config);
+  } else if (isLiveList(live) && Array.isArray(json)) {
+    return reconcileLiveList(live, json, config);
+  } else if (isLiveMap(live) && isPlainObject(json)) {
+    return reconcileLiveMap(live, config);
+  } else {
+    return deepLiveify(json, config);
+  }
+}
+function reconcileLiveMap(_liveMap, _config) {
+  throw new Error("Reconciling a LiveMap is not supported yet");
+}
+function reconcileLiveObject(liveObj, jsonObj, config) {
+  const currentKeys = liveObj.keys();
+  for (const key in jsonObj) {
+    currentKeys.delete(key);
+    const newVal = jsonObj[key];
+    if (newVal === void 0) {
+      liveObj.delete(key);
+      continue;
+    }
+    const subConfig = isPlainObject(config) ? config[key] : config;
+    if (subConfig === false) {
+      liveObj.setLocal(key, newVal);
+    } else if (subConfig === "atomic") {
+      const curVal = liveObj.get(key);
+      if (curVal !== newVal) {
+        liveObj.set(key, newVal);
+      }
+    } else {
+      const curVal = liveObj.get(key);
+      if (curVal === void 0) {
+        liveObj.set(key, deepLiveify(newVal, subConfig));
+      } else if (isLiveStructure(curVal)) {
+        const next = reconcile(curVal, newVal, subConfig);
+        if (next !== curVal) {
+          liveObj.set(key, next);
+        }
+      } else if (curVal !== newVal) {
+        liveObj.set(key, deepLiveify(newVal, subConfig));
+      }
+    }
+  }
+  for (const key of currentKeys) {
+    liveObj.delete(key);
+  }
+  return liveObj;
+}
+function reconcileLiveList(liveList, jsonArr, config) {
+  const curLen = liveList.length;
+  const newLen = jsonArr.length;
+  for (let i = 0; i < Math.min(curLen, newLen); i++) {
+    const curVal = liveList.get(i);
+    const newVal = jsonArr[i];
+    if (isLiveStructure(curVal)) {
+      const next = reconcile(curVal, newVal, config);
+      if (next !== curVal) {
+        liveList.set(i, next);
+      }
+    } else if (curVal !== newVal) {
+      liveList.set(i, deepLiveify(newVal, config));
+    }
+  }
+  for (let i = curLen; i < newLen; i++) {
+    liveList.push(deepLiveify(jsonArr[i], config));
+  }
+  for (let i = curLen - 1; i >= newLen; i--) {
+    liveList.delete(i);
+  }
+  return liveList;
+}
+
 // src/crdts/LiveObject.ts
 var MAX_LIVE_OBJECT_SIZE = 128 * 1024;
 var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
-  #map;
+  #synced;
+  #local = /* @__PURE__ */ new Map();
   /**
    * Tracks unacknowledged local changes per property to preserve optimistic
    * updates. Maps property keys to their pending operation IDs.
@@ -7944,7 +8059,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         value._setParentLink(this, key);
       }
     }
-    this.#map = new Map(Object.entries(o));
+    this.#synced = new Map(Object.entries(o));
   }
   /** @internal */
   _toOps(parentId, parentKey) {
@@ -7960,7 +8075,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       data: {}
     };
     ops.push(op);
-    for (const [key, value] of this.#map) {
+    for (const [key, value] of this.#synced) {
       if (isLiveNode(value)) {
         for (const childOp of value._toOps(this._id, key)) {
           ops.push(childOp);
@@ -7989,7 +8104,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       if (isLiveStructure(child)) {
         child._setParentLink(liveObj, crdt.parentKey);
       }
-      liveObj.#map.set(crdt.parentKey, child);
+      liveObj.#synced.set(crdt.parentKey, child);
       liveObj.invalidate();
     }
     return liveObj;
@@ -7997,7 +8112,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   /** @internal */
   _attach(id, pool) {
     super._attach(id, pool);
-    for (const [_key, value] of this.#map) {
+    for (const [_key, value] of this.#synced) {
       if (isLiveNode(value)) {
         value._attach(pool.generateId(), pool);
       }
@@ -8026,7 +8141,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       return { modified: false };
     }
     const thisId = nn(this._id);
-    const previousValue = this.#map.get(key);
+    const previousValue = this.#synced.get(key);
     let reverse;
     if (isLiveNode(previousValue)) {
       reverse = previousValue._toOps(thisId, key);
@@ -8042,7 +8157,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         }
       ];
     }
-    this.#map.set(key, child);
+    this.#local.delete(key);
+    this.#synced.set(key, child);
     this.invalidate();
     if (isLiveStructure(child)) {
       child._setParentLink(this, key);
@@ -8063,9 +8179,9 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       const id = nn(this._id);
       const parentKey = nn(child._parentKey);
       const reverse = child._toOps(id, parentKey);
-      for (const [key, value] of this.#map) {
+      for (const [key, value] of this.#synced) {
         if (value === child) {
-          this.#map.delete(key);
+          this.#synced.delete(key);
           this.invalidate();
         }
       }
@@ -8084,7 +8200,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   /** @internal */
   _detach() {
     super._detach();
-    for (const value of this.#map.values()) {
+    for (const value of this.#synced.values()) {
       if (isLiveNode(value)) {
         value._detach();
       }
@@ -8102,7 +8218,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   /** @internal */
   _serialize() {
     const data = {};
-    for (const [key, value] of this.#map) {
+    for (const [key, value] of this.#synced) {
       if (!isLiveNode(value)) {
         data[key] = value;
       }
@@ -8131,7 +8247,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       data: {}
     };
     for (const key in op.data) {
-      const oldValue = this.#map.get(key);
+      const oldValue = this.#synced.get(key);
       if (isLiveNode(oldValue)) {
         for (const childOp of oldValue._toOps(id, key)) {
           reverse.push(childOp);
@@ -8159,13 +8275,14 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       } else {
         continue;
       }
-      const oldValue = this.#map.get(key);
+      const oldValue = this.#synced.get(key);
       if (isLiveNode(oldValue)) {
         oldValue._detach();
       }
       isModified = true;
       updateDelta[key] = { type: "update" };
-      this.#map.set(key, value);
+      this.#local.delete(key);
+      this.#synced.set(key, value);
       this.invalidate();
     }
     if (Object.keys(reverseUpdate.data).length !== 0) {
@@ -8182,7 +8299,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   }
   #applyDeleteObjectKey(op, isLocal) {
     const key = op.key;
-    const oldValue = this.#map.get(key);
+    const oldValue = this.#synced.get(key);
     if (oldValue === void 0) {
       return { modified: false };
     }
@@ -8203,7 +8320,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         }
       ];
     }
-    this.#map.delete(key);
+    this.#local.delete(key);
+    this.#synced.delete(key);
     this.invalidate();
     return {
       modified: {
@@ -8216,11 +8334,23 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       reverse
     };
   }
+  /** @private */
+  keys() {
+    const result = new Set(this.#synced.keys());
+    for (const key of this.#local.keys()) {
+      result.add(key);
+    }
+    return result;
+  }
   /**
    * Transform the LiveObject into a javascript object
    */
   toObject() {
-    return Object.fromEntries(this.#map);
+    const result = Object.fromEntries(this.#synced);
+    for (const [key, value] of this.#local) {
+      result[key] = value;
+    }
+    return result;
   }
   /**
    * Adds or updates a property with a specified key and a value.
@@ -8228,49 +8358,109 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
    * @param value The value of the property to add
    */
   set(key, value) {
-    _optionalChain([this, 'access', _192 => _192._pool, 'optionalAccess', _193 => _193.assertStorageIsWritable, 'call', _194 => _194()]);
     this.update({ [key]: value });
   }
+  /**
+   * @experimental
+   *
+   * Sets a local-only property that is not synchronized over the wire.
+   * The value will be visible via get(), toObject(), and toImmutable() on
+   * this client only. Other clients and the server will see `undefined`
+   * for this key.
+   *
+   * Caveat: this method will not add changes to the undo/redo stack.
+   */
+  setLocal(key, value) {
+    _optionalChain([this, 'access', _192 => _192._pool, 'optionalAccess', _193 => _193.assertStorageIsWritable, 'call', _194 => _194()]);
+    const deleteResult = this.#prepareDelete(key);
+    this.#local.set(key, value);
+    this.invalidate();
+    if (this._pool !== void 0 && this._id !== void 0) {
+      const ops = _nullishCoalesce(_optionalChain([deleteResult, 'optionalAccess', _195 => _195[0]]), () => ( []));
+      const reverse = _nullishCoalesce(_optionalChain([deleteResult, 'optionalAccess', _196 => _196[1]]), () => ( []));
+      const storageUpdates = _nullishCoalesce(_optionalChain([deleteResult, 'optionalAccess', _197 => _197[2]]), () => ( /* @__PURE__ */ new Map()));
+      const existing = storageUpdates.get(this._id);
+      storageUpdates.set(this._id, {
+        node: this,
+        type: "LiveObject",
+        updates: {
+          ..._optionalChain([existing, 'optionalAccess', _198 => _198.updates]),
+          [key]: { type: "update" }
+        }
+      });
+      this._pool.dispatch(ops, reverse, storageUpdates);
+    }
+  }
   /**
    * Returns a specified property from the LiveObject.
    * @param key The key of the property to get
    */
   get(key) {
-    return this.#map.get(key);
+    return this.#local.has(key) ? this.#local.get(key) : this.#synced.get(key);
   }
   /**
-   * Deletes a key from the LiveObject
-   * @param key The key of the property to delete
+   * Removes a synced key, returning the ops, reverse ops, and storage updates
+   * needed to notify the pool. Returns null if the key doesn't exist in
+   * #synced or pool/id are unavailable. Does NOT dispatch.
    */
-  delete(key) {
-    _optionalChain([this, 'access', _195 => _195._pool, 'optionalAccess', _196 => _196.assertStorageIsWritable, 'call', _197 => _197()]);
-    const keyAsString = key;
-    const oldValue = this.#map.get(keyAsString);
+  #prepareDelete(key) {
+    _optionalChain([this, 'access', _199 => _199._pool, 'optionalAccess', _200 => _200.assertStorageIsWritable, 'call', _201 => _201()]);
+    const k = key;
+    if (this.#local.has(k) && !this.#synced.has(k)) {
+      const oldValue2 = this.#local.get(k);
+      this.#local.delete(k);
+      this.invalidate();
+      if (this._pool !== void 0 && this._id !== void 0) {
+        const storageUpdates2 = /* @__PURE__ */ new Map();
+        storageUpdates2.set(this._id, {
+          node: this,
+          type: "LiveObject",
+          updates: {
+            [k]: {
+              type: "delete",
+              deletedItem: oldValue2
+            }
+          }
+        });
+        return [[], [], storageUpdates2];
+      }
+      return null;
+    }
+    this.#local.delete(k);
+    const oldValue = this.#synced.get(k);
     if (oldValue === void 0) {
-      return;
+      return null;
     }
     if (this._pool === void 0 || this._id === void 0) {
       if (isLiveNode(oldValue)) {
         oldValue._detach();
       }
-      this.#map.delete(keyAsString);
+      this.#synced.delete(k);
       this.invalidate();
-      return;
+      return null;
     }
+    const ops = [
+      {
+        type: OpCode.DELETE_OBJECT_KEY,
+        key: k,
+        id: this._id,
+        opId: this._pool.generateOpId()
+      }
+    ];
     let reverse;
     if (isLiveNode(oldValue)) {
       oldValue._detach();
-      reverse = oldValue._toOps(this._id, keyAsString);
+      reverse = oldValue._toOps(this._id, k);
     } else {
       reverse = [
         {
           type: OpCode.UPDATE_OBJECT,
-          data: { [keyAsString]: oldValue },
+          data: { [k]: oldValue },
           id: this._id
         }
       ];
     }
-    this.#map.delete(keyAsString);
+    this.#synced.delete(k);
     this.invalidate();
     const storageUpdates = /* @__PURE__ */ new Map();
     storageUpdates.set(this._id, {
@@ -8280,28 +8470,28 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         [key]: { type: "delete", deletedItem: oldValue }
       }
     });
-    this._pool.dispatch(
-      [
-        {
-          type: OpCode.DELETE_OBJECT_KEY,
-          key: keyAsString,
-          id: this._id,
-          opId: this._pool.generateOpId()
-        }
-      ],
-      reverse,
-      storageUpdates
-    );
+    return [ops, reverse, storageUpdates];
+  }
+  /**
+   * Deletes a key from the LiveObject
+   * @param key The key of the property to delete
+   */
+  delete(key) {
+    const result = this.#prepareDelete(key);
+    if (result) {
+      const [ops, reverse, storageUpdates] = result;
+      _optionalChain([this, 'access', _202 => _202._pool, 'optionalAccess', _203 => _203.dispatch, 'call', _204 => _204(ops, reverse, storageUpdates)]);
+    }
   }
   /**
    * Adds or updates multiple properties at once with an object.
    * @param patch The object used to overrides properties
    */
   update(patch) {
-    _optionalChain([this, 'access', _198 => _198._pool, 'optionalAccess', _199 => _199.assertStorageIsWritable, 'call', _200 => _200()]);
+    _optionalChain([this, 'access', _205 => _205._pool, 'optionalAccess', _206 => _206.assertStorageIsWritable, 'call', _207 => _207()]);
     if (_LiveObject.detectLargeObjects) {
       const data = {};
-      for (const [key, value] of this.#map) {
+      for (const [key, value] of this.#synced) {
         if (!isLiveNode(value)) {
           data[key] = value;
         }
@@ -8330,14 +8520,15 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         if (newValue === void 0) {
           continue;
         }
-        const oldValue = this.#map.get(key);
+        const oldValue = this.#synced.get(key);
         if (isLiveNode(oldValue)) {
           oldValue._detach();
         }
         if (isLiveNode(newValue)) {
           newValue._setParentLink(this, key);
         }
-        this.#map.set(key, newValue);
+        this.#local.delete(key);
+        this.#synced.set(key, newValue);
         this.invalidate();
       }
       return;
@@ -8357,7 +8548,10 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       if (newValue === void 0) {
         continue;
       }
-      const oldValue = this.#map.get(key);
+      const oldValue = this.#synced.get(key);
+      if (oldValue === newValue) {
+        continue;
+      }
       if (isLiveNode(oldValue)) {
         for (const childOp of oldValue._toOps(this._id, key)) {
           reverseOps.push(childOp);
@@ -8389,7 +8583,8 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         updatedProps[key] = newValue;
         this.#unackedOpsByKey.set(key, opId);
       }
-      this.#map.set(key, newValue);
+      this.#local.delete(key);
+      this.#synced.set(key, newValue);
       this.invalidate();
       updateDelta[key] = { type: "update" };
     }
@@ -8404,6 +8599,9 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         data: updatedProps
       });
     }
+    if (ops.length === 0 && reverseOps.length === 0 && Object.keys(updateDelta).length === 0) {
+      return;
+    }
     const storageUpdates = /* @__PURE__ */ new Map();
     storageUpdates.set(this._id, {
       node: this,
@@ -8412,6 +8610,34 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
     });
     this._pool.dispatch(ops, reverseOps, storageUpdates);
   }
+  /**
+   * Creates a new LiveObject from a plain JSON object, recursively converting
+   * nested objects to LiveObjects and arrays to LiveLists. An optional
+   * SyncConfig controls per-key behavior (local-only, atomic, or deep).
+   *
+   * @private
+   */
+  static from(obj, config) {
+    if (!isPlainObject(obj)) throw new Error("Expected a JSON object");
+    const liveObj = new _LiveObject({});
+    liveObj.reconcile(obj, config);
+    return liveObj;
+  }
+  /**
+   * Reconciles a LiveObject tree to match the given JSON object and sync
+   * config. Only mutates keys that actually changed. Recursively reconciles
+   * the entire Live tree below it.
+   *
+   * @private
+   */
+  reconcile(jsonObj, config) {
+    if (this.immutableIs(jsonObj)) return;
+    if (!isPlainObject(jsonObj))
+      throw new Error(
+        "Reconciling the document root expects a plain object value"
+      );
+    reconcileLiveObject(this, jsonObj, config);
+  }
   toImmutable() {
     return super.toImmutable();
   }
@@ -8426,7 +8652,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       type: "LiveObject",
       id: nodeId,
       key,
-      payload: Array.from(this.#map.entries()).map(
+      payload: Array.from(this.#synced.entries()).map(
         ([key2, value]) => isLiveNode(value) ? value.toTreeNode(key2) : { type: "Json", id: `${nodeId}:${key2}`, key: key2, payload: value }
       )
     };
@@ -8434,20 +8660,27 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   /** @internal */
   _toImmutable() {
     const result = {};
-    for (const [key, val] of this.#map) {
+    for (const [key, val] of this.#synced) {
       result[key] = isLiveStructure(val) ? val.toImmutable() : val;
     }
+    for (const [key, val] of this.#local) {
+      result[key] = val;
+    }
     return process.env.NODE_ENV === "production" ? result : Object.freeze(result);
   }
   clone() {
-    return new _LiveObject(
+    const cloned = new _LiveObject(
       Object.fromEntries(
-        Array.from(this.#map).map(([key, value]) => [
+        Array.from(this.#synced).map(([key, value]) => [
           key,
           isLiveStructure(value) ? value.clone() : deepClone(value)
         ])
       )
     );
+    for (const [key, value] of this.#local) {
+      cloned.#local.set(key, deepClone(value));
+    }
+    return cloned;
   }
 }, _class2.__initStatic(), _class2);
 
@@ -9067,15 +9300,15 @@ function installBackgroundTabSpy() {
   const doc = typeof document !== "undefined" ? document : void 0;
   const inBackgroundSince = { current: null };
   function onVisibilityChange() {
-    if (_optionalChain([doc, 'optionalAccess', _201 => _201.visibilityState]) === "hidden") {
+    if (_optionalChain([doc, 'optionalAccess', _208 => _208.visibilityState]) === "hidden") {
       inBackgroundSince.current = _nullishCoalesce(inBackgroundSince.current, () => ( Date.now()));
     } else {
       inBackgroundSince.current = null;
     }
   }
-  _optionalChain([doc, 'optionalAccess', _202 => _202.addEventListener, 'call', _203 => _203("visibilitychange", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _209 => _209.addEventListener, 'call', _210 => _210("visibilitychange", onVisibilityChange)]);
   const unsub = () => {
-    _optionalChain([doc, 'optionalAccess', _204 => _204.removeEventListener, 'call', _205 => _205("visibilitychange", onVisibilityChange)]);
+    _optionalChain([doc, 'optionalAccess', _211 => _211.removeEventListener, 'call', _212 => _212("visibilitychange", onVisibilityChange)]);
   };
   return [inBackgroundSince, unsub];
 }
@@ -9255,14 +9488,18 @@ function createRoom(options, config) {
       }
       context.activeBatch.reverseOps.pushLeft(reverse);
     } else {
-      addToUndoStack(reverse);
-      context.redoStack.length = 0;
-      dispatchOps(ops);
+      if (reverse.length > 0) {
+        addToUndoStack(reverse);
+      }
+      if (ops.length > 0) {
+        context.redoStack.length = 0;
+        dispatchOps(ops);
+      }
       notify({ storageUpdates });
     }
   }
   function isStorageWritable() {
-    const scopes = _optionalChain([context, 'access', _206 => _206.dynamicSessionInfoSig, 'access', _207 => _207.get, 'call', _208 => _208(), 'optionalAccess', _209 => _209.scopes]);
+    const scopes = _optionalChain([context, 'access', _213 => _213.dynamicSessionInfoSig, 'access', _214 => _214.get, 'call', _215 => _215(), 'optionalAccess', _216 => _216.scopes]);
     return scopes !== void 0 ? canWriteStorage(scopes) : true;
   }
   const eventHub = {
@@ -9366,20 +9603,21 @@ function createRoom(options, config) {
         context.pool
       );
     }
-    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _210 => _210.get, 'call', _211 => _211(), 'optionalAccess', _212 => _212.canWrite]), () => ( true));
-    const stackSizeBefore = context.undoStack.length;
-    for (const key in context.initialStorage) {
-      if (context.root.get(key) === void 0) {
-        if (canWrite) {
-          context.root.set(key, cloneLson(context.initialStorage[key]));
-        } else {
-          warn(
-            `Attempted to populate missing storage key '${key}', but current user has no write access`
-          );
+    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _217 => _217.get, 'call', _218 => _218(), 'optionalAccess', _219 => _219.canWrite]), () => ( true));
+    const root = context.root;
+    withoutHistory(() => {
+      for (const key in context.initialStorage) {
+        if (root.get(key) === void 0) {
+          if (canWrite) {
+            root.set(key, cloneLson(context.initialStorage[key]));
+          } else {
+            warn(
+              `Attempted to populate missing storage key '${key}', but current user has no write access`
+            );
+          }
         }
       }
-    }
-    context.undoStack.length = stackSizeBefore;
+    });
   }
   function _addToRealUndoStack(frames) {
     if (context.undoStack.length >= 50) {
@@ -9570,7 +9808,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _213 => _213.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _220 => _220.addToHistory])) {
         context.activeBatch.reverseOps.pushLeft({
           type: "presence",
           data: oldValues
@@ -9579,7 +9817,7 @@ function createRoom(options, config) {
       context.activeBatch.updates.presence = true;
     } else {
       flushNowOrSoon();
-      if (_optionalChain([options2, 'optionalAccess', _214 => _214.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _221 => _221.addToHistory])) {
         addToUndoStack([{ type: "presence", data: oldValues }]);
       }
       notify({ presence: true });
@@ -9756,11 +9994,11 @@ function createRoom(options, config) {
           break;
         }
         case ServerMsgCode.STORAGE_CHUNK:
-          _optionalChain([stopwatch, 'optionalAccess', _215 => _215.lap, 'call', _216 => _216()]);
+          _optionalChain([stopwatch, 'optionalAccess', _222 => _222.lap, 'call', _223 => _223()]);
           nodeMapBuffer.append(compactNodesToNodeStream(message.nodes));
           break;
         case ServerMsgCode.STORAGE_STREAM_END: {
-          const timing = _optionalChain([stopwatch, 'optionalAccess', _217 => _217.stop, 'call', _218 => _218()]);
+          const timing = _optionalChain([stopwatch, 'optionalAccess', _224 => _224.stop, 'call', _225 => _225()]);
           if (timing) {
             const ms = (v) => `${v.toFixed(1)}ms`;
             const rest = timing.laps.slice(1);
@@ -9895,11 +10133,11 @@ function createRoom(options, config) {
           } else if (pendingFeedsRequests.has(requestId)) {
             const pending = pendingFeedsRequests.get(requestId);
             pendingFeedsRequests.delete(requestId);
-            _optionalChain([pending, 'optionalAccess', _219 => _219.reject, 'call', _220 => _220(err)]);
+            _optionalChain([pending, 'optionalAccess', _226 => _226.reject, 'call', _227 => _227(err)]);
           } else if (pendingFeedMessagesRequests.has(requestId)) {
             const pending = pendingFeedMessagesRequests.get(requestId);
             pendingFeedMessagesRequests.delete(requestId);
-            _optionalChain([pending, 'optionalAccess', _221 => _221.reject, 'call', _222 => _222(err)]);
+            _optionalChain([pending, 'optionalAccess', _228 => _228.reject, 'call', _229 => _229(err)]);
           }
           eventHub.feeds.notify(message);
           break;
@@ -10053,10 +10291,10 @@ function createRoom(options, config) {
       timeoutId,
       kind,
       feedId,
-      messageId: _optionalChain([options2, 'optionalAccess', _223 => _223.messageId]),
-      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _224 => _224.expectedClientMessageId])
+      messageId: _optionalChain([options2, 'optionalAccess', _230 => _230.messageId]),
+      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _231 => _231.expectedClientMessageId])
     });
-    if (kind === "add-message" && _optionalChain([options2, 'optionalAccess', _225 => _225.expectedClientMessageId]) === void 0) {
+    if (kind === "add-message" && _optionalChain([options2, 'optionalAccess', _232 => _232.expectedClientMessageId]) === void 0) {
       const q = _nullishCoalesce(pendingAddMessageFifoByFeed.get(feedId), () => ( []));
       q.push(requestId);
       pendingAddMessageFifoByFeed.set(feedId, q);
@@ -10107,10 +10345,10 @@ function createRoom(options, config) {
           }
           if (!matched) {
             const q = pendingAddMessageFifoByFeed.get(message.feedId);
-            const headId = _optionalChain([q, 'optionalAccess', _226 => _226[0]]);
+            const headId = _optionalChain([q, 'optionalAccess', _233 => _233[0]]);
             if (headId !== void 0) {
               const pending = pendingFeedMutations.get(headId);
-              if (_optionalChain([pending, 'optionalAccess', _227 => _227.kind]) === "add-message" && pending.expectedClientMessageId === void 0) {
+              if (_optionalChain([pending, 'optionalAccess', _234 => _234.kind]) === "add-message" && pending.expectedClientMessageId === void 0) {
                 settleFeedMutation(headId, "ok");
               }
             }
@@ -10146,7 +10384,7 @@ function createRoom(options, config) {
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
     createOrUpdateRootFromMessage(nodes);
     applyAndSendOfflineOps(unacknowledgedOps);
-    _optionalChain([_resolveStoragePromise, 'optionalCall', _228 => _228()]);
+    _optionalChain([_resolveStoragePromise, 'optionalCall', _235 => _235()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
@@ -10164,7 +10402,7 @@ function createRoom(options, config) {
     } else if (!messages.some((msg) => msg.type === ClientMsgCode.FETCH_STORAGE)) {
       messages.push({ type: ClientMsgCode.FETCH_STORAGE });
       nodeMapBuffer.take();
-      _optionalChain([stopwatch, 'optionalAccess', _229 => _229.start, 'call', _230 => _230()]);
+      _optionalChain([stopwatch, 'optionalAccess', _236 => _236.start, 'call', _237 => _237()]);
     }
     if (options2.flush) {
       flushNowOrSoon();
@@ -10220,10 +10458,10 @@ function createRoom(options, config) {
     const message = {
       type: ClientMsgCode.FETCH_FEEDS,
       requestId,
-      cursor: _optionalChain([options2, 'optionalAccess', _231 => _231.cursor]),
-      since: _optionalChain([options2, 'optionalAccess', _232 => _232.since]),
-      limit: _optionalChain([options2, 'optionalAccess', _233 => _233.limit]),
-      metadata: _optionalChain([options2, 'optionalAccess', _234 => _234.metadata])
+      cursor: _optionalChain([options2, 'optionalAccess', _238 => _238.cursor]),
+      since: _optionalChain([options2, 'optionalAccess', _239 => _239.since]),
+      limit: _optionalChain([options2, 'optionalAccess', _240 => _240.limit]),
+      metadata: _optionalChain([options2, 'optionalAccess', _241 => _241.metadata])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -10243,9 +10481,9 @@ function createRoom(options, config) {
       type: ClientMsgCode.FETCH_FEED_MESSAGES,
       requestId,
       feedId,
-      cursor: _optionalChain([options2, 'optionalAccess', _235 => _235.cursor]),
-      since: _optionalChain([options2, 'optionalAccess', _236 => _236.since]),
-      limit: _optionalChain([options2, 'optionalAccess', _237 => _237.limit])
+      cursor: _optionalChain([options2, 'optionalAccess', _242 => _242.cursor]),
+      since: _optionalChain([options2, 'optionalAccess', _243 => _243.since]),
+      limit: _optionalChain([options2, 'optionalAccess', _244 => _244.limit])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -10264,8 +10502,8 @@ function createRoom(options, config) {
       type: ClientMsgCode.ADD_FEED,
       requestId,
       feedId,
-      metadata: _optionalChain([options2, 'optionalAccess', _238 => _238.metadata]),
-      createdAt: _optionalChain([options2, 'optionalAccess', _239 => _239.createdAt])
+      metadata: _optionalChain([options2, 'optionalAccess', _245 => _245.metadata]),
+      createdAt: _optionalChain([options2, 'optionalAccess', _246 => _246.createdAt])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -10299,15 +10537,15 @@ function createRoom(options, config) {
   function addFeedMessage(feedId, data, options2) {
     const requestId = nanoid();
     const promise = registerFeedMutation(requestId, "add-message", feedId, {
-      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _240 => _240.id])
+      expectedClientMessageId: _optionalChain([options2, 'optionalAccess', _247 => _247.id])
     });
     const message = {
       type: ClientMsgCode.ADD_FEED_MESSAGE,
       requestId,
       feedId,
       data,
-      id: _optionalChain([options2, 'optionalAccess', _241 => _241.id]),
-      createdAt: _optionalChain([options2, 'optionalAccess', _242 => _242.createdAt])
+      id: _optionalChain([options2, 'optionalAccess', _248 => _248.id]),
+      createdAt: _optionalChain([options2, 'optionalAccess', _249 => _249.createdAt])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -10324,7 +10562,7 @@ function createRoom(options, config) {
       feedId,
       messageId,
       data,
-      updatedAt: _optionalChain([options2, 'optionalAccess', _243 => _243.updatedAt])
+      updatedAt: _optionalChain([options2, 'optionalAccess', _250 => _250.updatedAt])
     };
     context.buffer.messages.push(message);
     flushNowOrSoon();
@@ -10397,7 +10635,8 @@ function createRoom(options, config) {
         presence: false,
         others: []
       },
-      reverseOps: new Deque()
+      reverseOps: new Deque(),
+      scheduleHistoryResume: false
     };
     try {
       returnValue = callback();
@@ -10407,6 +10646,9 @@ function createRoom(options, config) {
       if (currentBatch.reverseOps.length > 0) {
         addToUndoStack(Array.from(currentBatch.reverseOps));
       }
+      if (currentBatch.scheduleHistoryResume) {
+        commitPausedHistoryToUndoStack();
+      }
       if (currentBatch.ops.length > 0) {
         context.redoStack.length = 0;
       }
@@ -10423,13 +10665,30 @@ function createRoom(options, config) {
       context.pausedHistory = new Deque();
     }
   }
-  function resumeHistory() {
+  function commitPausedHistoryToUndoStack() {
     const frames = context.pausedHistory;
     context.pausedHistory = null;
     if (frames !== null && frames.length > 0) {
       _addToRealUndoStack(Array.from(frames));
     }
   }
+  function resumeHistory() {
+    if (context.activeBatch !== null) {
+      context.activeBatch.scheduleHistoryResume = true;
+      return;
+    }
+    commitPausedHistoryToUndoStack();
+  }
+  function withoutHistory(fn) {
+    const undoBefore = context.undoStack.length;
+    const redoBefore = context.redoStack.length;
+    try {
+      return fn();
+    } finally {
+      context.undoStack.length = undoBefore;
+      context.redoStack.length = redoBefore;
+    }
+  }
   const syncSourceForStorage = config.createSyncSource();
   function getStorageStatus() {
     if (context.root === void 0) {
@@ -10500,8 +10759,8 @@ function createRoom(options, config) {
   async function getThreads(options2) {
     return httpClient.getThreads({
       roomId,
-      query: _optionalChain([options2, 'optionalAccess', _244 => _244.query]),
-      cursor: _optionalChain([options2, 'optionalAccess', _245 => _245.cursor])
+      query: _optionalChain([options2, 'optionalAccess', _251 => _251.query]),
+      cursor: _optionalChain([options2, 'optionalAccess', _252 => _252.cursor])
     });
   }
   async function getThread(threadId) {
@@ -10623,7 +10882,7 @@ function createRoom(options, config) {
   function getSubscriptionSettings(options2) {
     return httpClient.getSubscriptionSettings({
       roomId,
-      signal: _optionalChain([options2, 'optionalAccess', _246 => _246.signal])
+      signal: _optionalChain([options2, 'optionalAccess', _253 => _253.signal])
     });
   }
   function updateSubscriptionSettings(settings) {
@@ -10645,7 +10904,7 @@ function createRoom(options, config) {
     {
       [kInternal]: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _247 => _247.buffer, 'access', _248 => _248.presenceUpdates, 'optionalAccess', _249 => _249.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _254 => _254.buffer, 'access', _255 => _255.presenceUpdates, 'optionalAccess', _256 => _256.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -10660,9 +10919,9 @@ function createRoom(options, config) {
           return context.yjsProvider;
         },
         setYjsProvider(newProvider) {
-          _optionalChain([context, 'access', _250 => _250.yjsProvider, 'optionalAccess', _251 => _251.off, 'call', _252 => _252("status", yjsStatusDidChange)]);
+          _optionalChain([context, 'access', _257 => _257.yjsProvider, 'optionalAccess', _258 => _258.off, 'call', _259 => _259("status", yjsStatusDidChange)]);
           context.yjsProvider = newProvider;
-          _optionalChain([newProvider, 'optionalAccess', _253 => _253.on, 'call', _254 => _254("status", yjsStatusDidChange)]);
+          _optionalChain([newProvider, 'optionalAccess', _260 => _260.on, 'call', _261 => _261("status", yjsStatusDidChange)]);
           context.yjsProviderDidChange.notify();
         },
         yjsProviderDidChange: context.yjsProviderDidChange.observable,
@@ -10715,7 +10974,7 @@ function createRoom(options, config) {
           source.dispose();
         }
         eventHub.roomWillDestroy.notify();
-        _optionalChain([context, 'access', _255 => _255.yjsProvider, 'optionalAccess', _256 => _256.off, 'call', _257 => _257("status", yjsStatusDidChange)]);
+        _optionalChain([context, 'access', _262 => _262.yjsProvider, 'optionalAccess', _263 => _263.off, 'call', _264 => _264("status", yjsStatusDidChange)]);
         syncSourceForStorage.destroy();
         syncSourceForYjs.destroy();
         uninstallBgTabSpy();
@@ -10735,7 +10994,10 @@ function createRoom(options, config) {
         canRedo,
         clear,
         pause: pauseHistory,
-        resume: resumeHistory
+        resume: resumeHistory,
+        [kInternal]: {
+          withoutHistory
+        }
       },
       fetchYDoc,
       fetchFeeds,
@@ -10874,7 +11136,7 @@ function makeClassicSubscribeFn(roomId, events, errorEvents) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _258 => _258.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _265 => _265.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -10960,8 +11222,8 @@ function createClient(options) {
   const authManager = createAuthManager(options, (token) => {
     currentUserId.set(() => token.uid);
   });
-  const fetchPolyfill = _optionalChain([clientOptions, 'access', _259 => _259.polyfills, 'optionalAccess', _260 => _260.fetch]) || /* istanbul ignore next */
-  _optionalChain([globalThis, 'access', _261 => _261.fetch, 'optionalAccess', _262 => _262.bind, 'call', _263 => _263(globalThis)]);
+  const fetchPolyfill = _optionalChain([clientOptions, 'access', _266 => _266.polyfills, 'optionalAccess', _267 => _267.fetch]) || /* istanbul ignore next */
+  _optionalChain([globalThis, 'access', _268 => _268.fetch, 'optionalAccess', _269 => _269.bind, 'call', _270 => _270(globalThis)]);
   const httpClient = createApiClient({
     baseUrl,
     fetchPolyfill,
@@ -10979,7 +11241,7 @@ function createClient(options) {
     delegates: {
       createSocket: makeCreateSocketDelegateForAi(
         baseUrl,
-        _optionalChain([clientOptions, 'access', _264 => _264.polyfills, 'optionalAccess', _265 => _265.WebSocket])
+        _optionalChain([clientOptions, 'access', _271 => _271.polyfills, 'optionalAccess', _272 => _272.WebSocket])
       ),
       authenticate: async () => {
         const resp = await authManager.getAuthValue({
@@ -11039,7 +11301,7 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _266 => _266.polyfills, 'optionalAccess', _267 => _267.WebSocket])
+            _optionalChain([clientOptions, 'access', _273 => _273.polyfills, 'optionalAccess', _274 => _274.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
@@ -11062,7 +11324,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _268 => _268.polyfills, 'optionalAccess', _269 => _269.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _275 => _275.polyfills, 'optionalAccess', _276 => _276.atob]) === void 0) {
           throw new Error(
             "You need to polyfill atob to use the client in your environment. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/atob-polyfill"
           );
@@ -11074,7 +11336,7 @@ function createClient(options) {
     return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _270 => _270.get, 'call', _271 => _271(roomId), 'optionalAccess', _272 => _272.room]);
+    const room = _optionalChain([roomsById, 'access', _277 => _277.get, 'call', _278 => _278(roomId), 'optionalAccess', _279 => _279.room]);
     return room ? room : null;
   }
   function logout() {
@@ -11090,7 +11352,7 @@ function createClient(options) {
   const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _273 => _273({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _280 => _280({ userIds })]);
       warnOnceIf(
         !resolveUsers,
         "Set the resolveUsers option in createClient to specify user info."
@@ -11107,7 +11369,7 @@ function createClient(options) {
   const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _274 => _274({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _281 => _281({ roomIds })]);
       warnOnceIf(
         !resolveRoomsInfo,
         "Set the resolveRoomsInfo option in createClient to specify room info."
@@ -11124,7 +11386,7 @@ function createClient(options) {
   const batchedResolveGroupsInfo = new Batch(
     async (batchedGroupIds) => {
       const groupIds = batchedGroupIds.flat();
-      const groupsInfo = await _optionalChain([resolveGroupsInfo, 'optionalCall', _275 => _275({ groupIds })]);
+      const groupsInfo = await _optionalChain([resolveGroupsInfo, 'optionalCall', _282 => _282({ groupIds })]);
       warnOnceIf(
         !resolveGroupsInfo,
         "Set the resolveGroupsInfo option in createClient to specify group info."
@@ -11180,7 +11442,7 @@ function createClient(options) {
       }
     };
     const win = typeof window !== "undefined" ? window : void 0;
-    _optionalChain([win, 'optionalAccess', _276 => _276.addEventListener, 'call', _277 => _277("beforeunload", maybePreventClose)]);
+    _optionalChain([win, 'optionalAccess', _283 => _283.addEventListener, 'call', _284 => _284("beforeunload", maybePreventClose)]);
   }
   async function getNotificationSettings(options2) {
     const plainSettings = await httpClient.getNotificationSettings(options2);
@@ -11307,7 +11569,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _278 => _278.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _285 => _285.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -11317,13 +11579,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _279 => _279(block)]);
+        _optionalChain([visitor, 'optionalCall', _286 => _286(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _280 => _280(inline)]);
+          _optionalChain([visitor, 'optionalCall', _287 => _287(inline)]);
         }
       }
     }
@@ -11493,7 +11755,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => _nullishCoalesce(element.text, () => ( element.url)),
   mention: ({ element, user, group }) => {
-    return `@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _281 => _281.name]), () => ( _optionalChain([group, 'optionalAccess', _282 => _282.name]))), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _288 => _288.name]), () => ( _optionalChain([group, 'optionalAccess', _289 => _289.name]))), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -11523,7 +11785,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${element.text ? html`${element.text}` : element.url}</a>`;
   },
   mention: ({ element, user, group }) => {
-    return html`<span data-mention>@${_optionalChain([user, 'optionalAccess', _283 => _283.name]) ? html`${_optionalChain([user, 'optionalAccess', _284 => _284.name])}` : _optionalChain([group, 'optionalAccess', _285 => _285.name]) ? html`${_optionalChain([group, 'optionalAccess', _286 => _286.name])}` : element.id}</span>`;
+    return html`<span data-mention>@${_optionalChain([user, 'optionalAccess', _290 => _290.name]) ? html`${_optionalChain([user, 'optionalAccess', _291 => _291.name])}` : _optionalChain([group, 'optionalAccess', _292 => _292.name]) ? html`${_optionalChain([group, 'optionalAccess', _293 => _293.name])}` : element.id}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -11553,20 +11815,20 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${_nullishCoalesce(element.text, () => ( element.url))}](${href})`;
   },
   mention: ({ element, user, group }) => {
-    return markdown`@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _287 => _287.name]), () => ( _optionalChain([group, 'optionalAccess', _288 => _288.name]))), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _294 => _294.name]), () => ( _optionalChain([group, 'optionalAccess', _295 => _295.name]))), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _289 => _289.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _290 => _290.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _296 => _296.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _297 => _297.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _291 => _291.elements])
+    ..._optionalChain([options, 'optionalAccess', _298 => _298.elements])
   };
   const { users: resolvedUsers, groups: resolvedGroupsInfo } = await resolveMentionsInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _292 => _292.resolveUsers]),
-    _optionalChain([options, 'optionalAccess', _293 => _293.resolveGroupsInfo])
+    _optionalChain([options, 'optionalAccess', _299 => _299.resolveUsers]),
+    _optionalChain([options, 'optionalAccess', _300 => _300.resolveGroupsInfo])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -11697,24 +11959,7 @@ function lsonToJson(value) {
   }
   return value;
 }
-function deepLiveify(value) {
-  if (Array.isArray(value)) {
-    return new LiveList(value.map(deepLiveify));
-  } else if (isPlainObject(value)) {
-    const init = {};
-    for (const key in value) {
-      const val = value[key];
-      if (val === void 0) {
-        continue;
-      }
-      init[key] = deepLiveify(val);
-    }
-    return new LiveObject(init);
-  } else {
-    return value;
-  }
-}
-function patchLiveList(liveList, prev, next) {
+function legacy_patchLiveList(liveList, prev, next) {
   let i = 0;
   let prevEnd = prev.length - 1;
   let nextEnd = next.length - 1;
@@ -11760,7 +12005,7 @@ function patchLiveList(liveList, prev, next) {
       nextNode = next[i];
       const liveListNode = liveList.get(i);
       if (isLiveObject(liveListNode) && isPlainObject(prevNode) && isPlainObject(nextNode)) {
-        patchLiveObject(liveListNode, prevNode, nextNode);
+        legacy_patchLiveObject(liveListNode, prevNode, nextNode);
       } else {
         liveList.set(i, deepLiveify(nextNode));
       }
@@ -11777,7 +12022,7 @@ function patchLiveList(liveList, prev, next) {
     }
   }
 }
-function patchLiveObjectKey(liveObject, key, prev, next) {
+function legacy_patchLiveObjectKey(liveObject, key, prev, next) {
   if (process.env.NODE_ENV !== "production") {
     const nonSerializableValue = findNonSerializableValue(next);
     if (nonSerializableValue) {
@@ -11798,17 +12043,17 @@ Only serializable value can be synced with Liveblocks.`
   } else if (prev === next) {
     return;
   } else if (isLiveList(value) && Array.isArray(prev) && Array.isArray(next)) {
-    patchLiveList(value, prev, next);
+    legacy_patchLiveList(value, prev, next);
   } else if (isLiveObject(value) && isPlainObject(prev) && isPlainObject(next)) {
-    patchLiveObject(value, prev, next);
+    legacy_patchLiveObject(value, prev, next);
   } else {
     liveObject.set(key, deepLiveify(next));
   }
 }
-function patchLiveObject(root, prev, next) {
+function legacy_patchLiveObject(root, prev, next) {
   const updates = {};
   for (const key in next) {
-    patchLiveObjectKey(root, key, prev[key], next[key]);
+    legacy_patchLiveObjectKey(root, key, prev[key], next[key]);
   }
   for (const key in prev) {
     if (next[key] === void 0) {
@@ -11853,12 +12098,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _294 => _294.updates, 'access', _295 => _295[key], 'optionalAccess', _296 => _296.type]) === "update") {
+          if (_optionalChain([update, 'access', _301 => _301.updates, 'access', _302 => _302[key], 'optionalAccess', _303 => _303.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _297 => _297.updates, 'access', _298 => _298[key], 'optionalAccess', _299 => _299.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _304 => _304.updates, 'access', _305 => _305[key], 'optionalAccess', _306 => _306.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -11919,12 +12164,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _300 => _300.updates, 'access', _301 => _301[key], 'optionalAccess', _302 => _302.type]) === "update") {
+          if (_optionalChain([update, 'access', _307 => _307.updates, 'access', _308 => _308[key], 'optionalAccess', _309 => _309.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _303 => _303.updates, 'access', _304 => _304[key], 'optionalAccess', _305 => _305.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _310 => _310.updates, 'access', _311 => _311[key], 'optionalAccess', _312 => _312.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -12004,9 +12249,9 @@ function makePoller(callback, intervalMs, options) {
   const startTime = performance.now();
   const doc = typeof document !== "undefined" ? document : void 0;
   const win = typeof window !== "undefined" ? window : void 0;
-  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _306 => _306.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
+  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _313 => _313.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
   const context = {
-    inForeground: _optionalChain([doc, 'optionalAccess', _307 => _307.visibilityState]) !== "hidden",
+    inForeground: _optionalChain([doc, 'optionalAccess', _314 => _314.visibilityState]) !== "hidden",
     lastSuccessfulPollAt: startTime,
     count: 0,
     backoff: 0
@@ -12087,11 +12332,11 @@ function makePoller(callback, intervalMs, options) {
     pollNowIfStale();
   }
   function onVisibilityChange() {
-    setInForeground(_optionalChain([doc, 'optionalAccess', _308 => _308.visibilityState]) !== "hidden");
+    setInForeground(_optionalChain([doc, 'optionalAccess', _315 => _315.visibilityState]) !== "hidden");
   }
-  _optionalChain([doc, 'optionalAccess', _309 => _309.addEventListener, 'call', _310 => _310("visibilitychange", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _311 => _311.addEventListener, 'call', _312 => _312("online", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _313 => _313.addEventListener, 'call', _314 => _314("focus", pollNowIfStale)]);
+  _optionalChain([doc, 'optionalAccess', _316 => _316.addEventListener, 'call', _317 => _317("visibilitychange", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _318 => _318.addEventListener, 'call', _319 => _319("online", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _320 => _320.addEventListener, 'call', _321 => _321("focus", pollNowIfStale)]);
   fsm.start();
   return {
     inc,
@@ -12231,5 +12476,5 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.FeedRequestErrorCode = FeedRequestErrorCode; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.FeedRequestErrorCode = FeedRequestErrorCode; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.legacy_patchLiveObjectKey = legacy_patchLiveObjectKey; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.objectToQuery = objectToQuery; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.cjs.map