@liveblocks/core 1.10.0-beta3 → 1.10.0

package/dist/index.d.mts

@@ -179,12 +179,15 @@ interface IWebSocket {
 /**
  * The following ranges will be respected by the client:
  *
+ *   10xx: client will reauthorize (just like 41xx)
  *   40xx: client will disconnect
  *   41xx: client will reauthorize
  *   42xx: client will retry without reauthorizing (currently not used)
  *
  */
 declare enum WebsocketCloseCodes {
+    /** Normal close of connection, the connection fulfilled its purpose. */
+    CLOSE_NORMAL = 1000,
     /** Unexpected error happened with the network/infra level. In spirit akin to HTTP 503 */
     CLOSE_ABNORMAL = 1006,
     /** Unexpected error happened. In spirit akin to HTTP 500 */
@@ -203,6 +206,8 @@ declare enum WebsocketCloseCodes {
     MAX_NUMBER_OF_MESSAGES_PER_DAY_PER_APP = 4004,
     /** Room is full, disconnect */
     MAX_NUMBER_OF_CONCURRENT_CONNECTIONS_PER_ROOM = 4005,
+    /** The server kicked the connection from the room. */
+    KICKED = 4100,
     /** The auth token is expired, reauthorize to get a fresh one. In spirit akin to HTTP 401 */
     TOKEN_EXPIRED = 4109,
     /** Disconnect immediately */
@@ -237,6 +242,9 @@ declare type LostConnectionEvent = "lost" | "restored" | "failed";
  * any value (except null).
  */
 declare type BaseAuthResult = NonNullable<Json>;
+declare class LiveblocksError extends Error {
+    code: number;
+}
 declare type Delegates<T extends BaseAuthResult> = {
     authenticate: () => Promise<T>;
     createSocket: (authValue: T) => IWebSocketInstance;
@@ -1332,6 +1340,7 @@ declare type InternalOthersEvent<TPresence extends JsonObject, TUserMeta extends
     updates: Partial<TPresence>;
 } | {
     type: "reset";
+    user?: never;
 };
 declare type OthersEvent<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = Resolve<InternalOthersEvent<TPresence, TUserMeta> & {
     others: readonly User<TPresence, TUserMeta>[];
@@ -1540,7 +1549,7 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      * @returns Unsubscribe function.
      *
      */
-    (type: "error", listener: ErrorCallback): () => void;
+    (type: "error", listener: Callback<LiveblocksError>): () => void;
     /**
      * @deprecated This API will be removed in a future version of Liveblocks.
      * Prefer using the newer `.subscribe('status')` API.
@@ -1655,11 +1664,8 @@ declare type GetThreadsOptions<TThreadMetadata extends BaseMetadata> = {
     };
     since?: Date;
 };
-declare type CommentsApi<TThreadMetadata extends BaseMetadata = never> = {
-    /**
-     * @private
-     */
-    getThreads(options?: GetThreadsOptions<TThreadMetadata>): Promise<{
+declare type CommentsApi = {
+    getThreads<TThreadMetadata extends BaseMetadata = never>(options?: GetThreadsOptions<TThreadMetadata>): Promise<{
         threads: ThreadData<TThreadMetadata>[];
         inboxNotifications: InboxNotificationData[];
         deletedThreads: ThreadDeleteInfo[];
@@ -1668,72 +1674,48 @@ declare type CommentsApi<TThreadMetadata extends BaseMetadata = never> = {
             requestedAt: Date;
         };
     }>;
-    /**
-     * @private
-     */
-    getThread(options: {
+    getThread<TThreadMetadata extends BaseMetadata = never>(options: {
         threadId: string;
     }): Promise<{
         thread: ThreadData<TThreadMetadata>;
         inboxNotification?: InboxNotificationData;
     } | undefined>;
-    /**
-     * @private
-     */
-    createThread(options: {
+    createThread<TThreadMetadata extends BaseMetadata = never>(options: {
         threadId: string;
         commentId: string;
         metadata: TThreadMetadata | undefined;
         body: CommentBody;
     }): Promise<ThreadData<TThreadMetadata>>;
-    /**
-     * @private
-     */
-    editThreadMetadata(options: {
+    editThreadMetadata<TThreadMetadata extends BaseMetadata = never>(options: {
         metadata: PartialNullable<TThreadMetadata>;
         threadId: string;
     }): Promise<TThreadMetadata>;
-    /**
-     * @private
-     */
     createComment(options: {
         threadId: string;
         commentId: string;
         body: CommentBody;
     }): Promise<CommentData>;
-    /**
-     * @private
-     */
     editComment(options: {
         threadId: string;
         commentId: string;
         body: CommentBody;
     }): Promise<CommentData>;
-    /**
-     * @private
-     */
     deleteComment(options: {
         threadId: string;
         commentId: string;
     }): Promise<void>;
-    /**
-     * @private
-     */
     addReaction(options: {
         threadId: string;
         commentId: string;
         emoji: string;
     }): Promise<CommentUserReaction>;
-    /**
-     * @private
-     */
     removeReaction(options: {
         threadId: string;
         commentId: string;
         emoji: string;
     }): Promise<void>;
 };
-declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = CommentsApi<any> & {
+declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = {
     /**
      * @private
      *
@@ -1866,7 +1848,7 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
         readonly self: Observable<User<TPresence, TUserMeta>>;
         readonly myPresence: Observable<TPresence>;
         readonly others: Observable<OthersEvent<TPresence, TUserMeta>>;
-        readonly error: Observable<Error>;
+        readonly error: Observable<LiveblocksError>;
         readonly storage: Observable<StorageUpdate[]>;
         readonly history: Observable<HistoryEvent>;
         /**
@@ -1879,14 +1861,6 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
         readonly ydoc: Observable<YDocUpdateServerMsg | UpdateYDocClientMsg>;
         readonly comments: Observable<CommentsEventServerMsg>;
     };
-    /**
-     * @private
-     */
-    getRoomNotificationSettings(): Promise<RoomNotificationSettings>;
-    /**
-     * @private
-     */
-    updateRoomNotificationSettings(settings: Partial<RoomNotificationSettings>): Promise<RoomNotificationSettings>;
     /**
      * Batches modifications made during the given function.
      * All the modifications are sent to other clients in a single message.
@@ -1952,8 +1926,11 @@ declare type PrivateRoomApi = {
         explicitClose(event: IWebSocketCloseEvent): void;
         rawSend(data: string): void;
     };
-    comments: {
-        lastRequestedAt: Date | null;
+    comments: CommentsApi;
+    notifications: {
+        getRoomNotificationSettings(): Promise<RoomNotificationSettings>;
+        updateRoomNotificationSettings(settings: Partial<RoomNotificationSettings>): Promise<RoomNotificationSettings>;
+        markInboxNotificationAsRead(notificationId: string): Promise<void>;
     };
 };
 declare type HistoryOp<TPresence extends JsonObject> = Op | {
@@ -2036,20 +2013,17 @@ declare type EditThreadMetadataOptimisticUpdate<TThreadMetadata extends BaseMeta
     id: string;
     threadId: string;
     metadata: Resolve<PartialNullable<TThreadMetadata>>;
+    updatedAt: Date;
 };
 declare type CreateCommentOptimisticUpdate = {
     type: "create-comment";
     id: string;
     comment: CommentData;
-    inboxNotificationId?: string;
 };
 declare type EditCommentOptimisticUpdate = {
     type: "edit-comment";
     id: string;
-    threadId: string;
-    editedAt: Date;
-    commentId: string;
-    body: CommentBody;
+    comment: CommentData;
 };
 declare type DeleteCommentOptimisticUpdate = {
     type: "delete-comment";
@@ -2063,9 +2037,7 @@ declare type AddReactionOptimisticUpdate = {
     id: string;
     threadId: string;
     commentId: string;
-    emoji: string;
-    createdAt: Date;
-    userId: string;
+    reaction: CommentUserReaction;
 };
 declare type RemoveReactionOptimisticUpdate = {
     type: "remove-reaction";
@@ -2074,6 +2046,7 @@ declare type RemoveReactionOptimisticUpdate = {
     commentId: string;
     emoji: string;
     userId: string;
+    removedAt: Date;
 };
 declare type MarkInboxNotificationAsReadOptimisticUpdate = {
     type: "mark-inbox-notification-as-read";
@@ -2131,6 +2104,10 @@ interface CacheStore<TThreadMetadata extends BaseMetadata> extends Store<CacheSt
     setQueryState(queryKey: string, queryState: QueryState): void;
 }
 declare function applyOptimisticUpdates<TThreadMetadata extends BaseMetadata>(state: CacheState<TThreadMetadata>): Pick<CacheState<TThreadMetadata>, "threads" | "inboxNotifications" | "notificationSettings">;
+declare function upsertComment<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, comment: CommentData): ThreadDataWithDeleteInfo<TThreadMetadata>;
+declare function deleteComment<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, commentId: string, deletedAt: Date): ThreadDataWithDeleteInfo<TThreadMetadata>;
+declare function addReaction<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, commentId: string, reaction: CommentUserReaction): ThreadDataWithDeleteInfo<TThreadMetadata>;
+declare function removeReaction<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, commentId: string, emoji: string, userId: string, removedAt: Date): ThreadDataWithDeleteInfo<TThreadMetadata>;
 
 declare type OptionalPromise<T> = T | Promise<T>;
 
@@ -2186,6 +2163,7 @@ declare type EnterOptions<TPresence extends JsonObject, TStorage extends LsonObj
  * will probably happen if you do.
  */
 declare type PrivateClientApi<TUserMeta extends BaseUserMeta> = {
+    notifications: NotificationsApi;
     currentUserIdStore: Store<string | null>;
     resolveMentionSuggestions: ClientOptions["resolveMentionSuggestions"];
     cacheStore: CacheStore<BaseMetadata>;
@@ -2193,10 +2171,7 @@ declare type PrivateClientApi<TUserMeta extends BaseUserMeta> = {
     roomsInfoStore: BatchStore<RoomInfo | undefined, [string]>;
     getRoomIds: () => string[];
 };
-declare type InboxNotificationsApi<TThreadMetadata extends BaseMetadata = never> = {
-    /**
-     * @private
-     */
+declare type NotificationsApi<TThreadMetadata extends BaseMetadata = never> = {
     getInboxNotifications(options?: GetInboxNotificationsOptions): Promise<{
         inboxNotifications: InboxNotificationData[];
         threads: ThreadData<TThreadMetadata>[];
@@ -2206,20 +2181,11 @@ declare type InboxNotificationsApi<TThreadMetadata extends BaseMetadata = never>
             requestedAt: Date;
         };
     }>;
-    /**
-     * @private
-     */
     getUnreadInboxNotificationsCount(): Promise<number>;
-    /**
-     * @private
-     */
     markAllInboxNotificationsAsRead(): Promise<void>;
-    /**
-     * @private
-     */
     markInboxNotificationAsRead(inboxNotificationId: string): Promise<void>;
 };
-declare type Client<TUserMeta extends BaseUserMeta = BaseUserMeta> = InboxNotificationsApi & {
+declare type Client<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
     /**
      * Gets a room. Returns null if {@link Client.enter} has not been called previously.
      *
@@ -2812,4 +2778,4 @@ declare type EnsureJson<T> = [
     [K in keyof T]: EnsureJson<T[K]>;
 };
 
-export { type AckOp, type BaseAuthResult, type BaseMetadata, type BaseUserMeta, type Brand, type BroadcastEventClientMsg, type BroadcastOptions, type BroadcastedEventServerMsg, type CacheState, type CacheStore, type Client, type ClientMsg, ClientMsgCode, type CommentBody, type CommentBodyBlockElement, type CommentBodyElement, type CommentBodyInlineElement, type CommentBodyLink, type CommentBodyLinkElementArgs, type CommentBodyMention, type CommentBodyMentionElementArgs, type CommentBodyParagraph, type CommentBodyParagraphElementArgs, type CommentBodyText, type CommentBodyTextElementArgs, type CommentData, type CommentDataPlain, type CommentReaction, type CommentUserReaction, type CommentUserReactionPlain, CommentsApiError, type CommentsEventServerMsg, CrdtType, type CreateListOp, type CreateMapOp, type CreateObjectOp, type CreateOp, type CreateRegisterOp, type CustomAuthenticationResult, type Delegates, type DeleteCrdtOp, type DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, type EnsureJson, type EnterOptions, type EventSource, type FetchStorageClientMsg, type FetchYDocClientMsg, type GetThreadsOptions, type History, type IUserInfo, type IWebSocket, type IWebSocketCloseEvent, type IWebSocketEvent, type IWebSocketInstance, type IWebSocketMessageEvent, type IdTuple, type Immutable, type InboxNotificationData, type InboxNotificationDataPlain, type InboxNotificationDeleteInfo, type InboxNotificationThreadData, type InitialDocumentStateServerMsg, type Json, type JsonArray, type JsonObject, type JsonScalar, type LegacyConnectionStatus, LiveList, type LiveListUpdate, LiveMap, type LiveMapUpdate, type LiveNode, LiveObject, type LiveObjectUpdate, type LiveStructure, type LostConnectionEvent, type Lson, type LsonObject, type NodeMap, NotificationsApiError, type Op, OpCode, type OptionalPromise, type Others, type OthersEvent, type ParentToChildNodeMap, type PartialNullable, type PlainLson, type PlainLsonFields, type PlainLsonList, type PlainLsonMap, type PlainLsonObject, type RejectedStorageOpServerMsg, type Resolve, type ResolveMentionSuggestionsArgs, type ResolveRoomsInfoArgs, type ResolveUsersArgs, type Room, type RoomEventMessage, type RoomInfo, type RoomInitializers, type RoomNotificationSettings, type RoomStateServerMsg, type SerializedChild, type SerializedCrdt, type SerializedList, type SerializedMap, type SerializedObject, type SerializedRegister, type SerializedRootObject, type ServerMsg, ServerMsgCode, type SetParentKeyOp, type Status, type StorageStatus, type StorageUpdate, type Store, type StringifyCommentBodyElements, type StringifyCommentBodyOptions, type ThreadData, type ThreadDataPlain, type ThreadDeleteInfo, type ToImmutable, type ToJson, type UnsubscribeCallback, type UpdateObjectOp, type UpdatePresenceClientMsg, type UpdatePresenceServerMsg, type UpdateStorageClientMsg, type UpdateStorageServerMsg, type UpdateYDocClientMsg, type User, type UserJoinServerMsg, type UserLeftServerMsg, WebsocketCloseCodes, type YDocUpdateServerMsg, ackOp, applyOptimisticUpdates, asPos, assert, assertNever, b64decode, cloneLson, fancyConsole as console, convertToCommentData, convertToCommentUserReaction, convertToThreadData, createClient, deprecate, deprecateIf, detectDupes, errorIf, freeze, getMentionedIdsFromCommentBody, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isLiveNode, isPlainObject, isRootCrdt, kInternal, legacy_patchImmutableObject, lsonToJson, makeEventSource, makePoller, makePosition, nn, patchLiveObjectKey, raise, shallow, stringify, stringifyCommentBody, throwUsageError, toPlainLson, tryParseJson, withTimeout };
+export { type AckOp, type BaseAuthResult, type BaseMetadata, type BaseUserMeta, type Brand, type BroadcastEventClientMsg, type BroadcastOptions, type BroadcastedEventServerMsg, type CacheState, type CacheStore, type Client, type ClientMsg, ClientMsgCode, type ClientOptions, type CommentBody, type CommentBodyBlockElement, type CommentBodyElement, type CommentBodyInlineElement, type CommentBodyLink, type CommentBodyLinkElementArgs, type CommentBodyMention, type CommentBodyMentionElementArgs, type CommentBodyParagraph, type CommentBodyParagraphElementArgs, type CommentBodyText, type CommentBodyTextElementArgs, type CommentData, type CommentDataPlain, type CommentReaction, type CommentUserReaction, type CommentUserReactionPlain, CommentsApiError, type CommentsEventServerMsg, CrdtType, type CreateListOp, type CreateMapOp, type CreateObjectOp, type CreateOp, type CreateRegisterOp, type CustomAuthenticationResult, type Delegates, type DeleteCrdtOp, type DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, type EnsureJson, type EnterOptions, type EventSource, type FetchStorageClientMsg, type FetchYDocClientMsg, type GetThreadsOptions, type History, type IUserInfo, type IWebSocket, type IWebSocketCloseEvent, type IWebSocketEvent, type IWebSocketInstance, type IWebSocketMessageEvent, type IdTuple, type Immutable, type InboxNotificationData, type InboxNotificationDataPlain, type InboxNotificationDeleteInfo, type InboxNotificationThreadData, type InitialDocumentStateServerMsg, type Json, type JsonArray, type JsonObject, type JsonScalar, type LegacyConnectionStatus, LiveList, type LiveListUpdate, LiveMap, type LiveMapUpdate, type LiveNode, LiveObject, type LiveObjectUpdate, type LiveStructure, LiveblocksError, type LostConnectionEvent, type Lson, type LsonObject, type NodeMap, NotificationsApiError, type Op, OpCode, type OptionalPromise, type Others, type OthersEvent, type ParentToChildNodeMap, type PartialNullable, type PlainLson, type PlainLsonFields, type PlainLsonList, type PlainLsonMap, type PlainLsonObject, type RejectedStorageOpServerMsg, type Resolve, type ResolveMentionSuggestionsArgs, type ResolveRoomsInfoArgs, type ResolveUsersArgs, type Room, type RoomEventMessage, type RoomInfo, type RoomInitializers, type RoomNotificationSettings, type RoomStateServerMsg, type SerializedChild, type SerializedCrdt, type SerializedList, type SerializedMap, type SerializedObject, type SerializedRegister, type SerializedRootObject, type ServerMsg, ServerMsgCode, type SetParentKeyOp, type Status, type StorageStatus, type StorageUpdate, type Store, type StringifyCommentBodyElements, type StringifyCommentBodyOptions, type ThreadData, type ThreadDataPlain, type ThreadDeleteInfo, type ToImmutable, type ToJson, type UnsubscribeCallback, type UpdateObjectOp, type UpdatePresenceClientMsg, type UpdatePresenceServerMsg, type UpdateStorageClientMsg, type UpdateStorageServerMsg, type UpdateYDocClientMsg, type User, type UserJoinServerMsg, type UserLeftServerMsg, WebsocketCloseCodes, type YDocUpdateServerMsg, ackOp, addReaction, applyOptimisticUpdates, asPos, assert, assertNever, b64decode, cloneLson, fancyConsole as console, convertToCommentData, convertToCommentUserReaction, convertToThreadData, createClient, deleteComment, deprecate, deprecateIf, detectDupes, errorIf, freeze, getMentionedIdsFromCommentBody, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isLiveNode, isPlainObject, isRootCrdt, kInternal, legacy_patchImmutableObject, lsonToJson, makeEventSource, makePoller, makePosition, nn, patchLiveObjectKey, raise, removeReaction, shallow, stringify, stringifyCommentBody, throwUsageError, toPlainLson, tryParseJson, upsertComment, withTimeout };

package/dist/index.d.ts

@@ -179,12 +179,15 @@ interface IWebSocket {
 /**
  * The following ranges will be respected by the client:
  *
+ *   10xx: client will reauthorize (just like 41xx)
  *   40xx: client will disconnect
  *   41xx: client will reauthorize
  *   42xx: client will retry without reauthorizing (currently not used)
  *
  */
 declare enum WebsocketCloseCodes {
+    /** Normal close of connection, the connection fulfilled its purpose. */
+    CLOSE_NORMAL = 1000,
     /** Unexpected error happened with the network/infra level. In spirit akin to HTTP 503 */
     CLOSE_ABNORMAL = 1006,
     /** Unexpected error happened. In spirit akin to HTTP 500 */
@@ -203,6 +206,8 @@ declare enum WebsocketCloseCodes {
     MAX_NUMBER_OF_MESSAGES_PER_DAY_PER_APP = 4004,
     /** Room is full, disconnect */
     MAX_NUMBER_OF_CONCURRENT_CONNECTIONS_PER_ROOM = 4005,
+    /** The server kicked the connection from the room. */
+    KICKED = 4100,
     /** The auth token is expired, reauthorize to get a fresh one. In spirit akin to HTTP 401 */
     TOKEN_EXPIRED = 4109,
     /** Disconnect immediately */
@@ -237,6 +242,9 @@ declare type LostConnectionEvent = "lost" | "restored" | "failed";
  * any value (except null).
  */
 declare type BaseAuthResult = NonNullable<Json>;
+declare class LiveblocksError extends Error {
+    code: number;
+}
 declare type Delegates<T extends BaseAuthResult> = {
     authenticate: () => Promise<T>;
     createSocket: (authValue: T) => IWebSocketInstance;
@@ -1332,6 +1340,7 @@ declare type InternalOthersEvent<TPresence extends JsonObject, TUserMeta extends
     updates: Partial<TPresence>;
 } | {
     type: "reset";
+    user?: never;
 };
 declare type OthersEvent<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = Resolve<InternalOthersEvent<TPresence, TUserMeta> & {
     others: readonly User<TPresence, TUserMeta>[];
@@ -1540,7 +1549,7 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      * @returns Unsubscribe function.
      *
      */
-    (type: "error", listener: ErrorCallback): () => void;
+    (type: "error", listener: Callback<LiveblocksError>): () => void;
     /**
      * @deprecated This API will be removed in a future version of Liveblocks.
      * Prefer using the newer `.subscribe('status')` API.
@@ -1655,11 +1664,8 @@ declare type GetThreadsOptions<TThreadMetadata extends BaseMetadata> = {
     };
     since?: Date;
 };
-declare type CommentsApi<TThreadMetadata extends BaseMetadata = never> = {
-    /**
-     * @private
-     */
-    getThreads(options?: GetThreadsOptions<TThreadMetadata>): Promise<{
+declare type CommentsApi = {
+    getThreads<TThreadMetadata extends BaseMetadata = never>(options?: GetThreadsOptions<TThreadMetadata>): Promise<{
         threads: ThreadData<TThreadMetadata>[];
         inboxNotifications: InboxNotificationData[];
         deletedThreads: ThreadDeleteInfo[];
@@ -1668,72 +1674,48 @@ declare type CommentsApi<TThreadMetadata extends BaseMetadata = never> = {
             requestedAt: Date;
         };
     }>;
-    /**
-     * @private
-     */
-    getThread(options: {
+    getThread<TThreadMetadata extends BaseMetadata = never>(options: {
         threadId: string;
     }): Promise<{
         thread: ThreadData<TThreadMetadata>;
         inboxNotification?: InboxNotificationData;
     } | undefined>;
-    /**
-     * @private
-     */
-    createThread(options: {
+    createThread<TThreadMetadata extends BaseMetadata = never>(options: {
         threadId: string;
         commentId: string;
         metadata: TThreadMetadata | undefined;
         body: CommentBody;
     }): Promise<ThreadData<TThreadMetadata>>;
-    /**
-     * @private
-     */
-    editThreadMetadata(options: {
+    editThreadMetadata<TThreadMetadata extends BaseMetadata = never>(options: {
         metadata: PartialNullable<TThreadMetadata>;
         threadId: string;
     }): Promise<TThreadMetadata>;
-    /**
-     * @private
-     */
     createComment(options: {
         threadId: string;
         commentId: string;
         body: CommentBody;
     }): Promise<CommentData>;
-    /**
-     * @private
-     */
     editComment(options: {
         threadId: string;
         commentId: string;
         body: CommentBody;
     }): Promise<CommentData>;
-    /**
-     * @private
-     */
     deleteComment(options: {
         threadId: string;
         commentId: string;
     }): Promise<void>;
-    /**
-     * @private
-     */
     addReaction(options: {
         threadId: string;
         commentId: string;
         emoji: string;
     }): Promise<CommentUserReaction>;
-    /**
-     * @private
-     */
     removeReaction(options: {
         threadId: string;
         commentId: string;
         emoji: string;
     }): Promise<void>;
 };
-declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = CommentsApi<any> & {
+declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = {
     /**
      * @private
      *
@@ -1866,7 +1848,7 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
         readonly self: Observable<User<TPresence, TUserMeta>>;
         readonly myPresence: Observable<TPresence>;
         readonly others: Observable<OthersEvent<TPresence, TUserMeta>>;
-        readonly error: Observable<Error>;
+        readonly error: Observable<LiveblocksError>;
         readonly storage: Observable<StorageUpdate[]>;
         readonly history: Observable<HistoryEvent>;
         /**
@@ -1879,14 +1861,6 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
         readonly ydoc: Observable<YDocUpdateServerMsg | UpdateYDocClientMsg>;
         readonly comments: Observable<CommentsEventServerMsg>;
     };
-    /**
-     * @private
-     */
-    getRoomNotificationSettings(): Promise<RoomNotificationSettings>;
-    /**
-     * @private
-     */
-    updateRoomNotificationSettings(settings: Partial<RoomNotificationSettings>): Promise<RoomNotificationSettings>;
     /**
      * Batches modifications made during the given function.
      * All the modifications are sent to other clients in a single message.
@@ -1952,8 +1926,11 @@ declare type PrivateRoomApi = {
         explicitClose(event: IWebSocketCloseEvent): void;
         rawSend(data: string): void;
     };
-    comments: {
-        lastRequestedAt: Date | null;
+    comments: CommentsApi;
+    notifications: {
+        getRoomNotificationSettings(): Promise<RoomNotificationSettings>;
+        updateRoomNotificationSettings(settings: Partial<RoomNotificationSettings>): Promise<RoomNotificationSettings>;
+        markInboxNotificationAsRead(notificationId: string): Promise<void>;
     };
 };
 declare type HistoryOp<TPresence extends JsonObject> = Op | {
@@ -2036,20 +2013,17 @@ declare type EditThreadMetadataOptimisticUpdate<TThreadMetadata extends BaseMeta
     id: string;
     threadId: string;
     metadata: Resolve<PartialNullable<TThreadMetadata>>;
+    updatedAt: Date;
 };
 declare type CreateCommentOptimisticUpdate = {
     type: "create-comment";
     id: string;
     comment: CommentData;
-    inboxNotificationId?: string;
 };
 declare type EditCommentOptimisticUpdate = {
     type: "edit-comment";
     id: string;
-    threadId: string;
-    editedAt: Date;
-    commentId: string;
-    body: CommentBody;
+    comment: CommentData;
 };
 declare type DeleteCommentOptimisticUpdate = {
     type: "delete-comment";
@@ -2063,9 +2037,7 @@ declare type AddReactionOptimisticUpdate = {
     id: string;
     threadId: string;
     commentId: string;
-    emoji: string;
-    createdAt: Date;
-    userId: string;
+    reaction: CommentUserReaction;
 };
 declare type RemoveReactionOptimisticUpdate = {
     type: "remove-reaction";
@@ -2074,6 +2046,7 @@ declare type RemoveReactionOptimisticUpdate = {
     commentId: string;
     emoji: string;
     userId: string;
+    removedAt: Date;
 };
 declare type MarkInboxNotificationAsReadOptimisticUpdate = {
     type: "mark-inbox-notification-as-read";
@@ -2131,6 +2104,10 @@ interface CacheStore<TThreadMetadata extends BaseMetadata> extends Store<CacheSt
     setQueryState(queryKey: string, queryState: QueryState): void;
 }
 declare function applyOptimisticUpdates<TThreadMetadata extends BaseMetadata>(state: CacheState<TThreadMetadata>): Pick<CacheState<TThreadMetadata>, "threads" | "inboxNotifications" | "notificationSettings">;
+declare function upsertComment<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, comment: CommentData): ThreadDataWithDeleteInfo<TThreadMetadata>;
+declare function deleteComment<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, commentId: string, deletedAt: Date): ThreadDataWithDeleteInfo<TThreadMetadata>;
+declare function addReaction<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, commentId: string, reaction: CommentUserReaction): ThreadDataWithDeleteInfo<TThreadMetadata>;
+declare function removeReaction<TThreadMetadata extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<TThreadMetadata>, commentId: string, emoji: string, userId: string, removedAt: Date): ThreadDataWithDeleteInfo<TThreadMetadata>;
 
 declare type OptionalPromise<T> = T | Promise<T>;
 
@@ -2186,6 +2163,7 @@ declare type EnterOptions<TPresence extends JsonObject, TStorage extends LsonObj
  * will probably happen if you do.
  */
 declare type PrivateClientApi<TUserMeta extends BaseUserMeta> = {
+    notifications: NotificationsApi;
     currentUserIdStore: Store<string | null>;
     resolveMentionSuggestions: ClientOptions["resolveMentionSuggestions"];
     cacheStore: CacheStore<BaseMetadata>;
@@ -2193,10 +2171,7 @@ declare type PrivateClientApi<TUserMeta extends BaseUserMeta> = {
     roomsInfoStore: BatchStore<RoomInfo | undefined, [string]>;
     getRoomIds: () => string[];
 };
-declare type InboxNotificationsApi<TThreadMetadata extends BaseMetadata = never> = {
-    /**
-     * @private
-     */
+declare type NotificationsApi<TThreadMetadata extends BaseMetadata = never> = {
     getInboxNotifications(options?: GetInboxNotificationsOptions): Promise<{
         inboxNotifications: InboxNotificationData[];
         threads: ThreadData<TThreadMetadata>[];
@@ -2206,20 +2181,11 @@ declare type InboxNotificationsApi<TThreadMetadata extends BaseMetadata = never>
             requestedAt: Date;
         };
     }>;
-    /**
-     * @private
-     */
     getUnreadInboxNotificationsCount(): Promise<number>;
-    /**
-     * @private
-     */
     markAllInboxNotificationsAsRead(): Promise<void>;
-    /**
-     * @private
-     */
     markInboxNotificationAsRead(inboxNotificationId: string): Promise<void>;
 };
-declare type Client<TUserMeta extends BaseUserMeta = BaseUserMeta> = InboxNotificationsApi & {
+declare type Client<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
     /**
      * Gets a room. Returns null if {@link Client.enter} has not been called previously.
      *
@@ -2812,4 +2778,4 @@ declare type EnsureJson<T> = [
     [K in keyof T]: EnsureJson<T[K]>;
 };
 
-export { type AckOp, type BaseAuthResult, type BaseMetadata, type BaseUserMeta, type Brand, type BroadcastEventClientMsg, type BroadcastOptions, type BroadcastedEventServerMsg, type CacheState, type CacheStore, type Client, type ClientMsg, ClientMsgCode, type CommentBody, type CommentBodyBlockElement, type CommentBodyElement, type CommentBodyInlineElement, type CommentBodyLink, type CommentBodyLinkElementArgs, type CommentBodyMention, type CommentBodyMentionElementArgs, type CommentBodyParagraph, type CommentBodyParagraphElementArgs, type CommentBodyText, type CommentBodyTextElementArgs, type CommentData, type CommentDataPlain, type CommentReaction, type CommentUserReaction, type CommentUserReactionPlain, CommentsApiError, type CommentsEventServerMsg, CrdtType, type CreateListOp, type CreateMapOp, type CreateObjectOp, type CreateOp, type CreateRegisterOp, type CustomAuthenticationResult, type Delegates, type DeleteCrdtOp, type DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, type EnsureJson, type EnterOptions, type EventSource, type FetchStorageClientMsg, type FetchYDocClientMsg, type GetThreadsOptions, type History, type IUserInfo, type IWebSocket, type IWebSocketCloseEvent, type IWebSocketEvent, type IWebSocketInstance, type IWebSocketMessageEvent, type IdTuple, type Immutable, type InboxNotificationData, type InboxNotificationDataPlain, type InboxNotificationDeleteInfo, type InboxNotificationThreadData, type InitialDocumentStateServerMsg, type Json, type JsonArray, type JsonObject, type JsonScalar, type LegacyConnectionStatus, LiveList, type LiveListUpdate, LiveMap, type LiveMapUpdate, type LiveNode, LiveObject, type LiveObjectUpdate, type LiveStructure, type LostConnectionEvent, type Lson, type LsonObject, type NodeMap, NotificationsApiError, type Op, OpCode, type OptionalPromise, type Others, type OthersEvent, type ParentToChildNodeMap, type PartialNullable, type PlainLson, type PlainLsonFields, type PlainLsonList, type PlainLsonMap, type PlainLsonObject, type RejectedStorageOpServerMsg, type Resolve, type ResolveMentionSuggestionsArgs, type ResolveRoomsInfoArgs, type ResolveUsersArgs, type Room, type RoomEventMessage, type RoomInfo, type RoomInitializers, type RoomNotificationSettings, type RoomStateServerMsg, type SerializedChild, type SerializedCrdt, type SerializedList, type SerializedMap, type SerializedObject, type SerializedRegister, type SerializedRootObject, type ServerMsg, ServerMsgCode, type SetParentKeyOp, type Status, type StorageStatus, type StorageUpdate, type Store, type StringifyCommentBodyElements, type StringifyCommentBodyOptions, type ThreadData, type ThreadDataPlain, type ThreadDeleteInfo, type ToImmutable, type ToJson, type UnsubscribeCallback, type UpdateObjectOp, type UpdatePresenceClientMsg, type UpdatePresenceServerMsg, type UpdateStorageClientMsg, type UpdateStorageServerMsg, type UpdateYDocClientMsg, type User, type UserJoinServerMsg, type UserLeftServerMsg, WebsocketCloseCodes, type YDocUpdateServerMsg, ackOp, applyOptimisticUpdates, asPos, assert, assertNever, b64decode, cloneLson, fancyConsole as console, convertToCommentData, convertToCommentUserReaction, convertToThreadData, createClient, deprecate, deprecateIf, detectDupes, errorIf, freeze, getMentionedIdsFromCommentBody, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isLiveNode, isPlainObject, isRootCrdt, kInternal, legacy_patchImmutableObject, lsonToJson, makeEventSource, makePoller, makePosition, nn, patchLiveObjectKey, raise, shallow, stringify, stringifyCommentBody, throwUsageError, toPlainLson, tryParseJson, withTimeout };
+export { type AckOp, type BaseAuthResult, type BaseMetadata, type BaseUserMeta, type Brand, type BroadcastEventClientMsg, type BroadcastOptions, type BroadcastedEventServerMsg, type CacheState, type CacheStore, type Client, type ClientMsg, ClientMsgCode, type ClientOptions, type CommentBody, type CommentBodyBlockElement, type CommentBodyElement, type CommentBodyInlineElement, type CommentBodyLink, type CommentBodyLinkElementArgs, type CommentBodyMention, type CommentBodyMentionElementArgs, type CommentBodyParagraph, type CommentBodyParagraphElementArgs, type CommentBodyText, type CommentBodyTextElementArgs, type CommentData, type CommentDataPlain, type CommentReaction, type CommentUserReaction, type CommentUserReactionPlain, CommentsApiError, type CommentsEventServerMsg, CrdtType, type CreateListOp, type CreateMapOp, type CreateObjectOp, type CreateOp, type CreateRegisterOp, type CustomAuthenticationResult, type Delegates, type DeleteCrdtOp, type DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, type EnsureJson, type EnterOptions, type EventSource, type FetchStorageClientMsg, type FetchYDocClientMsg, type GetThreadsOptions, type History, type IUserInfo, type IWebSocket, type IWebSocketCloseEvent, type IWebSocketEvent, type IWebSocketInstance, type IWebSocketMessageEvent, type IdTuple, type Immutable, type InboxNotificationData, type InboxNotificationDataPlain, type InboxNotificationDeleteInfo, type InboxNotificationThreadData, type InitialDocumentStateServerMsg, type Json, type JsonArray, type JsonObject, type JsonScalar, type LegacyConnectionStatus, LiveList, type LiveListUpdate, LiveMap, type LiveMapUpdate, type LiveNode, LiveObject, type LiveObjectUpdate, type LiveStructure, LiveblocksError, type LostConnectionEvent, type Lson, type LsonObject, type NodeMap, NotificationsApiError, type Op, OpCode, type OptionalPromise, type Others, type OthersEvent, type ParentToChildNodeMap, type PartialNullable, type PlainLson, type PlainLsonFields, type PlainLsonList, type PlainLsonMap, type PlainLsonObject, type RejectedStorageOpServerMsg, type Resolve, type ResolveMentionSuggestionsArgs, type ResolveRoomsInfoArgs, type ResolveUsersArgs, type Room, type RoomEventMessage, type RoomInfo, type RoomInitializers, type RoomNotificationSettings, type RoomStateServerMsg, type SerializedChild, type SerializedCrdt, type SerializedList, type SerializedMap, type SerializedObject, type SerializedRegister, type SerializedRootObject, type ServerMsg, ServerMsgCode, type SetParentKeyOp, type Status, type StorageStatus, type StorageUpdate, type Store, type StringifyCommentBodyElements, type StringifyCommentBodyOptions, type ThreadData, type ThreadDataPlain, type ThreadDeleteInfo, type ToImmutable, type ToJson, type UnsubscribeCallback, type UpdateObjectOp, type UpdatePresenceClientMsg, type UpdatePresenceServerMsg, type UpdateStorageClientMsg, type UpdateStorageServerMsg, type UpdateYDocClientMsg, type User, type UserJoinServerMsg, type UserLeftServerMsg, WebsocketCloseCodes, type YDocUpdateServerMsg, ackOp, addReaction, applyOptimisticUpdates, asPos, assert, assertNever, b64decode, cloneLson, fancyConsole as console, convertToCommentData, convertToCommentUserReaction, convertToThreadData, createClient, deleteComment, deprecate, deprecateIf, detectDupes, errorIf, freeze, getMentionedIdsFromCommentBody, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isLiveNode, isPlainObject, isRootCrdt, kInternal, legacy_patchImmutableObject, lsonToJson, makeEventSource, makePoller, makePosition, nn, patchLiveObjectKey, raise, removeReaction, shallow, stringify, stringifyCommentBody, throwUsageError, toPlainLson, tryParseJson, upsertComment, withTimeout };