@liveblocks/core 1.12.0 → 2.0.0-alpha1

package/dist/index.d.mts

@@ -216,10 +216,6 @@ declare enum WebsocketCloseCodes {
     CLOSE_WITHOUT_RETRY = 4999
 }
 
-/**
- * Old connection statuses, here for backward-compatibility reasons only.
- */
-declare type LegacyConnectionStatus = "closed" | "authenticating" | "connecting" | "open" | "unavailable" | "failed";
 /**
  * Returns a human-readable status indicating the current connection status of
  * a Room, as returned by `room.getStatus()`. Can be used to implement
@@ -778,6 +774,147 @@ declare class LiveObject<O extends LsonObject> extends AbstractCrdt {
     clone(): LiveObject<O>;
 }
 
+declare type BaseRoomInfo = {
+    [key: string]: Json | undefined;
+    /**
+     * The name of the room.
+     */
+    name?: string;
+    /**
+     * The URL of the room.
+     */
+    url?: string;
+};
+
+declare type DateToString<T> = {
+    [P in keyof T]: T[P] extends Date ? string : T[P] extends Date | null ? string | null : T[P] extends Date | undefined ? string | undefined : T[P];
+};
+
+declare type BaseMetadata = Record<string, string | boolean | number | undefined>;
+declare type CommentReaction = {
+    emoji: string;
+    createdAt: Date;
+    users: {
+        id: string;
+    }[];
+};
+/**
+ * Represents a comment.
+ */
+declare type CommentData = {
+    type: "comment";
+    id: string;
+    threadId: string;
+    roomId: string;
+    userId: string;
+    createdAt: Date;
+    editedAt?: Date;
+    reactions: CommentReaction[];
+} & ({
+    body: CommentBody;
+    deletedAt?: never;
+} | {
+    body?: never;
+    deletedAt: Date;
+});
+declare type CommentDataPlain = Omit<DateToString<CommentData>, "reactions" | "body"> & {
+    reactions: DateToString<CommentReaction>[];
+} & ({
+    body: CommentBody;
+    deletedAt?: never;
+} | {
+    body?: never;
+    deletedAt: string;
+});
+declare type CommentBodyBlockElement = CommentBodyParagraph;
+declare type CommentBodyInlineElement = CommentBodyText | CommentBodyMention | CommentBodyLink;
+declare type CommentBodyElement = CommentBodyBlockElement | CommentBodyInlineElement;
+declare type CommentBodyParagraph = {
+    type: "paragraph";
+    children: CommentBodyInlineElement[];
+};
+declare type CommentBodyMention = {
+    type: "mention";
+    id: string;
+};
+declare type CommentBodyLink = {
+    type: "link";
+    url: string;
+};
+declare type CommentBodyText = {
+    bold?: boolean;
+    italic?: boolean;
+    strikethrough?: boolean;
+    code?: boolean;
+    text: string;
+};
+declare type CommentBody = {
+    version: 1;
+    content: CommentBodyBlockElement[];
+};
+declare type CommentUserReaction = {
+    emoji: string;
+    createdAt: Date;
+    userId: string;
+};
+declare type CommentUserReactionPlain = DateToString<CommentUserReaction>;
+/**
+ * Represents a thread of comments.
+ */
+declare type ThreadData<M extends BaseMetadata = DM> = {
+    type: "thread";
+    id: string;
+    roomId: string;
+    createdAt: Date;
+    updatedAt?: Date;
+    comments: CommentData[];
+    metadata: M;
+};
+interface ThreadDataWithDeleteInfo<M extends BaseMetadata = DM> extends ThreadData<M> {
+    deletedAt?: Date;
+}
+declare type ThreadDataPlain<M extends BaseMetadata> = Omit<DateToString<ThreadData<M>>, "comments" | "metadata"> & {
+    comments: CommentDataPlain[];
+    metadata: M;
+};
+declare type ThreadDeleteInfo = {
+    type: "deletedThread";
+    id: string;
+    roomId: string;
+    deletedAt: Date;
+};
+declare type QueryMetadataStringValue<T extends string> = T | {
+    startsWith: string;
+};
+/**
+ * This type can be used to build a metadata query string (compatible
+ * with `@liveblocks/query-parser`) through a type-safe API.
+ *
+ * In addition to exact values (`:` in query string), it adds:
+ * - to strings:
+ *  - `startsWith` (`^` in query string)
+ */
+declare type QueryMetadata<M extends BaseMetadata> = {
+    [K in keyof M]: M[K] extends string ? QueryMetadataStringValue<M[K]> : M[K];
+};
+
+declare global {
+    /**
+     * Namespace for user-defined Liveblocks types.
+     */
+    export interface Liveblocks {
+        [key: string]: unknown;
+    }
+}
+declare type ExtendableTypes = "Presence" | "Storage" | "UserMeta" | "RoomEvent" | "ThreadMetadata" | "RoomInfo";
+declare type ExtendedType<K extends ExtendableTypes, B> = unknown extends Liveblocks[K] ? B : Liveblocks[K] extends B ? Liveblocks[K] : `The type you provided for '${K}' does not match its requirements. To learn how to fix this, see https://liveblocks.io/errors/${K}`;
+declare type DP = ExtendedType<"Presence", JsonObject>;
+declare type DS = ExtendedType<"Storage", LsonObject>;
+declare type DU = ExtendedType<"UserMeta", BaseUserMeta>;
+declare type DE = ExtendedType<"RoomEvent", Json>;
+declare type DM = ExtendedType<"ThreadMetadata", BaseMetadata>;
+declare type DRI = ExtendedType<"RoomInfo", BaseRoomInfo>;
+
 /**
  * Use this symbol to brand an object property as internal.
  *
@@ -834,12 +971,12 @@ declare enum ClientMsgCode {
 /**
  * Messages that can be sent from the client to the server.
  */
-declare type ClientMsg<TPresence extends JsonObject, TRoomEvent extends Json> = BroadcastEventClientMsg<TRoomEvent> | UpdatePresenceClientMsg<TPresence> | UpdateStorageClientMsg | FetchStorageClientMsg | FetchYDocClientMsg | UpdateYDocClientMsg;
-declare type BroadcastEventClientMsg<TRoomEvent extends Json> = {
+declare type ClientMsg<P extends JsonObject, E extends Json> = BroadcastEventClientMsg<E> | UpdatePresenceClientMsg<P> | UpdateStorageClientMsg | FetchStorageClientMsg | FetchYDocClientMsg | UpdateYDocClientMsg;
+declare type BroadcastEventClientMsg<E extends Json> = {
     type: ClientMsgCode.BROADCAST_EVENT;
-    event: TRoomEvent;
+    event: E;
 };
-declare type UpdatePresenceClientMsg<TPresence extends JsonObject> = {
+declare type UpdatePresenceClientMsg<P extends JsonObject> = {
     readonly type: ClientMsgCode.UPDATE_PRESENCE;
     /**
      * Set this to any number to signify that this is a Full Presence™
@@ -855,7 +992,7 @@ declare type UpdatePresenceClientMsg<TPresence extends JsonObject> = {
      * all presence fields, and isn't a partial "patch".
      */
     readonly targetActor: number;
-    readonly data: TPresence;
+    readonly data: P;
 } | {
     readonly type: ClientMsgCode.UPDATE_PRESENCE;
     /**
@@ -863,7 +1000,7 @@ declare type UpdatePresenceClientMsg<TPresence extends JsonObject> = {
      * Presence™ "patch".
      */
     readonly targetActor?: undefined;
-    readonly data: Partial<TPresence>;
+    readonly data: Partial<P>;
 };
 declare type UpdateStorageClientMsg = {
     readonly type: ClientMsgCode.UPDATE_STORAGE;
@@ -883,6 +1020,42 @@ declare type UpdateYDocClientMsg = {
     readonly guid?: string;
 };
 
+declare type InboxNotificationThreadData = {
+    kind: "thread";
+    id: string;
+    roomId: string;
+    threadId: string;
+    notifiedAt: Date;
+    readAt: Date | null;
+};
+declare type ActivityData = Record<string, string | boolean | number | undefined>;
+declare type InboxNotificationActivity = {
+    id: string;
+    createdAt: Date;
+    data: ActivityData;
+};
+declare type InboxNotificationCustomData = {
+    kind: `$${string}`;
+    id: string;
+    roomId?: string;
+    subjectId: string;
+    notifiedAt: Date;
+    readAt: Date | null;
+    activities: InboxNotificationActivity[];
+};
+declare type InboxNotificationData = InboxNotificationThreadData | InboxNotificationCustomData;
+declare type InboxNotificationThreadDataPlain = DateToString<InboxNotificationThreadData>;
+declare type InboxNotificationCustomDataPlain = Omit<DateToString<InboxNotificationCustomData>, "activities"> & {
+    activities: DateToString<InboxNotificationActivity>[];
+};
+declare type InboxNotificationDataPlain = InboxNotificationThreadDataPlain | InboxNotificationCustomDataPlain;
+declare type InboxNotificationDeleteInfo = {
+    type: "deletedInboxNotification";
+    id: string;
+    roomId: string;
+    deletedAt: Date;
+};
+
 declare type IdTuple<T> = [id: string, value: T];
 declare enum CrdtType {
     OBJECT = 0,
@@ -944,7 +1117,7 @@ declare enum ServerMsgCode {
 /**
  * Messages that can be sent from the server to the client.
  */
-declare type ServerMsg<TPresence extends JsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = UpdatePresenceServerMsg<TPresence> | UserJoinServerMsg<TUserMeta> | UserLeftServerMsg | BroadcastedEventServerMsg<TRoomEvent> | RoomStateServerMsg<TUserMeta> | InitialDocumentStateServerMsg | UpdateStorageServerMsg | RejectedStorageOpServerMsg | YDocUpdateServerMsg | CommentsEventServerMsg;
+declare type ServerMsg<P extends JsonObject, U extends BaseUserMeta, E extends Json> = UpdatePresenceServerMsg<P> | UserJoinServerMsg<U> | UserLeftServerMsg | BroadcastedEventServerMsg<E> | RoomStateServerMsg<U> | InitialDocumentStateServerMsg | UpdateStorageServerMsg | RejectedStorageOpServerMsg | YDocUpdateServerMsg | CommentsEventServerMsg;
 declare type CommentsEventServerMsg = ThreadCreatedEvent | ThreadMetadataUpdatedEvent | CommentCreatedEvent | CommentEditedEvent | CommentDeletedEvent | CommentReactionAdded | CommentReactionRemoved;
 declare type ThreadCreatedEvent = {
     type: ServerMsgCode.THREAD_CREATED;
@@ -992,7 +1165,7 @@ declare type CommentReactionRemoved = {
  * those cases, the `targetActor` field indicates the newly connected client,
  * so all other existing clients can ignore this broadcasted message.
  */
-declare type UpdatePresenceServerMsg<TPresence extends JsonObject> = {
+declare type UpdatePresenceServerMsg<P extends JsonObject> = {
     readonly type: ServerMsgCode.UPDATE_PRESENCE;
     /**
      * The User whose Presence has changed.
@@ -1016,7 +1189,7 @@ declare type UpdatePresenceServerMsg<TPresence extends JsonObject> = {
      * this will be the full Presence, otherwise it only contain the fields that
      * have changed since the last broadcast.
      */
-    readonly data: TPresence;
+    readonly data: P;
 } | {
     readonly type: ServerMsgCode.UPDATE_PRESENCE;
     /**
@@ -1031,25 +1204,25 @@ declare type UpdatePresenceServerMsg<TPresence extends JsonObject> = {
      * A partial Presence patch to apply to the User. It will only contain the
      * fields that have changed since the last broadcast.
      */
-    readonly data: Partial<TPresence>;
+    readonly data: Partial<P>;
 };
 /**
  * Sent by the WebSocket server and broadcasted to all clients to announce that
  * a new User has joined the Room.
  */
-declare type UserJoinServerMsg<TUserMeta extends BaseUserMeta> = {
+declare type UserJoinServerMsg<U extends BaseUserMeta> = {
     readonly type: ServerMsgCode.USER_JOINED;
     readonly actor: number;
     /**
      * The id of the User that has been set in the authentication endpoint.
      * Useful to get additional information about the connected user.
      */
-    readonly id: TUserMeta["id"];
+    readonly id: U["id"];
     /**
      * Additional user information that has been set in the authentication
      * endpoint.
      */
-    readonly info: TUserMeta["info"];
+    readonly info: U["info"];
     /**
      * Informs the client what (public) permissions this (other) User has.
      */
@@ -1078,7 +1251,7 @@ declare type YDocUpdateServerMsg = {
  * Sent by the WebSocket server and broadcasted to all clients to announce that
  * a User broadcasted an Event to everyone in the Room.
  */
-declare type BroadcastedEventServerMsg<TRoomEvent extends Json> = {
+declare type BroadcastedEventServerMsg<E extends Json> = {
     readonly type: ServerMsgCode.BROADCASTED_EVENT;
     /**
      * The User who broadcast the Event. Absent when this event is broadcast from
@@ -1089,14 +1262,14 @@ declare type BroadcastedEventServerMsg<TRoomEvent extends Json> = {
      * The arbitrary payload of the Event. This can be any JSON value. Clients
      * will have to manually verify/decode this event.
      */
-    readonly event: TRoomEvent;
+    readonly event: E;
 };
 /**
  * Sent by the WebSocket server to a single client in response to the client
  * joining the Room, to provide the initial state of the Room. The payload
  * includes a list of all other Users that already are in the Room.
  */
-declare type RoomStateServerMsg<TUserMeta extends BaseUserMeta> = {
+declare type RoomStateServerMsg<U extends BaseUserMeta> = {
     readonly type: ServerMsgCode.ROOM_STATE;
     /**
      * Informs the client what their actor ID is going to be.
@@ -1114,7 +1287,7 @@ declare type RoomStateServerMsg<TUserMeta extends BaseUserMeta> = {
      */
     readonly scopes: string[];
     readonly users: {
-        readonly [otherActor: number]: TUserMeta & {
+        readonly [otherActor: number]: U & {
             scopes: string[];
         };
     };
@@ -1150,82 +1323,6 @@ declare type RejectedStorageOpServerMsg = {
     readonly reason: string;
 };
 
-declare type BaseMetadata = Record<string, string | boolean | number>;
-
-declare type CommentBodyBlockElement = CommentBodyParagraph;
-declare type CommentBodyInlineElement = CommentBodyText | CommentBodyMention | CommentBodyLink;
-declare type CommentBodyElement = CommentBodyBlockElement | CommentBodyInlineElement;
-declare type CommentBodyParagraph = {
-    type: "paragraph";
-    children: CommentBodyInlineElement[];
-};
-declare type CommentBodyMention = {
-    type: "mention";
-    id: string;
-};
-declare type CommentBodyLink = {
-    type: "link";
-    url: string;
-};
-declare type CommentBodyText = {
-    bold?: boolean;
-    italic?: boolean;
-    strikethrough?: boolean;
-    code?: boolean;
-    text: string;
-};
-declare type CommentBody = {
-    version: 1;
-    content: CommentBodyBlockElement[];
-};
-
-declare type DateToString<T> = {
-    [P in keyof T]: T[P] extends Date ? string : T[P] extends Date | null ? string | null : T[P] extends Date | undefined ? string | undefined : T[P];
-};
-
-declare type CommentReaction = {
-    emoji: string;
-    createdAt: Date;
-    users: {
-        id: string;
-    }[];
-};
-/**
- * Represents a comment.
- */
-declare type CommentData = {
-    type: "comment";
-    id: string;
-    threadId: string;
-    roomId: string;
-    userId: string;
-    createdAt: Date;
-    editedAt?: Date;
-    reactions: CommentReaction[];
-} & ({
-    body: CommentBody;
-    deletedAt?: never;
-} | {
-    body?: never;
-    deletedAt: Date;
-});
-declare type CommentDataPlain = Omit<DateToString<CommentData>, "reactions" | "body"> & {
-    reactions: DateToString<CommentReaction>[];
-} & ({
-    body: CommentBody;
-    deletedAt?: never;
-} | {
-    body?: never;
-    deletedAt: string;
-});
-
-declare type CommentUserReaction = {
-    emoji: string;
-    createdAt: Date;
-    userId: string;
-};
-declare type CommentUserReactionPlain = DateToString<CommentUserReaction>;
-
 declare type JsonTreeNode = {
     readonly type: "Json";
     readonly id: string;
@@ -1270,47 +1367,10 @@ declare namespace DevToolsTreeNode {
   export type { DevToolsTreeNode_CustomEventTreeNode as CustomEventTreeNode, DevToolsTreeNode_JsonTreeNode as JsonTreeNode, DevToolsTreeNode_LiveTreeNode as LiveTreeNode, DevToolsTreeNode_LsonTreeNode as LsonTreeNode, DevToolsTreeNode_TreeNode as TreeNode, DevToolsTreeNode_UserTreeNode as UserTreeNode };
 }
 
-declare type InboxNotificationThreadData = {
-    kind: "thread";
-    id: string;
-    roomId: string;
-    threadId: string;
-    notifiedAt: Date;
-    readAt: Date | null;
-};
-declare type ActivityData = Record<string, string | boolean | number>;
-declare type InboxNotificationActivity = {
-    id: string;
-    createdAt: Date;
-    data: ActivityData;
-};
-declare type InboxNotificationCustomData = {
-    kind: `$${string}`;
-    id: string;
-    roomId?: string;
-    subjectId: string;
-    notifiedAt: Date;
-    readAt: Date | null;
-    activities: InboxNotificationActivity[];
-};
-declare type InboxNotificationData = InboxNotificationThreadData | InboxNotificationCustomData;
-declare type InboxNotificationThreadDataPlain = DateToString<InboxNotificationThreadData>;
-declare type InboxNotificationCustomDataPlain = Omit<DateToString<InboxNotificationCustomData>, "activities"> & {
-    activities: DateToString<InboxNotificationActivity>[];
-};
-declare type InboxNotificationDataPlain = InboxNotificationThreadDataPlain | InboxNotificationCustomDataPlain;
-
-declare type InboxNotificationDeleteInfo = {
-    type: "deletedInboxNotification";
-    id: string;
-    roomId: string;
-    deletedAt: Date;
-};
-
 /**
  * Represents a user connected in a room. Treated as immutable.
  */
-declare type User<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = {
+declare type User<P extends JsonObject = DP, U extends BaseUserMeta = DU> = {
     /**
      * The connection ID of the User. It is unique and increment at every new connection.
      */
@@ -1319,21 +1379,15 @@ declare type User<TPresence extends JsonObject, TUserMeta extends BaseUserMeta>
      * The ID of the User that has been set in the authentication endpoint.
      * Useful to get additional information about the connected user.
      */
-    readonly id: TUserMeta["id"];
+    readonly id: U["id"];
     /**
      * Additional user information that has been set in the authentication endpoint.
      */
-    readonly info: TUserMeta["info"];
+    readonly info: U["info"];
     /**
      * The user’s presence data.
      */
-    readonly presence: TPresence;
-    /**
-     * @deprecated Use `!user.canWrite` instead.
-     * False if the user can mutate the Room’s Storage and/or YDoc, true if they
-     * can only read but not mutate it.
-     */
-    readonly isReadOnly: boolean;
+    readonly presence: P;
     /**
      * True if the user can mutate the Room’s Storage and/or YDoc, false if they
      * can only read but not mutate it.
@@ -1345,94 +1399,48 @@ declare type User<TPresence extends JsonObject, TUserMeta extends BaseUserMeta>
     readonly canComment: boolean;
 };
 
-/**
- * @deprecated Use `readonly User<TPresence, TUserMeta>[]` instead of `Others<TPresence, TUserMeta>`.
- */
-declare type Others<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = readonly User<TPresence, TUserMeta>[];
-declare type InternalOthersEvent<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = {
+declare type InternalOthersEvent<P extends JsonObject, U extends BaseUserMeta> = {
     type: "leave";
-    user: User<TPresence, TUserMeta>;
+    user: User<P, U>;
 } | {
     type: "enter";
-    user: User<TPresence, TUserMeta>;
+    user: User<P, U>;
 } | {
     type: "update";
-    user: User<TPresence, TUserMeta>;
-    updates: Partial<TPresence>;
+    user: User<P, U>;
+    updates: Partial<P>;
 } | {
     type: "reset";
     user?: never;
 };
-declare type OthersEvent<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = Resolve<InternalOthersEvent<TPresence, TUserMeta> & {
-    others: readonly User<TPresence, TUserMeta>[];
+declare type OthersEvent<P extends JsonObject = DP, U extends BaseUserMeta = DU> = Resolve<InternalOthersEvent<P, U> & {
+    others: readonly User<P, U>[];
 }>;
 
 declare type PartialNullable<T> = {
     [P in keyof T]?: T[P] | null;
 };
 
-declare type QueryMetadataStringValue<T extends string> = T | {
-    startsWith: string;
-};
-/**
- * This type can be used to build a metadata query string (compatible
- * with `@liveblocks/query-parser`) through a type-safe API.
- *
- * In addition to exact values (`:` in query string), it adds:
- * - to strings:
- *  - `startsWith` (`^` in query string)
- */
-declare type QueryMetadata<T extends BaseMetadata> = {
-    [K in keyof T]: T[K] extends string ? QueryMetadataStringValue<T[K]> : T[K];
-};
-
 declare type RoomThreadsNotificationSettings = "all" | "replies_and_mentions" | "none";
 declare type RoomNotificationSettings = {
     threads: RoomThreadsNotificationSettings;
 };
 
-/**
- * Represents a thread of comments.
- */
-declare type ThreadData<TThreadMetadata extends BaseMetadata = never> = {
-    type: "thread";
-    id: string;
-    roomId: string;
-    createdAt: Date;
-    updatedAt?: Date;
-    comments: CommentData[];
-    metadata: [TThreadMetadata] extends [never] ? Record<string, never> : TThreadMetadata;
-};
-interface ThreadDataWithDeleteInfo<TThreadMetadata extends BaseMetadata = never> extends ThreadData<TThreadMetadata> {
-    deletedAt?: Date;
-}
-declare type ThreadDataPlain<TThreadMetadata extends BaseMetadata = never> = Omit<DateToString<ThreadData<TThreadMetadata>>, "comments" | "metadata"> & {
-    comments: CommentDataPlain[];
-    metadata: [TThreadMetadata] extends [never] ? Record<string, never> : TThreadMetadata;
-};
-
-declare type ThreadDeleteInfo = {
-    type: "deletedThread";
-    id: string;
-    roomId: string;
-    deletedAt: Date;
-};
-
-declare type LegacyOthersEvent<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = {
+declare type LegacyOthersEvent<P extends JsonObject, U extends BaseUserMeta> = {
     type: "leave";
-    user: User<TPresence, TUserMeta>;
+    user: User<P, U>;
 } | {
     type: "enter";
-    user: User<TPresence, TUserMeta>;
+    user: User<P, U>;
 } | {
     type: "update";
-    user: User<TPresence, TUserMeta>;
-    updates: Partial<TPresence>;
+    user: User<P, U>;
+    updates: Partial<P>;
 } | {
     type: "reset";
 };
-declare type LegacyOthersEventCallback<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = (others: readonly User<TPresence, TUserMeta>[], event: LegacyOthersEvent<TPresence, TUserMeta>) => void;
-declare type RoomEventMessage<TPresence extends JsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = {
+declare type LegacyOthersEventCallback<P extends JsonObject, U extends BaseUserMeta> = (others: readonly User<P, U>[], event: LegacyOthersEvent<P, U>) => void;
+declare type RoomEventMessage<P extends JsonObject, U extends BaseUserMeta, E extends Json> = {
     /**
      * The connection ID of the client that sent the event.
      * If this message was broadcast from the server (via the REST API), then
@@ -1444,8 +1452,8 @@ declare type RoomEventMessage<TPresence extends JsonObject, TUserMeta extends Ba
      * If this message was broadcast from the server (via the REST API), then
      * this value will be null.
      */
-    user: User<TPresence, TUserMeta> | null;
-    event: TRoomEvent;
+    user: User<P, U> | null;
+    event: E;
 };
 declare type StorageStatus = "not-loaded" | "loading" | "synchronizing" | "synchronized";
 interface History {
@@ -1537,7 +1545,7 @@ declare type BroadcastOptions = {
      */
     shouldQueueEventIfNotReady: boolean;
 };
-declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = {
+declare type SubscribeFn<P extends JsonObject, _TStorage extends LsonObject, U extends BaseUserMeta, E extends Json> = {
     /**
      * Subscribe to the current user presence updates.
      *
@@ -1550,7 +1558,7 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      *   // Do something
      * });
      */
-    (type: "my-presence", listener: Callback<TPresence>): () => void;
+    (type: "my-presence", listener: Callback<P>): () => void;
     /**
      * Subscribe to the other users updates.
      *
@@ -1564,7 +1572,7 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      * });
      *
      */
-    (type: "others", listener: LegacyOthersEventCallback<TPresence, TUserMeta>): () => void;
+    (type: "others", listener: LegacyOthersEventCallback<P, U>): () => void;
     /**
      * Subscribe to events broadcasted by {@link Room.broadcastEvent}
      *
@@ -1578,7 +1586,7 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      * });
      *
      */
-    (type: "event", listener: Callback<RoomEventMessage<TPresence, TUserMeta, TRoomEvent>>): () => void;
+    (type: "event", listener: Callback<RoomEventMessage<P, U, E>>): () => void;
     /**
      * Subscribe to errors thrown in the room.
      *
@@ -1586,30 +1594,6 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      *
      */
     (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.
-     *
-     * We recommend making the following changes if you use these APIs:
-     *
-     *     OLD APIs                       NEW APIs
-     *     .getConnectionState()     -->  .getStatus()
-     *     .subscribe('connection')  -->  .subscribe('status')
-     *
-     *     OLD STATUSES         NEW STATUSES
-     *     closed          -->  initial
-     *     authenticating  -->  connecting
-     *     connecting      -->  connecting
-     *     open            -->  connected
-     *     unavailable     -->  reconnecting
-     *     failed          -->  disconnected
-     *
-     * Subscribe to legacy connection status updates.
-     *
-     * @returns Unsubscribe function.
-     *
-     */
-    (type: "connection", listener: Callback<LegacyConnectionStatus>): () => void;
     /**
      * Subscribe to connection status updates. The callback will be called any
      * time the status changes.
@@ -1694,15 +1678,15 @@ declare type SubscribeFn<TPresence extends JsonObject, _TStorage extends LsonObj
      */
     (type: "storage-status", listener: Callback<StorageStatus>): () => void;
 };
-declare type GetThreadsOptions<TThreadMetadata extends BaseMetadata> = {
+declare type GetThreadsOptions<M extends BaseMetadata> = {
     query?: {
-        metadata?: Partial<QueryMetadata<TThreadMetadata>>;
+        metadata?: Partial<QueryMetadata<M>>;
     };
     since?: Date;
 };
-declare type CommentsApi = {
-    getThreads<TThreadMetadata extends BaseMetadata = never>(options?: GetThreadsOptions<TThreadMetadata>): Promise<{
-        threads: ThreadData<TThreadMetadata>[];
+declare type CommentsApi<M extends BaseMetadata> = {
+    getThreads(options?: GetThreadsOptions<M>): Promise<{
+        threads: ThreadData<M>[];
         inboxNotifications: InboxNotificationData[];
         deletedThreads: ThreadDeleteInfo[];
         deletedInboxNotifications: InboxNotificationDeleteInfo[];
@@ -1710,22 +1694,22 @@ declare type CommentsApi = {
             requestedAt: Date;
         };
     }>;
-    getThread<TThreadMetadata extends BaseMetadata = never>(options: {
+    getThread(options: {
         threadId: string;
     }): Promise<{
-        thread: ThreadData<TThreadMetadata>;
+        thread: ThreadData<M>;
         inboxNotification?: InboxNotificationData;
     } | undefined>;
-    createThread<TThreadMetadata extends BaseMetadata = never>(options: {
+    createThread(options: {
         threadId: string;
         commentId: string;
-        metadata: TThreadMetadata | undefined;
+        metadata: M | undefined;
         body: CommentBody;
-    }): Promise<ThreadData<TThreadMetadata>>;
-    editThreadMetadata<TThreadMetadata extends BaseMetadata = never>(options: {
-        metadata: PartialNullable<TThreadMetadata>;
+    }): Promise<ThreadData<M>>;
+    editThreadMetadata(options: {
+        metadata: PartialNullable<M>;
         threadId: string;
-    }): Promise<TThreadMetadata>;
+    }): Promise<M>;
     createComment(options: {
         threadId: string;
         commentId: string;
@@ -1751,7 +1735,13 @@ declare type CommentsApi = {
         emoji: string;
     }): Promise<void>;
 };
-declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUserMeta extends BaseUserMeta, TRoomEvent extends Json> = {
+/**
+ * @private Widest-possible Room type, matching _any_ Room instance. Note that
+ * this type is different from `Room`-without-type-arguments. That represents
+ * a Room instance using globally augmented types only, which is narrower.
+ */
+declare type OpaqueRoom = Room<JsonObject, LsonObject, BaseUserMeta, Json, BaseMetadata>;
+declare type Room<P extends JsonObject = DP, S extends LsonObject = DS, U extends BaseUserMeta = DU, E extends Json = DE, M extends BaseMetadata = DM> = {
     /**
      * @private
      *
@@ -1759,36 +1749,17 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
      * of Liveblocks, NEVER USE ANY OF THESE DIRECTLY, because bad things
      * will probably happen if you do.
      */
-    readonly [kInternal]: PrivateRoomApi;
+    readonly [kInternal]: PrivateRoomApi<M>;
     /**
      * The id of the room.
      */
     readonly id: string;
-    /**
-     * @deprecated This API will be removed in a future version of Liveblocks.
-     * Prefer using `.getStatus()` instead.
-     *
-     * We recommend making the following changes if you use these APIs:
-     *
-     *     OLD APIs                       NEW APIs
-     *     .getConnectionState()     -->  .getStatus()
-     *     .subscribe('connection')  -->  .subscribe('status')
-     *
-     *     OLD STATUSES         NEW STATUSES
-     *     closed          -->  initial
-     *     authenticating  -->  connecting
-     *     connecting      -->  connecting
-     *     open            -->  connected
-     *     unavailable     -->  reconnecting
-     *     failed          -->  disconnected
-     */
-    getConnectionState(): LegacyConnectionStatus;
     /**
      * Return the current connection status for this room. Can be used to display
      * a status badge for your Liveblocks connection.
      */
     getStatus(): Status;
-    readonly subscribe: SubscribeFn<TPresence, TStorage, TUserMeta, TRoomEvent>;
+    readonly subscribe: SubscribeFn<P, S, U, E>;
     /**
      * Room's history contains functions that let you undo and redo operation made on by the current client on the presence and storage.
      */
@@ -1800,21 +1771,21 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
      * @example
      * const user = room.getSelf();
      */
-    getSelf(): User<TPresence, TUserMeta> | null;
+    getSelf(): User<P, U> | null;
     /**
      * Gets the presence of the current user.
      *
      * @example
      * const presence = room.getPresence();
      */
-    getPresence(): TPresence;
+    getPresence(): P;
     /**
      * Gets all the other users in the room.
      *
      * @example
      * const others = room.getOthers();
      */
-    getOthers(): readonly User<TPresence, TUserMeta>[];
+    getOthers(): readonly User<P, U>[];
     /**
      * Updates the presence of the current user. Only pass the properties you want to update. No need to send the full presence.
      * @param patch A partial object that contains the properties you want to update.
@@ -1827,7 +1798,7 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
      * const presence = room.getPresence();
      * // presence is equivalent to { x: 0, y: 0 }
      */
-    updatePresence(patch: Partial<TPresence>, options?: {
+    updatePresence(patch: Partial<P>, options?: {
         /**
          * Whether or not the presence should have an impact on the undo/redo history.
          */
@@ -1858,7 +1829,7 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
      *   }
      * });
      */
-    broadcastEvent(event: TRoomEvent, options?: BroadcastOptions): void;
+    broadcastEvent(event: E, options?: BroadcastOptions): void;
     /**
      * Get the room's storage asynchronously.
      * The storage's root is a {@link LiveObject}.
@@ -1867,7 +1838,7 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
      * const { root } = await room.getStorage();
      */
     getStorage(): Promise<{
-        root: LiveObject<TStorage>;
+        root: LiveObject<S>;
     }>;
     /**
      * Get the room's storage synchronously.
@@ -1876,14 +1847,14 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
      * @example
      * const root = room.getStorageSnapshot();
      */
-    getStorageSnapshot(): LiveObject<TStorage> | null;
+    getStorageSnapshot(): LiveObject<S> | null;
     readonly events: {
         readonly status: Observable<Status>;
         readonly lostConnection: Observable<LostConnectionEvent>;
-        readonly customEvent: Observable<RoomEventMessage<TPresence, TUserMeta, TRoomEvent>>;
-        readonly self: Observable<User<TPresence, TUserMeta>>;
-        readonly myPresence: Observable<TPresence>;
-        readonly others: Observable<OthersEvent<TPresence, TUserMeta>>;
+        readonly customEvent: Observable<RoomEventMessage<P, U, E>>;
+        readonly self: Observable<User<P, U>>;
+        readonly myPresence: Observable<P>;
+        readonly others: Observable<OthersEvent<P, U>>;
         readonly error: Observable<LiveblocksError>;
         readonly storage: Observable<StorageUpdate[]>;
         readonly history: Observable<HistoryEvent>;
@@ -1952,7 +1923,7 @@ declare type Room<TPresence extends JsonObject, TStorage extends LsonObject, TUs
  * Liveblocks, NEVER USE ANY OF THESE METHODS DIRECTLY, because bad things
  * will probably happen if you do.
  */
-declare type PrivateRoomApi = {
+declare type PrivateRoomApi<M extends BaseMetadata> = {
     presenceBuffer: Json | undefined;
     undoStack: readonly (readonly Readonly<HistoryOp<JsonObject>>[])[];
     nodeCount: number;
@@ -1962,32 +1933,32 @@ declare type PrivateRoomApi = {
         explicitClose(event: IWebSocketCloseEvent): void;
         rawSend(data: string): void;
     };
-    comments: CommentsApi;
+    comments: CommentsApi<M>;
     notifications: {
         getRoomNotificationSettings(): Promise<RoomNotificationSettings>;
         updateRoomNotificationSettings(settings: Partial<RoomNotificationSettings>): Promise<RoomNotificationSettings>;
         markInboxNotificationAsRead(notificationId: string): Promise<void>;
     };
 };
-declare type HistoryOp<TPresence extends JsonObject> = Op | {
+declare type HistoryOp<P extends JsonObject> = Op | {
     readonly type: "presence";
-    readonly data: TPresence;
+    readonly data: P;
 };
 declare type Polyfills = {
     atob?: (data: string) => string;
     fetch?: typeof fetch;
     WebSocket?: IWebSocket;
 };
-declare type RoomInitializers<TPresence extends JsonObject, TStorage extends LsonObject> = Resolve<{
+declare type RoomInitializers<P extends JsonObject, S extends LsonObject> = Resolve<{
     /**
      * The initial Presence to use and announce when you enter the Room. The
      * Presence is available on all users in the Room (me & others).
      */
-    initialPresence: TPresence | ((roomId: string) => TPresence);
+    initialPresence: P | ((roomId: string) => P);
     /**
      * The initial Storage to use when entering a new Room.
      */
-    initialStorage?: TStorage | ((roomId: string) => TStorage);
+    initialStorage?: S | ((roomId: string) => S);
     /**
      * Whether or not the room automatically connects to Liveblock servers.
      * Default is true.
@@ -1996,8 +1967,6 @@ declare type RoomInitializers<TPresence extends JsonObject, TStorage extends Lso
      * the authentication endpoint or connect via WebSocket.
      */
     autoConnect?: boolean;
-    /** @deprecated Renamed to `autoConnect` */
-    shouldInitiallyConnect?: boolean;
 }>;
 declare class CommentsApiError extends Error {
     message: string;
@@ -2038,17 +2007,17 @@ declare type GetInboxNotificationsOptions = {
     since?: Date;
 };
 
-declare type OptimisticUpdate<TThreadMetadata extends BaseMetadata> = CreateThreadOptimisticUpdate<TThreadMetadata> | EditThreadMetadataOptimisticUpdate<TThreadMetadata> | CreateCommentOptimisticUpdate | EditCommentOptimisticUpdate | DeleteCommentOptimisticUpdate | AddReactionOptimisticUpdate | RemoveReactionOptimisticUpdate | MarkInboxNotificationAsReadOptimisticUpdate | MarkAllInboxNotificationsAsReadOptimisticUpdate | UpdateNotificationSettingsOptimisticUpdate;
-declare type CreateThreadOptimisticUpdate<TThreadMetadata extends BaseMetadata> = {
+declare type OptimisticUpdate<M extends BaseMetadata> = CreateThreadOptimisticUpdate<M> | EditThreadMetadataOptimisticUpdate<M> | CreateCommentOptimisticUpdate | EditCommentOptimisticUpdate | DeleteCommentOptimisticUpdate | AddReactionOptimisticUpdate | RemoveReactionOptimisticUpdate | MarkInboxNotificationAsReadOptimisticUpdate | MarkAllInboxNotificationsAsReadOptimisticUpdate | UpdateNotificationSettingsOptimisticUpdate;
+declare type CreateThreadOptimisticUpdate<M extends BaseMetadata> = {
     type: "create-thread";
     id: string;
-    thread: ThreadData<TThreadMetadata>;
+    thread: ThreadData<M>;
 };
-declare type EditThreadMetadataOptimisticUpdate<TThreadMetadata extends BaseMetadata> = {
+declare type EditThreadMetadataOptimisticUpdate<M extends BaseMetadata> = {
     type: "edit-thread-metadata";
     id: string;
     threadId: string;
-    metadata: Resolve<PartialNullable<TThreadMetadata>>;
+    metadata: Resolve<PartialNullable<M>>;
     updatedAt: Date;
 };
 declare type CreateCommentOptimisticUpdate = {
@@ -2108,11 +2077,11 @@ declare type QueryState = {
     isLoading: false;
     error?: Error;
 };
-declare type CacheState<TThreadMetadata extends BaseMetadata> = {
+declare type CacheState<M extends BaseMetadata> = {
     /**
      * Threads by ID.
      */
-    threads: Record<string, ThreadDataWithDeleteInfo<TThreadMetadata>>;
+    threads: Record<string, ThreadDataWithDeleteInfo<M>>;
     /**
      * Keep track of loading and error status of all the queries made by the client.
      */
@@ -2121,7 +2090,7 @@ declare type CacheState<TThreadMetadata extends BaseMetadata> = {
      * Optimistic updates that have not been acknowledged by the server yet.
      * They are applied on top of the threads in selectors.
      */
-    optimisticUpdates: OptimisticUpdate<TThreadMetadata>[];
+    optimisticUpdates: OptimisticUpdate<M>[];
     /**
      * Inbox notifications by ID.
      */
@@ -2131,33 +2100,22 @@ declare type CacheState<TThreadMetadata extends BaseMetadata> = {
      */
     notificationSettings: Record<string, RoomNotificationSettings>;
 };
-interface CacheStore<TThreadMetadata extends BaseMetadata> extends Store<CacheState<TThreadMetadata>> {
+interface CacheStore<M extends BaseMetadata> extends Store<CacheState<M>> {
     deleteThread(threadId: string): void;
-    updateThreadAndNotification(thread: ThreadData<TThreadMetadata>, inboxNotification?: InboxNotificationData): void;
-    updateThreadsAndNotifications(threads: ThreadData<TThreadMetadata>[], inboxNotifications: InboxNotificationData[], deletedThreads: ThreadDeleteInfo[], deletedInboxNotifications: InboxNotificationDeleteInfo[], queryKey?: string): void;
+    updateThreadAndNotification(thread: ThreadData<M>, inboxNotification?: InboxNotificationData): void;
+    updateThreadsAndNotifications(threads: ThreadData<M>[], inboxNotifications: InboxNotificationData[], deletedThreads: ThreadDeleteInfo[], deletedInboxNotifications: InboxNotificationDeleteInfo[], queryKey?: string): void;
     updateRoomInboxNotificationSettings(roomId: string, settings: RoomNotificationSettings, queryKey: string): void;
-    pushOptimisticUpdate(optimisticUpdate: OptimisticUpdate<TThreadMetadata>): void;
+    pushOptimisticUpdate(optimisticUpdate: OptimisticUpdate<M>): void;
     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 function applyOptimisticUpdates<M extends BaseMetadata>(state: CacheState<M>): Pick<CacheState<M>, "threads" | "inboxNotifications" | "notificationSettings">;
+declare function upsertComment<M extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<M>, comment: CommentData): ThreadDataWithDeleteInfo<M>;
+declare function deleteComment<M extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<M>, commentId: string, deletedAt: Date): ThreadDataWithDeleteInfo<M>;
+declare function addReaction<M extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<M>, commentId: string, reaction: CommentUserReaction): ThreadDataWithDeleteInfo<M>;
+declare function removeReaction<M extends BaseMetadata>(thread: ThreadDataWithDeleteInfo<M>, commentId: string, emoji: string, userId: string, removedAt: Date): ThreadDataWithDeleteInfo<M>;
 
 declare type OptionalPromise<T> = T | Promise<T>;
 
-declare type RoomInfo = {
-    /**
-     * The name of the room.
-     */
-    name?: string;
-    /**
-     * The URL of the room.
-     */
-    url?: string;
-};
-
 declare type ResolveMentionSuggestionsArgs = {
     /**
      * The ID of the current room.
@@ -2180,7 +2138,7 @@ declare type ResolveRoomsInfoArgs = {
      */
     roomIds: string[];
 };
-declare type EnterOptions<TPresence extends JsonObject, TStorage extends LsonObject> = Resolve<RoomInitializers<TPresence, TStorage> & {
+declare type EnterOptions<P extends JsonObject = DP, S extends LsonObject = DS> = Resolve<RoomInitializers<P, S> & {
     /**
      * Only necessary when you’re using Liveblocks with React v17 or lower.
      *
@@ -2198,19 +2156,19 @@ declare type EnterOptions<TPresence extends JsonObject, TStorage extends LsonObj
  * of Liveblocks, NEVER USE ANY OF THESE DIRECTLY, because bad things
  * will probably happen if you do.
  */
-declare type PrivateClientApi<TUserMeta extends BaseUserMeta> = {
-    notifications: NotificationsApi;
-    currentUserIdStore: Store<string | null>;
-    resolveMentionSuggestions: ClientOptions["resolveMentionSuggestions"];
-    cacheStore: CacheStore<BaseMetadata>;
-    usersStore: BatchStore<TUserMeta["info"] | undefined, [string]>;
-    roomsInfoStore: BatchStore<RoomInfo | undefined, [string]>;
-    getRoomIds: () => string[];
+declare type PrivateClientApi<U extends BaseUserMeta, M extends BaseMetadata> = {
+    readonly notifications: NotificationsApi<M>;
+    readonly currentUserIdStore: Store<string | null>;
+    readonly resolveMentionSuggestions: ClientOptions<U>["resolveMentionSuggestions"];
+    readonly cacheStore: CacheStore<BaseMetadata>;
+    readonly usersStore: BatchStore<U["info"] | undefined, [string]>;
+    readonly roomsInfoStore: BatchStore<DRI | undefined, [string]>;
+    readonly getRoomIds: () => string[];
 };
-declare type NotificationsApi<TThreadMetadata extends BaseMetadata = never> = {
+declare type NotificationsApi<M extends BaseMetadata> = {
     getInboxNotifications(options?: GetInboxNotificationsOptions): Promise<{
         inboxNotifications: InboxNotificationData[];
-        threads: ThreadData<TThreadMetadata>[];
+        threads: ThreadData<M>[];
         deletedThreads: ThreadDeleteInfo[];
         deletedInboxNotifications: InboxNotificationDeleteInfo[];
         meta: {
@@ -2221,44 +2179,30 @@ declare type NotificationsApi<TThreadMetadata extends BaseMetadata = never> = {
     markAllInboxNotificationsAsRead(): Promise<void>;
     markInboxNotificationAsRead(inboxNotificationId: string): Promise<void>;
 };
-declare type Client<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
+/**
+ * @private Widest-possible Client type, matching _any_ Client instance. Note
+ * that this type is different from `Client`-without-type-arguments. That
+ * represents a Client instance using globally augmented types only, which is
+ * narrower.
+ */
+declare type OpaqueClient = Client<BaseUserMeta>;
+declare type Client<U extends BaseUserMeta = DU> = {
     /**
      * Gets a room. Returns null if {@link Client.enter} has not been called previously.
      *
      * @param roomId The id of the room
      */
-    getRoom<TPresence extends JsonObject, TStorage extends LsonObject = LsonObject, TUserMeta extends BaseUserMeta = BaseUserMeta, TRoomEvent extends Json = never>(roomId: string): Room<TPresence, TStorage, TUserMeta, TRoomEvent> | null;
+    getRoom<P extends JsonObject = DP, S extends LsonObject = DS, E extends Json = DE, M extends BaseMetadata = DM>(roomId: string): Room<P, S, U, E, M> | null;
     /**
      * Enter a room.
      * @param roomId The id of the room
      * @param options Optional. You can provide initializers for the Presence or Storage when entering the Room.
      * @returns The room and a leave function. Call the returned leave() function when you no longer need the room.
      */
-    enterRoom<TPresence extends JsonObject, TStorage extends LsonObject = LsonObject, TUserMeta extends BaseUserMeta = BaseUserMeta, TRoomEvent extends Json = never>(roomId: string, options: EnterOptions<TPresence, TStorage>): {
-        room: Room<TPresence, TStorage, TUserMeta, TRoomEvent>;
+    enterRoom<P extends JsonObject = DP, S extends LsonObject = DS, E extends Json = DE, M extends BaseMetadata = DM>(roomId: string, options: EnterOptions<P, S>): {
+        room: Room<P, S, U, E, M>;
         leave: () => void;
     };
-    /**
-     * @deprecated - Prefer using {@link Client.enterRoom} instead.
-     *
-     * Enters a room and returns it.
-     * @param roomId The id of the room
-     * @param options Optional. You can provide initializers for the Presence or Storage when entering the Room.
-     */
-    enter<TPresence extends JsonObject, TStorage extends LsonObject = LsonObject, TUserMeta extends BaseUserMeta = BaseUserMeta, TRoomEvent extends Json = never>(roomId: string, options: EnterOptions<TPresence, TStorage>): Room<TPresence, TStorage, TUserMeta, TRoomEvent>;
-    /**
-     * @deprecated - Prefer using {@link Client.enterRoom} and calling the returned leave function instead, which is safer.
-     *
-     * Forcefully leaves a room.
-     *
-     * Only call this if you know for sure there are no other "instances" of this
-     * room used elsewhere in your application. Force-leaving can trigger
-     * unexpected conditions in other parts of your application that may not
-     * expect this.
-     *
-     * @param roomId The id of the room
-     */
-    leave(roomId: string): void;
     /**
      * Purges all cached auth tokens and reconnects all rooms that are still
      * connected, if any.
@@ -2273,14 +2217,14 @@ declare type Client<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
      * of Liveblocks, NEVER USE ANY OF THESE DIRECTLY, because bad things
      * will probably happen if you do.
      */
-    readonly [kInternal]: PrivateClientApi<TUserMeta>;
+    readonly [kInternal]: PrivateClientApi<U, BaseMetadata>;
 };
 declare type AuthEndpoint = string | ((room?: string) => Promise<CustomAuthenticationResult>);
 /**
  * The authentication endpoint that is called to ensure that the current user has access to a room.
  * Can be an url or a callback if you need to add additional headers.
  */
-declare type ClientOptions<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
+declare type ClientOptions<U extends BaseUserMeta = DU> = {
     throttle?: number;
     lostConnectionTimeout?: number;
     backgroundKeepAliveTimeout?: number;
@@ -2288,33 +2232,17 @@ declare type ClientOptions<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
     unstable_fallbackToHTTP?: boolean;
     unstable_streamData?: boolean;
     /**
-     * @deprecated Use `polyfills: { fetch: ... }` instead.
-     * This option will be removed in a future release.
-     */
-    fetchPolyfill?: Polyfills["fetch"];
-    /**
-     * @deprecated Use `polyfills: { WebSocket: ... }` instead.
-     * This option will be removed in a future release.
-     */
-    WebSocketPolyfill?: Polyfills["WebSocket"];
-    /**
-     * @beta
-     *
      * A function that returns a list of user IDs matching a string.
      */
     resolveMentionSuggestions?: (args: ResolveMentionSuggestionsArgs) => OptionalPromise<string[]>;
     /**
-     * @beta
-     *
      * A function that returns user info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(TUserMeta["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
     /**
-     * @beta
-     *
      * A function that returns room info from room IDs.
      */
-    resolveRoomsInfo?: (args: ResolveRoomsInfoArgs) => OptionalPromise<(RoomInfo | undefined)[] | undefined>;
+    resolveRoomsInfo?: (args: ResolveRoomsInfoArgs) => OptionalPromise<(DRI | undefined)[] | undefined>;
 } & ({
     publicApiKey: string;
     authEndpoint?: never;
@@ -2347,7 +2275,7 @@ declare type ClientOptions<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
  *   }
  * });
  */
-declare function createClient<TUserMeta extends BaseUserMeta = BaseUserMeta>(options: ClientOptions<TUserMeta>): Client<TUserMeta>;
+declare function createClient<U extends BaseUserMeta = DU>(options: ClientOptions<U>): Client<U>;
 declare class NotificationsApiError extends Error {
     message: string;
     status: number;
@@ -2381,7 +2309,7 @@ declare type CommentBodyLinkElementArgs = {
      */
     href: string;
 };
-declare type CommentBodyMentionElementArgs<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
+declare type CommentBodyMentionElementArgs<U extends BaseUserMeta = DU> = {
     /**
      * The mention element.
      */
@@ -2389,9 +2317,9 @@ declare type CommentBodyMentionElementArgs<TUserMeta extends BaseUserMeta = Base
     /**
      * The mention's user info, if the `resolvedUsers` option was provided.
      */
-    user?: TUserMeta["info"];
+    user?: U["info"];
 };
-declare type StringifyCommentBodyElements<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
+declare type StringifyCommentBodyElements<U extends BaseUserMeta = DU> = {
     /**
      * The element used to display paragraphs.
      */
@@ -2407,9 +2335,9 @@ declare type StringifyCommentBodyElements<TUserMeta extends BaseUserMeta = BaseU
     /**
      * The element used to display mentions.
      */
-    mention: (args: CommentBodyMentionElementArgs<TUserMeta>, index: number) => string;
+    mention: (args: CommentBodyMentionElementArgs<U>, index: number) => string;
 };
-declare type StringifyCommentBodyOptions<TUserMeta extends BaseUserMeta = BaseUserMeta> = {
+declare type StringifyCommentBodyOptions<U extends BaseUserMeta = DU> = {
     /**
      * Which format to convert the comment to.
      */
@@ -2418,7 +2346,7 @@ declare type StringifyCommentBodyOptions<TUserMeta extends BaseUserMeta = BaseUs
      * The elements used to customize the resulting string. Each element has
      * priority over the defaults inherited from the `format` option.
      */
-    elements?: Partial<StringifyCommentBodyElements<TUserMeta>>;
+    elements?: Partial<StringifyCommentBodyElements<U>>;
     /**
      * The separator used between paragraphs.
      */
@@ -2426,7 +2354,7 @@ declare type StringifyCommentBodyOptions<TUserMeta extends BaseUserMeta = BaseUs
     /**
      * A function that returns user info from user IDs.
      */
-    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(TUserMeta["info"] | undefined)[] | undefined>;
+    resolveUsers?: (args: ResolveUsersArgs) => OptionalPromise<(U["info"] | undefined)[] | undefined>;
 };
 /**
  * Get an array of each user's ID that has been mentioned in a `CommentBody`.
@@ -2436,7 +2364,7 @@ declare function getMentionedIdsFromCommentBody(body: CommentBody): string[];
  * Convert a `CommentBody` into either a plain string,
  * Markdown, HTML, or a custom format.
  */
-declare function stringifyCommentBody<TUserMeta extends BaseUserMeta = BaseUserMeta>(body: CommentBody, options?: StringifyCommentBodyOptions<TUserMeta>): Promise<string>;
+declare function stringifyCommentBody(body: CommentBody, options?: StringifyCommentBodyOptions<BaseUserMeta>): Promise<string>;
 
 /**
  * Converts a plain comment data object (usually returned by the API) to a comment data object that can be used by the client.
@@ -2451,7 +2379,7 @@ declare function convertToCommentData(data: CommentDataPlain): CommentData;
  * @param data The plain thread data object (usually returned by the API)
  * @returns The rich thread data object that can be used by the client.
  */
-declare function convertToThreadData<TThreadMetadata extends BaseMetadata = never>(data: ThreadDataPlain<TThreadMetadata>): ThreadData<TThreadMetadata>;
+declare function convertToThreadData<M extends BaseMetadata>(data: ThreadDataPlain<M>): ThreadData<M>;
 /**
  * Converts a plain comment reaction object (usually returned by the API) to a comment reaction object that can be used by the client.
  * This is necessary because the plain data object stores dates as ISO strings, but the client expects them as Date objects.
@@ -2484,7 +2412,7 @@ declare function cloneLson<L extends Lson | undefined>(value: L): L;
 
 declare function lsonToJson(value: Lson): Json;
 declare function patchLiveObjectKey<O extends LsonObject, K extends keyof O, V extends Json>(liveObject: LiveObject<O>, key: K, prev?: V, next?: V): void;
-declare function legacy_patchImmutableObject<S extends JsonObject>(state: S, updates: StorageUpdate[]): S;
+declare function legacy_patchImmutableObject<TState extends JsonObject>(state: TState, updates: StorageUpdate[]): TState;
 
 /**
  * Helper function that can be used to implement exhaustive switch statements
@@ -2854,4 +2782,4 @@ declare type EnsureJson<T> = [
     [K in keyof T]: EnsureJson<T[K]>;
 };
 
-export { type AckOp, type ActivityData, 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 InboxNotificationCustomData, type InboxNotificationCustomDataPlain, type InboxNotificationData, type InboxNotificationDataPlain, type InboxNotificationDeleteInfo, type InboxNotificationThreadData, type InboxNotificationThreadDataPlain, 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 QueryMetadata, 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, convertToInboxNotificationData, convertToThreadData, createClient, deleteComment, deprecate, deprecateIf, detectDupes, errorIf, freeze, getMentionedIdsFromCommentBody, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isLiveNode, isPlainObject, isRootCrdt, kInternal, legacy_patchImmutableObject, lsonToJson, makeEventSource, makePoller, makePosition, nn, objectToQuery, patchLiveObjectKey, raise, removeReaction, shallow, stringify, stringifyCommentBody, throwUsageError, toPlainLson, tryParseJson, upsertComment, withTimeout };
+export { type AckOp, type ActivityData, type BaseAuthResult, type BaseMetadata, type BaseRoomInfo, 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 DE, type DM, type DP, type DRI, type DS, type DU, 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 InboxNotificationCustomData, type InboxNotificationCustomDataPlain, type InboxNotificationData, type InboxNotificationDataPlain, type InboxNotificationDeleteInfo, type InboxNotificationThreadData, type InboxNotificationThreadDataPlain, type InitialDocumentStateServerMsg, type Json, type JsonArray, type JsonObject, type JsonScalar, 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 OpaqueClient, type OpaqueRoom, type OptionalPromise, type OthersEvent, type ParentToChildNodeMap, type PartialNullable, type PlainLson, type PlainLsonFields, type PlainLsonList, type PlainLsonMap, type PlainLsonObject, type PrivateClientApi, type PrivateRoomApi, type QueryMetadata, type RejectedStorageOpServerMsg, type Resolve, type ResolveMentionSuggestionsArgs, type ResolveRoomsInfoArgs, type ResolveUsersArgs, type Room, type RoomEventMessage, 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, convertToInboxNotificationData, convertToThreadData, createClient, deleteComment, deprecate, deprecateIf, detectDupes, errorIf, freeze, getMentionedIdsFromCommentBody, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isLiveNode, isPlainObject, isRootCrdt, kInternal, legacy_patchImmutableObject, lsonToJson, makeEventSource, makePoller, makePosition, nn, objectToQuery, patchLiveObjectKey, raise, removeReaction, shallow, stringify, stringifyCommentBody, throwUsageError, toPlainLson, tryParseJson, upsertComment, withTimeout };