@liveblocks/react 1.6.0 → 1.7.1-pre1

package/dist/index.d.mts

@@ -1142,11 +1142,7 @@ declare function useRoomContextBundle(): {
         <T_5>(selector: (me: User<JsonObject, BaseUserMeta>) => T_5, isEqual?: ((prev: T_5, curr: T_5) => boolean) | undefined): T_5 | null;
     };
     useThreads: () => ThreadsState<BaseMetadata>;
-    useUser: (userId: string) => UserState<{
-        [key: string]: Json | undefined;
-        name?: string | undefined;
-        avatar?: string | undefined;
-    } | undefined>;
+    useUser: (userId: string) => UserState<_liveblocks_core.IUserInfo | undefined>;
     useList: <TKey extends string>(key: TKey) => _liveblocks_core.Lson | undefined;
     useMap: <TKey_1 extends string>(key: TKey_1) => _liveblocks_core.Lson | undefined;
     useObject: <TKey_2 extends string>(key: TKey_2) => _liveblocks_core.Lson | undefined;
@@ -1500,11 +1496,7 @@ declare function useRoomContextBundle(): {
             <T_7>(selector: (me: User<JsonObject, BaseUserMeta>) => T_7, isEqual?: ((prev: T_7, curr: T_7) => boolean) | undefined): T_7;
         };
         useThreads: () => ThreadsStateSuccess<BaseMetadata>;
-        useUser: (userId: string) => UserStateSuccess<{
-            [key: string]: Json | undefined;
-            name?: string | undefined;
-            avatar?: string | undefined;
-        } | undefined>;
+        useUser: (userId: string) => UserStateSuccess<_liveblocks_core.IUserInfo | undefined>;
         useList: <TKey_3 extends string>(key: TKey_3) => _liveblocks_core.Lson | undefined;
         useMap: <TKey_4 extends string>(key: TKey_4) => _liveblocks_core.Lson | undefined;
         useObject: <TKey_5 extends string>(key: TKey_5) => _liveblocks_core.Lson | undefined;

package/dist/index.d.ts

@@ -1142,11 +1142,7 @@ declare function useRoomContextBundle(): {
         <T_5>(selector: (me: User<JsonObject, BaseUserMeta>) => T_5, isEqual?: ((prev: T_5, curr: T_5) => boolean) | undefined): T_5 | null;
     };
     useThreads: () => ThreadsState<BaseMetadata>;
-    useUser: (userId: string) => UserState<{
-        [key: string]: Json | undefined;
-        name?: string | undefined;
-        avatar?: string | undefined;
-    } | undefined>;
+    useUser: (userId: string) => UserState<_liveblocks_core.IUserInfo | undefined>;
     useList: <TKey extends string>(key: TKey) => _liveblocks_core.Lson | undefined;
     useMap: <TKey_1 extends string>(key: TKey_1) => _liveblocks_core.Lson | undefined;
     useObject: <TKey_2 extends string>(key: TKey_2) => _liveblocks_core.Lson | undefined;
@@ -1500,11 +1496,7 @@ declare function useRoomContextBundle(): {
             <T_7>(selector: (me: User<JsonObject, BaseUserMeta>) => T_7, isEqual?: ((prev: T_7, curr: T_7) => boolean) | undefined): T_7;
         };
         useThreads: () => ThreadsStateSuccess<BaseMetadata>;
-        useUser: (userId: string) => UserStateSuccess<{
-            [key: string]: Json | undefined;
-            name?: string | undefined;
-            avatar?: string | undefined;
-        } | undefined>;
+        useUser: (userId: string) => UserStateSuccess<_liveblocks_core.IUserInfo | undefined>;
         useList: <TKey_3 extends string>(key: TKey_3) => _liveblocks_core.Lson | undefined;
         useMap: <TKey_4 extends string>(key: TKey_4) => _liveblocks_core.Lson | undefined;
         useObject: <TKey_5 extends string>(key: TKey_5) => _liveblocks_core.Lson | undefined;

package/dist/index.js

@@ -5,7 +5,7 @@ var _core = require('@liveblocks/core');
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "1.6.0";
+var PKG_VERSION = "1.7.1-pre1";
 var PKG_FORMAT = "cjs";
 
 // src/ClientSideSuspense.tsx
@@ -136,6 +136,14 @@ function createThreadsManager() {
     }
   };
 }
+function handleCommentsApiError(err) {
+  const message = `Request failed with status ${err.status}: ${err.message}`;
+  if (_optionalChain([err, 'access', _ => _.details, 'optionalAccess', _2 => _2.error]) === "FORBIDDEN") {
+    const detailedMessage = [message, err.details.suggestion, err.details.docs].filter(Boolean).join("\n");
+    _core.console.error(detailedMessage);
+  }
+  return new Error(message);
+}
 function createCommentsRoom(room, errorEventSource) {
   const manager = createThreadsManager();
   let timestamp = 0;
@@ -242,8 +250,12 @@ function createCommentsRoom(room, errorEventSource) {
     mutate(room.editThreadMetadata({ metadata, threadId }), {
       optimisticData
     }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
       errorEventSource.notify(
-        new EditThreadMetadataError(err, {
+        new EditThreadMetadataError(error, {
           roomId: room.id,
           threadId,
           metadata
@@ -278,17 +290,21 @@ function createCommentsRoom(room, errorEventSource) {
     };
     mutate(room.createThread({ threadId, commentId, body, metadata }), {
       optimisticData: [...threads, newThread]
-    }).catch(
-      (er) => errorEventSource.notify(
-        new CreateThreadError(er, {
+    }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
+      errorEventSource.notify(
+        new CreateThreadError(error, {
           roomId: room.id,
           threadId,
           commentId,
           body,
           metadata
         })
-      )
-    );
+      );
+    });
     return newThread;
   }
   function createComment({
@@ -316,16 +332,20 @@ function createCommentsRoom(room, errorEventSource) {
     );
     mutate(room.createComment({ threadId, commentId, body }), {
       optimisticData
-    }).catch(
-      (er) => errorEventSource.notify(
-        new CreateCommentError(er, {
+    }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
+      errorEventSource.notify(
+        new CreateCommentError(error, {
           roomId: room.id,
           threadId,
           commentId,
           body
         })
-      )
-    );
+      );
+    });
     return comment;
   }
   function editComment({ threadId, commentId, body }) {
@@ -345,16 +365,20 @@ function createCommentsRoom(room, errorEventSource) {
     );
     mutate(room.editComment({ threadId, commentId, body }), {
       optimisticData
-    }).catch(
-      (er) => errorEventSource.notify(
-        new EditCommentError(er, {
+    }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
+      errorEventSource.notify(
+        new EditCommentError(error, {
           roomId: room.id,
           threadId,
           commentId,
           body
         })
-      )
-    );
+      );
+    });
   }
   function deleteComment({ threadId, commentId }) {
     const threads = getThreads();
@@ -381,15 +405,19 @@ function createCommentsRoom(room, errorEventSource) {
     }
     mutate(room.deleteComment({ threadId, commentId }), {
       optimisticData: newThreads
-    }).catch(
-      (er) => errorEventSource.notify(
-        new DeleteCommentError(er, {
+    }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
+      errorEventSource.notify(
+        new DeleteCommentError(error, {
           roomId: room.id,
           threadId,
           commentId
         })
-      )
-    );
+      );
+    });
   }
   function getCurrentUserId() {
     const self = room.getSelf();
@@ -419,7 +447,7 @@ function createCommentsRoom(room, errorEventSource) {
       commentsEventRefCount = commentsEventRefCount - 1;
       if (commentsEventRefCount > 0)
         return;
-      _optionalChain([commentsEventDisposer, 'optionalCall', _ => _()]);
+      _optionalChain([commentsEventDisposer, 'optionalCall', _3 => _3()]);
       commentsEventDisposer = void 0;
     };
   }
@@ -527,8 +555,12 @@ function createCommentsRoom(room, errorEventSource) {
     mutate(room.addReaction({ threadId, commentId, emoji }), {
       optimisticData
     }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
       errorEventSource.notify(
-        new AddReactionError(err, {
+        new AddReactionError(error, {
           roomId: room.id,
           threadId,
           commentId,
@@ -580,8 +612,12 @@ function createCommentsRoom(room, errorEventSource) {
     mutate(room.removeReaction({ threadId, commentId, emoji }), {
       optimisticData
     }).catch((err) => {
+      if (!(err instanceof _core.CommentsApiError)) {
+        throw err;
+      }
+      const error = handleCommentsApiError(err);
       errorEventSource.notify(
-        new RemoveReactionError(err, {
+        new RemoveReactionError(error, {
           roomId: room.id,
           threadId,
           commentId,
@@ -656,14 +692,14 @@ function useAsyncCache(cache, key, options) {
     return cacheItem2;
   }, [cache, key]);
   const subscribe = _react.useCallback.call(void 0, 
-    (callback) => _nullishCoalesce(_optionalChain([cacheItem, 'optionalAccess', _2 => _2.subscribe, 'call', _3 => _3(callback)]), () => ( noop)),
+    (callback) => _nullishCoalesce(_optionalChain([cacheItem, 'optionalAccess', _4 => _4.subscribe, 'call', _5 => _5(callback)]), () => ( noop)),
     [cacheItem]
   );
   const getState = _react.useCallback.call(void 0, 
-    () => _nullishCoalesce(_optionalChain([cacheItem, 'optionalAccess', _4 => _4.getState, 'call', _5 => _5()]), () => ( INITIAL_ASYNC_STATE)),
+    () => _nullishCoalesce(_optionalChain([cacheItem, 'optionalAccess', _6 => _6.getState, 'call', _7 => _7()]), () => ( INITIAL_ASYNC_STATE)),
     [cacheItem]
   );
-  const revalidate = _react.useCallback.call(void 0, () => _optionalChain([cacheItem, 'optionalAccess', _6 => _6.revalidate, 'call', _7 => _7()]), [cacheItem]);
+  const revalidate = _react.useCallback.call(void 0, () => _optionalChain([cacheItem, 'optionalAccess', _8 => _8.revalidate, 'call', _9 => _9()]), [cacheItem]);
   const state = _indexjs.useSyncExternalStore.call(void 0, subscribe, getState, getState);
   const previousData = _react.useRef.call(void 0, );
   let data = state.data;
@@ -679,7 +715,7 @@ function useAsyncCache(cache, key, options) {
       revalidate
     };
   }
-  if (_optionalChain([frozenOptions, 'optionalAccess', _8 => _8.suspense])) {
+  if (_optionalChain([frozenOptions, 'optionalAccess', _10 => _10.suspense])) {
     const error = getState().error;
     if (error) {
       throw error;
@@ -693,7 +729,7 @@ function useAsyncCache(cache, key, options) {
       });
     }
   }
-  if (state.isLoading && _optionalChain([frozenOptions, 'optionalAccess', _9 => _9.keepPreviousDataWhileLoading]) && typeof state.data === "undefined" && _optionalChain([previousData, 'access', _10 => _10.current, 'optionalAccess', _11 => _11.key]) !== key && typeof _optionalChain([previousData, 'access', _12 => _12.current, 'optionalAccess', _13 => _13.data]) !== "undefined") {
+  if (state.isLoading && _optionalChain([frozenOptions, 'optionalAccess', _11 => _11.keepPreviousDataWhileLoading]) && typeof state.data === "undefined" && _optionalChain([previousData, 'access', _12 => _12.current, 'optionalAccess', _13 => _13.key]) !== key && typeof _optionalChain([previousData, 'access', _14 => _14.current, 'optionalAccess', _15 => _15.data]) !== "undefined") {
     data = previousData.current.data;
   }
   return {
@@ -790,15 +826,6 @@ function warnIfNoResolveUsers(usersCache) {
     hasWarnedIfNoResolveUsers = true;
   }
 }
-var hasWarnedAboutCommentsBeta = false;
-function warnIfBetaCommentsHook() {
-  if (!hasWarnedAboutCommentsBeta && process.env.NODE_ENV !== "production") {
-    console.warn(
-      "Comments is currently in private beta. Learn more at https://liveblocks.io/docs/products/comments."
-    );
-    hasWarnedAboutCommentsBeta = true;
-  }
-}
 var ContextBundle = React2.createContext(null);
 function useRoomContextBundle() {
   const bundle = React2.useContext(ContextBundle);
@@ -1098,7 +1125,7 @@ function createRoomContext(client, options) {
       function onRootChange() {
         const newValue = root.get(key);
         if (newValue !== curr) {
-          _optionalChain([unsubCurr, 'optionalCall', _14 => _14()]);
+          _optionalChain([unsubCurr, 'optionalCall', _16 => _16()]);
           curr = newValue;
           subscribeToCurr();
           rerender();
@@ -1109,7 +1136,7 @@ function createRoomContext(client, options) {
       const unsubscribeRoot = room.subscribe(root, onRootChange);
       return () => {
         unsubscribeRoot();
-        _optionalChain([unsubCurr, 'optionalCall', _15 => _15()]);
+        _optionalChain([unsubCurr, 'optionalCall', _17 => _17()]);
       };
     }, [rootOrNull, room, key, rerender]);
     if (rootOrNull === null) {
@@ -1245,23 +1272,14 @@ function createRoomContext(client, options) {
   }
   function useThreads() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return getCommentsRoom(room).useThreads();
   }
   function useThreadsSuspense() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return getCommentsRoom(room).useThreadsSuspense();
   }
   function useCreateThread() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).createThread(options2),
       [room]
@@ -1269,9 +1287,6 @@ function createRoomContext(client, options) {
   }
   function useEditThreadMetadata() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).editThreadMetadata(options2),
       [room]
@@ -1279,9 +1294,6 @@ function createRoomContext(client, options) {
   }
   function useAddReaction() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).addReaction(options2),
       [room]
@@ -1289,9 +1301,6 @@ function createRoomContext(client, options) {
   }
   function useRemoveReaction() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).removeReaction(options2),
       [room]
@@ -1299,9 +1308,6 @@ function createRoomContext(client, options) {
   }
   function useCreateComment() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).createComment(options2),
       [room]
@@ -1309,9 +1315,6 @@ function createRoomContext(client, options) {
   }
   function useEditComment() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).editComment(options2),
       [room]
@@ -1319,9 +1322,6 @@ function createRoomContext(client, options) {
   }
   function useDeleteComment() {
     const room = useRoom();
-    React2.useEffect(() => {
-      warnIfBetaCommentsHook();
-    }, []);
     return React2.useCallback(
       (options2) => getCommentsRoom(room).deleteComment(options2),
       [room]
@@ -1332,7 +1332,7 @@ function createRoomContext(client, options) {
     const users = await resolveUsers(
       JSON.parse(stringifiedOptions)
     );
-    return _optionalChain([users, 'optionalAccess', _16 => _16[0]]);
+    return _optionalChain([users, 'optionalAccess', _18 => _18[0]]);
   }) : void 0;
   function useUser(userId) {
     const room = useRoom();