@liveblocks/react 2.16.0-toolbars5 → 2.16.0

package/dist/{chunk-FQKGWA7O.mjs → chunk-JZBPCFEX.mjs}

@@ -224,15 +224,13 @@ import {
   console as console2,
   DefaultMap,
   DerivedSignal,
-  HttpError,
   kInternal,
   MutableSignal as MutableSignal2,
   nanoid,
   nn,
   shallow as shallow3,
   Signal,
-  stringify,
-  unstringify
+  stringify
 } from "@liveblocks/core";
 
 // src/lib/autobind.ts
@@ -282,16 +280,16 @@ function matchesMetadata(thread, q) {
   const metadata = thread.metadata;
   return q.metadata === void 0 || Object.entries(q.metadata).every(
     ([key, op]) => (
-      // NOTE: `op` can be explicitly-`undefined` here, which ideally would not
-      // mean "filter for absence" like it does now, as this does not match the
-      // backend behavior at the moment. For an in-depth discussion, see
-      // https://liveblocks.slack.com/archives/C02PZL7QAAW/p1728546988505989
-      matchesOperator(metadata[key], op)
+      // Ignore explicit-undefined filters
+      // Boolean logic: op? => value matches the operator
+      op === void 0 || matchesOperator(metadata[key], op)
     )
   );
 }
 function matchesOperator(value, op) {
-  if (isStartsWithOperator(op)) {
+  if (op === null) {
+    return value === void 0;
+  } else if (isStartsWithOperator(op)) {
     return typeof value === "string" && value.startsWith(op.startsWith);
   } else {
     return value === op;
@@ -836,7 +834,7 @@ var UmbrellaStore = class {
     );
     const loadingUserThreads = new DefaultMap(
       (queryKey) => {
-        const query = unstringify(queryKey);
+        const query = JSON.parse(queryKey);
         const resource = new PaginatedResource(async (cursor) => {
           const result = await this.#client[kInternal].httpClient.getUserThreads_experimental({
             cursor,
@@ -878,7 +876,7 @@ var UmbrellaStore = class {
     );
     const loadingRoomThreads = new DefaultMap(
       (queryKey) => {
-        const [roomId, query] = unstringify(queryKey);
+        const [roomId, query] = JSON.parse(queryKey);
         const resource = new PaginatedResource(async (cursor) => {
           const result = await this.#client[kInternal].httpClient.getThreads({
             roomId,
@@ -941,10 +939,7 @@ var UmbrellaStore = class {
       const resource = new SinglePageResource(async () => {
         const room = this.#client.getRoom(roomId);
         if (room === null) {
-          throw new HttpError(
-            `Room '${roomId}' is not available on client`,
-            479
-          );
+          throw new Error(`Room '${roomId}' is not available on client`);
         }
         const result = await room.getNotificationSettings();
         this.roomNotificationSettings.update(roomId, result);
@@ -967,10 +962,7 @@ var UmbrellaStore = class {
         const resource = new SinglePageResource(async () => {
           const room = this.#client.getRoom(roomId);
           if (room === null) {
-            throw new HttpError(
-              `Room '${roomId}' is not available on client`,
-              479
-            );
+            throw new Error(`Room '${roomId}' is not available on client`);
           }
           const result = await room[kInternal].listTextVersions();
           this.historyVersions.update(roomId, result.versions);
@@ -1826,8 +1818,15 @@ function useMarkInboxNotificationAsRead_withClient(client) {
             optimisticId
           );
         },
-        () => {
+        (err) => {
           store.optimisticUpdates.remove(optimisticId);
+          client[kInternal2].emitError(
+            {
+              type: "MARK_INBOX_NOTIFICATION_AS_READ_ERROR",
+              inboxNotificationId
+            },
+            err
+          );
         }
       );
     },
@@ -1846,8 +1845,13 @@ function useMarkAllInboxNotificationsAsRead_withClient(client) {
       () => {
         store.markAllInboxNotificationsRead(optimisticId, readAt);
       },
-      () => {
+      (err) => {
         store.optimisticUpdates.remove(optimisticId);
+        client[kInternal2].emitError(
+          // No roomId, threadId, commentId to include for this error
+          { type: "MARK_ALL_INBOX_NOTIFICATIONS_AS_READ_ERROR" },
+          err
+        );
       }
     );
   }, [client]);
@@ -1866,8 +1870,12 @@ function useDeleteInboxNotification_withClient(client) {
         () => {
           store.deleteInboxNotification(inboxNotificationId, optimisticId);
         },
-        () => {
+        (err) => {
           store.optimisticUpdates.remove(optimisticId);
+          client[kInternal2].emitError(
+            { type: "DELETE_INBOX_NOTIFICATION_ERROR", inboxNotificationId },
+            err
+          );
         }
       );
     },
@@ -1886,8 +1894,12 @@ function useDeleteAllInboxNotifications_withClient(client) {
       () => {
         store.deleteAllInboxNotifications(optimisticId);
       },
-      () => {
+      (err) => {
         store.optimisticUpdates.remove(optimisticId);
+        client[kInternal2].emitError(
+          { type: "DELETE_ALL_INBOX_NOTIFICATIONS_ERROR" },
+          err
+        );
       }
     );
   }, [client]);
@@ -2049,6 +2061,7 @@ function createSharedContext(client) {
       useUser: (userId) => useUser_withClient(client, userId),
       useRoomInfo: (roomId) => useRoomInfo_withClient(client, roomId),
       useIsInsideRoom,
+      useErrorListener,
       useSyncStatus: useSyncStatus2
     },
     suspense: {
@@ -2056,6 +2069,7 @@ function createSharedContext(client) {
       useUser: (userId) => useUserSuspense_withClient(client, userId),
       useRoomInfo: (roomId) => useRoomInfoSuspense_withClient(client, roomId),
       useIsInsideRoom,
+      useErrorListener,
       useSyncStatus: useSyncStatus2
     }
   };
@@ -2235,104 +2249,14 @@ function useSyncStatusSmooth_withClient(client) {
 function useSyncStatus(options) {
   return useSyncStatus_withClient(useClient(), options);
 }
-
-// src/types/errors.ts
-var CreateThreadError = class extends Error {
-  constructor(cause, context) {
-    super("Create thread failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "CreateThreadError";
-  }
-};
-var DeleteThreadError = class extends Error {
-  constructor(cause, context) {
-    super("Delete thread failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "DeleteThreadError";
-  }
-};
-var EditThreadMetadataError = class extends Error {
-  constructor(cause, context) {
-    super("Edit thread metadata failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "EditThreadMetadataError";
-  }
-};
-var MarkThreadAsResolvedError = class extends Error {
-  constructor(cause, context) {
-    super("Mark thread as resolved failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "MarkThreadAsResolvedError";
-  }
-};
-var MarkThreadAsUnresolvedError = class extends Error {
-  constructor(cause, context) {
-    super("Mark thread as unresolved failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "MarkThreadAsUnresolvedError";
-  }
-};
-var CreateCommentError = class extends Error {
-  constructor(cause, context) {
-    super("Create comment failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "CreateCommentError";
-  }
-};
-var EditCommentError = class extends Error {
-  constructor(cause, context) {
-    super("Edit comment failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "EditCommentError";
-  }
-};
-var DeleteCommentError = class extends Error {
-  constructor(cause, context) {
-    super("Delete comment failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "DeleteCommentError";
-  }
-};
-var AddReactionError = class extends Error {
-  constructor(cause, context) {
-    super("Add reaction failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "AddReactionError";
-  }
-};
-var RemoveReactionError = class extends Error {
-  constructor(cause, context) {
-    super("Remove reaction failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "RemoveReactionError";
-  }
-};
-var MarkInboxNotificationAsReadError = class extends Error {
-  constructor(cause, context) {
-    super("Mark inbox notification as read failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "MarkInboxNotificationAsReadError";
-  }
-};
-var UpdateNotificationSettingsError = class extends Error {
-  constructor(cause, context) {
-    super("Update notification settings failed.");
-    this.cause = cause;
-    this.context = context;
-    this.name = "UpdateNotificationSettingsError";
-  }
-};
+function useErrorListener(callback) {
+  const client = useClient();
+  const savedCallback = useLatest(callback);
+  useEffect3(
+    () => client.events.error.subscribe((e) => savedCallback.current(e)),
+    [client, savedCallback]
+  );
+}
 
 // src/room.tsx
 import { shallow as shallow5 } from "@liveblocks/client";
@@ -2343,9 +2267,8 @@ import {
   createThreadId,
   DefaultMap as DefaultMap2,
   errorIf,
-  HttpError as HttpError2,
+  HttpError,
   kInternal as kInternal3,
-  makeEventSource,
   makePoller as makePoller2,
   ServerMsgCode
 } from "@liveblocks/core";
@@ -2439,14 +2362,6 @@ function getCurrentUserId(client) {
   }
   return userId;
 }
-function handleApiError(err) {
-  const message = `Request failed with status ${err.status}: ${err.message}`;
-  if (err.details?.error === "FORBIDDEN") {
-    const detailedMessage = [message, err.details.suggestion, err.details.docs].filter(Boolean).join("\n");
-    console3.error(detailedMessage);
-  }
-  return new Error(message);
-}
 var _extras2 = /* @__PURE__ */ new WeakMap();
 var _bundles2 = /* @__PURE__ */ new WeakMap();
 function getOrCreateRoomContextBundle(client) {
@@ -2467,19 +2382,21 @@ function getRoomExtrasForClient(client) {
 }
 function makeRoomExtrasForClient(client) {
   const store = getUmbrellaStoreForClient(client);
-  const commentsErrorEventSource = makeEventSource();
-  function onMutationFailure(innerError, optimisticId, createPublicError) {
+  function onMutationFailure(optimisticId, context, innerError) {
     store.optimisticUpdates.remove(optimisticId);
-    if (innerError instanceof HttpError2) {
-      const error = handleApiError(innerError);
-      commentsErrorEventSource.notify(createPublicError(error));
-      return;
-    }
-    if (innerError instanceof HttpError2) {
-      handleApiError(innerError);
-      return;
+    if (innerError instanceof HttpError) {
+      if (innerError.status === 403) {
+        const detailedMessage = [
+          innerError.message,
+          innerError.details?.suggestion,
+          innerError.details?.docs
+        ].filter(Boolean).join("\n");
+        console3.error(detailedMessage);
+      }
+      client[kInternal3].emitError(context, innerError);
+    } else {
+      throw innerError;
     }
-    throw innerError;
   }
   const threadsPollersByRoomId = new DefaultMap2(
     (roomId) => makePoller2(
@@ -2525,7 +2442,6 @@ function makeRoomExtrasForClient(client) {
   );
   return {
     store,
-    commentsErrorEventSource: commentsErrorEventSource.observable,
     onMutationFailure,
     getOrCreateThreadsPollerForRoomId: threadsPollersByRoomId.getOrCreate.bind(
       threadsPollersByRoomId
@@ -2551,7 +2467,6 @@ function makeRoomContextBundle(client) {
     useBroadcastEvent,
     useOthersListener,
     useLostConnectionListener,
-    useErrorListener,
     useEventListener,
     useHistory,
     useUndo,
@@ -2597,7 +2512,6 @@ function makeRoomContextBundle(client) {
       useBroadcastEvent,
       useOthersListener,
       useLostConnectionListener,
-      useErrorListener,
       useEventListener,
       useHistory,
       useUndo,
@@ -2633,8 +2547,7 @@ function makeRoomContextBundle(client) {
       useRoomNotificationSettings: useRoomNotificationSettingsSuspense,
       useUpdateRoomNotificationSettings,
       ...shared.suspense
-    },
-    useCommentsErrorListener
+    }
   };
   return Object.defineProperty(bundle, kInternal3, {
     enumerable: false
@@ -2895,14 +2808,6 @@ function useLostConnectionListener(callback) {
     [room, savedCallback]
   );
 }
-function useErrorListener(callback) {
-  const room = useRoom();
-  const savedCallback = useLatest(callback);
-  useEffect5(
-    () => room.events.error.subscribe((e) => savedCallback.current(e)),
-    [room, savedCallback]
-  );
-}
 function useEventListener(callback) {
   const room = useRoom();
   const savedCallback = useLatest(callback);
@@ -3112,14 +3017,6 @@ function useThreads(options = {}) {
   useScrollToCommentOnLoadEffect(scrollOnLoad, result);
   return result;
 }
-function useCommentsErrorListener(callback) {
-  const client = useClient();
-  const savedCallback = useLatest(callback);
-  const { commentsErrorEventSource } = getRoomExtrasForClient(client);
-  useEffect5(() => {
-    return commentsErrorEventSource.subscribe(savedCallback.current);
-  }, [savedCallback, commentsErrorEventSource]);
-}
 function useCreateThread() {
   return useCreateRoomThread(useRoom().id);
 }
@@ -3173,15 +3070,16 @@ function useCreateRoomThread(roomId) {
           store.createThread(optimisticId, thread);
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (err2) => new CreateThreadError(err2, {
+          {
+            type: "CREATE_THREAD_ERROR",
             roomId,
             threadId,
             commentId,
             body,
             metadata
-          })
+          },
+          err
         )
       );
       return newThread;
@@ -3213,9 +3111,9 @@ function useDeleteRoomThread(roomId) {
           store.deleteThread(threadId, optimisticId);
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (err2) => new DeleteThreadError(err2, { roomId, threadId })
+          { type: "DELETE_THREAD_ERROR", roomId, threadId },
+          err
         )
       );
     },
@@ -3248,13 +3146,14 @@ function useEditRoomThreadMetadata(roomId) {
           store.patchThread(threadId, optimisticId, { metadata: metadata2 }, updatedAt)
         ),
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new EditThreadMetadataError(error, {
+          {
+            type: "EDIT_THREAD_METADATA_ERROR",
             roomId,
             threadId,
             metadata
-          })
+          },
+          err
         )
       );
     },
@@ -3292,14 +3191,15 @@ function useCreateRoomComment(roomId) {
           store.createComment(newComment, optimisticId);
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (err2) => new CreateCommentError(err2, {
+          {
+            type: "CREATE_COMMENT_ERROR",
             roomId,
             threadId,
             commentId,
             body
-          })
+          },
+          err
         )
       );
       return comment;
@@ -3347,14 +3247,9 @@ function useEditRoomComment(roomId) {
           store.editComment(threadId, optimisticId, editedComment);
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new EditCommentError(error, {
-            roomId,
-            threadId,
-            commentId,
-            body
-          })
+          { type: "EDIT_COMMENT_ERROR", roomId, threadId, commentId, body },
+          err
         )
       );
     },
@@ -3382,13 +3277,9 @@ function useDeleteRoomComment(roomId) {
           store.deleteComment(threadId, optimisticId, commentId, deletedAt);
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new DeleteCommentError(error, {
-            roomId,
-            threadId,
-            commentId
-          })
+          { type: "DELETE_COMMENT_ERROR", roomId, threadId, commentId },
+          err
         )
       );
     },
@@ -3426,14 +3317,15 @@ function useAddRoomCommentReaction(roomId) {
           );
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new AddReactionError(error, {
+          {
+            type: "ADD_REACTION_ERROR",
             roomId,
             threadId,
             commentId,
             emoji
-          })
+          },
+          err
         )
       );
     },
@@ -3470,14 +3362,15 @@ function useRemoveRoomCommentReaction(roomId) {
           );
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new RemoveReactionError(error, {
+          {
+            type: "REMOVE_REACTION_ERROR",
             roomId,
             threadId,
             commentId,
             emoji
-          })
+          },
+          err
         )
       );
     },
@@ -3517,11 +3410,13 @@ function useMarkRoomThreadAsRead(roomId) {
         },
         (err) => {
           onMutationFailure(
-            err,
             optimisticId,
-            (error) => new MarkInboxNotificationAsReadError(error, {
+            {
+              type: "MARK_INBOX_NOTIFICATION_AS_READ_ERROR",
+              roomId,
               inboxNotificationId: inboxNotification.id
-            })
+            },
+            err
           );
           return;
         }
@@ -3554,12 +3449,9 @@ function useMarkRoomThreadAsResolved(roomId) {
           );
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new MarkThreadAsResolvedError(error, {
-            roomId,
-            threadId
-          })
+          { type: "MARK_THREAD_AS_RESOLVED_ERROR", roomId, threadId },
+          err
         )
       );
     },
@@ -3590,12 +3482,9 @@ function useMarkRoomThreadAsUnresolved(roomId) {
           );
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new MarkThreadAsUnresolvedError(error, {
-            roomId,
-            threadId
-          })
+          { type: "MARK_THREAD_AS_UNRESOLVED_ERROR", roomId, threadId },
+          err
         )
       );
     },
@@ -3745,11 +3634,9 @@ function useUpdateRoomNotificationSettings() {
           store.updateRoomNotificationSettings(room.id, optimisticId, settings2);
         },
         (err) => onMutationFailure(
-          err,
           optimisticId,
-          (error) => new UpdateNotificationSettingsError(error, {
-            roomId: room.id
-          })
+          { type: "UPDATE_NOTIFICATION_SETTINGS_ERROR", roomId: room.id },
+          err
         )
       );
     },
@@ -3962,7 +3849,7 @@ export {
   _useUserThreads_experimental,
   _useUserThreadsSuspense_experimental,
   useSyncStatus,
-  CreateThreadError,
+  useErrorListener,
   useStatus,
   useReportTextEditor,
   useYjsProvider,
@@ -3973,14 +3860,12 @@ export {
   useStorageStatus,
   useBatch,
   useLostConnectionListener,
-  useErrorListener,
   useHistory,
   useUndo,
   useRedo,
   useCanUndo,
   useCanRedo,
   useOthersConnectionIds,
-  useCommentsErrorListener,
   useCreateRoomThread,
   useDeleteRoomThread,
   useEditRoomThreadMetadata,
@@ -4040,4 +3925,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-FQKGWA7O.mjs.map
+//# sourceMappingURL=chunk-JZBPCFEX.mjs.map