@liveblocks/core 1.11.2 → 1.12.0-lexical2

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var __defProp = Object.defineProperty;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var __defProp = Object.defineProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.11.2";
+var PKG_VERSION = "1.12.0-lexical2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1389,7 +1389,6 @@ function createAuthManager(authOptions) {
         room: options.roomId
       });
       const parsed = parseAuthToken(response.token);
-      verifyTokenPermissions(parsed, options);
       if (seenTokens.has(parsed.raw)) {
         throw new StopRetrying(
           "The same Liveblocks auth token was issued from the backend before. Caching Liveblocks tokens is not supported."
@@ -1402,7 +1401,6 @@ function createAuthManager(authOptions) {
       if (response && typeof response === "object") {
         if (typeof response.token === "string") {
           const parsed = parseAuthToken(response.token);
-          verifyTokenPermissions(parsed, options);
           return parsed;
         } else if (typeof response.error === "string") {
           const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
@@ -1421,23 +1419,6 @@ function createAuthManager(authOptions) {
       "Unexpected authentication type. Must be private or custom."
     );
   }
-  function verifyTokenPermissions(parsedToken, options) {
-    if (!options.roomId && parsedToken.parsed.k === "acc" /* ACCESS_TOKEN */) {
-      if (Object.entries(parsedToken.parsed.perms).length === 0) {
-        return;
-      }
-      for (const [resource, scopes] of Object.entries(
-        parsedToken.parsed.perms
-      )) {
-        if (resource.includes("*") && hasCorrespondingScopes(options.requestedScope, scopes)) {
-          return;
-        }
-      }
-      throw new StopRetrying(
-        "The issued access token doesn't grant enough permissions. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/access-tokens-not-enough-permissions"
-      );
-    }
-  }
   async function getAuthValue(requestOptions) {
     if (authentication.type === "public") {
       return { type: "public", publicApiKey: authentication.publicApiKey };
@@ -1561,430 +1542,564 @@ async function fetchAuthEndpoint(fetch2, endpoint, body) {
   return { token };
 }
 
-// src/constants.ts
-var DEFAULT_BASE_URL = "https://api.liveblocks.io";
+// ../../node_modules/nanoid/index.js
+var _crypto = require('crypto'); var _crypto2 = _interopRequireDefault(_crypto);
 
-// src/internal.ts
-var kInternal = Symbol();
+// ../../node_modules/nanoid/url-alphabet/index.js
+var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 
-// src/devtools/bridge.ts
-var _bridgeActive = false;
-function activateBridge(allowed) {
-  _bridgeActive = allowed;
-}
-function sendToPanel(message, options) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
-  }
-  const fullMsg = {
-    ...message,
-    source: "liveblocks-devtools-client"
-  };
-  if (!(_optionalChain([options, 'optionalAccess', _38 => _38.force]) || _bridgeActive)) {
-    return;
+// ../../node_modules/nanoid/index.js
+var POOL_SIZE_MULTIPLIER = 128;
+var pool;
+var poolOffset;
+var fillPool = (bytes) => {
+  if (!pool || pool.length < bytes) {
+    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
+    _crypto2.default.randomFillSync(pool);
+    poolOffset = 0;
+  } else if (poolOffset + bytes > pool.length) {
+    _crypto2.default.randomFillSync(pool);
+    poolOffset = 0;
+  }
+  poolOffset += bytes;
+};
+var nanoid = (size = 21) => {
+  fillPool(size -= 0);
+  let id = "";
+  for (let i = poolOffset - size; i < poolOffset; i++) {
+    id += urlAlphabet[pool[i] & 63];
   }
-  window.postMessage(fullMsg, "*");
-}
-var eventSource = makeEventSource();
-if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
-  window.addEventListener("message", (event) => {
-    if (event.source === window && _optionalChain([event, 'access', _39 => _39.data, 'optionalAccess', _40 => _40.source]) === "liveblocks-devtools-panel") {
-      eventSource.notify(event.data);
-    } else {
-    }
-  });
-}
-var onMessageFromPanel = eventSource.observable;
+  return id;
+};
 
-// src/devtools/index.ts
-var VERSION = PKG_VERSION || "dev";
-var _devtoolsSetupHasRun = false;
-function setupDevTools(getAllRooms) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
-  }
-  if (_devtoolsSetupHasRun) {
-    return;
-  }
-  _devtoolsSetupHasRun = true;
-  onMessageFromPanel.subscribe((msg) => {
-    switch (msg.msg) {
-      case "connect": {
-        activateBridge(true);
-        for (const roomId of getAllRooms()) {
-          sendToPanel({
-            msg: "room::available",
-            roomId,
-            clientVersion: VERSION
-          });
-        }
-        break;
-      }
-    }
-  });
-  sendToPanel({ msg: "wake-up-devtools" }, { force: true });
-}
-var unsubsByRoomId = /* @__PURE__ */ new Map();
-function stopSyncStream(roomId) {
-  const unsubs = _nullishCoalesce(unsubsByRoomId.get(roomId), () => ( []));
-  unsubsByRoomId.delete(roomId);
-  for (const unsub of unsubs) {
-    unsub();
-  }
-}
-function startSyncStream(room) {
-  stopSyncStream(room.id);
-  fullSync(room);
-  unsubsByRoomId.set(room.id, [
-    // When the connection status changes
-    room.events.status.subscribe(() => partialSyncConnection(room)),
-    // When storage initializes, send the update
-    room.events.storageDidLoad.subscribeOnce(() => partialSyncStorage(room)),
-    // Any time storage updates, send the new storage root
-    room.events.storage.subscribe(() => partialSyncStorage(room)),
-    // Any time "me" or "others" updates, send the new values accordingly
-    room.events.self.subscribe(() => partialSyncMe(room)),
-    room.events.others.subscribe(() => partialSyncOthers(room)),
-    // Any time ydoc is updated, forward the update
-    room.events.ydoc.subscribe((update) => syncYdocUpdate(room, update)),
-    // Any time a custom room event is received, forward it
-    room.events.customEvent.subscribe(
-      (eventData) => forwardEvent(room, eventData)
-    )
-  ]);
+// src/comments/lib/createIds.ts
+var THREAD_ID_PREFIX = "th";
+var COMMENT_ID_PREFIX = "cm";
+var INBOX_NOTIFICATION_ID_PREFIX = "in";
+function createOptimisticId(prefix) {
+  return `${prefix}_${nanoid()}`;
 }
-function syncYdocUpdate(room, update) {
-  sendToPanel({
-    msg: "room::sync::ydoc",
-    roomId: room.id,
-    update
-  });
-}
-var loadedAt = Date.now();
-var eventCounter = 0;
-function nextEventId() {
-  return `event-${loadedAt}-${eventCounter++}`;
+function createThreadId() {
+  return createOptimisticId(THREAD_ID_PREFIX);
 }
-function forwardEvent(room, eventData) {
-  sendToPanel({
-    msg: "room::events::custom-event",
-    roomId: room.id,
-    event: {
-      type: "CustomEvent",
-      id: nextEventId(),
-      key: "Event",
-      connectionId: eventData.connectionId,
-      payload: eventData.event
-    }
-  });
+function createCommentId() {
+  return createOptimisticId(COMMENT_ID_PREFIX);
 }
-function partialSyncConnection(room) {
-  sendToPanel({
-    msg: "room::sync::partial",
-    roomId: room.id,
-    status: room.getStatus()
-  });
+function createInboxNotificationId() {
+  return createOptimisticId(INBOX_NOTIFICATION_ID_PREFIX);
 }
-function partialSyncStorage(room) {
-  const root = room.getStorageSnapshot();
-  if (root) {
-    sendToPanel({
-      msg: "room::sync::partial",
-      roomId: room.id,
-      storage: root.toTreeNode("root").payload
-    });
+
+// src/lib/create-store.ts
+function createStore(initialState) {
+  let state = initialState;
+  const subscribers = /* @__PURE__ */ new Set();
+  function get() {
+    return state;
   }
-}
-function partialSyncMe(room) {
-  const me = room[kInternal].getSelf_forDevTools();
-  if (me) {
-    sendToPanel({
-      msg: "room::sync::partial",
-      roomId: room.id,
-      me
-    });
+  function set(callback) {
+    const newState = callback(state);
+    if (state === newState) {
+      return;
+    }
+    state = newState;
+    for (const subscriber of subscribers) {
+      subscriber(state);
+    }
   }
-}
-function partialSyncOthers(room) {
-  const others = room[kInternal].getOthers_forDevTools();
-  if (others) {
-    sendToPanel({
-      msg: "room::sync::partial",
-      roomId: room.id,
-      others
-    });
+  function subscribe(callback) {
+    subscribers.add(callback);
+    callback(state);
+    return () => {
+      subscribers.delete(callback);
+    };
   }
+  return {
+    get,
+    set,
+    subscribe
+  };
 }
-function fullSync(room) {
-  const root = room.getStorageSnapshot();
-  const me = room[kInternal].getSelf_forDevTools();
-  const others = room[kInternal].getOthers_forDevTools();
-  room.fetchYDoc("");
-  sendToPanel({
-    msg: "room::sync::full",
-    roomId: room.id,
-    status: room.getStatus(),
-    storage: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _41 => _41.toTreeNode, 'call', _42 => _42("root"), 'access', _43 => _43.payload]), () => ( null)),
-    me,
-    others
+
+// src/store.ts
+function createClientStore() {
+  const store = createStore({
+    threads: {},
+    queries: {},
+    optimisticUpdates: [],
+    inboxNotifications: {},
+    notificationSettings: {}
   });
-}
-var roomChannelListeners = /* @__PURE__ */ new Map();
-function stopRoomChannelListener(roomId) {
-  const listener = roomChannelListeners.get(roomId);
-  roomChannelListeners.delete(roomId);
-  if (listener) {
-    listener();
-  }
-}
-function linkDevTools(roomId, room) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
-  }
-  sendToPanel({ msg: "room::available", roomId, clientVersion: VERSION });
-  stopRoomChannelListener(roomId);
-  roomChannelListeners.set(
-    roomId,
-    // Returns the unsubscribe callback, that we store in the
-    // roomChannelListeners registry
-    onMessageFromPanel.subscribe((msg) => {
-      switch (msg.msg) {
-        case "room::subscribe": {
-          if (msg.roomId === roomId) {
-            startSyncStream(room);
-          }
-          break;
-        }
-        case "room::unsubscribe": {
-          if (msg.roomId === roomId) {
-            stopSyncStream(roomId);
+  const optimisticUpdatesEventSource = makeEventSource();
+  return {
+    ...store,
+    deleteThread(threadId) {
+      store.set((state) => {
+        return {
+          ...state,
+          threads: deleteKeyImmutable(state.threads, threadId),
+          inboxNotifications: Object.fromEntries(
+            Object.entries(state.inboxNotifications).filter(
+              ([_id, notification]) => notification.kind === "thread" && notification.threadId === threadId
+            )
+          )
+        };
+      });
+    },
+    updateThreadAndNotification(thread, inboxNotification) {
+      store.set((state) => {
+        const existingThread = state.threads[thread.id];
+        return {
+          ...state,
+          threads: existingThread === void 0 || compareThreads(thread, existingThread) === 1 ? { ...state.threads, [thread.id]: thread } : state.threads,
+          inboxNotifications: inboxNotification === void 0 ? state.inboxNotifications : {
+            ...state.inboxNotifications,
+            [inboxNotification.id]: inboxNotification
           }
-          break;
-        }
-      }
-    })
-  );
+        };
+      });
+    },
+    updateThreadsAndNotifications(threads, inboxNotifications, deletedThreads, deletedInboxNotifications, queryKey) {
+      store.set((state) => ({
+        ...state,
+        threads: applyThreadUpdates(state.threads, {
+          newThreads: threads,
+          deletedThreads
+        }),
+        inboxNotifications: applyNotificationsUpdates(
+          state.inboxNotifications,
+          {
+            newInboxNotifications: inboxNotifications,
+            deletedNotifications: deletedInboxNotifications
+          }
+        ),
+        queries: queryKey !== void 0 ? {
+          ...state.queries,
+          [queryKey]: {
+            isLoading: false
+          }
+        } : state.queries
+      }));
+    },
+    updateRoomInboxNotificationSettings(roomId, settings, queryKey) {
+      store.set((state) => ({
+        ...state,
+        notificationSettings: {
+          ...state.notificationSettings,
+          [roomId]: settings
+        },
+        queries: {
+          ...state.queries,
+          [queryKey]: {
+            isLoading: false
+          }
+        }
+      }));
+    },
+    pushOptimisticUpdate(optimisticUpdate) {
+      optimisticUpdatesEventSource.notify(optimisticUpdate);
+      store.set((state) => ({
+        ...state,
+        optimisticUpdates: [...state.optimisticUpdates, optimisticUpdate]
+      }));
+    },
+    setQueryState(queryKey, queryState) {
+      store.set((state) => ({
+        ...state,
+        queries: {
+          ...state.queries,
+          [queryKey]: queryState
+        }
+      }));
+    },
+    optimisticUpdatesEventSource
+  };
 }
-function unlinkDevTools(roomId) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
+function deleteKeyImmutable(record, key) {
+  if (Object.prototype.hasOwnProperty.call(record, key)) {
+    const { [key]: _toDelete, ...rest } = record;
+    return rest;
   }
-  stopSyncStream(roomId);
-  stopRoomChannelListener(roomId);
-  sendToPanel({
-    msg: "room::unavailable",
-    roomId
-  });
+  return record;
 }
-
-// src/lib/stringify.ts
-function stringify(object, ...args) {
-  if (typeof object !== "object" || object === null || Array.isArray(object)) {
-    return JSON.stringify(object, ...args);
+function compareThreads(thread1, thread2) {
+  if (thread1.updatedAt && thread2.updatedAt) {
+    return thread1.updatedAt > thread2.updatedAt ? 1 : thread1.updatedAt < thread2.updatedAt ? -1 : 0;
+  } else if (thread1.updatedAt || thread2.updatedAt) {
+    return thread1.updatedAt ? 1 : -1;
   }
-  const sortedObject = Object.keys(object).sort().reduce(
-    (sortedObject2, key) => {
-      sortedObject2[key] = object[key];
-      return sortedObject2;
+  if (thread1.createdAt > thread2.createdAt) {
+    return 1;
+  } else if (thread1.createdAt < thread2.createdAt) {
+    return -1;
+  }
+  return 0;
+}
+function applyOptimisticUpdates(state) {
+  const result = {
+    threads: {
+      ...state.threads
     },
-    {}
+    inboxNotifications: {
+      ...state.inboxNotifications
+    },
+    notificationSettings: {
+      ...state.notificationSettings
+    }
+  };
+  for (const optimisticUpdate of state.optimisticUpdates) {
+    switch (optimisticUpdate.type) {
+      case "create-thread": {
+        result.threads[optimisticUpdate.thread.id] = optimisticUpdate.thread;
+        break;
+      }
+      case "edit-thread-metadata": {
+        const thread = result.threads[optimisticUpdate.threadId];
+        if (thread === void 0) {
+          break;
+        }
+        if (thread.deletedAt !== void 0) {
+          break;
+        }
+        if (thread.updatedAt !== void 0 && thread.updatedAt > optimisticUpdate.updatedAt) {
+          break;
+        }
+        result.threads[thread.id] = {
+          ...thread,
+          updatedAt: optimisticUpdate.updatedAt,
+          metadata: {
+            ...thread.metadata,
+            ...optimisticUpdate.metadata
+          }
+        };
+        break;
+      }
+      case "create-comment": {
+        const thread = result.threads[optimisticUpdate.comment.threadId];
+        if (thread === void 0) {
+          break;
+        }
+        result.threads[thread.id] = upsertComment(
+          thread,
+          optimisticUpdate.comment
+        );
+        const inboxNotification = Object.values(result.inboxNotifications).find(
+          (notification) => notification.kind === "thread" && notification.threadId === thread.id
+        );
+        if (inboxNotification === void 0) {
+          break;
+        }
+        result.inboxNotifications[inboxNotification.id] = {
+          ...inboxNotification,
+          notifiedAt: optimisticUpdate.comment.createdAt,
+          readAt: optimisticUpdate.comment.createdAt
+        };
+        break;
+      }
+      case "edit-comment": {
+        const thread = result.threads[optimisticUpdate.comment.threadId];
+        if (thread === void 0) {
+          break;
+        }
+        result.threads[thread.id] = upsertComment(
+          thread,
+          optimisticUpdate.comment
+        );
+        break;
+      }
+      case "delete-comment": {
+        const thread = result.threads[optimisticUpdate.threadId];
+        if (thread === void 0) {
+          break;
+        }
+        result.threads[thread.id] = deleteComment(
+          thread,
+          optimisticUpdate.commentId,
+          optimisticUpdate.deletedAt
+        );
+        break;
+      }
+      case "add-reaction": {
+        const thread = result.threads[optimisticUpdate.threadId];
+        if (thread === void 0) {
+          break;
+        }
+        result.threads[thread.id] = addReaction(
+          thread,
+          optimisticUpdate.commentId,
+          optimisticUpdate.reaction
+        );
+        break;
+      }
+      case "remove-reaction": {
+        const thread = result.threads[optimisticUpdate.threadId];
+        if (thread === void 0) {
+          break;
+        }
+        result.threads[thread.id] = removeReaction(
+          thread,
+          optimisticUpdate.commentId,
+          optimisticUpdate.emoji,
+          optimisticUpdate.userId,
+          optimisticUpdate.removedAt
+        );
+        break;
+      }
+      case "mark-inbox-notification-as-read": {
+        result.inboxNotifications[optimisticUpdate.inboxNotificationId] = {
+          ...state.inboxNotifications[optimisticUpdate.inboxNotificationId],
+          readAt: optimisticUpdate.readAt
+        };
+        break;
+      }
+      case "mark-inbox-notifications-as-read": {
+        for (const id in result.inboxNotifications) {
+          result.inboxNotifications[id] = {
+            ...result.inboxNotifications[id],
+            readAt: optimisticUpdate.readAt
+          };
+        }
+        break;
+      }
+      case "update-notification-settings": {
+        result.notificationSettings[optimisticUpdate.roomId] = {
+          ...result.notificationSettings[optimisticUpdate.roomId],
+          ...optimisticUpdate.settings
+        };
+      }
+    }
+  }
+  return result;
+}
+function applyThreadUpdates(existingThreads, updates) {
+  const updatedThreads = { ...existingThreads };
+  updates.newThreads.forEach((thread) => {
+    const existingThread = updatedThreads[thread.id];
+    if (existingThread) {
+      const result = compareThreads(existingThread, thread);
+      if (result === 1)
+        return;
+    }
+    updatedThreads[thread.id] = thread;
+  });
+  updates.deletedThreads.forEach(({ id, deletedAt }) => {
+    const existingThread = updatedThreads[id];
+    if (existingThread === void 0)
+      return;
+    existingThread.deletedAt = deletedAt;
+    existingThread.updatedAt = deletedAt;
+    existingThread.comments = [];
+  });
+  return updatedThreads;
+}
+function applyNotificationsUpdates(existingInboxNotifications, updates) {
+  const updatedInboxNotifications = { ...existingInboxNotifications };
+  updates.newInboxNotifications.forEach((notification) => {
+    const existingNotification = updatedInboxNotifications[notification.id];
+    if (existingNotification) {
+      const result = compareInboxNotifications(
+        existingNotification,
+        notification
+      );
+      if (result === 1)
+        return;
+    }
+    updatedInboxNotifications[notification.id] = notification;
+  });
+  updates.deletedNotifications.forEach(
+    ({ id }) => delete updatedInboxNotifications[id]
   );
-  return JSON.stringify(sortedObject, ...args);
+  return updatedInboxNotifications;
 }
-
-// src/lib/batch.ts
-var DEFAULT_SIZE = 50;
-var DEFAULT_DELAY = 100;
-var noop = () => {
-};
-var BatchCall = class {
-  constructor(args) {
-    this.resolve = noop;
-    this.reject = noop;
-    this.promise = new Promise(noop);
-    this.args = args;
+function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
+  if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
+    return 1;
+  } else if (inboxNotificationA.notifiedAt < inboxNotificationB.notifiedAt) {
+    return -1;
   }
-};
-var Batch = class {
-  constructor(callback, options) {
-    this.queue = [];
-    this.error = false;
-    this.callback = callback;
-    this.size = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _44 => _44.size]), () => ( DEFAULT_SIZE));
-    this.delay = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _45 => _45.delay]), () => ( DEFAULT_DELAY));
+  if (inboxNotificationA.readAt && inboxNotificationB.readAt) {
+    return inboxNotificationA.readAt > inboxNotificationB.readAt ? 1 : inboxNotificationA.readAt < inboxNotificationB.readAt ? -1 : 0;
+  } else if (inboxNotificationA.readAt || inboxNotificationB.readAt) {
+    return inboxNotificationA.readAt ? 1 : -1;
   }
-  clearDelayTimeout() {
-    if (this.delayTimeoutId !== void 0) {
-      clearTimeout(this.delayTimeoutId);
-      this.delayTimeoutId = void 0;
-    }
+  return 0;
+}
+function upsertComment(thread, comment) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
   }
-  schedule() {
-    if (this.queue.length === this.size) {
-      void this.flush();
-    } else if (this.queue.length === 1) {
-      this.clearDelayTimeout();
-      this.delayTimeoutId = setTimeout(() => void this.flush(), this.delay);
-    }
+  if (comment.threadId !== thread.id) {
+    warn(
+      `Comment ${comment.id} does not belong to thread ${thread.id}`
+    );
+    return thread;
   }
-  async flush() {
-    if (this.queue.length === 0) {
-      return;
-    }
-    const calls = this.queue.splice(0);
-    const args = calls.map((call) => call.args);
-    try {
-      const results = await this.callback(args);
-      this.error = false;
-      calls.forEach((call, index) => {
-        const result = _optionalChain([results, 'optionalAccess', _46 => _46[index]]);
-        if (!Array.isArray(results)) {
-          call.reject(new Error("Callback must return an array."));
-        } else if (calls.length !== results.length) {
-          call.reject(
-            new Error(
-              `Callback must return an array of the same length as the number of provided items. Expected ${calls.length}, but got ${results.length}.`
-            )
-          );
-        } else if (result instanceof Error) {
-          call.reject(result);
-        } else {
-          call.resolve(result);
-        }
-      });
-    } catch (error3) {
-      this.error = true;
-      calls.forEach((call) => {
-        call.reject(error3);
-      });
-    }
+  const existingComment = thread.comments.find(
+    (existingComment2) => existingComment2.id === comment.id
+  );
+  if (existingComment === void 0) {
+    const updatedAt = new Date(
+      Math.max(_optionalChain([thread, 'access', _38 => _38.updatedAt, 'optionalAccess', _39 => _39.getTime, 'call', _40 => _40()]) || 0, comment.createdAt.getTime())
+    );
+    const updatedThread = {
+      ...thread,
+      updatedAt,
+      comments: [...thread.comments, comment]
+    };
+    return updatedThread;
   }
-  get(...args) {
-    const existingCall = this.queue.find(
-      (call2) => stringify(call2.args) === stringify(args)
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
+  }
+  if (existingComment.editedAt === void 0 || comment.editedAt === void 0 || existingComment.editedAt <= comment.editedAt) {
+    const updatedComments = thread.comments.map(
+      (existingComment2) => existingComment2.id === comment.id ? comment : existingComment2
     );
-    if (existingCall) {
-      return existingCall.promise;
-    }
-    const call = new BatchCall(args);
-    call.promise = new Promise((resolve, reject) => {
-      call.resolve = resolve;
-      call.reject = reject;
-    });
-    this.queue.push(call);
-    this.schedule();
-    return call.promise;
+    const updatedThread = {
+      ...thread,
+      updatedAt: new Date(
+        Math.max(
+          _optionalChain([thread, 'access', _41 => _41.updatedAt, 'optionalAccess', _42 => _42.getTime, 'call', _43 => _43()]) || 0,
+          _optionalChain([comment, 'access', _44 => _44.editedAt, 'optionalAccess', _45 => _45.getTime, 'call', _46 => _46()]) || comment.createdAt.getTime()
+        )
+      ),
+      comments: updatedComments
+    };
+    return updatedThread;
   }
-  clear() {
-    this.queue = [];
-    this.error = false;
-    this.clearDelayTimeout();
+  return thread;
+}
+function deleteComment(thread, commentId, deletedAt) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
   }
-};
-function createBatchStore(callback, options) {
-  const batch = new Batch(callback, options);
-  const cache = /* @__PURE__ */ new Map();
-  const eventSource2 = makeEventSource();
-  function getCacheKey(args) {
-    return stringify(args);
+  const existingComment = thread.comments.find(
+    (comment) => comment.id === commentId
+  );
+  if (existingComment === void 0) {
+    return thread;
   }
-  function setStateAndNotify(cacheKey, state) {
-    if (state) {
-      cache.set(cacheKey, state);
-    } else {
-      cache.delete(cacheKey);
-    }
-    eventSource2.notify(state);
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
   }
-  async function get(...args) {
-    const cacheKey = getCacheKey(args);
-    if (cache.has(cacheKey)) {
-      return;
-    }
-    try {
-      setStateAndNotify(cacheKey, { isLoading: true });
-      const result = await batch.get(...args);
-      setStateAndNotify(cacheKey, { isLoading: false, data: result });
-    } catch (error3) {
-      setStateAndNotify(cacheKey, {
-        isLoading: false,
-        error: error3
-      });
-    }
+  const updatedComments = thread.comments.map(
+    (comment) => comment.id === commentId ? {
+      ...comment,
+      deletedAt,
+      body: void 0
+    } : comment
+  );
+  if (!updatedComments.some((comment) => comment.deletedAt === void 0)) {
+    return {
+      ...thread,
+      deletedAt,
+      updatedAt: deletedAt,
+      comments: []
+    };
   }
-  function getState(...args) {
-    const cacheKey = getCacheKey(args);
-    return cache.get(cacheKey);
+  return {
+    ...thread,
+    updatedAt: deletedAt,
+    comments: updatedComments
+  };
+}
+function addReaction(thread, commentId, reaction) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
+  }
+  const existingComment = thread.comments.find(
+    (comment) => comment.id === commentId
+  );
+  if (existingComment === void 0) {
+    return thread;
   }
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
+  }
+  const updatedComments = thread.comments.map(
+    (comment) => comment.id === commentId ? {
+      ...comment,
+      reactions: upsertReaction(comment.reactions, reaction)
+    } : comment
+  );
   return {
-    ...eventSource2,
-    get,
-    getState
+    ...thread,
+    updatedAt: new Date(
+      Math.max(reaction.createdAt.getTime(), _optionalChain([thread, 'access', _47 => _47.updatedAt, 'optionalAccess', _48 => _48.getTime, 'call', _49 => _49()]) || 0)
+    ),
+    comments: updatedComments
   };
 }
-
-// src/lib/create-store.ts
-function createStore(initialState) {
-  let state = initialState;
-  const subscribers = /* @__PURE__ */ new Set();
-  function get() {
-    return state;
+function removeReaction(thread, commentId, emoji, userId, removedAt) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
   }
-  function set(callback) {
-    const newState = callback(state);
-    if (state === newState) {
-      return;
-    }
-    state = newState;
-    for (const subscriber of subscribers) {
-      subscriber(state);
-    }
+  const existingComment = thread.comments.find(
+    (comment) => comment.id === commentId
+  );
+  if (existingComment === void 0) {
+    return thread;
   }
-  function subscribe(callback) {
-    subscribers.add(callback);
-    callback(state);
-    return () => {
-      subscribers.delete(callback);
-    };
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
   }
+  const updatedComments = thread.comments.map(
+    (comment) => comment.id === commentId ? {
+      ...comment,
+      reactions: comment.reactions.map(
+        (reaction) => reaction.emoji === emoji ? {
+          ...reaction,
+          users: reaction.users.filter((user) => user.id !== userId)
+        } : reaction
+      ).filter((reaction) => reaction.users.length > 0)
+      // Remove reactions with no users left
+    } : comment
+  );
   return {
-    get,
-    set,
-    subscribe
+    ...thread,
+    updatedAt: new Date(
+      Math.max(removedAt.getTime(), _optionalChain([thread, 'access', _50 => _50.updatedAt, 'optionalAccess', _51 => _51.getTime, 'call', _52 => _52()]) || 0)
+    ),
+    comments: updatedComments
   };
 }
-
-// src/lib/deprecation.ts
-var _emittedDeprecationWarnings = /* @__PURE__ */ new Set();
-function deprecate(message, key = message) {
-  if (process.env.NODE_ENV !== "production") {
-    if (!_emittedDeprecationWarnings.has(key)) {
-      _emittedDeprecationWarnings.add(key);
-      errorWithTitle("Deprecation warning", message);
-    }
+function upsertReaction(reactions, reaction) {
+  const existingReaction = reactions.find(
+    (existingReaction2) => existingReaction2.emoji === reaction.emoji
+  );
+  if (existingReaction === void 0) {
+    return [
+      ...reactions,
+      {
+        emoji: reaction.emoji,
+        createdAt: reaction.createdAt,
+        users: [{ id: reaction.userId }]
+      }
+    ];
   }
-}
-function deprecateIf(condition, message, key = message) {
-  if (process.env.NODE_ENV !== "production") {
-    if (condition) {
-      deprecate(message, key);
-    }
+  if (existingReaction.users.some((user) => user.id === reaction.userId) === false) {
+    return reactions.map(
+      (existingReaction2) => existingReaction2.emoji === reaction.emoji ? {
+        ...existingReaction2,
+        users: [...existingReaction2.users, { id: reaction.userId }]
+      } : existingReaction2
+    );
   }
+  return reactions;
 }
-function throwUsageError(message) {
-  if (process.env.NODE_ENV !== "production") {
-    const usageError = new Error(message);
-    usageError.name = "Usage error";
-    errorWithTitle("Usage error", message);
-    throw usageError;
-  }
+
+// src/comments/lib/select-notification-settings.ts
+function selectNotificationSettings(roomId, state) {
+  const { notificationSettings } = applyOptimisticUpdates(state);
+  return nn(notificationSettings[roomId]);
 }
-function errorIf(condition, message) {
-  if (process.env.NODE_ENV !== "production") {
-    if (condition) {
-      throwUsageError(message);
-    }
-  }
+
+// src/comments/lib/selected-inbox-notifications.ts
+function selectedInboxNotifications(state) {
+  const result = applyOptimisticUpdates(state);
+  return Object.values(result.inboxNotifications).sort(
+    // Sort so that the most recent notifications are first
+    (a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime()
+  );
 }
 
 // src/convert-plain-data.ts
@@ -2035,6 +2150,18 @@ function convertToCommentUserReaction(data) {
 function convertToInboxNotificationData(data) {
   const notifiedAt = new Date(data.notifiedAt);
   const readAt = data.readAt ? new Date(data.readAt) : null;
+  if ("activities" in data) {
+    const activities = data.activities.map((activity) => ({
+      ...activity,
+      createdAt: new Date(activity.createdAt)
+    }));
+    return {
+      ...data,
+      notifiedAt,
+      readAt,
+      activities
+    };
+  }
   return {
     ...data,
     notifiedAt,
@@ -2048,142 +2175,11 @@ function convertToThreadDeleteInfo(data) {
     deletedAt
   };
 }
-function convertToInboxNotificationDeleteInfo(data) {
-  const deletedAt = new Date(data.deletedAt);
-  return {
-    ...data,
-    deletedAt
-  };
-}
-
-// src/lib/url.ts
-function toURLSearchParams(params) {
-  const result = new URLSearchParams();
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0 && value !== null) {
-      result.set(key, value.toString());
-    }
-  }
-  return result;
-}
-function urljoin(baseUrl, path, params) {
-  const url = new URL(path, baseUrl);
-  if (params !== void 0) {
-    url.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
-  }
-  return url.toString();
-}
-
-// src/notifications.ts
-var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY = 50;
-function createNotificationsApi({
-  baseUrl,
-  authManager,
-  currentUserIdStore,
-  fetcher
-}) {
-  async function fetchJson(endpoint, options, params) {
-    const authValue = await authManager.getAuthValue({
-      requestedScope: "comments:read"
-    });
-    if (authValue.type === "secret" && authValue.token.parsed.k === "acc" /* ACCESS_TOKEN */) {
-      const userId = authValue.token.parsed.uid;
-      currentUserIdStore.set(() => userId);
-    }
-    const url = urljoin(baseUrl, `/v2/c${endpoint}`, params);
-    const response = await fetcher(url.toString(), {
-      ...options,
-      headers: {
-        ..._optionalChain([options, 'optionalAccess', _47 => _47.headers]),
-        Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`
-      }
-    });
-    if (!response.ok) {
-      if (response.status >= 400 && response.status < 600) {
-        let error3;
-        try {
-          const errorBody = await response.json();
-          error3 = new NotificationsApiError(
-            errorBody.message,
-            response.status,
-            errorBody
-          );
-        } catch (e3) {
-          error3 = new NotificationsApiError(
-            response.statusText,
-            response.status
-          );
-        }
-        throw error3;
-      }
-    }
-    let body;
-    try {
-      body = await response.json();
-    } catch (e4) {
-      body = {};
-    }
-    return body;
-  }
-  async function getInboxNotifications(options) {
-    const json = await fetchJson("/inbox-notifications", void 0, {
-      limit: _optionalChain([options, 'optionalAccess', _48 => _48.limit]),
-      since: _optionalChain([options, 'optionalAccess', _49 => _49.since, 'optionalAccess', _50 => _50.toISOString, 'call', _51 => _51()])
-    });
-    return {
-      threads: json.threads.map((thread) => convertToThreadData(thread)),
-      inboxNotifications: json.inboxNotifications.map(
-        (notification) => convertToInboxNotificationData(notification)
-      ),
-      deletedThreads: json.deletedThreads.map(
-        (info) => convertToThreadDeleteInfo(info)
-      ),
-      deletedInboxNotifications: json.deletedInboxNotifications.map(
-        (info) => convertToInboxNotificationDeleteInfo(info)
-      ),
-      meta: {
-        requestedAt: new Date(json.meta.requestedAt)
-      }
-    };
-  }
-  async function getUnreadInboxNotificationsCount() {
-    const { count } = await fetchJson("/inbox-notifications/count");
-    return count;
-  }
-  async function markAllInboxNotificationsAsRead() {
-    await fetchJson("/inbox-notifications/read", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ inboxNotificationIds: "all" })
-    });
-  }
-  async function markInboxNotificationsAsRead(inboxNotificationIds) {
-    await fetchJson("/inbox-notifications/read", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ inboxNotificationIds })
-    });
-  }
-  const batchedMarkInboxNotificationsAsRead = new Batch(
-    async (batchedInboxNotificationIds) => {
-      const inboxNotificationIds = batchedInboxNotificationIds.flat();
-      await markInboxNotificationsAsRead(inboxNotificationIds);
-      return inboxNotificationIds;
-    },
-    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY }
-  );
-  async function markInboxNotificationAsRead(inboxNotificationId) {
-    await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
-  }
-  return {
-    getInboxNotifications,
-    getUnreadInboxNotificationsCount,
-    markAllInboxNotificationsAsRead,
-    markInboxNotificationAsRead
+function convertToInboxNotificationDeleteInfo(data) {
+  const deletedAt = new Date(data.deletedAt);
+  return {
+    ...data,
+    deletedAt
   };
 }
 
@@ -2441,13 +2437,13 @@ var AbstractCrdt = class {
     }
   }
   /** @internal */
-  _attach(id, pool) {
+  _attach(id, pool2) {
     if (this.__id || this.__pool) {
       throw new Error("Cannot attach node: already attached");
     }
-    pool.addNode(id, crdtAsLiveNode(this));
+    pool2.addNode(id, crdtAsLiveNode(this));
     this.__id = id;
-    this.__pool = pool;
+    this.__pool = pool2;
   }
   /** @internal */
   _detach() {
@@ -2526,7 +2522,7 @@ function isChildCrdt(crdt) {
 }
 
 // src/lib/nanoid.ts
-function nanoid(length = 7) {
+function nanoid2(length = 7) {
   const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,./;[]~!@#$%&*()_+=-";
   const len = alphabet.length;
   return Array.from(
@@ -2545,13 +2541,13 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return this._data;
   }
   /** @internal */
-  static _deserialize([id, item], _parentToChildren, pool) {
+  static _deserialize([id, item], _parentToChildren, pool2) {
     const register = new _LiveRegister(item.data);
-    register._attach(id, pool);
+    register._attach(id, pool2);
     return register;
   }
   /** @internal */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey, pool2) {
     if (this._id === void 0) {
       throw new Error(
         "Cannot serialize register if parentId or parentKey is undefined"
@@ -2560,7 +2556,7 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return [
       {
         type: 8 /* CREATE_REGISTER */,
-        opId: _optionalChain([pool, 'optionalAccess', _52 => _52.generateOpId, 'call', _53 => _53()]),
+        opId: _optionalChain([pool2, 'optionalAccess', _53 => _53.generateOpId, 'call', _54 => _54()]),
         id: this._id,
         parentId,
         parentKey,
@@ -2596,7 +2592,7 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
   _toTreeNode(key) {
     return {
       type: "Json",
-      id: _nullishCoalesce(this._id, () => ( nanoid())),
+      id: _nullishCoalesce(this._id, () => ( nanoid2())),
       key,
       payload: this._data
     };
@@ -2632,15 +2628,15 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   /** @internal */
-  static _deserialize([id], parentToChildren, pool) {
+  static _deserialize([id], parentToChildren, pool2) {
     const list = new _LiveList();
-    list._attach(id, pool);
+    list._attach(id, pool2);
     const children = parentToChildren.get(id);
     if (children === void 0) {
       return list;
     }
     for (const [id2, crdt] of children) {
-      const child = deserialize([id2, crdt], parentToChildren, pool);
+      const child = deserialize([id2, crdt], parentToChildren, pool2);
       child._setParentLink(list, crdt.parentKey);
       list._insertAndSort(child);
     }
@@ -2655,14 +2651,14 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * This is quite unintuitive and should disappear as soon as
    * we introduce an explicit LiveList.Set operation
    */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey, pool2) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _54 => _54.generateOpId, 'call', _55 => _55()]),
+      opId: _optionalChain([pool2, 'optionalAccess', _55 => _55.generateOpId, 'call', _56 => _56()]),
       type: 2 /* CREATE_LIST */,
       parentId,
       parentKey
@@ -2671,7 +2667,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     for (const item of this._items) {
       const parentKey2 = item._getParentKeyOrThrow();
       const childOps = HACK_addIntentAndDeletedIdToOperation(
-        item._toOps(this._id, parentKey2, pool),
+        item._toOps(this._id, parentKey2, pool2),
         void 0
       );
       const childOpId = childOps[0].opId;
@@ -2703,10 +2699,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
     );
   }
   /** @internal */
-  _attach(id, pool) {
-    super._attach(id, pool);
+  _attach(id, pool2) {
+    super._attach(id, pool2);
     for (const item of this._items) {
-      item._attach(pool.generateId(), pool);
+      item._attach(pool2.generateId(), pool2);
     }
   }
   /** @internal */
@@ -2939,7 +2935,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _applyInsertUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _56 => _56._pool, 'optionalAccess', _57 => _57.getNode, 'call', _58 => _58(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _57 => _57._pool, 'optionalAccess', _58 => _58.getNode, 'call', _59 => _59(id)]) !== void 0) {
       return { modified: false };
     }
     child._attach(id, nn(this._pool));
@@ -2947,8 +2943,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const existingItemIndex = this._indexOfPosition(key);
     let newKey = key;
     if (existingItemIndex !== -1) {
-      const before2 = _optionalChain([this, 'access', _59 => _59._items, 'access', _60 => _60[existingItemIndex], 'optionalAccess', _61 => _61._parentPos]);
-      const after2 = _optionalChain([this, 'access', _62 => _62._items, 'access', _63 => _63[existingItemIndex + 1], 'optionalAccess', _64 => _64._parentPos]);
+      const before2 = _optionalChain([this, 'access', _60 => _60._items, 'access', _61 => _61[existingItemIndex], 'optionalAccess', _62 => _62._parentPos]);
+      const after2 = _optionalChain([this, 'access', _63 => _63._items, 'access', _64 => _64[existingItemIndex + 1], 'optionalAccess', _65 => _65._parentPos]);
       newKey = makePosition(before2, after2);
       child._setParentLink(this, newKey);
     }
@@ -2963,7 +2959,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _applySetUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _65 => _65._pool, 'optionalAccess', _66 => _66.getNode, 'call', _67 => _67(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _66 => _66._pool, 'optionalAccess', _67 => _67.getNode, 'call', _68 => _68(id)]) !== void 0) {
       return { modified: false };
     }
     this._unacknowledgedSets.set(key, nn(op.opId));
@@ -3085,7 +3081,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     } else {
       this._items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _68 => _68._items, 'access', _69 => _69[existingItemIndex + 1], 'optionalAccess', _70 => _70._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _69 => _69._items, 'access', _70 => _70[existingItemIndex + 1], 'optionalAccess', _71 => _71._parentPos]))
       );
       const previousIndex = this._items.indexOf(child);
       child._setParentLink(this, newKey);
@@ -3111,7 +3107,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this._items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _71 => _71._items, 'access', _72 => _72[existingItemIndex + 1], 'optionalAccess', _73 => _73._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _72 => _72._items, 'access', _73 => _73[existingItemIndex + 1], 'optionalAccess', _74 => _74._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -3130,7 +3126,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this._items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _74 => _74._items, 'access', _75 => _75[existingItemIndex + 1], 'optionalAccess', _76 => _76._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _75 => _75._items, 'access', _76 => _76[existingItemIndex + 1], 'optionalAccess', _77 => _77._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -3158,7 +3154,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (existingItemIndex !== -1) {
       this._items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _77 => _77._items, 'access', _78 => _78[existingItemIndex + 1], 'optionalAccess', _79 => _79._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _78 => _78._items, 'access', _79 => _79[existingItemIndex + 1], 'optionalAccess', _80 => _80._parentPos]))
       );
     }
     child._setParentLink(this, newKey);
@@ -3216,7 +3212,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param element The element to add to the end of the LiveList.
    */
   push(element) {
-    _optionalChain([this, 'access', _80 => _80._pool, 'optionalAccess', _81 => _81.assertStorageIsWritable, 'call', _82 => _82()]);
+    _optionalChain([this, 'access', _81 => _81._pool, 'optionalAccess', _82 => _82.assertStorageIsWritable, 'call', _83 => _83()]);
     return this.insert(element, this.length);
   }
   /**
@@ -3225,7 +3221,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index at which you want to insert the element.
    */
   insert(element, index) {
-    _optionalChain([this, 'access', _83 => _83._pool, 'optionalAccess', _84 => _84.assertStorageIsWritable, 'call', _85 => _85()]);
+    _optionalChain([this, 'access', _84 => _84._pool, 'optionalAccess', _85 => _85.assertStorageIsWritable, 'call', _86 => _86()]);
     if (index < 0 || index > this._items.length) {
       throw new Error(
         `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
@@ -3255,7 +3251,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param targetIndex The index where the element should be after moving.
    */
   move(index, targetIndex) {
-    _optionalChain([this, 'access', _86 => _86._pool, 'optionalAccess', _87 => _87.assertStorageIsWritable, 'call', _88 => _88()]);
+    _optionalChain([this, 'access', _87 => _87._pool, 'optionalAccess', _88 => _88.assertStorageIsWritable, 'call', _89 => _89()]);
     if (targetIndex < 0) {
       throw new Error("targetIndex cannot be less than 0");
     }
@@ -3313,7 +3309,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index of the element to delete
    */
   delete(index) {
-    _optionalChain([this, 'access', _89 => _89._pool, 'optionalAccess', _90 => _90.assertStorageIsWritable, 'call', _91 => _91()]);
+    _optionalChain([this, 'access', _90 => _90._pool, 'optionalAccess', _91 => _91.assertStorageIsWritable, 'call', _92 => _92()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
         `Cannot delete list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
@@ -3346,7 +3342,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   clear() {
-    _optionalChain([this, 'access', _92 => _92._pool, 'optionalAccess', _93 => _93.assertStorageIsWritable, 'call', _94 => _94()]);
+    _optionalChain([this, 'access', _93 => _93._pool, 'optionalAccess', _94 => _94.assertStorageIsWritable, 'call', _95 => _95()]);
     if (this._pool) {
       const ops = [];
       const reverseOps = [];
@@ -3380,7 +3376,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   set(index, item) {
-    _optionalChain([this, 'access', _95 => _95._pool, 'optionalAccess', _96 => _96.assertStorageIsWritable, 'call', _97 => _97()]);
+    _optionalChain([this, 'access', _96 => _96._pool, 'optionalAccess', _97 => _97.assertStorageIsWritable, 'call', _98 => _98()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
         `Cannot set list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
@@ -3528,7 +3524,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _shiftItemPosition(index, key) {
     const shiftedPosition = makePosition(
       key,
-      this._items.length > index + 1 ? _optionalChain([this, 'access', _98 => _98._items, 'access', _99 => _99[index + 1], 'optionalAccess', _100 => _100._parentPos]) : void 0
+      this._items.length > index + 1 ? _optionalChain([this, 'access', _99 => _99._items, 'access', _100 => _100[index + 1], 'optionalAccess', _101 => _101._parentPos]) : void 0
     );
     this._items[index]._setParentLink(this, shiftedPosition);
   }
@@ -3536,7 +3532,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _toTreeNode(key) {
     return {
       type: "LiveList",
-      id: _nullishCoalesce(this._id, () => ( nanoid())),
+      id: _nullishCoalesce(this._id, () => ( nanoid2())),
       key,
       payload: this._items.map(
         (item, index) => item.toTreeNode(index.toString())
@@ -3650,36 +3646,36 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
   /**
    * @internal
    */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey, pool2) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _101 => _101.generateOpId, 'call', _102 => _102()]),
+      opId: _optionalChain([pool2, 'optionalAccess', _102 => _102.generateOpId, 'call', _103 => _103()]),
       type: 7 /* CREATE_MAP */,
       parentId,
       parentKey
     };
     ops.push(op);
     for (const [key, value] of this._map) {
-      ops.push(...value._toOps(this._id, key, pool));
+      ops.push(...value._toOps(this._id, key, pool2));
     }
     return ops;
   }
   /**
    * @internal
    */
-  static _deserialize([id, _item], parentToChildren, pool) {
+  static _deserialize([id, _item], parentToChildren, pool2) {
     const map = new _LiveMap();
-    map._attach(id, pool);
+    map._attach(id, pool2);
     const children = parentToChildren.get(id);
     if (children === void 0) {
       return map;
     }
     for (const [id2, crdt] of children) {
-      const child = deserialize([id2, crdt], parentToChildren, pool);
+      const child = deserialize([id2, crdt], parentToChildren, pool2);
       child._setParentLink(map, crdt.parentKey);
       map._map.set(crdt.parentKey, child);
       map.invalidate();
@@ -3689,11 +3685,11 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
   /**
    * @internal
    */
-  _attach(id, pool) {
-    super._attach(id, pool);
+  _attach(id, pool2) {
+    super._attach(id, pool2);
     for (const [_key, value] of this._map) {
       if (isLiveNode(value)) {
-        value._attach(pool.generateId(), pool);
+        value._attach(pool2.generateId(), pool2);
       }
     }
   }
@@ -3804,7 +3800,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @param value The value of the element to add. Should be serializable to JSON.
    */
   set(key, value) {
-    _optionalChain([this, 'access', _103 => _103._pool, 'optionalAccess', _104 => _104.assertStorageIsWritable, 'call', _105 => _105()]);
+    _optionalChain([this, 'access', _104 => _104._pool, 'optionalAccess', _105 => _105.assertStorageIsWritable, 'call', _106 => _106()]);
     const oldValue = this._map.get(key);
     if (oldValue) {
       oldValue._detach();
@@ -3850,7 +3846,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @returns true if an element existed and has been removed, or false if the element does not exist.
    */
   delete(key) {
-    _optionalChain([this, 'access', _106 => _106._pool, 'optionalAccess', _107 => _107.assertStorageIsWritable, 'call', _108 => _108()]);
+    _optionalChain([this, 'access', _107 => _107._pool, 'optionalAccess', _108 => _108.assertStorageIsWritable, 'call', _109 => _109()]);
     const item = this._map.get(key);
     if (item === void 0) {
       return false;
@@ -3953,7 +3949,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
   _toTreeNode(key) {
     return {
       type: "LiveMap",
-      id: _nullishCoalesce(this._id, () => ( nanoid())),
+      id: _nullishCoalesce(this._id, () => ( nanoid2())),
       key,
       payload: Array.from(this._map.entries()).map(
         ([key2, val]) => val.toTreeNode(key2)
@@ -4015,20 +4011,20 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     return [root, parentToChildren];
   }
   /** @internal */
-  static _fromItems(items, pool) {
+  static _fromItems(items, pool2) {
     const [root, parentToChildren] = _LiveObject._buildRootAndParentToChildren(items);
     return _LiveObject._deserialize(
       root,
       parentToChildren,
-      pool
+      pool2
     );
   }
   /** @internal */
-  _toOps(parentId, parentKey, pool) {
+  _toOps(parentId, parentKey, pool2) {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
-    const opId = _optionalChain([pool, 'optionalAccess', _109 => _109.generateOpId, 'call', _110 => _110()]);
+    const opId = _optionalChain([pool2, 'optionalAccess', _110 => _110.generateOpId, 'call', _111 => _111()]);
     const ops = [];
     const op = {
       type: 4 /* CREATE_OBJECT */,
@@ -4041,7 +4037,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     ops.push(op);
     for (const [key, value] of this._map) {
       if (isLiveNode(value)) {
-        ops.push(...value._toOps(this._id, key, pool));
+        ops.push(...value._toOps(this._id, key, pool2));
       } else {
         op.data[key] = value;
       }
@@ -4049,19 +4045,19 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     return ops;
   }
   /** @internal */
-  static _deserialize([id, item], parentToChildren, pool) {
+  static _deserialize([id, item], parentToChildren, pool2) {
     const liveObj = new _LiveObject(item.data);
-    liveObj._attach(id, pool);
-    return this._deserializeChildren(liveObj, parentToChildren, pool);
+    liveObj._attach(id, pool2);
+    return this._deserializeChildren(liveObj, parentToChildren, pool2);
   }
   /** @internal */
-  static _deserializeChildren(liveObj, parentToChildren, pool) {
+  static _deserializeChildren(liveObj, parentToChildren, pool2) {
     const children = parentToChildren.get(nn(liveObj._id));
     if (children === void 0) {
       return liveObj;
     }
     for (const [id, crdt] of children) {
-      const child = deserializeToLson([id, crdt], parentToChildren, pool);
+      const child = deserializeToLson([id, crdt], parentToChildren, pool2);
       if (isLiveStructure(child)) {
         child._setParentLink(liveObj, crdt.parentKey);
       }
@@ -4071,11 +4067,11 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     return liveObj;
   }
   /** @internal */
-  _attach(id, pool) {
-    super._attach(id, pool);
+  _attach(id, pool2) {
+    super._attach(id, pool2);
     for (const [_key, value] of this._map) {
       if (isLiveNode(value)) {
-        value._attach(pool.generateId(), pool);
+        value._attach(pool2.generateId(), pool2);
       }
     }
   }
@@ -4306,7 +4302,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param value The value of the property to add
    */
   set(key, value) {
-    _optionalChain([this, 'access', _111 => _111._pool, 'optionalAccess', _112 => _112.assertStorageIsWritable, 'call', _113 => _113()]);
+    _optionalChain([this, 'access', _112 => _112._pool, 'optionalAccess', _113 => _113.assertStorageIsWritable, 'call', _114 => _114()]);
     this.update({ [key]: value });
   }
   /**
@@ -4321,7 +4317,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param key The key of the property to delete
    */
   delete(key) {
-    _optionalChain([this, 'access', _114 => _114._pool, 'optionalAccess', _115 => _115.assertStorageIsWritable, 'call', _116 => _116()]);
+    _optionalChain([this, 'access', _115 => _115._pool, 'optionalAccess', _116 => _116.assertStorageIsWritable, 'call', _117 => _117()]);
     const keyAsString = key;
     const oldValue = this._map.get(keyAsString);
     if (oldValue === void 0) {
@@ -4374,7 +4370,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param patch The object used to overrides properties
    */
   update(patch) {
-    _optionalChain([this, 'access', _117 => _117._pool, 'optionalAccess', _118 => _118.assertStorageIsWritable, 'call', _119 => _119()]);
+    _optionalChain([this, 'access', _118 => _118._pool, 'optionalAccess', _119 => _119.assertStorageIsWritable, 'call', _120 => _120()]);
     if (this._pool === void 0 || this._id === void 0) {
       for (const key in patch) {
         const newValue = patch[key];
@@ -4464,7 +4460,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
   }
   /** @internal */
   _toTreeNode(key) {
-    const nodeId = _nullishCoalesce(this._id, () => ( nanoid()));
+    const nodeId = _nullishCoalesce(this._id, () => ( nanoid2()));
     return {
       type: "LiveObject",
       id: nodeId,
@@ -4521,35 +4517,35 @@ function isSameNodeOrChildOf(node, parent) {
   }
   return false;
 }
-function deserialize([id, crdt], parentToChildren, pool) {
+function deserialize([id, crdt], parentToChildren, pool2) {
   switch (crdt.type) {
     case 0 /* OBJECT */: {
-      return LiveObject._deserialize([id, crdt], parentToChildren, pool);
+      return LiveObject._deserialize([id, crdt], parentToChildren, pool2);
     }
     case 1 /* LIST */: {
-      return LiveList._deserialize([id, crdt], parentToChildren, pool);
+      return LiveList._deserialize([id, crdt], parentToChildren, pool2);
     }
     case 2 /* MAP */: {
-      return LiveMap._deserialize([id, crdt], parentToChildren, pool);
+      return LiveMap._deserialize([id, crdt], parentToChildren, pool2);
     }
     case 3 /* REGISTER */: {
-      return LiveRegister._deserialize([id, crdt], parentToChildren, pool);
+      return LiveRegister._deserialize([id, crdt], parentToChildren, pool2);
     }
     default: {
       throw new Error("Unexpected CRDT type");
     }
   }
 }
-function deserializeToLson([id, crdt], parentToChildren, pool) {
+function deserializeToLson([id, crdt], parentToChildren, pool2) {
   switch (crdt.type) {
     case 0 /* OBJECT */: {
-      return LiveObject._deserialize([id, crdt], parentToChildren, pool);
+      return LiveObject._deserialize([id, crdt], parentToChildren, pool2);
     }
     case 1 /* LIST */: {
-      return LiveList._deserialize([id, crdt], parentToChildren, pool);
+      return LiveList._deserialize([id, crdt], parentToChildren, pool2);
     }
     case 2 /* MAP */: {
-      return LiveMap._deserialize([id, crdt], parentToChildren, pool);
+      return LiveMap._deserialize([id, crdt], parentToChildren, pool2);
     }
     case 3 /* REGISTER */: {
       return crdt.data;
@@ -4747,6 +4743,155 @@ function findNonSerializableValue(value, path = "") {
   return false;
 }
 
+// src/internal.ts
+var kInternal = Symbol();
+
+// src/lib/stringify.ts
+function stringify(object, ...args) {
+  if (typeof object !== "object" || object === null || Array.isArray(object)) {
+    return JSON.stringify(object, ...args);
+  }
+  const sortedObject = Object.keys(object).sort().reduce(
+    (sortedObject2, key) => {
+      sortedObject2[key] = object[key];
+      return sortedObject2;
+    },
+    {}
+  );
+  return JSON.stringify(sortedObject, ...args);
+}
+
+// src/lib/batch.ts
+var DEFAULT_SIZE = 50;
+var DEFAULT_DELAY = 100;
+var noop = () => {
+};
+var BatchCall = class {
+  constructor(args) {
+    this.resolve = noop;
+    this.reject = noop;
+    this.promise = new Promise(noop);
+    this.args = args;
+  }
+};
+var Batch = class {
+  constructor(callback, options) {
+    this.queue = [];
+    this.error = false;
+    this.callback = callback;
+    this.size = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _121 => _121.size]), () => ( DEFAULT_SIZE));
+    this.delay = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _122 => _122.delay]), () => ( DEFAULT_DELAY));
+  }
+  clearDelayTimeout() {
+    if (this.delayTimeoutId !== void 0) {
+      clearTimeout(this.delayTimeoutId);
+      this.delayTimeoutId = void 0;
+    }
+  }
+  schedule() {
+    if (this.queue.length === this.size) {
+      void this.flush();
+    } else if (this.queue.length === 1) {
+      this.clearDelayTimeout();
+      this.delayTimeoutId = setTimeout(() => void this.flush(), this.delay);
+    }
+  }
+  async flush() {
+    if (this.queue.length === 0) {
+      return;
+    }
+    const calls = this.queue.splice(0);
+    const args = calls.map((call) => call.args);
+    try {
+      const results = await this.callback(args);
+      this.error = false;
+      calls.forEach((call, index) => {
+        const result = _optionalChain([results, 'optionalAccess', _123 => _123[index]]);
+        if (!Array.isArray(results)) {
+          call.reject(new Error("Callback must return an array."));
+        } else if (calls.length !== results.length) {
+          call.reject(
+            new Error(
+              `Callback must return an array of the same length as the number of provided items. Expected ${calls.length}, but got ${results.length}.`
+            )
+          );
+        } else if (result instanceof Error) {
+          call.reject(result);
+        } else {
+          call.resolve(result);
+        }
+      });
+    } catch (error3) {
+      this.error = true;
+      calls.forEach((call) => {
+        call.reject(error3);
+      });
+    }
+  }
+  get(...args) {
+    const existingCall = this.queue.find(
+      (call2) => stringify(call2.args) === stringify(args)
+    );
+    if (existingCall) {
+      return existingCall.promise;
+    }
+    const call = new BatchCall(args);
+    call.promise = new Promise((resolve, reject) => {
+      call.resolve = resolve;
+      call.reject = reject;
+    });
+    this.queue.push(call);
+    this.schedule();
+    return call.promise;
+  }
+  clear() {
+    this.queue = [];
+    this.error = false;
+    this.clearDelayTimeout();
+  }
+};
+function createBatchStore(callback, options) {
+  const batch = new Batch(callback, options);
+  const cache = /* @__PURE__ */ new Map();
+  const eventSource2 = makeEventSource();
+  function getCacheKey(args) {
+    return stringify(args);
+  }
+  function setStateAndNotify(cacheKey, state) {
+    if (state) {
+      cache.set(cacheKey, state);
+    } else {
+      cache.delete(cacheKey);
+    }
+    eventSource2.notify(state);
+  }
+  async function get(...args) {
+    const cacheKey = getCacheKey(args);
+    if (cache.has(cacheKey)) {
+      return;
+    }
+    try {
+      setStateAndNotify(cacheKey, { isLoading: true });
+      const result = await batch.get(...args);
+      setStateAndNotify(cacheKey, { isLoading: false, data: result });
+    } catch (error3) {
+      setStateAndNotify(cacheKey, {
+        isLoading: false,
+        error: error3
+      });
+    }
+  }
+  function getState(...args) {
+    const cacheKey = getCacheKey(args);
+    return cache.get(cacheKey);
+  }
+  return {
+    ...eventSource2,
+    get,
+    getState
+  };
+}
+
 // src/lib/debug.ts
 function captureStackTrace(msg, traceRoot) {
   const errorLike = { name: msg };
@@ -4768,6 +4913,133 @@ function isJsonObject(data) {
   return !isJsonScalar(data) && !isJsonArray(data);
 }
 
+// src/lib/objectToQuery.ts
+var identifierRegex = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+function objectToQuery(obj) {
+  let filterList = [];
+  const entries2 = Object.entries(obj);
+  const keyValuePairs = [];
+  const keyValuePairsWithOperator = [];
+  const indexedKeys = [];
+  entries2.forEach(([key, value]) => {
+    if (!identifierRegex.test(key)) {
+      throw new Error("Key must only contain letters, numbers, _");
+    }
+    if (isSimpleValue(value)) {
+      keyValuePairs.push([key, value]);
+    } else if (isValueWithOperator(value)) {
+      keyValuePairsWithOperator.push([key, value]);
+    } else if (typeof value === "object" && !("startsWith" in value)) {
+      indexedKeys.push([key, value]);
+    }
+  });
+  filterList = [
+    ...getFiltersFromKeyValuePairs(keyValuePairs),
+    ...getFiltersFromKeyValuePairsWithOperator(keyValuePairsWithOperator)
+  ];
+  indexedKeys.forEach(([key, value]) => {
+    const nestedEntries = Object.entries(value);
+    const nKeyValuePairs = [];
+    const nKeyValuePairsWithOperator = [];
+    nestedEntries.forEach(([nestedKey, nestedValue]) => {
+      if (isStringEmpty(nestedKey)) {
+        throw new Error("Key cannot be empty");
+      }
+      if (isSimpleValue(nestedValue)) {
+        nKeyValuePairs.push([formatFilterKey(key, nestedKey), nestedValue]);
+      } else if (isValueWithOperator(nestedValue)) {
+        nKeyValuePairsWithOperator.push([
+          formatFilterKey(key, nestedKey),
+          nestedValue
+        ]);
+      }
+    });
+    filterList = [
+      ...filterList,
+      ...getFiltersFromKeyValuePairs(nKeyValuePairs),
+      ...getFiltersFromKeyValuePairsWithOperator(nKeyValuePairsWithOperator)
+    ];
+  });
+  return filterList.map(
+    ({ key, operator, value }) => formatFilter(key, operator, formatFilterValue(value))
+  ).join(" AND ");
+}
+var getFiltersFromKeyValuePairs = (keyValuePairs) => {
+  const filters = [];
+  keyValuePairs.forEach(([key, value]) => {
+    filters.push({
+      key,
+      operator: ":",
+      value
+    });
+  });
+  return filters;
+};
+var getFiltersFromKeyValuePairsWithOperator = (keyValuePairsWithOperator) => {
+  const filters = [];
+  keyValuePairsWithOperator.forEach(([key, value]) => {
+    if ("startsWith" in value && typeof value.startsWith === "string") {
+      filters.push({
+        key,
+        operator: "^",
+        value: value.startsWith
+      });
+    }
+  });
+  return filters;
+};
+var isSimpleValue = (value) => {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return true;
+  }
+  return false;
+};
+var isValueWithOperator = (value) => {
+  if (typeof value === "object" && value !== null && "startsWith" in value) {
+    return true;
+  }
+  return false;
+};
+var formatFilter = (key, operator, value) => {
+  return `${key}${operator}${value}`;
+};
+var formatFilterKey = (key, nestedKey) => {
+  if (nestedKey) {
+    return `${key}[${JSON.stringify(nestedKey)}]`;
+  }
+  return key;
+};
+var formatFilterValue = (value) => {
+  if (typeof value === "string") {
+    if (isStringEmpty(value)) {
+      throw new Error("Value cannot be empty");
+    }
+    return JSON.stringify(value);
+  }
+  return value.toString();
+};
+var isStringEmpty = (value) => {
+  return !value || value.toString().trim() === "";
+};
+
+// src/lib/url.ts
+function toURLSearchParams(params) {
+  const result = new URLSearchParams();
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== void 0 && value !== null) {
+      result.set(key, value.toString());
+    }
+  }
+  return result;
+}
+function urljoin(baseUrl, path, params) {
+  const url = new URL(path, baseUrl);
+  if (params !== void 0) {
+    url.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
+  }
+  return url.toString();
+}
+
 // src/protocol/ClientMsg.ts
 var ClientMsgCode = /* @__PURE__ */ ((ClientMsgCode2) => {
   ClientMsgCode2[ClientMsgCode2["UPDATE_PRESENCE"] = 100] = "UPDATE_PRESENCE";
@@ -5018,15 +5290,15 @@ function installBackgroundTabSpy() {
   const doc = typeof document !== "undefined" ? document : void 0;
   const inBackgroundSince = { current: null };
   function onVisibilityChange() {
-    if (_optionalChain([doc, 'optionalAccess', _120 => _120.visibilityState]) === "hidden") {
+    if (_optionalChain([doc, 'optionalAccess', _124 => _124.visibilityState]) === "hidden") {
       inBackgroundSince.current = _nullishCoalesce(inBackgroundSince.current, () => ( Date.now()));
     } else {
       inBackgroundSince.current = null;
     }
   }
-  _optionalChain([doc, 'optionalAccess', _121 => _121.addEventListener, 'call', _122 => _122("visibilitychange", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _125 => _125.addEventListener, 'call', _126 => _126("visibilitychange", onVisibilityChange)]);
   const unsub = () => {
-    _optionalChain([doc, 'optionalAccess', _123 => _123.removeEventListener, 'call', _124 => _124("visibilitychange", onVisibilityChange)]);
+    _optionalChain([doc, 'optionalAccess', _127 => _127.removeEventListener, 'call', _128 => _128("visibilitychange", onVisibilityChange)]);
   };
   return [inBackgroundSince, unsub];
 }
@@ -5055,7 +5327,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
             response.status,
             errorBody
           );
-        } catch (e5) {
+        } catch (e3) {
           error3 = new CommentsApiError(response.statusText, response.status);
         }
         throw error3;
@@ -5064,25 +5336,26 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     let body;
     try {
       body = await response.json();
-    } catch (e6) {
+    } catch (e4) {
       body = {};
     }
     return body;
   }
   async function getThreads(options) {
+    let query;
+    if (_optionalChain([options, 'optionalAccess', _129 => _129.query])) {
+      query = objectToQuery(options.query);
+    }
     const response = await fetchCommentsApi(
-      "/threads/search",
+      "/threads",
       {
-        since: _optionalChain([options, 'optionalAccess', _125 => _125.since, 'optionalAccess', _126 => _126.toISOString, 'call', _127 => _127()])
+        since: _optionalChain([options, 'optionalAccess', _130 => _130.since, 'optionalAccess', _131 => _131.toISOString, 'call', _132 => _132()]),
+        query
       },
       {
-        body: JSON.stringify({
-          ..._optionalChain([options, 'optionalAccess', _128 => _128.query, 'optionalAccess', _129 => _129.metadata]) && { metadata: options.query.metadata }
-        }),
         headers: {
           "Content-Type": "application/json"
-        },
-        method: "POST"
+        }
       }
     );
     if (response.ok) {
@@ -5138,23 +5411,20 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     commentId,
     threadId
   }) {
-    const thread = await fetchJson(
-      "/threads",
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
+    const thread = await fetchJson("/threads", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        id: threadId,
+        comment: {
+          id: commentId,
+          body
         },
-        body: JSON.stringify({
-          id: threadId,
-          comment: {
-            id: commentId,
-            body
-          },
-          metadata
-        })
-      }
-    );
+        metadata
+      })
+    });
     return convertToThreadData(thread);
   }
   async function editThreadMetadata({
@@ -5271,7 +5541,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     removeReaction: removeReaction2
   };
 }
-var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 = 50;
+var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY = 50;
 function createRoom(options, config) {
   const initialPresence = typeof options.initialPresence === "function" ? options.initialPresence(config.roomId) : options.initialPresence;
   const initialStorage = typeof options.initialStorage === "function" ? options.initialStorage(config.roomId) : options.initialStorage;
@@ -5416,7 +5686,7 @@ function createRoom(options, config) {
       eventHub.error.notify(err);
     });
   });
-  const pool = {
+  const pool2 = {
     roomId: config.roomId,
     getNode: (id) => context.nodes.get(id),
     addNode: (id, node) => void context.nodes.set(id, node),
@@ -5436,7 +5706,9 @@ function createRoom(options, config) {
         }
       }
       if (activeBatch) {
-        activeBatch.ops.push(...ops);
+        for (const op of ops) {
+          activeBatch.ops.push(op);
+        }
         for (const [key, value] of storageUpdates) {
           activeBatch.updates.storageUpdates.set(
             key,
@@ -5457,7 +5729,7 @@ function createRoom(options, config) {
       }
     },
     assertStorageIsWritable: () => {
-      const scopes = _optionalChain([context, 'access', _130 => _130.dynamicSessionInfo, 'access', _131 => _131.current, 'optionalAccess', _132 => _132.scopes]);
+      const scopes = _optionalChain([context, 'access', _133 => _133.dynamicSessionInfo, 'access', _134 => _134.current, 'optionalAccess', _135 => _135.scopes]);
       if (scopes === void 0) {
         return;
       }
@@ -5493,12 +5765,12 @@ function createRoom(options, config) {
       `/v2/c/rooms/${encodeURIComponent(roomId)}${endpoint}`,
       params
     );
-    const fetcher = _optionalChain([config, 'access', _133 => _133.polyfills, 'optionalAccess', _134 => _134.fetch]) || /* istanbul ignore next */
+    const fetcher = _optionalChain([config, 'access', _136 => _136.polyfills, 'optionalAccess', _137 => _137.fetch]) || /* istanbul ignore next */
     fetch;
     return await fetcher(url, {
       ...options2,
       headers: {
-        ..._optionalChain([options2, 'optionalAccess', _135 => _135.headers]),
+        ..._optionalChain([options2, 'optionalAccess', _138 => _138.headers]),
         Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`
       }
     });
@@ -5509,23 +5781,62 @@ function createRoom(options, config) {
       headers: {
         "Content-Type": "application/json"
       }
-    });
+    });
+  }
+  async function httpPostToRoom(endpoint, body) {
+    if (!managedSocket.authValue) {
+      throw new Error("Not authorized");
+    }
+    return fetchClientApi(config.roomId, endpoint, managedSocket.authValue, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body)
+    });
+  }
+  async function createTextMention(userId, mentionId) {
+    if (!managedSocket.authValue) {
+      throw new Error("Not authorized");
+    }
+    return fetchClientApi(
+      config.roomId,
+      "/text-mentions",
+      managedSocket.authValue,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          userId,
+          mentionId
+        })
+      }
+    );
   }
-  async function httpPostToRoom(endpoint, body) {
+  async function deleteTextMention(mentionId) {
     if (!managedSocket.authValue) {
       throw new Error("Not authorized");
     }
-    return fetchClientApi(config.roomId, endpoint, managedSocket.authValue, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body)
+    return fetchClientApi(
+      config.roomId,
+      `/text-mentions/${mentionId}`,
+      managedSocket.authValue,
+      {
+        method: "DELETE"
+      }
+    );
+  }
+  async function reportTextEditor(type, rootKey) {
+    return httpPostToRoom("/text-metadata", {
+      type,
+      rootKey
     });
   }
   function sendMessages(messages) {
     const serializedPayload = JSON.stringify(messages);
-    const nonce = _optionalChain([context, 'access', _136 => _136.dynamicSessionInfo, 'access', _137 => _137.current, 'optionalAccess', _138 => _138.nonce]);
+    const nonce = _optionalChain([context, 'access', _139 => _139.dynamicSessionInfo, 'access', _140 => _140.current, 'optionalAccess', _141 => _141.nonce]);
     if (config.unstable_fallbackToHTTP && nonce) {
       const size = new TextEncoder().encode(serializedPayload).length;
       if (size > MAX_SOCKET_MESSAGE_SIZE) {
@@ -5587,7 +5898,7 @@ function createRoom(options, config) {
     if (context.root !== void 0) {
       updateRoot(message.items, batchedUpdatesWrapper);
     } else {
-      context.root = LiveObject._fromItems(message.items, pool);
+      context.root = LiveObject._fromItems(message.items, pool2);
     }
     const stackSizeBefore = context.undoStack.length;
     for (const key in context.initialStorage) {
@@ -5662,7 +5973,7 @@ function createRoom(options, config) {
     const createdNodeIds = /* @__PURE__ */ new Set();
     const ops = rawOps.map((op) => {
       if (op.type !== "presence" && !op.opId) {
-        return { ...op, opId: pool.generateOpId() };
+        return { ...op, opId: pool2.generateOpId() };
       } else {
         return op;
       }
@@ -5787,7 +6098,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _139 => _139.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _142 => _142.addToHistory])) {
         context.activeBatch.reverseOps.unshift({
           type: "presence",
           data: oldValues
@@ -5797,7 +6108,7 @@ function createRoom(options, config) {
     } else {
       flushNowOrSoon();
       batchUpdates(() => {
-        if (_optionalChain([options2, 'optionalAccess', _140 => _140.addToHistory])) {
+        if (_optionalChain([options2, 'optionalAccess', _143 => _143.addToHistory])) {
           addToUndoStack(
             [{ type: "presence", data: oldValues }],
             doNotBatchUpdates
@@ -5995,7 +6306,7 @@ function createRoom(options, config) {
             if (process.env.NODE_ENV !== "production") {
               const traces = /* @__PURE__ */ new Set();
               for (const opId of message.opIds) {
-                const trace = _optionalChain([context, 'access', _141 => _141.opStackTraces, 'optionalAccess', _142 => _142.get, 'call', _143 => _143(opId)]);
+                const trace = _optionalChain([context, 'access', _144 => _144.opStackTraces, 'optionalAccess', _145 => _145.get, 'call', _146 => _146(opId)]);
                 if (trace) {
                   traces.add(trace);
                 }
@@ -6115,7 +6426,10 @@ ${Array.from(traces).join("\n\n")}`
     flushNowOrSoon();
   }
   function dispatchOps(ops) {
-    context.buffer.storageOperations.push(...ops);
+    const { storageOperations } = context.buffer;
+    for (const op of ops) {
+      storageOperations.push(op);
+    }
     flushNowOrSoon();
   }
   let _getStorage$ = null;
@@ -6124,7 +6438,7 @@ ${Array.from(traces).join("\n\n")}`
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
     createOrUpdateRootFromMessage(message, doNotBatchUpdates);
     applyAndSendOps(unacknowledgedOps, doNotBatchUpdates);
-    _optionalChain([_resolveStoragePromise, 'optionalCall', _144 => _144()]);
+    _optionalChain([_resolveStoragePromise, 'optionalCall', _147 => _147()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
@@ -6341,7 +6655,7 @@ ${Array.from(traces).join("\n\n")}`
             response.status,
             errorBody
           );
-        } catch (e7) {
+        } catch (e5) {
           error3 = new NotificationsApiError(
             response.statusText,
             response.status
@@ -6353,7 +6667,7 @@ ${Array.from(traces).join("\n\n")}`
     let body;
     try {
       body = await response.json();
-    } catch (e8) {
+    } catch (e6) {
       body = {};
     }
     return body;
@@ -6390,7 +6704,7 @@ ${Array.from(traces).join("\n\n")}`
       await markInboxNotificationsAsRead(inboxNotificationIds);
       return inboxNotificationIds;
     },
-    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 }
+    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY }
   );
   async function markInboxNotificationAsRead(inboxNotificationId) {
     await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
@@ -6399,7 +6713,7 @@ ${Array.from(traces).join("\n\n")}`
     {
       [kInternal]: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _145 => _145.buffer, 'access', _146 => _146.presenceUpdates, 'optionalAccess', _147 => _147.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _148 => _148.buffer, 'access', _149 => _149.presenceUpdates, 'optionalAccess', _150 => _150.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -6410,6 +6724,12 @@ ${Array.from(traces).join("\n\n")}`
           return context.nodes.size;
         },
         // prettier-ignore
+        // send metadata when using a text editor
+        reportTextEditor,
+        // create a text mention when using a text editor
+        createTextMention,
+        // delete a text mention when using a text editor
+        deleteTextMention,
         // Support for the Liveblocks browser extension
         getSelf_forDevTools: () => selfAsTreeNode.current,
         getOthers_forDevTools: () => others_forDevTools.current,
@@ -6548,7 +6868,7 @@ function makeClassicSubscribeFn(events) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _148 => _148.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _151 => _151.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -6594,469 +6914,405 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
   };
 }
 
-// src/store.ts
-function createClientStore() {
-  const store = createStore({
-    threads: {},
-    queries: {},
-    optimisticUpdates: [],
-    inboxNotifications: {},
-    notificationSettings: {}
-  });
-  return {
-    ...store,
-    deleteThread(threadId) {
-      store.set((state) => {
-        return {
-          ...state,
-          threads: deleteKeyImmutable(state.threads, threadId),
-          inboxNotifications: Object.fromEntries(
-            Object.entries(state.inboxNotifications).filter(
-              ([_id, notification]) => notification.threadId !== threadId
-            )
-          )
-        };
-      });
-    },
-    updateThreadAndNotification(thread, inboxNotification) {
-      store.set((state) => {
-        const existingThread = state.threads[thread.id];
-        return {
-          ...state,
-          threads: existingThread === void 0 || compareThreads(thread, existingThread) === 1 ? { ...state.threads, [thread.id]: thread } : state.threads,
-          inboxNotifications: inboxNotification === void 0 ? state.inboxNotifications : {
-            ...state.inboxNotifications,
-            [inboxNotification.id]: inboxNotification
-          }
-        };
-      });
-    },
-    updateThreadsAndNotifications(threads, inboxNotifications, deletedThreads, deletedInboxNotifications, queryKey) {
-      store.set((state) => ({
-        ...state,
-        threads: applyThreadUpdates(state.threads, {
-          newThreads: threads,
-          deletedThreads
-        }),
-        inboxNotifications: applyNotificationsUpdates(
-          state.inboxNotifications,
-          {
-            newInboxNotifications: inboxNotifications,
-            deletedNotifications: deletedInboxNotifications
-          }
-        ),
-        queries: queryKey !== void 0 ? {
-          ...state.queries,
-          [queryKey]: {
-            isLoading: false
-          }
-        } : state.queries
-      }));
-    },
-    updateRoomInboxNotificationSettings(roomId, settings, queryKey) {
-      store.set((state) => ({
-        ...state,
-        notificationSettings: {
-          ...state.notificationSettings,
-          [roomId]: settings
-        },
-        queries: {
-          ...state.queries,
-          [queryKey]: {
-            isLoading: false
+// src/comments/lib/selected-threads.ts
+function selectedThreads(roomId, state, options) {
+  const result = applyOptimisticUpdates(state);
+  const threads = Object.values(result.threads).filter(
+    (thread) => {
+      if (thread.roomId !== roomId)
+        return false;
+      if (thread.deletedAt !== void 0) {
+        return false;
+      }
+      const query = options.query;
+      if (!query)
+        return true;
+      for (const key in query.metadata) {
+        const metadataValue = thread.metadata[key];
+        const filterValue = query.metadata[key];
+        if (assertFilterIsStartsWithOperator(filterValue) && assertMetadataValueIsString(metadataValue)) {
+          if (metadataValue.startsWith(filterValue.startsWith)) {
+            return true;
           }
         }
-      }));
-    },
-    pushOptimisticUpdate(optimisticUpdate) {
-      store.set((state) => ({
-        ...state,
-        optimisticUpdates: [...state.optimisticUpdates, optimisticUpdate]
-      }));
-    },
-    setQueryState(queryKey, queryState) {
-      store.set((state) => ({
-        ...state,
-        queries: {
-          ...state.queries,
-          [queryKey]: queryState
+        if (metadataValue !== filterValue) {
+          return false;
         }
-      }));
+      }
+      return true;
     }
-  };
-}
-function deleteKeyImmutable(record, key) {
-  if (Object.prototype.hasOwnProperty.call(record, key)) {
-    const { [key]: _toDelete, ...rest } = record;
-    return rest;
-  }
-  return record;
+  );
+  return threads.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
 }
-function compareThreads(thread1, thread2) {
-  if (thread1.updatedAt && thread2.updatedAt) {
-    return thread1.updatedAt > thread2.updatedAt ? 1 : thread1.updatedAt < thread2.updatedAt ? -1 : 0;
-  } else if (thread1.updatedAt || thread2.updatedAt) {
-    return thread1.updatedAt ? 1 : -1;
-  }
-  if (thread1.createdAt > thread2.createdAt) {
-    return 1;
-  } else if (thread1.createdAt < thread2.createdAt) {
-    return -1;
+var assertFilterIsStartsWithOperator = (filter) => {
+  if (typeof filter === "object" && typeof filter.startsWith === "string") {
+    return true;
+  } else {
+    return false;
   }
-  return 0;
-}
-function applyOptimisticUpdates(state) {
-  const result = {
-    threads: {
-      ...state.threads
-    },
-    inboxNotifications: {
-      ...state.inboxNotifications
-    },
-    notificationSettings: {
-      ...state.notificationSettings
-    }
-  };
-  for (const optimisticUpdate of state.optimisticUpdates) {
-    switch (optimisticUpdate.type) {
-      case "create-thread": {
-        result.threads[optimisticUpdate.thread.id] = optimisticUpdate.thread;
-        break;
-      }
-      case "edit-thread-metadata": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        if (thread.deletedAt !== void 0) {
-          break;
-        }
-        if (thread.updatedAt !== void 0 && thread.updatedAt > optimisticUpdate.updatedAt) {
-          break;
-        }
-        result.threads[thread.id] = {
-          ...thread,
-          updatedAt: optimisticUpdate.updatedAt,
-          metadata: {
-            ...thread.metadata,
-            ...optimisticUpdate.metadata
-          }
-        };
-        break;
-      }
-      case "create-comment": {
-        const thread = result.threads[optimisticUpdate.comment.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = upsertComment(
-          thread,
-          optimisticUpdate.comment
-        );
-        const inboxNotification = Object.values(result.inboxNotifications).find(
-          (notification) => notification.threadId === thread.id
-        );
-        if (inboxNotification === void 0) {
-          break;
-        }
-        result.inboxNotifications[inboxNotification.id] = {
-          ...inboxNotification,
-          notifiedAt: optimisticUpdate.comment.createdAt,
-          readAt: optimisticUpdate.comment.createdAt
-        };
-        break;
-      }
-      case "edit-comment": {
-        const thread = result.threads[optimisticUpdate.comment.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = upsertComment(
-          thread,
-          optimisticUpdate.comment
-        );
-        break;
-      }
-      case "delete-comment": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = deleteComment(
-          thread,
-          optimisticUpdate.commentId,
-          optimisticUpdate.deletedAt
-        );
-        break;
-      }
-      case "add-reaction": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = addReaction(
-          thread,
-          optimisticUpdate.commentId,
-          optimisticUpdate.reaction
-        );
-        break;
-      }
-      case "remove-reaction": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = removeReaction(
-          thread,
-          optimisticUpdate.commentId,
-          optimisticUpdate.emoji,
-          optimisticUpdate.userId,
-          optimisticUpdate.removedAt
-        );
-        break;
-      }
-      case "mark-inbox-notification-as-read": {
-        result.inboxNotifications[optimisticUpdate.inboxNotificationId] = {
-          ...state.inboxNotifications[optimisticUpdate.inboxNotificationId],
-          readAt: optimisticUpdate.readAt
-        };
-        break;
-      }
-      case "mark-inbox-notifications-as-read": {
-        for (const id in result.inboxNotifications) {
-          result.inboxNotifications[id] = {
-            ...result.inboxNotifications[id],
-            readAt: optimisticUpdate.readAt
-          };
+};
+var assertMetadataValueIsString = (value) => {
+  return typeof value === "string";
+};
+
+// src/constants.ts
+var DEFAULT_BASE_URL = "https://api.liveblocks.io";
+
+// src/devtools/bridge.ts
+var _bridgeActive = false;
+function activateBridge(allowed) {
+  _bridgeActive = allowed;
+}
+function sendToPanel(message, options) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
+  }
+  const fullMsg = {
+    ...message,
+    source: "liveblocks-devtools-client"
+  };
+  if (!(_optionalChain([options, 'optionalAccess', _152 => _152.force]) || _bridgeActive)) {
+    return;
+  }
+  window.postMessage(fullMsg, "*");
+}
+var eventSource = makeEventSource();
+if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
+  window.addEventListener("message", (event) => {
+    if (event.source === window && _optionalChain([event, 'access', _153 => _153.data, 'optionalAccess', _154 => _154.source]) === "liveblocks-devtools-panel") {
+      eventSource.notify(event.data);
+    } else {
+    }
+  });
+}
+var onMessageFromPanel = eventSource.observable;
+
+// src/devtools/index.ts
+var VERSION = PKG_VERSION || "dev";
+var _devtoolsSetupHasRun = false;
+function setupDevTools(getAllRooms) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
+  }
+  if (_devtoolsSetupHasRun) {
+    return;
+  }
+  _devtoolsSetupHasRun = true;
+  onMessageFromPanel.subscribe((msg) => {
+    switch (msg.msg) {
+      case "connect": {
+        activateBridge(true);
+        for (const roomId of getAllRooms()) {
+          sendToPanel({
+            msg: "room::available",
+            roomId,
+            clientVersion: VERSION
+          });
         }
         break;
       }
-      case "update-notification-settings": {
-        result.notificationSettings[optimisticUpdate.roomId] = {
-          ...result.notificationSettings[optimisticUpdate.roomId],
-          ...optimisticUpdate.settings
-        };
-      }
     }
+  });
+  sendToPanel({ msg: "wake-up-devtools" }, { force: true });
+}
+var unsubsByRoomId = /* @__PURE__ */ new Map();
+function stopSyncStream(roomId) {
+  const unsubs = _nullishCoalesce(unsubsByRoomId.get(roomId), () => ( []));
+  unsubsByRoomId.delete(roomId);
+  for (const unsub of unsubs) {
+    unsub();
   }
-  return result;
 }
-function applyThreadUpdates(existingThreads, updates) {
-  const updatedThreads = { ...existingThreads };
-  updates.newThreads.forEach((thread) => {
-    const existingThread = updatedThreads[thread.id];
-    if (existingThread) {
-      const result = compareThreads(existingThread, thread);
-      if (result === 1)
-        return;
-    }
-    updatedThreads[thread.id] = thread;
-  });
-  updates.deletedThreads.forEach(({ id, deletedAt }) => {
-    const existingThread = updatedThreads[id];
-    if (existingThread === void 0)
-      return;
-    existingThread.deletedAt = deletedAt;
-    existingThread.updatedAt = deletedAt;
-    existingThread.comments = [];
+function startSyncStream(room) {
+  stopSyncStream(room.id);
+  fullSync(room);
+  unsubsByRoomId.set(room.id, [
+    // When the connection status changes
+    room.events.status.subscribe(() => partialSyncConnection(room)),
+    // When storage initializes, send the update
+    room.events.storageDidLoad.subscribeOnce(() => partialSyncStorage(room)),
+    // Any time storage updates, send the new storage root
+    room.events.storage.subscribe(() => partialSyncStorage(room)),
+    // Any time "me" or "others" updates, send the new values accordingly
+    room.events.self.subscribe(() => partialSyncMe(room)),
+    room.events.others.subscribe(() => partialSyncOthers(room)),
+    // Any time ydoc is updated, forward the update
+    room.events.ydoc.subscribe((update) => syncYdocUpdate(room, update)),
+    // Any time a custom room event is received, forward it
+    room.events.customEvent.subscribe(
+      (eventData) => forwardEvent(room, eventData)
+    )
+  ]);
+}
+function syncYdocUpdate(room, update) {
+  sendToPanel({
+    msg: "room::sync::ydoc",
+    roomId: room.id,
+    update
   });
-  return updatedThreads;
 }
-function applyNotificationsUpdates(existingInboxNotifications, updates) {
-  const updatedInboxNotifications = { ...existingInboxNotifications };
-  updates.newInboxNotifications.forEach((notification) => {
-    const existingNotification = updatedInboxNotifications[notification.id];
-    if (existingNotification) {
-      const result = compareInboxNotifications(
-        existingNotification,
-        notification
-      );
-      if (result === 1)
-        return;
+var loadedAt = Date.now();
+var eventCounter = 0;
+function nextEventId() {
+  return `event-${loadedAt}-${eventCounter++}`;
+}
+function forwardEvent(room, eventData) {
+  sendToPanel({
+    msg: "room::events::custom-event",
+    roomId: room.id,
+    event: {
+      type: "CustomEvent",
+      id: nextEventId(),
+      key: "Event",
+      connectionId: eventData.connectionId,
+      payload: eventData.event
     }
-    updatedInboxNotifications[notification.id] = notification;
   });
-  updates.deletedNotifications.forEach(
-    ({ id }) => delete updatedInboxNotifications[id]
-  );
-  return updatedInboxNotifications;
 }
-function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
-  if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
-    return 1;
-  } else if (inboxNotificationA.notifiedAt < inboxNotificationB.notifiedAt) {
-    return -1;
+function partialSyncConnection(room) {
+  sendToPanel({
+    msg: "room::sync::partial",
+    roomId: room.id,
+    status: room.getStatus()
+  });
+}
+function partialSyncStorage(room) {
+  const root = room.getStorageSnapshot();
+  if (root) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      storage: root.toTreeNode("root").payload
+    });
   }
-  if (inboxNotificationA.readAt && inboxNotificationB.readAt) {
-    return inboxNotificationA.readAt > inboxNotificationB.readAt ? 1 : inboxNotificationA.readAt < inboxNotificationB.readAt ? -1 : 0;
-  } else if (inboxNotificationA.readAt || inboxNotificationB.readAt) {
-    return inboxNotificationA.readAt ? 1 : -1;
+}
+function partialSyncMe(room) {
+  const me = room[kInternal].getSelf_forDevTools();
+  if (me) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      me
+    });
   }
-  return 0;
 }
-function upsertComment(thread, comment) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
+function partialSyncOthers(room) {
+  const others = room[kInternal].getOthers_forDevTools();
+  if (others) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      others
+    });
   }
-  if (comment.threadId !== thread.id) {
-    warn(
-      `Comment ${comment.id} does not belong to thread ${thread.id}`
-    );
-    return thread;
+}
+function fullSync(room) {
+  const root = room.getStorageSnapshot();
+  const me = room[kInternal].getSelf_forDevTools();
+  const others = room[kInternal].getOthers_forDevTools();
+  room.fetchYDoc("");
+  sendToPanel({
+    msg: "room::sync::full",
+    roomId: room.id,
+    status: room.getStatus(),
+    storage: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _155 => _155.toTreeNode, 'call', _156 => _156("root"), 'access', _157 => _157.payload]), () => ( null)),
+    me,
+    others
+  });
+}
+var roomChannelListeners = /* @__PURE__ */ new Map();
+function stopRoomChannelListener(roomId) {
+  const listener = roomChannelListeners.get(roomId);
+  roomChannelListeners.delete(roomId);
+  if (listener) {
+    listener();
   }
-  const existingComment = thread.comments.find(
-    (existingComment2) => existingComment2.id === comment.id
+}
+function linkDevTools(roomId, room) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
+  }
+  sendToPanel({ msg: "room::available", roomId, clientVersion: VERSION });
+  stopRoomChannelListener(roomId);
+  roomChannelListeners.set(
+    roomId,
+    // Returns the unsubscribe callback, that we store in the
+    // roomChannelListeners registry
+    onMessageFromPanel.subscribe((msg) => {
+      switch (msg.msg) {
+        case "room::subscribe": {
+          if (msg.roomId === roomId) {
+            startSyncStream(room);
+          }
+          break;
+        }
+        case "room::unsubscribe": {
+          if (msg.roomId === roomId) {
+            stopSyncStream(roomId);
+          }
+          break;
+        }
+      }
+    })
   );
-  if (existingComment === void 0) {
-    const updatedAt = new Date(
-      Math.max(_optionalChain([thread, 'access', _149 => _149.updatedAt, 'optionalAccess', _150 => _150.getTime, 'call', _151 => _151()]) || 0, comment.createdAt.getTime())
-    );
-    const updatedThread = {
-      ...thread,
-      updatedAt,
-      comments: [...thread.comments, comment]
-    };
-    return updatedThread;
+}
+function unlinkDevTools(roomId) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
   }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
+  stopSyncStream(roomId);
+  stopRoomChannelListener(roomId);
+  sendToPanel({
+    msg: "room::unavailable",
+    roomId
+  });
+}
+
+// src/lib/deprecation.ts
+var _emittedDeprecationWarnings = /* @__PURE__ */ new Set();
+function deprecate(message, key = message) {
+  if (process.env.NODE_ENV !== "production") {
+    if (!_emittedDeprecationWarnings.has(key)) {
+      _emittedDeprecationWarnings.add(key);
+      errorWithTitle("Deprecation warning", message);
+    }
   }
-  if (existingComment.editedAt === void 0 || comment.editedAt === void 0 || existingComment.editedAt <= comment.editedAt) {
-    const updatedComments = thread.comments.map(
-      (existingComment2) => existingComment2.id === comment.id ? comment : existingComment2
-    );
-    const updatedThread = {
-      ...thread,
-      updatedAt: new Date(
-        Math.max(
-          _optionalChain([thread, 'access', _152 => _152.updatedAt, 'optionalAccess', _153 => _153.getTime, 'call', _154 => _154()]) || 0,
-          _optionalChain([comment, 'access', _155 => _155.editedAt, 'optionalAccess', _156 => _156.getTime, 'call', _157 => _157()]) || comment.createdAt.getTime()
-        )
-      ),
-      comments: updatedComments
-    };
-    return updatedThread;
+}
+function deprecateIf(condition, message, key = message) {
+  if (process.env.NODE_ENV !== "production") {
+    if (condition) {
+      deprecate(message, key);
+    }
   }
-  return thread;
 }
-function deleteComment(thread, commentId, deletedAt) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
+function throwUsageError(message) {
+  if (process.env.NODE_ENV !== "production") {
+    const usageError = new Error(message);
+    usageError.name = "Usage error";
+    errorWithTitle("Usage error", message);
+    throw usageError;
   }
-  const existingComment = thread.comments.find(
-    (comment) => comment.id === commentId
-  );
-  if (existingComment === void 0) {
-    return thread;
+}
+function errorIf(condition, message) {
+  if (process.env.NODE_ENV !== "production") {
+    if (condition) {
+      throwUsageError(message);
+    }
   }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
+}
+
+// src/notifications.ts
+var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 = 50;
+function createNotificationsApi({
+  baseUrl,
+  authManager,
+  currentUserIdStore,
+  fetcher
+}) {
+  async function fetchJson(endpoint, options, params) {
+    const authValue = await authManager.getAuthValue({
+      requestedScope: "comments:read"
+    });
+    if (authValue.type === "secret" && authValue.token.parsed.k === "acc" /* ACCESS_TOKEN */) {
+      const userId = authValue.token.parsed.uid;
+      currentUserIdStore.set(() => userId);
+    }
+    const url = urljoin(baseUrl, `/v2/c${endpoint}`, params);
+    const response = await fetcher(url.toString(), {
+      ...options,
+      headers: {
+        ..._optionalChain([options, 'optionalAccess', _158 => _158.headers]),
+        Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`
+      }
+    });
+    if (!response.ok) {
+      if (response.status >= 400 && response.status < 600) {
+        let error3;
+        try {
+          const errorBody = await response.json();
+          error3 = new NotificationsApiError(
+            errorBody.message,
+            response.status,
+            errorBody
+          );
+        } catch (e7) {
+          error3 = new NotificationsApiError(
+            response.statusText,
+            response.status
+          );
+        }
+        throw error3;
+      }
+    }
+    let body;
+    try {
+      body = await response.json();
+    } catch (e8) {
+      body = {};
+    }
+    return body;
   }
-  const updatedComments = thread.comments.map(
-    (comment) => comment.id === commentId ? {
-      ...comment,
-      deletedAt,
-      body: void 0
-    } : comment
-  );
-  if (!updatedComments.some((comment) => comment.deletedAt === void 0)) {
+  async function getInboxNotifications(options) {
+    const json = await fetchJson("/inbox-notifications", void 0, {
+      limit: _optionalChain([options, 'optionalAccess', _159 => _159.limit]),
+      since: _optionalChain([options, 'optionalAccess', _160 => _160.since, 'optionalAccess', _161 => _161.toISOString, 'call', _162 => _162()])
+    });
     return {
-      ...thread,
-      deletedAt,
-      updatedAt: deletedAt,
-      comments: []
+      threads: json.threads.map((thread) => convertToThreadData(thread)),
+      inboxNotifications: json.inboxNotifications.map(
+        (notification) => convertToInboxNotificationData(notification)
+      ),
+      deletedThreads: json.deletedThreads.map(
+        (info) => convertToThreadDeleteInfo(info)
+      ),
+      deletedInboxNotifications: json.deletedInboxNotifications.map(
+        (info) => convertToInboxNotificationDeleteInfo(info)
+      ),
+      meta: {
+        requestedAt: new Date(json.meta.requestedAt)
+      }
     };
   }
-  return {
-    ...thread,
-    updatedAt: deletedAt,
-    comments: updatedComments
-  };
-}
-function addReaction(thread, commentId, reaction) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
-  }
-  const existingComment = thread.comments.find(
-    (comment) => comment.id === commentId
-  );
-  if (existingComment === void 0) {
-    return thread;
+  async function getUnreadInboxNotificationsCount() {
+    const { count } = await fetchJson("/inbox-notifications/count");
+    return count;
   }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
+  async function markAllInboxNotificationsAsRead() {
+    await fetchJson("/inbox-notifications/read", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ inboxNotificationIds: "all" })
+    });
   }
-  const updatedComments = thread.comments.map(
-    (comment) => comment.id === commentId ? {
-      ...comment,
-      reactions: upsertReaction(comment.reactions, reaction)
-    } : comment
-  );
-  return {
-    ...thread,
-    updatedAt: new Date(
-      Math.max(reaction.createdAt.getTime(), _optionalChain([thread, 'access', _158 => _158.updatedAt, 'optionalAccess', _159 => _159.getTime, 'call', _160 => _160()]) || 0)
-    ),
-    comments: updatedComments
-  };
-}
-function removeReaction(thread, commentId, emoji, userId, removedAt) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
+  async function markInboxNotificationsAsRead(inboxNotificationIds) {
+    await fetchJson("/inbox-notifications/read", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ inboxNotificationIds })
+    });
   }
-  const existingComment = thread.comments.find(
-    (comment) => comment.id === commentId
+  const batchedMarkInboxNotificationsAsRead = new Batch(
+    async (batchedInboxNotificationIds) => {
+      const inboxNotificationIds = batchedInboxNotificationIds.flat();
+      await markInboxNotificationsAsRead(inboxNotificationIds);
+      return inboxNotificationIds;
+    },
+    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 }
   );
-  if (existingComment === void 0) {
-    return thread;
-  }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
+  async function markInboxNotificationAsRead(inboxNotificationId) {
+    await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
   }
-  const updatedComments = thread.comments.map(
-    (comment) => comment.id === commentId ? {
-      ...comment,
-      reactions: comment.reactions.map(
-        (reaction) => reaction.emoji === emoji ? {
-          ...reaction,
-          users: reaction.users.filter((user) => user.id !== userId)
-        } : reaction
-      ).filter((reaction) => reaction.users.length > 0)
-      // Remove reactions with no users left
-    } : comment
-  );
   return {
-    ...thread,
-    updatedAt: new Date(
-      Math.max(removedAt.getTime(), _optionalChain([thread, 'access', _161 => _161.updatedAt, 'optionalAccess', _162 => _162.getTime, 'call', _163 => _163()]) || 0)
-    ),
-    comments: updatedComments
+    getInboxNotifications,
+    getUnreadInboxNotificationsCount,
+    markAllInboxNotificationsAsRead,
+    markInboxNotificationAsRead
   };
 }
-function upsertReaction(reactions, reaction) {
-  const existingReaction = reactions.find(
-    (existingReaction2) => existingReaction2.emoji === reaction.emoji
-  );
-  if (existingReaction === void 0) {
-    return [
-      ...reactions,
-      {
-        emoji: reaction.emoji,
-        createdAt: reaction.createdAt,
-        users: [{ id: reaction.userId }]
-      }
-    ];
-  }
-  if (existingReaction.users.some((user) => user.id === reaction.userId) === false) {
-    return reactions.map(
-      (existingReaction2) => existingReaction2.emoji === reaction.emoji ? {
-        ...existingReaction2,
-        users: [...existingReaction2.users, { id: reaction.userId }]
-      } : existingReaction2
-    );
-  }
-  return reactions;
-}
 
 // src/client.ts
 var MIN_THROTTLE = 16;
@@ -7143,12 +7399,12 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _164 => _164.polyfills, 'optionalAccess', _165 => _165.WebSocket])
+            _optionalChain([clientOptions, 'access', _163 => _163.polyfills, 'optionalAccess', _164 => _164.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
-        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _166 => _166.unstable_batchedUpdates]),
+        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _165 => _165.unstable_batchedUpdates]),
         baseUrl,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData
@@ -7164,7 +7420,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(_nullishCoalesce(options2.autoConnect, () => ( options2.shouldInitiallyConnect)), () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _167 => _167.polyfills, 'optionalAccess', _168 => _168.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _166 => _166.polyfills, 'optionalAccess', _167 => _167.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"
           );
@@ -7180,11 +7436,11 @@ function createClient(options) {
     return room;
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _169 => _169.get, 'call', _170 => _170(roomId), 'optionalAccess', _171 => _171.room]);
+    const room = _optionalChain([roomsById, 'access', _168 => _168.get, 'call', _169 => _169(roomId), 'optionalAccess', _170 => _170.room]);
     return room ? room : null;
   }
   function forceLeave(roomId) {
-    const unsubs = _nullishCoalesce(_optionalChain([roomsById, 'access', _172 => _172.get, 'call', _173 => _173(roomId), 'optionalAccess', _174 => _174.unsubs]), () => ( /* @__PURE__ */ new Set()));
+    const unsubs = _nullishCoalesce(_optionalChain([roomsById, 'access', _171 => _171.get, 'call', _172 => _172(roomId), 'optionalAccess', _173 => _173.unsubs]), () => ( /* @__PURE__ */ new Set()));
     for (const unsub of unsubs) {
       unsub();
     }
@@ -7205,7 +7461,7 @@ function createClient(options) {
     markInboxNotificationAsRead
   } = createNotificationsApi({
     baseUrl,
-    fetcher: _optionalChain([clientOptions, 'access', _175 => _175.polyfills, 'optionalAccess', _176 => _176.fetch]) || /* istanbul ignore next */
+    fetcher: _optionalChain([clientOptions, 'access', _174 => _174.polyfills, 'optionalAccess', _175 => _175.fetch]) || /* istanbul ignore next */
     fetch,
     authManager,
     currentUserIdStore
@@ -7219,7 +7475,7 @@ function createClient(options) {
   const usersStore = createBatchStore(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _177 => _177({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _176 => _176({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -7233,7 +7489,7 @@ function createClient(options) {
   const roomsInfoStore = createBatchStore(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _178 => _178({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _177 => _177({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -7256,6 +7512,14 @@ function createClient(options) {
           markAllInboxNotificationsAsRead,
           markInboxNotificationAsRead
         },
+        comments: {
+          createThreadId,
+          createCommentId,
+          createInboxNotificationId,
+          selectedThreads,
+          selectedInboxNotifications,
+          selectNotificationSettings
+        },
         currentUserIdStore,
         resolveMentionSuggestions: clientOptions.resolveMentionSuggestions,
         cacheStore,
@@ -7350,7 +7614,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _179 => _179.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _178 => _178.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -7360,13 +7624,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _180 => _180(block)]);
+        _optionalChain([visitor, 'optionalCall', _179 => _179(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _181 => _181(inline)]);
+          _optionalChain([visitor, 'optionalCall', _180 => _180(inline)]);
         }
       }
     }
@@ -7391,7 +7655,7 @@ async function resolveUsersInCommentBody(body, resolveUsers) {
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _182 => _182[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _181 => _181[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -7514,7 +7778,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => element.url,
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _182 => _182.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -7544,7 +7808,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${element.url}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _184 => _184.name]), () => ( element.id))}</span>`;
+    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -7574,19 +7838,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${element.url}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _185 => _185.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _184 => _184.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _186 => _186.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _187 => _187.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  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 elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _188 => _188.elements])
+    ..._optionalChain([options, 'optionalAccess', _187 => _187.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _189 => _189.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _188 => _188.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -7861,12 +8125,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _190 => _190.updates, 'access', _191 => _191[key], 'optionalAccess', _192 => _192.type]) === "update") {
+          if (_optionalChain([update, 'access', _189 => _189.updates, 'access', _190 => _190[key], 'optionalAccess', _191 => _191.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _193 => _193.updates, 'access', _194 => _194[key], 'optionalAccess', _195 => _195.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _192 => _192.updates, 'access', _193 => _193[key], 'optionalAccess', _194 => _194.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -7927,12 +8191,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _196 => _196.updates, 'access', _197 => _197[key], 'optionalAccess', _198 => _198.type]) === "update") {
+          if (_optionalChain([update, 'access', _195 => _195.updates, 'access', _196 => _196[key], 'optionalAccess', _197 => _197.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _199 => _199.updates, 'access', _200 => _200[key], 'optionalAccess', _201 => _201.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _198 => _198.updates, 'access', _199 => _199[key], 'optionalAccess', _200 => _200.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8150,5 +8414,7 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.addReaction = addReaction; exports.applyOptimisticUpdates = applyOptimisticUpdates; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.cloneLson = cloneLson; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.deleteComment = deleteComment; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.isChildCrdt = isChildCrdt; 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.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.removeReaction = removeReaction; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.upsertComment = upsertComment; exports.withTimeout = withTimeout;
+
+
+exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.addReaction = addReaction; exports.applyOptimisticUpdates = applyOptimisticUpdates; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.cloneLson = cloneLson; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.deleteComment = deleteComment; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.isChildCrdt = isChildCrdt; 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.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.removeReaction = removeReaction; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.upsertComment = upsertComment; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map