@liveblocks/core 2.14.0-v2encoding → 2.15.0-debug1

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.14.0-v2encoding";
+var PKG_VERSION = "2.15.0-debug1";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -2668,7 +2668,7 @@ var ManagedSocket = class {
   #machine;
   #cleanups;
   
-  constructor(delegates, enableDebugLogging = false, waitForActorId = true) {
+  constructor(delegates, enableDebugLogging = true, waitForActorId = true) {
     const { machine, events, cleanups } = createConnectionStateMachine(
       delegates,
       { waitForActorId, enableDebugLogging }
@@ -3214,68 +3214,13 @@ function unlinkDevTools(roomId) {
   });
 }
 
-// src/lib/create-store.ts
-function createStore(initialState) {
-  let notifyImmediately = true;
-  let dirty = false;
-  let state = initialState;
-  const subscribers = /* @__PURE__ */ new Set();
-  function get() {
-    return state;
-  }
-  function set(callback) {
-    const oldState = state;
-    const newState = callback(oldState);
-    if (newState !== oldState) {
-      state = newState;
-      dirty = true;
-    }
-    if (notifyImmediately) {
-      notify();
-    }
-  }
-  function notify() {
-    if (!dirty) {
-      return;
-    }
-    dirty = false;
-    for (const subscriber of subscribers) {
-      subscriber(state);
-    }
-  }
-  function batch2(cb) {
-    if (notifyImmediately === false) {
-      return cb();
-    }
-    notifyImmediately = false;
-    try {
-      cb();
-    } finally {
-      notifyImmediately = true;
-      notify();
-    }
-  }
-  function subscribe(callback) {
-    subscribers.add(callback);
-    return () => {
-      subscribers.delete(callback);
-    };
-  }
-  return {
-    get,
-    set,
-    batch: batch2,
-    subscribe
-  };
-}
-
 // src/lib/freeze.ts
 var freeze = process.env.NODE_ENV === "production" ? (
   /* istanbul ignore next */
   (x) => x
 ) : Object.freeze;
 
-// src/lib/Signal.ts
+// src/lib/signals.ts
 var kSinks = Symbol("kSinks");
 var kTrigger = Symbol("kTrigger");
 var signalsToTrigger = null;
@@ -3515,7 +3460,7 @@ var MutableSignal = class extends AbstractSignal {
    */
   mutate(callback) {
     batch(() => {
-      const result = callback(this.#state);
+      const result = callback ? callback(this.#state) : true;
       if (result !== null && typeof result === "object" && "then" in result) {
         raise("MutableSignal.mutate() does not support async callbacks");
       }
@@ -6324,8 +6269,25 @@ function createRoom(options, config) {
     // Debug
     opStackTraces: process.env.NODE_ENV !== "production" ? /* @__PURE__ */ new Map() : void 0
   };
-  const doNotBatchUpdates = (cb) => cb();
-  const batchUpdates = _nullishCoalesce(config.unstable_batchedUpdates, () => ( doNotBatchUpdates));
+  function printPending(cs) {
+    if (cs) globalThis.console.log(`[debug] at ${cs}`);
+    if (context.unacknowledgedOps.size === 0) {
+      globalThis.console.log("[debug] no pending ops");
+    } else {
+      globalThis.console.log(
+        `[debug] pending ops (${context.unacknowledgedOps.size}):`
+      );
+      for (const [opId, op] of context.unacknowledgedOps) {
+        globalThis.console.log(
+          "[debug] opid=",
+          opId,
+          "op=",
+          JSON.stringify(op)
+        );
+      }
+    }
+    globalThis.console.log("[debug] storage status", getStorageStatus());
+  }
   let lastTokenKey;
   function onStatusDidChange(newStatus) {
     const authValue = managedSocket.authValue;
@@ -6347,34 +6309,26 @@ function createRoom(options, config) {
         }
       }
     }
-    batchUpdates(() => {
-      eventHub.status.notify(newStatus);
-      notifySelfChanged(doNotBatchUpdates);
-    });
+    eventHub.status.notify(newStatus);
+    notifySelfChanged();
   }
   let _connectionLossTimerId;
   let _hasLostConnection = false;
   function handleConnectionLossEvent(newStatus) {
     if (newStatus === "reconnecting") {
       _connectionLossTimerId = setTimeout(() => {
-        batchUpdates(() => {
-          eventHub.lostConnection.notify("lost");
-          _hasLostConnection = true;
-          context.others.clearOthers();
-          notify({ others: [{ type: "reset" }] }, doNotBatchUpdates);
-        });
+        eventHub.lostConnection.notify("lost");
+        _hasLostConnection = true;
+        context.others.clearOthers();
+        notify({ others: [{ type: "reset" }] });
       }, config.lostConnectionTimeout);
     } else {
       clearTimeout(_connectionLossTimerId);
       if (_hasLostConnection) {
         if (newStatus === "disconnected") {
-          batchUpdates(() => {
-            eventHub.lostConnection.notify("failed");
-          });
+          eventHub.lostConnection.notify("failed");
         } else {
-          batchUpdates(() => {
-            eventHub.lostConnection.notify("restored");
-          });
+          eventHub.lostConnection.notify("restored");
         }
         _hasLostConnection = false;
       }
@@ -6404,14 +6358,12 @@ function createRoom(options, config) {
   managedSocket.events.didConnect.subscribe(onDidConnect);
   managedSocket.events.didDisconnect.subscribe(onDidDisconnect);
   managedSocket.events.onLiveblocksError.subscribe((err) => {
-    batchUpdates(() => {
-      if (process.env.NODE_ENV !== "production") {
-        error2(
-          `Connection to websocket server closed. Reason: ${err.message} (code: ${err.code}).`
-        );
-      }
-      eventHub.error.notify(err);
-    });
+    if (process.env.NODE_ENV !== "production") {
+      error2(
+        `Connection to websocket server closed. Reason: ${err.message} (code: ${err.code}).`
+      );
+    }
+    eventHub.error.notify(err);
   });
   const pool = {
     roomId: config.roomId,
@@ -6447,12 +6399,10 @@ function createRoom(options, config) {
         }
         activeBatch.reverseOps.unshift(...reverse);
       } else {
-        batchUpdates(() => {
-          addToUndoStack(reverse, doNotBatchUpdates);
-          context.redoStack.length = 0;
-          dispatchOps(ops);
-          notify({ storageUpdates }, doNotBatchUpdates);
-        });
+        addToUndoStack(reverse);
+        context.redoStack.length = 0;
+        dispatchOps(ops);
+        notify({ storageUpdates });
       }
     },
     assertStorageIsWritable: () => {
@@ -6550,12 +6500,10 @@ function createRoom(options, config) {
     }
   );
   let _lastSelf;
-  function notifySelfChanged(batchedUpdatesWrapper) {
+  function notifySelfChanged() {
     const currSelf = self.get();
     if (currSelf !== null && currSelf !== _lastSelf) {
-      batchedUpdatesWrapper(() => {
-        eventHub.self.notify(currSelf);
-      });
+      eventHub.self.notify(currSelf);
       _lastSelf = currSelf;
     }
   }
@@ -6563,12 +6511,12 @@ function createRoom(options, config) {
     self,
     (me) => me !== null ? userToTreeNode("Me", me) : null
   );
-  function createOrUpdateRootFromMessage(message, batchedUpdatesWrapper) {
+  function createOrUpdateRootFromMessage(message) {
     if (message.items.length === 0) {
       throw new Error("Internal error: cannot load storage without items");
     }
     if (context.root !== void 0) {
-      updateRoot(message.items, batchedUpdatesWrapper);
+      updateRoot(message.items);
     } else {
       context.root = LiveObject._fromItems(message.items, pool);
     }
@@ -6587,7 +6535,7 @@ function createRoom(options, config) {
     }
     context.undoStack.length = stackSizeBefore;
   }
-  function updateRoot(items, batchedUpdatesWrapper) {
+  function updateRoot(items) {
     if (context.root === void 0) {
       return;
     }
@@ -6597,42 +6545,40 @@ function createRoom(options, config) {
     }
     const ops = getTreesDiffOperations(currentItems, new Map(items));
     const result = applyOps(ops, false);
-    notify(result.updates, batchedUpdatesWrapper);
+    notify(result.updates);
   }
-  function _addToRealUndoStack(historyOps, batchedUpdatesWrapper) {
+  function _addToRealUndoStack(historyOps) {
     if (context.undoStack.length >= 50) {
       context.undoStack.shift();
     }
     context.undoStack.push(historyOps);
-    onHistoryChange(batchedUpdatesWrapper);
+    onHistoryChange();
   }
-  function addToUndoStack(historyOps, batchedUpdatesWrapper) {
+  function addToUndoStack(historyOps) {
     if (context.pausedHistory !== null) {
       context.pausedHistory.unshift(...historyOps);
     } else {
-      _addToRealUndoStack(historyOps, batchedUpdatesWrapper);
+      _addToRealUndoStack(historyOps);
     }
   }
-  function notify(updates, batchedUpdatesWrapper) {
+  function notify(updates) {
     const storageUpdates = updates.storageUpdates;
     const othersUpdates = updates.others;
-    batchedUpdatesWrapper(() => {
-      if (othersUpdates !== void 0 && othersUpdates.length > 0) {
-        const others = context.others.get();
-        for (const event of othersUpdates) {
-          eventHub.others.notify({ ...event, others });
-        }
-      }
-      if (_nullishCoalesce(updates.presence, () => ( false))) {
-        notifySelfChanged(doNotBatchUpdates);
-        eventHub.myPresence.notify(context.myPresence.get());
-      }
-      if (storageUpdates !== void 0 && storageUpdates.size > 0) {
-        const updates2 = Array.from(storageUpdates.values());
-        eventHub.storageBatch.notify(updates2);
+    if (othersUpdates !== void 0 && othersUpdates.length > 0) {
+      const others = context.others.get();
+      for (const event of othersUpdates) {
+        eventHub.others.notify({ ...event, others });
       }
-      notifyStorageStatus();
-    });
+    }
+    if (_nullishCoalesce(updates.presence, () => ( false))) {
+      notifySelfChanged();
+      eventHub.myPresence.notify(context.myPresence.get());
+    }
+    if (storageUpdates !== void 0 && storageUpdates.size > 0) {
+      const updates2 = Array.from(storageUpdates.values());
+      eventHub.storageBatch.notify(updates2);
+    }
+    notifyStorageStatus();
   }
   function getConnectionId() {
     const info = context.dynamicSessionInfoSig.get();
@@ -6644,6 +6590,7 @@ function createRoom(options, config) {
     );
   }
   function applyOps(rawOps, isLocal) {
+    printPending("start of applyOps");
     const output = {
       reverse: [],
       storageUpdates: /* @__PURE__ */ new Map(),
@@ -6686,6 +6633,9 @@ function createRoom(options, config) {
             nn(context.opStackTraces).delete(opId);
           }
           const deleted = context.unacknowledgedOps.delete(opId);
+          if (deleted) {
+            globalThis.console.log("[debug] acked", opId);
+          }
           source = deleted ? 2 /* ACK */ : 1 /* REMOTE */;
         }
         const applyOpResult = applyOp(op, source);
@@ -6707,6 +6657,7 @@ function createRoom(options, config) {
         }
       }
     }
+    printPending("end of applyOps");
     return {
       ops,
       reverse: output.reverse,
@@ -6786,15 +6737,10 @@ function createRoom(options, config) {
       context.activeBatch.updates.presence = true;
     } else {
       flushNowOrSoon();
-      batchUpdates(() => {
-        if (_optionalChain([options2, 'optionalAccess', _141 => _141.addToHistory])) {
-          addToUndoStack(
-            [{ type: "presence", data: oldValues }],
-            doNotBatchUpdates
-          );
-        }
-        notify({ presence: true }, doNotBatchUpdates);
-      });
+      if (_optionalChain([options2, 'optionalAccess', _141 => _141.addToHistory])) {
+        addToUndoStack([{ type: "presence", data: oldValues }]);
+      }
+      notify({ presence: true });
     }
   }
   function onUpdatePresenceMessage(message) {
@@ -6827,14 +6773,14 @@ function createRoom(options, config) {
     }
     return null;
   }
-  function onRoomStateMessage(message, batchedUpdatesWrapper) {
+  function onRoomStateMessage(message) {
     context.dynamicSessionInfoSig.set({
       actor: message.actor,
       nonce: message.nonce,
       scopes: message.scopes
     });
     context.idFactory = makeIdFactory(message.actor);
-    notifySelfChanged(batchedUpdatesWrapper);
+    notifySelfChanged();
     for (const connectionId of context.others.connectionIds()) {
       const user = message.users[connectionId];
       if (user === void 0) {
@@ -6859,10 +6805,8 @@ function createRoom(options, config) {
   function canRedo() {
     return context.redoStack.length > 0;
   }
-  function onHistoryChange(batchedUpdatesWrapper) {
-    batchedUpdatesWrapper(() => {
-      eventHub.history.notify({ canUndo: canUndo(), canRedo: canRedo() });
-    });
+  function onHistoryChange() {
+    eventHub.history.notify({ canUndo: canUndo(), canRedo: canRedo() });
   }
   function onUserJoinedMessage(message) {
     context.others.setConnection(
@@ -6896,7 +6840,7 @@ function createRoom(options, config) {
       return compact([parseServerMessage(data)]);
     }
   }
-  function applyAndSendOps(offlineOps, batchedUpdatesWrapper) {
+  function applyAndSendOps(offlineOps) {
     if (offlineOps.size === 0) {
       return;
     }
@@ -6907,7 +6851,7 @@ function createRoom(options, config) {
       type: 201 /* UPDATE_STORAGE */,
       ops: result.ops
     });
-    notify(result.updates, batchedUpdatesWrapper);
+    notify(result.updates);
     sendMessages(messages);
   }
   function handleServerMessage(event) {
@@ -6922,104 +6866,102 @@ function createRoom(options, config) {
       storageUpdates: /* @__PURE__ */ new Map(),
       others: []
     };
-    batchUpdates(() => {
-      for (const message of messages) {
-        switch (message.type) {
-          case 101 /* USER_JOINED */: {
-            const userJoinedUpdate = onUserJoinedMessage(message);
-            if (userJoinedUpdate) {
-              updates.others.push(userJoinedUpdate);
-            }
-            break;
-          }
-          case 100 /* UPDATE_PRESENCE */: {
-            const othersPresenceUpdate = onUpdatePresenceMessage(message);
-            if (othersPresenceUpdate) {
-              updates.others.push(othersPresenceUpdate);
-            }
-            break;
+    for (const message of messages) {
+      switch (message.type) {
+        case 101 /* USER_JOINED */: {
+          const userJoinedUpdate = onUserJoinedMessage(message);
+          if (userJoinedUpdate) {
+            updates.others.push(userJoinedUpdate);
           }
-          case 103 /* BROADCASTED_EVENT */: {
-            const others = context.others.get();
-            eventHub.customEvent.notify({
-              connectionId: message.actor,
-              user: message.actor < 0 ? null : _nullishCoalesce(others.find((u) => u.connectionId === message.actor), () => ( null)),
-              event: message.event
-            });
-            break;
-          }
-          case 102 /* USER_LEFT */: {
-            const event2 = onUserLeftMessage(message);
-            if (event2) {
-              updates.others.push(event2);
-            }
-            break;
-          }
-          case 300 /* UPDATE_YDOC */: {
-            eventHub.ydoc.notify(message);
-            break;
-          }
-          case 104 /* ROOM_STATE */: {
-            updates.others.push(onRoomStateMessage(message, doNotBatchUpdates));
-            break;
-          }
-          case 200 /* INITIAL_STORAGE_STATE */: {
-            processInitialStorage(message);
-            break;
+          break;
+        }
+        case 100 /* UPDATE_PRESENCE */: {
+          const othersPresenceUpdate = onUpdatePresenceMessage(message);
+          if (othersPresenceUpdate) {
+            updates.others.push(othersPresenceUpdate);
           }
-          case 201 /* UPDATE_STORAGE */: {
-            const applyResult = applyOps(message.ops, false);
-            for (const [key, value] of applyResult.updates.storageUpdates) {
-              updates.storageUpdates.set(
-                key,
-                mergeStorageUpdates(updates.storageUpdates.get(key), value)
-              );
-            }
-            break;
+          break;
+        }
+        case 103 /* BROADCASTED_EVENT */: {
+          const others = context.others.get();
+          eventHub.customEvent.notify({
+            connectionId: message.actor,
+            user: message.actor < 0 ? null : _nullishCoalesce(others.find((u) => u.connectionId === message.actor), () => ( null)),
+            event: message.event
+          });
+          break;
+        }
+        case 102 /* USER_LEFT */: {
+          const event2 = onUserLeftMessage(message);
+          if (event2) {
+            updates.others.push(event2);
           }
-          case 299 /* REJECT_STORAGE_OP */: {
-            errorWithTitle(
-              "Storage mutation rejection error",
-              message.reason
+          break;
+        }
+        case 300 /* UPDATE_YDOC */: {
+          eventHub.ydoc.notify(message);
+          break;
+        }
+        case 104 /* ROOM_STATE */: {
+          updates.others.push(onRoomStateMessage(message));
+          break;
+        }
+        case 200 /* INITIAL_STORAGE_STATE */: {
+          processInitialStorage(message);
+          break;
+        }
+        case 201 /* UPDATE_STORAGE */: {
+          const applyResult = applyOps(message.ops, false);
+          for (const [key, value] of applyResult.updates.storageUpdates) {
+            updates.storageUpdates.set(
+              key,
+              mergeStorageUpdates(updates.storageUpdates.get(key), value)
             );
-            if (process.env.NODE_ENV !== "production") {
-              const traces = /* @__PURE__ */ new Set();
-              for (const opId of message.opIds) {
-                const trace = _optionalChain([context, 'access', _142 => _142.opStackTraces, 'optionalAccess', _143 => _143.get, 'call', _144 => _144(opId)]);
-                if (trace) {
-                  traces.add(trace);
-                }
+          }
+          break;
+        }
+        case 299 /* REJECT_STORAGE_OP */: {
+          errorWithTitle(
+            "Storage mutation rejection error",
+            message.reason
+          );
+          if (process.env.NODE_ENV !== "production") {
+            const traces = /* @__PURE__ */ new Set();
+            for (const opId of message.opIds) {
+              const trace = _optionalChain([context, 'access', _142 => _142.opStackTraces, 'optionalAccess', _143 => _143.get, 'call', _144 => _144(opId)]);
+              if (trace) {
+                traces.add(trace);
               }
-              if (traces.size > 0) {
-                warnWithTitle(
-                  "The following function calls caused the rejected storage mutations:",
-                  `
+            }
+            if (traces.size > 0) {
+              warnWithTitle(
+                "The following function calls caused the rejected storage mutations:",
+                `
 
 ${Array.from(traces).join("\n\n")}`
-                );
-              }
-              throw new Error(
-                `Storage mutations rejected by server: ${message.reason}`
               );
             }
-            break;
-          }
-          case 400 /* THREAD_CREATED */:
-          case 407 /* THREAD_DELETED */:
-          case 401 /* THREAD_METADATA_UPDATED */:
-          case 408 /* THREAD_UPDATED */:
-          case 405 /* COMMENT_REACTION_ADDED */:
-          case 406 /* COMMENT_REACTION_REMOVED */:
-          case 402 /* COMMENT_CREATED */:
-          case 403 /* COMMENT_EDITED */:
-          case 404 /* COMMENT_DELETED */: {
-            eventHub.comments.notify(message);
-            break;
+            throw new Error(
+              `Storage mutations rejected by server: ${message.reason}`
+            );
           }
+          break;
+        }
+        case 400 /* THREAD_CREATED */:
+        case 407 /* THREAD_DELETED */:
+        case 401 /* THREAD_METADATA_UPDATED */:
+        case 408 /* THREAD_UPDATED */:
+        case 405 /* COMMENT_REACTION_ADDED */:
+        case 406 /* COMMENT_REACTION_REMOVED */:
+        case 402 /* COMMENT_CREATED */:
+        case 403 /* COMMENT_EDITED */:
+        case 404 /* COMMENT_DELETED */: {
+          eventHub.comments.notify(message);
+          break;
         }
       }
-      notify(updates, doNotBatchUpdates);
-    });
+    }
+    notify(updates);
   }
   function flushNowOrSoon() {
     const storageOps = context.buffer.storageOperations;
@@ -7027,6 +6969,7 @@ ${Array.from(traces).join("\n\n")}`
       for (const op of storageOps) {
         context.unacknowledgedOps.set(nn(op.opId), op);
       }
+      printPending("flushNowOrSoon");
       notifyStorageStatus();
     }
     if (managedSocket.getStatus() !== "connected") {
@@ -7084,12 +7027,11 @@ ${Array.from(traces).join("\n\n")}`
     }
     return messages;
   }
-  function updateYDoc(update, guid, isV2) {
+  function updateYDoc(update, guid) {
     const clientMsg = {
       type: 301 /* UPDATE_YDOC */,
       update,
-      guid,
-      v2: isV2
+      guid
     };
     context.buffer.messages.push(clientMsg);
     eventHub.ydoc.notify(clientMsg);
@@ -7117,9 +7059,10 @@ ${Array.from(traces).join("\n\n")}`
   let _getStorage$ = null;
   let _resolveStoragePromise = null;
   function processInitialStorage(message) {
+    printPending("initial local ops");
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
-    createOrUpdateRootFromMessage(message, doNotBatchUpdates);
-    applyAndSendOps(unacknowledgedOps, doNotBatchUpdates);
+    createOrUpdateRootFromMessage(message);
+    applyAndSendOps(unacknowledgedOps);
     _optionalChain([_resolveStoragePromise, 'optionalCall', _145 => _145()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
@@ -7170,15 +7113,14 @@ ${Array.from(traces).join("\n\n")}`
       root: nn(context.root)
     };
   }
-  function fetchYDoc(vector, guid, isV2) {
+  function fetchYDoc(vector, guid) {
     if (!context.buffer.messages.find((m) => {
-      return m.type === 300 /* FETCH_YDOC */ && m.vector === vector && m.guid === guid && m.v2 === isV2;
+      return m.type === 300 /* FETCH_YDOC */ && m.vector === vector && m.guid === guid;
     })) {
       context.buffer.messages.push({
         type: 300 /* FETCH_YDOC */,
         vector,
-        guid,
-        v2: isV2
+        guid
       });
     }
     flushNowOrSoon();
@@ -7193,11 +7135,9 @@ ${Array.from(traces).join("\n\n")}`
     }
     context.pausedHistory = null;
     const result = applyOps(historyOps, true);
-    batchUpdates(() => {
-      notify(result.updates, doNotBatchUpdates);
-      context.redoStack.push(result.reverse);
-      onHistoryChange(doNotBatchUpdates);
-    });
+    notify(result.updates);
+    context.redoStack.push(result.reverse);
+    onHistoryChange();
     for (const op of result.ops) {
       if (op.type !== "presence") {
         context.buffer.storageOperations.push(op);
@@ -7215,11 +7155,9 @@ ${Array.from(traces).join("\n\n")}`
     }
     context.pausedHistory = null;
     const result = applyOps(historyOps, true);
-    batchUpdates(() => {
-      notify(result.updates, doNotBatchUpdates);
-      context.undoStack.push(result.reverse);
-      onHistoryChange(doNotBatchUpdates);
-    });
+    notify(result.updates);
+    context.undoStack.push(result.reverse);
+    onHistoryChange();
     for (const op of result.ops) {
       if (op.type !== "presence") {
         context.buffer.storageOperations.push(op);
@@ -7236,34 +7174,32 @@ ${Array.from(traces).join("\n\n")}`
       return callback();
     }
     let returnValue = void 0;
-    batchUpdates(() => {
-      context.activeBatch = {
-        ops: [],
-        updates: {
-          storageUpdates: /* @__PURE__ */ new Map(),
-          presence: false,
-          others: []
-        },
-        reverseOps: []
-      };
-      try {
-        returnValue = callback();
-      } finally {
-        const currentBatch = context.activeBatch;
-        context.activeBatch = null;
-        if (currentBatch.reverseOps.length > 0) {
-          addToUndoStack(currentBatch.reverseOps, doNotBatchUpdates);
-        }
-        if (currentBatch.ops.length > 0) {
-          context.redoStack.length = 0;
-        }
-        if (currentBatch.ops.length > 0) {
-          dispatchOps(currentBatch.ops);
-        }
-        notify(currentBatch.updates, doNotBatchUpdates);
-        flushNowOrSoon();
+    context.activeBatch = {
+      ops: [],
+      updates: {
+        storageUpdates: /* @__PURE__ */ new Map(),
+        presence: false,
+        others: []
+      },
+      reverseOps: []
+    };
+    try {
+      returnValue = callback();
+    } finally {
+      const currentBatch = context.activeBatch;
+      context.activeBatch = null;
+      if (currentBatch.reverseOps.length > 0) {
+        addToUndoStack(currentBatch.reverseOps);
       }
-    });
+      if (currentBatch.ops.length > 0) {
+        context.redoStack.length = 0;
+      }
+      if (currentBatch.ops.length > 0) {
+        dispatchOps(currentBatch.ops);
+      }
+      notify(currentBatch.updates);
+      flushNowOrSoon();
+    }
     return returnValue;
   }
   function pauseHistory() {
@@ -7275,7 +7211,7 @@ ${Array.from(traces).join("\n\n")}`
     const historyOps = context.pausedHistory;
     context.pausedHistory = null;
     if (historyOps !== null && historyOps.length > 0) {
-      _addToRealUndoStack(historyOps, batchUpdates);
+      _addToRealUndoStack(historyOps);
     }
   }
   const syncSourceForStorage = config.createSyncSource();
@@ -7738,10 +7674,10 @@ function createClient(options) {
     clientOptions.backgroundKeepAliveTimeout
   );
   const baseUrl = getBaseUrl(clientOptions.baseUrl);
-  const currentUserIdStore = createStore(void 0);
+  const currentUserId = new Signal(void 0);
   const authManager = createAuthManager(options, (token) => {
     const userId = token.k === "sec-legacy" /* SECRET_LEGACY */ ? token.id : token.uid;
-    currentUserIdStore.set(() => userId);
+    currentUserId.set(() => userId);
   });
   const fetchPolyfill = _optionalChain([clientOptions, 'access', _161 => _161.polyfills, 'optionalAccess', _162 => _162.fetch]) || /* istanbul ignore next */
   _optionalChain([globalThis, 'access', _163 => _163.fetch, 'optionalAccess', _164 => _164.bind, 'call', _165 => _165(globalThis)]);
@@ -7800,7 +7736,6 @@ function createClient(options) {
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
-        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _168 => _168.unstable_batchedUpdates]),
         baseUrl,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData,
@@ -7818,7 +7753,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _169 => _169.polyfills, 'optionalAccess', _170 => _170.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _168 => _168.polyfills, 'optionalAccess', _169 => _169.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"
           );
@@ -7830,12 +7765,12 @@ function createClient(options) {
     return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _171 => _171.get, 'call', _172 => _172(roomId), 'optionalAccess', _173 => _173.room]);
+    const room = _optionalChain([roomsById, 'access', _170 => _170.get, 'call', _171 => _171(roomId), 'optionalAccess', _172 => _172.room]);
     return room ? room : null;
   }
   function logout() {
     authManager.reset();
-    currentUserIdStore.set(() => void 0);
+    currentUserId.set(() => void 0);
     for (const { room } of roomsById.values()) {
       if (!isIdle(room.getStatus())) {
         room.reconnect();
@@ -7850,7 +7785,7 @@ function createClient(options) {
   const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _174 => _174({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _173 => _173({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -7868,7 +7803,7 @@ function createClient(options) {
   const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _175 => _175({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _174 => _174({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -7920,7 +7855,7 @@ function createClient(options) {
       }
     };
     const win = typeof window !== "undefined" ? window : void 0;
-    _optionalChain([win, 'optionalAccess', _176 => _176.addEventListener, 'call', _177 => _177("beforeunload", maybePreventClose)]);
+    _optionalChain([win, 'optionalAccess', _175 => _175.addEventListener, 'call', _176 => _176("beforeunload", maybePreventClose)]);
   }
   const client = Object.defineProperty(
     {
@@ -7947,7 +7882,7 @@ function createClient(options) {
       },
       // Internal
       [kInternal]: {
-        currentUserIdStore,
+        currentUserId,
         mentionSuggestionsCache,
         resolveMentionSuggestions: clientOptions.resolveMentionSuggestions,
         usersStore,
@@ -8037,7 +7972,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _178 => _178.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _177 => _177.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -8047,13 +7982,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _179 => _179(block)]);
+        _optionalChain([visitor, 'optionalCall', _178 => _178(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _180 => _180(inline)]);
+          _optionalChain([visitor, 'optionalCall', _179 => _179(inline)]);
         }
       }
     }
@@ -8078,7 +8013,7 @@ async function resolveUsersInCommentBody(body, resolveUsers) {
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _181 => _181[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _180 => _180[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -8205,7 +8140,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => _nullishCoalesce(element.text, () => ( element.url)),
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _182 => _182.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _181 => _181.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -8235,7 +8170,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${_nullishCoalesce(element.text, () => ( element.url))}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}</span>`;
+    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _182 => _182.name]), () => ( element.id))}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -8265,19 +8200,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${_nullishCoalesce(element.text, () => ( element.url))}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _184 => _184.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _185 => _185.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _186 => _186.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _184 => _184.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _185 => _185.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _187 => _187.elements])
+    ..._optionalChain([options, 'optionalAccess', _186 => _186.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _188 => _188.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _187 => _187.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -8568,12 +8503,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _189 => _189.updates, 'access', _190 => _190[key], 'optionalAccess', _191 => _191.type]) === "update") {
+          if (_optionalChain([update, 'access', _188 => _188.updates, 'access', _189 => _189[key], 'optionalAccess', _190 => _190.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _192 => _192.updates, 'access', _193 => _193[key], 'optionalAccess', _194 => _194.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _191 => _191.updates, 'access', _192 => _192[key], 'optionalAccess', _193 => _193.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8634,12 +8569,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _195 => _195.updates, 'access', _196 => _196[key], 'optionalAccess', _197 => _197.type]) === "update") {
+          if (_optionalChain([update, 'access', _194 => _194.updates, 'access', _195 => _195[key], 'optionalAccess', _196 => _196.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _198 => _198.updates, 'access', _199 => _199[key], 'optionalAccess', _200 => _200.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _197 => _197.updates, 'access', _198 => _198[key], 'optionalAccess', _199 => _199.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8710,9 +8645,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', _201 => _201.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
+  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _200 => _200.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
   const context = {
-    inForeground: _optionalChain([doc, 'optionalAccess', _202 => _202.visibilityState]) !== "hidden",
+    inForeground: _optionalChain([doc, 'optionalAccess', _201 => _201.visibilityState]) !== "hidden",
     lastSuccessfulPollAt: startTime,
     count: 0,
     backoff: 0
@@ -8790,10 +8725,10 @@ function makePoller(callback, intervalMs, options) {
     pollNowIfStale();
   }
   function onVisibilityChange() {
-    setInForeground(_optionalChain([doc, 'optionalAccess', _203 => _203.visibilityState]) !== "hidden");
+    setInForeground(_optionalChain([doc, 'optionalAccess', _202 => _202.visibilityState]) !== "hidden");
   }
-  _optionalChain([doc, 'optionalAccess', _204 => _204.addEventListener, 'call', _205 => _205("visibilitychange", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _206 => _206.addEventListener, 'call', _207 => _207("online", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _203 => _203.addEventListener, 'call', _204 => _204("visibilitychange", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _205 => _205.addEventListener, 'call', _206 => _206("online", onVisibilityChange)]);
   fsm.start();
   return {
     inc,
@@ -9006,5 +8941,8 @@ var NotificationsApiError = HttpError;
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createStore = createStore; exports.createThreadId = createThreadId; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.kInternal = kInternal; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
+
+
+
+exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.MutableSignal = MutableSignal; exports.NotificationsApiError = NotificationsApiError; 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.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createThreadId = createThreadId; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.kInternal = kInternal; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map