@liveblocks/react 2.3.0 → 2.4.0-test1

package/dist/{chunk-N2EE2UOX.mjs → chunk-2ITOEAYK.mjs}

@@ -1,6 +1,6 @@
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.3.0";
+var PKG_VERSION = "2.4.0-test1";
 var PKG_FORMAT = "esm";
 
 // src/ClientSideSuspense.tsx
@@ -20,10 +20,10 @@ import {
   kInternal,
   makePoller,
   memoizeOnSuccess,
+  nanoid,
   raise,
   shallow
 } from "@liveblocks/core";
-import { nanoid } from "nanoid";
 import React2, {
   createContext,
   useCallback as useCallback2,
@@ -244,20 +244,32 @@ function getExtrasForClient(client) {
 function makeExtrasForClient(client) {
   const internals = client[kInternal];
   const store = internals.cacheStore;
-  const notifications = internals.notifications;
   let lastRequestedAt;
   async function fetchInboxNotifications() {
-    const since = lastRequestedAt !== void 0 ? { since: lastRequestedAt } : void 0;
-    const result = await notifications.getInboxNotifications(since);
-    store.updateThreadsAndNotifications(
-      result.threads,
-      result.inboxNotifications,
-      result.deletedThreads,
-      result.deletedInboxNotifications,
-      INBOX_NOTIFICATIONS_QUERY
-    );
-    if (lastRequestedAt === void 0 || lastRequestedAt < result.meta.requestedAt) {
-      lastRequestedAt = result.meta.requestedAt;
+    if (lastRequestedAt === void 0) {
+      const result = await client.getInboxNotifications();
+      store.updateThreadsAndNotifications(
+        result.threads,
+        result.inboxNotifications,
+        [],
+        [],
+        INBOX_NOTIFICATIONS_QUERY
+      );
+      lastRequestedAt = result.requestedAt;
+    } else {
+      const result = await client.getInboxNotificationsSince({
+        since: lastRequestedAt
+      });
+      store.updateThreadsAndNotifications(
+        result.threads.modified,
+        result.inboxNotifications.modified,
+        result.threads.deleted,
+        result.inboxNotifications.deleted,
+        INBOX_NOTIFICATIONS_QUERY
+      );
+      if (lastRequestedAt < result.requestedAt) {
+        lastRequestedAt = result.requestedAt;
+      }
     }
   }
   let pollerSubscribers = 0;
@@ -311,7 +323,6 @@ function makeExtrasForClient(client) {
   }
   return {
     store,
-    notifications,
     useEnableInboxNotificationsPolling,
     waitUntilInboxNotificationsLoaded,
     loadInboxNotifications
@@ -399,7 +410,7 @@ function useUnreadInboxNotificationsCountSuspense_withClient(client) {
 function useMarkInboxNotificationAsRead_withClient(client) {
   return useCallback2(
     (inboxNotificationId) => {
-      const { store, notifications } = getExtrasForClient(client);
+      const { store } = getExtrasForClient(client);
       const optimisticUpdateId = nanoid();
       const readAt = /* @__PURE__ */ new Date();
       store.pushOptimisticUpdate({
@@ -408,7 +419,7 @@ function useMarkInboxNotificationAsRead_withClient(client) {
         inboxNotificationId,
         readAt
       });
-      notifications.markInboxNotificationAsRead(inboxNotificationId).then(
+      client.markInboxNotificationAsRead(inboxNotificationId).then(
         () => {
           store.set((state) => {
             const existingNotification = state.inboxNotifications[inboxNotificationId];
@@ -450,7 +461,7 @@ function useMarkInboxNotificationAsRead_withClient(client) {
 }
 function useMarkAllInboxNotificationsAsRead_withClient(client) {
   return useCallback2(() => {
-    const { store, notifications } = getExtrasForClient(client);
+    const { store } = getExtrasForClient(client);
     const optimisticUpdateId = nanoid();
     const readAt = /* @__PURE__ */ new Date();
     store.pushOptimisticUpdate({
@@ -458,7 +469,7 @@ function useMarkAllInboxNotificationsAsRead_withClient(client) {
       id: optimisticUpdateId,
       readAt
     });
-    notifications.markAllInboxNotificationsAsRead().then(
+    client.markAllInboxNotificationsAsRead().then(
       () => {
         store.set((state) => ({
           ...state,
@@ -489,7 +500,7 @@ function useMarkAllInboxNotificationsAsRead_withClient(client) {
 function useDeleteInboxNotification_withClient(client) {
   return useCallback2(
     (inboxNotificationId) => {
-      const { store, notifications } = getExtrasForClient(client);
+      const { store } = getExtrasForClient(client);
       const optimisticUpdateId = nanoid();
       const deletedAt = /* @__PURE__ */ new Date();
       store.pushOptimisticUpdate({
@@ -498,7 +509,7 @@ function useDeleteInboxNotification_withClient(client) {
         inboxNotificationId,
         deletedAt
       });
-      notifications.deleteInboxNotification(inboxNotificationId).then(
+      client.deleteInboxNotification(inboxNotificationId).then(
         () => {
           store.set((state) => {
             const existingNotification = state.inboxNotifications[inboxNotificationId];
@@ -535,7 +546,7 @@ function useDeleteInboxNotification_withClient(client) {
 }
 function useDeleteAllInboxNotifications_withClient(client) {
   return useCallback2(() => {
-    const { store, notifications } = getExtrasForClient(client);
+    const { store } = getExtrasForClient(client);
     const optimisticUpdateId = nanoid();
     const deletedAt = /* @__PURE__ */ new Date();
     store.pushOptimisticUpdate({
@@ -543,7 +554,7 @@ function useDeleteAllInboxNotifications_withClient(client) {
       id: optimisticUpdateId,
       deletedAt
     });
-    notifications.deleteAllInboxNotifications().then(
+    client.deleteAllInboxNotifications().then(
       () => {
         store.set((state) => ({
           ...state,
@@ -952,36 +963,24 @@ import {
   addReaction,
   CommentsApiError,
   console as console2,
+  createCommentId,
+  createThreadId,
   deleteComment,
   deprecateIf,
   errorIf,
   kInternal as kInternal2,
   makeEventSource,
   makePoller as makePoller2,
+  nanoid as nanoid2,
   NotificationsApiError,
   removeReaction,
   ServerMsgCode,
   stringify,
   upsertComment
 } from "@liveblocks/core";
-import { nanoid as nanoid3 } from "nanoid";
 import * as React4 from "react";
 import { useSyncExternalStoreWithSelector as useSyncExternalStoreWithSelector2 } from "use-sync-external-store/shim/with-selector.js";
 
-// src/comments/lib/createIds.ts
-import { nanoid as nanoid2 } from "nanoid";
-var THREAD_ID_PREFIX = "th";
-var COMMENT_ID_PREFIX = "cm";
-function createOptimisticId(prefix) {
-  return `${prefix}_${nanoid2()}`;
-}
-function createThreadId() {
-  return createOptimisticId(THREAD_ID_PREFIX);
-}
-function createCommentId() {
-  return createOptimisticId(COMMENT_ID_PREFIX);
-}
-
 // src/comments/lib/select-notification-settings.ts
 import {
   applyOptimisticUpdates as applyOptimisticUpdates3,
@@ -1166,18 +1165,17 @@ function makeExtrasForClient2(client) {
     if (isFetchingThreadsUpdates === true) return;
     try {
       requestStatusByRoom.set(room.id, true);
-      const commentsAPI = room[kInternal2].comments;
-      const updates = await commentsAPI.getThreads({ since });
+      const updates = await room.getThreadsSince({ since });
       setTimeout(() => {
         requestStatusByRoom.set(room.id, false);
       }, DEFAULT_DEDUPING_INTERVAL);
       store.updateThreadsAndNotifications(
-        updates.threads,
-        updates.inboxNotifications,
-        updates.deletedThreads,
-        updates.deletedInboxNotifications
+        updates.threads.modified,
+        updates.inboxNotifications.modified,
+        updates.threads.deleted,
+        updates.inboxNotifications.deleted
       );
-      lastRequestedAtByRoom.set(room.id, updates.meta.requestedAt);
+      lastRequestedAtByRoom.set(room.id, updates.requestedAt);
     } catch (err) {
       requestStatusByRoom.set(room.id, false);
       return;
@@ -1186,8 +1184,7 @@ function makeExtrasForClient2(client) {
   async function getThreadsAndInboxNotifications(room, queryKey, options, { retryCount } = { retryCount: 0 }) {
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
-    const commentsAPI = room[kInternal2].comments;
-    const request = commentsAPI.getThreads(options);
+    const request = room.getThreads(options);
     requestsByQuery.set(queryKey, request);
     store.setQueryState(queryKey, {
       isLoading: true
@@ -1196,14 +1193,15 @@ function makeExtrasForClient2(client) {
       const result = await request;
       store.updateThreadsAndNotifications(
         result.threads,
+        // TODO: Figure out how to remove this casting
         result.inboxNotifications,
-        result.deletedThreads,
-        result.deletedInboxNotifications,
+        [],
+        [],
         queryKey
       );
       const lastRequestedAt = lastRequestedAtByRoom.get(room.id);
-      if (lastRequestedAt === void 0 || lastRequestedAt > result.meta.requestedAt) {
-        lastRequestedAtByRoom.set(room.id, result.meta.requestedAt);
+      if (lastRequestedAt === void 0 || lastRequestedAt > result.requestedAt) {
+        lastRequestedAtByRoom.set(room.id, result.requestedAt);
       }
       poller.start(POLLING_INTERVAL2);
     } catch (err) {
@@ -1224,7 +1222,7 @@ function makeExtrasForClient2(client) {
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
     try {
-      const request = room[kInternal2].notifications.getRoomNotificationSettings();
+      const request = room.getNotificationSettings();
       requestsByQuery.set(queryKey, request);
       store.setQueryState(queryKey, {
         isLoading: true
@@ -1444,10 +1442,8 @@ function RoomProviderInner(props) {
         store.deleteThread(message.threadId);
         return;
       }
-      const info = await room[kInternal2].comments.getThread({
-        threadId: message.threadId
-      });
-      if (!info) {
+      const info = await room.getThread(message.threadId);
+      if (!info.thread) {
         store.deleteThread(message.threadId);
         return;
       }
@@ -1848,7 +1844,7 @@ function useCreateThread() {
         comments: [newComment],
         resolved: false
       };
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "create-thread",
@@ -1856,8 +1852,7 @@ function useCreateThread() {
         id: optimisticUpdateId,
         roomId: room.id
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.createThread({ threadId, commentId, body, metadata }).then(
+      room.createThread({ threadId, commentId, body, metadata }).then(
         (thread) => {
           store.set((state) => ({
             ...state,
@@ -1892,7 +1887,7 @@ function useDeleteThread() {
   const room = useRoom();
   return React4.useCallback(
     (threadId) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       const thread = store.get().threads[threadId];
       const userId = getCurrentUserId(room);
@@ -1906,8 +1901,7 @@ function useDeleteThread() {
         threadId,
         deletedAt: /* @__PURE__ */ new Date()
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.deleteThread({ threadId }).then(
+      room.deleteThread(threadId).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -1951,7 +1945,7 @@ function useEditThreadMetadata() {
       const threadId = options.threadId;
       const metadata = options.metadata;
       const updatedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "edit-thread-metadata",
@@ -1960,8 +1954,7 @@ function useEditThreadMetadata() {
         threadId,
         updatedAt
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.editThreadMetadata({ metadata, threadId }).then(
+      room.editThreadMetadata({ metadata, threadId }).then(
         (metadata2) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2030,14 +2023,14 @@ function useCreateComment() {
         body,
         reactions: []
       };
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "create-comment",
         comment,
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.createComment({ threadId, commentId, body }).then(
+      room.createComment({ threadId, commentId, body }).then(
         (newComment) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2097,7 +2090,7 @@ function useEditComment() {
   return React4.useCallback(
     ({ threadId, commentId, body }) => {
       const editedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       const thread = store.get().threads[threadId];
       if (thread === void 0) {
@@ -2124,7 +2117,7 @@ function useEditComment() {
         },
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.editComment({ threadId, commentId, body }).then(
+      room.editComment({ threadId, commentId, body }).then(
         (editedComment) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2169,7 +2162,7 @@ function useDeleteComment() {
   return React4.useCallback(
     ({ threadId, commentId }) => {
       const deletedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "delete-comment",
@@ -2179,7 +2172,7 @@ function useDeleteComment() {
         id: optimisticUpdateId,
         roomId: room.id
       });
-      room[kInternal2].comments.deleteComment({ threadId, commentId }).then(
+      room.deleteComment({ threadId, commentId }).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2223,7 +2216,7 @@ function useAddReaction() {
     ({ threadId, commentId, emoji }) => {
       const createdAt = /* @__PURE__ */ new Date();
       const userId = getCurrentUserId(room);
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "add-reaction",
@@ -2236,7 +2229,7 @@ function useAddReaction() {
         },
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.addReaction({ threadId, commentId, emoji }).then(
+      room.addReaction({ threadId, commentId, emoji }).then(
         (addedReaction) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2285,7 +2278,7 @@ function useRemoveReaction() {
     ({ threadId, commentId, emoji }) => {
       const userId = getCurrentUserId(room);
       const removedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "remove-reaction",
@@ -2296,7 +2289,7 @@ function useRemoveReaction() {
         removedAt,
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.removeReaction({ threadId, commentId, emoji }).then(
+      room.removeReaction({ threadId, commentId, emoji }).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2352,7 +2345,7 @@ function useMarkThreadAsRead() {
         (inboxNotification2) => inboxNotification2.kind === "thread" && inboxNotification2.threadId === threadId
       );
       if (!inboxNotification) return;
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const now = /* @__PURE__ */ new Date();
       store.pushOptimisticUpdate({
         type: "mark-inbox-notification-as-read",
@@ -2360,7 +2353,7 @@ function useMarkThreadAsRead() {
         inboxNotificationId: inboxNotification.id,
         readAt: now
       });
-      room[kInternal2].notifications.markInboxNotificationAsRead(inboxNotification.id).then(
+      room.markInboxNotificationAsRead(inboxNotification.id).then(
         () => {
           store.set((state) => ({
             ...state,
@@ -2396,7 +2389,7 @@ function useMarkThreadAsResolved() {
   const room = useRoom();
   return React4.useCallback(
     (threadId) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const updatedAt = /* @__PURE__ */ new Date();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
@@ -2405,8 +2398,7 @@ function useMarkThreadAsResolved() {
         threadId,
         updatedAt
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.markThreadAsResolved({ threadId }).then(
+      room.markThreadAsResolved(threadId).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2462,7 +2454,7 @@ function useMarkThreadAsUnresolved() {
   const room = useRoom();
   return React4.useCallback(
     (threadId) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const updatedAt = /* @__PURE__ */ new Date();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
@@ -2471,8 +2463,7 @@ function useMarkThreadAsUnresolved() {
         threadId,
         updatedAt
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.markThreadAsUnresolved({ threadId }).then(
+      room.markThreadAsUnresolved(threadId).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2592,7 +2583,7 @@ function useUpdateRoomNotificationSettings() {
   const room = useRoom();
   return React4.useCallback(
     (settings) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         id: optimisticUpdateId,
@@ -2600,7 +2591,7 @@ function useUpdateRoomNotificationSettings() {
         roomId: room.id,
         settings
       });
-      room[kInternal2].notifications.updateRoomNotificationSettings(settings).then(
+      room.updateNotificationSettings(settings).then(
         (settings2) => {
           store.set((state) => ({
             ...state,
@@ -2870,4 +2861,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-N2EE2UOX.mjs.map
+//# sourceMappingURL=chunk-2ITOEAYK.mjs.map