@liveblocks/core 2.2.3-alpha2 → 2.4.0-test1

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.2.3-alpha2";
+var PKG_VERSION = "2.4.0-test1";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -645,7 +645,9 @@ function memoizeOnSuccess(factoryFn) {
   return () => {
     if (cached === null) {
       cached = factoryFn().catch((err) => {
-        cached = null;
+        setTimeout(() => {
+          cached = null;
+        }, 5e3);
         throw err;
       });
     }
@@ -1776,15 +1778,13 @@ function stringify(object, ...args) {
 
 // src/lib/batch.ts
 var DEFAULT_SIZE = 50;
-var DEFAULT_DELAY = 100;
-var noop = () => {
-};
 var BatchCall = class {
-  constructor(args) {
-    this.resolve = noop;
-    this.reject = noop;
-    this.promise = new Promise(noop);
-    this.args = args;
+  constructor(input) {
+    this.input = input;
+    const { promise, resolve, reject } = Promise_withResolvers();
+    this.promise = promise;
+    this.resolve = resolve;
+    this.reject = reject;
   }
 };
 var Batch = class {
@@ -1792,8 +1792,8 @@ var Batch = class {
     this.queue = [];
     this.error = false;
     this.callback = callback;
-    this.size = options?.size ?? DEFAULT_SIZE;
-    this.delay = options?.delay ?? DEFAULT_DELAY;
+    this.size = options.size ?? DEFAULT_SIZE;
+    this.delay = options.delay;
   }
   clearDelayTimeout() {
     if (this.delayTimeoutId !== void 0) {
@@ -1814,9 +1814,9 @@ var Batch = class {
       return;
     }
     const calls = this.queue.splice(0);
-    const args = calls.map((call) => call.args);
+    const inputs = calls.map((call) => call.input);
     try {
-      const results = await this.callback(args);
+      const results = await this.callback(inputs);
       this.error = false;
       calls.forEach((call, index) => {
         const result = results?.[index];
@@ -1841,18 +1841,14 @@ var Batch = class {
       });
     }
   }
-  get(...args) {
+  get(input) {
     const existingCall = this.queue.find(
-      (call2) => stringify(call2.args) === stringify(args)
+      (call2) => stringify(call2.input) === stringify(input)
     );
     if (existingCall) {
       return existingCall.promise;
     }
-    const call = new BatchCall(args);
-    call.promise = new Promise((resolve, reject) => {
-      call.resolve = resolve;
-      call.reject = reject;
-    });
+    const call = new BatchCall(input);
     this.queue.push(call);
     this.schedule();
     return call.promise;
@@ -1871,21 +1867,17 @@ function createBatchStore(callback, options) {
     return stringify(args);
   }
   function setStateAndNotify(cacheKey, state) {
-    if (state) {
-      cache.set(cacheKey, state);
-    } else {
-      cache.delete(cacheKey);
-    }
-    eventSource2.notify(state);
+    cache.set(cacheKey, state);
+    eventSource2.notify();
   }
-  async function get(...args) {
-    const cacheKey = getCacheKey(args);
+  async function get(input) {
+    const cacheKey = getCacheKey(input);
     if (cache.has(cacheKey)) {
       return;
     }
     try {
       setStateAndNotify(cacheKey, { isLoading: true });
-      const result = await batch.get(...args);
+      const result = await batch.get(input);
       setStateAndNotify(cacheKey, { isLoading: false, data: result });
     } catch (error3) {
       setStateAndNotify(cacheKey, {
@@ -1894,12 +1886,12 @@ function createBatchStore(callback, options) {
       });
     }
   }
-  function getState(...args) {
-    const cacheKey = getCacheKey(args);
+  function getState(input) {
+    const cacheKey = getCacheKey(input);
     return cache.get(cacheKey);
   }
   return {
-    ...eventSource2,
+    ...eventSource2.observable,
     get,
     getState
   };
@@ -2086,25 +2078,32 @@ function createNotificationsApi({
     }
     return body;
   }
-  async function getInboxNotifications(options) {
-    const json = await fetchJson("/inbox-notifications", void 0, {
-      limit: options?.limit,
-      since: options?.since?.toISOString()
-    });
+  async function getInboxNotifications() {
+    const json = await fetchJson("/inbox-notifications", void 0, {});
     return {
-      threads: json.threads.map((thread) => convertToThreadData(thread)),
+      threads: json.threads.map(convertToThreadData),
       inboxNotifications: json.inboxNotifications.map(
-        (notification) => convertToInboxNotificationData(notification)
+        convertToInboxNotificationData
       ),
-      deletedThreads: json.deletedThreads.map(
-        (info) => convertToThreadDeleteInfo(info)
-      ),
-      deletedInboxNotifications: json.deletedInboxNotifications.map(
-        (info) => convertToInboxNotificationDeleteInfo(info)
-      ),
-      meta: {
-        requestedAt: new Date(json.meta.requestedAt)
-      }
+      requestedAt: new Date(json.meta.requestedAt)
+    };
+  }
+  async function getInboxNotificationsSince(options) {
+    const json = await fetchJson("/inbox-notifications", void 0, {
+      since: options.since.toISOString()
+    });
+    return {
+      threads: {
+        modified: json.threads.map(convertToThreadData),
+        deleted: json.deletedThreads.map(convertToThreadDeleteInfo)
+      },
+      inboxNotifications: {
+        modified: json.inboxNotifications.map(convertToInboxNotificationData),
+        deleted: json.deletedInboxNotifications.map(
+          convertToInboxNotificationDeleteInfo
+        )
+      },
+      requestedAt: new Date(json.meta.requestedAt)
     };
   }
   async function getUnreadInboxNotificationsCount() {
@@ -2140,11 +2139,27 @@ function createNotificationsApi({
   async function markInboxNotificationAsRead(inboxNotificationId) {
     await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
   }
+  async function deleteAllInboxNotifications() {
+    await fetchJson("/inbox-notifications", {
+      method: "DELETE"
+    });
+  }
+  async function deleteInboxNotification(inboxNotificationId) {
+    await fetchJson(
+      `/inbox-notifications/${encodeURIComponent(inboxNotificationId)}`,
+      {
+        method: "DELETE"
+      }
+    );
+  }
   return {
     getInboxNotifications,
+    getInboxNotificationsSince,
     getUnreadInboxNotificationsCount,
     markAllInboxNotificationsAsRead,
-    markInboxNotificationAsRead
+    markInboxNotificationAsRead,
+    deleteAllInboxNotifications,
+    deleteInboxNotification
   };
 }
 
@@ -2487,14 +2502,10 @@ function isChildCrdt(crdt) {
 }
 
 // src/lib/nanoid.ts
-function nanoid(length = 7) {
-  const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,./;[]~!@#$%&*()_+=-";
-  const len = alphabet.length;
-  return Array.from(
-    { length },
-    () => alphabet.charAt(Math.floor(Math.random() * len))
-  ).join("");
-}
+var nanoid = (t = 21) => crypto.getRandomValues(new Uint8Array(t)).reduce(
+  (t2, e) => t2 += (e &= 63) < 36 ? e.toString(36) : e < 62 ? (e - 26).toString(36).toUpperCase() : e < 63 ? "_" : "-",
+  ""
+);
 
 // src/crdts/LiveRegister.ts
 var LiveRegister = class _LiveRegister extends AbstractCrdt {
@@ -4708,6 +4719,23 @@ function findNonSerializableValue(value, path = "") {
   return false;
 }
 
+// src/lib/createIds.ts
+var THREAD_ID_PREFIX = "th";
+var COMMENT_ID_PREFIX = "cm";
+var INBOX_NOTIFICATION_ID_PREFIX = "in";
+function createOptimisticId(prefix) {
+  return `${prefix}_${nanoid()}`;
+}
+function createThreadId() {
+  return createOptimisticId(THREAD_ID_PREFIX);
+}
+function createCommentId() {
+  return createOptimisticId(COMMENT_ID_PREFIX);
+}
+function createInboxNotificationId() {
+  return createOptimisticId(INBOX_NOTIFICATION_ID_PREFIX);
+}
+
 // src/lib/debug.ts
 function captureStackTrace(msg, traceRoot) {
   const errorLike = { name: msg };
@@ -5145,6 +5173,49 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     }
     return body;
   }
+  async function getThreadsSince(options) {
+    const response = await fetchCommentsApi(
+      "/threads",
+      {
+        since: options?.since?.toISOString()
+      },
+      {
+        headers: {
+          "Content-Type": "application/json"
+        }
+      }
+    );
+    if (response.ok) {
+      const json = await response.json();
+      return {
+        threads: {
+          modified: json.data.map(convertToThreadData),
+          deleted: json.deletedThreads.map(convertToThreadDeleteInfo)
+        },
+        inboxNotifications: {
+          modified: json.inboxNotifications.map(convertToInboxNotificationData),
+          deleted: json.deletedInboxNotifications.map(
+            convertToInboxNotificationDeleteInfo
+          )
+        },
+        requestedAt: new Date(json.meta.requestedAt)
+      };
+    } else if (response.status === 404) {
+      return {
+        threads: {
+          modified: [],
+          deleted: []
+        },
+        inboxNotifications: {
+          modified: [],
+          deleted: []
+        },
+        requestedAt: /* @__PURE__ */ new Date()
+      };
+    } else {
+      throw new Error("There was an error while getting threads.");
+    }
+  }
   async function getThreads(options) {
     let query;
     if (options?.query) {
@@ -5153,7 +5224,6 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     const response = await fetchCommentsApi(
       "/threads",
       {
-        since: options?.since?.toISOString(),
         query
       },
       {
@@ -5165,19 +5235,11 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     if (response.ok) {
       const json = await response.json();
       return {
-        threads: json.data.map((thread) => convertToThreadData(thread)),
+        threads: json.data.map(convertToThreadData),
         inboxNotifications: json.inboxNotifications.map(
-          (notification) => convertToInboxNotificationData(notification)
-        ),
-        deletedThreads: json.deletedThreads.map(
-          (info) => convertToThreadDeleteInfo(info)
-        ),
-        deletedInboxNotifications: json.deletedInboxNotifications.map(
-          (info) => convertToInboxNotificationDeleteInfo(info)
+          convertToInboxNotificationData
         ),
-        meta: {
-          requestedAt: new Date(json.meta.requestedAt)
-        }
+        requestedAt: new Date(json.meta.requestedAt)
       };
     } else if (response.status === 404) {
       return {
@@ -5185,15 +5247,13 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
         inboxNotifications: [],
         deletedThreads: [],
         deletedInboxNotifications: [],
-        meta: {
-          requestedAt: /* @__PURE__ */ new Date()
-        }
+        requestedAt: /* @__PURE__ */ new Date()
       };
     } else {
       throw new Error("There was an error while getting threads.");
     }
   }
-  async function getThread({ threadId }) {
+  async function getThread(threadId) {
     const response = await fetchCommentsApi(
       `/thread-with-notification/${threadId}`
     );
@@ -5204,7 +5264,10 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
         inboxNotification: json.inboxNotification ? convertToInboxNotificationData(json.inboxNotification) : void 0
       };
     } else if (response.status === 404) {
-      return;
+      return {
+        thread: void 0,
+        inboxNotification: void 0
+      };
     } else {
       throw new Error(`There was an error while getting thread ${threadId}.`);
     }
@@ -5212,8 +5275,8 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
   async function createThread({
     metadata,
     body,
-    commentId,
-    threadId
+    commentId = createCommentId(),
+    threadId = createThreadId()
   }) {
     const thread = await fetchJson("/threads", {
       method: "POST",
@@ -5231,7 +5294,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     });
     return convertToThreadData(thread);
   }
-  async function deleteThread({ threadId }) {
+  async function deleteThread(threadId) {
     await fetchJson(`/threads/${encodeURIComponent(threadId)}`, {
       method: "DELETE"
     });
@@ -5251,7 +5314,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
       }
     );
   }
-  async function markThreadAsResolved({ threadId }) {
+  async function markThreadAsResolved(threadId) {
     await fetchJson(
       `/threads/${encodeURIComponent(threadId)}/mark-as-resolved`,
       {
@@ -5259,7 +5322,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
       }
     );
   }
-  async function markThreadAsUnresolved({ threadId }) {
+  async function markThreadAsUnresolved(threadId) {
     await fetchJson(
       `/threads/${encodeURIComponent(threadId)}/mark-as-unresolved`,
       {
@@ -5269,7 +5332,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
   }
   async function createComment({
     threadId,
-    commentId,
+    commentId = createCommentId(),
     body
   }) {
     const comment = await fetchJson(
@@ -5356,6 +5419,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
   }
   return {
     getThreads,
+    getThreadsSince,
     getThread,
     createThread,
     deleteThread,
@@ -6535,12 +6599,12 @@ ${Array.from(traces).join("\n\n")}`
     }
     return body;
   }
-  function getRoomNotificationSettings() {
+  function getNotificationSettings() {
     return fetchNotificationsJson(
       "/notification-settings"
     );
   }
-  function updateRoomNotificationSettings(settings) {
+  function updateNotificationSettings(settings) {
     return fetchNotificationsJson(
       "/notification-settings",
       {
@@ -6601,14 +6665,6 @@ ${Array.from(traces).join("\n\n")}`
           // These exist only for our E2E testing app
           explicitClose: (event) => managedSocket._privateSendMachineEvent({ type: "EXPLICIT_SOCKET_CLOSE", event }),
           rawSend: (data) => managedSocket.send(data)
-        },
-        comments: {
-          ...commentsApi
-        },
-        notifications: {
-          getRoomNotificationSettings,
-          updateRoomNotificationSettings,
-          markInboxNotificationAsRead
         }
       },
       id: config.roomId,
@@ -6649,7 +6705,11 @@ ${Array.from(traces).join("\n\n")}`
       getSelf: () => self.current,
       // Presence
       getPresence: () => context.myPresence.current,
-      getOthers: () => context.others.current
+      getOthers: () => context.others.current,
+      getNotificationSettings,
+      updateNotificationSettings,
+      markInboxNotificationAsRead,
+      ...commentsApi
     },
     // Explictly make the internal field non-enumerable, to avoid aggressive
     // freezing when used with Immer
@@ -6711,6 +6771,10 @@ function makeClassicSubscribeFn(events) {
           return events.storageStatus.subscribe(
             callback
           );
+        case "comments":
+          return events.comments.subscribe(
+            callback
+          );
         default:
           return assertNever(
             first,
@@ -6743,7 +6807,7 @@ function makeClassicSubscribeFn(events) {
   return subscribe;
 }
 function isRoomEventName(value) {
-  return value === "my-presence" || value === "others" || value === "event" || value === "error" || value === "history" || value === "status" || value === "storage-status" || value === "lost-connection" || value === "connection";
+  return value === "my-presence" || value === "others" || value === "event" || value === "error" || value === "history" || value === "status" || value === "storage-status" || value === "lost-connection" || value === "connection" || value === "comments";
 }
 function makeAuthDelegateForRoom(roomId, authManager) {
   return async () => {
@@ -6828,9 +6892,7 @@ function createClientStore() {
         ),
         queries: queryKey !== void 0 ? {
           ...state.queries,
-          [queryKey]: {
-            isLoading: false
-          }
+          [queryKey]: { isLoading: false, data: void 0 }
         } : state.queries
       }));
     },
@@ -6843,9 +6905,7 @@ function createClientStore() {
         },
         queries: {
           ...state.queries,
-          [queryKey]: {
-            isLoading: false
-          }
+          [queryKey]: { isLoading: false, data: void 0 }
         }
       }));
     },
@@ -7046,7 +7106,7 @@ function applyOptimisticUpdates(state) {
         };
         break;
       }
-      case "mark-inbox-notifications-as-read": {
+      case "mark-all-inbox-notifications-as-read": {
         for (const id in result.inboxNotifications) {
           result.inboxNotifications[id] = {
             ...result.inboxNotifications[id],
@@ -7055,6 +7115,18 @@ function applyOptimisticUpdates(state) {
         }
         break;
       }
+      case "delete-inbox-notification": {
+        const {
+          [optimisticUpdate.inboxNotificationId]: _,
+          ...inboxNotifications
+        } = result.inboxNotifications;
+        result.inboxNotifications = inboxNotifications;
+        break;
+      }
+      case "delete-all-inbox-notifications": {
+        result.inboxNotifications = {};
+        break;
+      }
       case "update-notification-settings": {
         result.notificationSettings[optimisticUpdate.roomId] = {
           ...result.notificationSettings[optimisticUpdate.roomId],
@@ -7407,9 +7479,12 @@ function createClient(options) {
   const currentUserIdStore = createStore(null);
   const {
     getInboxNotifications,
+    getInboxNotificationsSince,
     getUnreadInboxNotificationsCount,
     markAllInboxNotificationsAsRead,
-    markInboxNotificationAsRead
+    markInboxNotificationAsRead,
+    deleteAllInboxNotifications,
+    deleteInboxNotification
   } = createNotificationsApi({
     baseUrl,
     fetcher: clientOptions.polyfills?.fetch || /* istanbul ignore next */
@@ -7451,14 +7526,15 @@ function createClient(options) {
       enterRoom,
       getRoom,
       logout,
+      getInboxNotifications,
+      getInboxNotificationsSince,
+      getUnreadInboxNotificationsCount,
+      markAllInboxNotificationsAsRead,
+      markInboxNotificationAsRead,
+      deleteAllInboxNotifications,
+      deleteInboxNotification,
       // Internal
       [kInternal]: {
-        notifications: {
-          getInboxNotifications,
-          getUnreadInboxNotificationsCount,
-          markAllInboxNotificationsAsRead,
-          markInboxNotificationAsRead
-        },
         currentUserIdStore,
         resolveMentionSuggestions: clientOptions.resolveMentionSuggestions,
         cacheStore,
@@ -8354,6 +8430,9 @@ export {
   convertToInboxNotificationData,
   convertToThreadData,
   createClient,
+  createCommentId,
+  createInboxNotificationId,
+  createThreadId,
   deleteComment,
   deprecate,
   deprecateIf,
@@ -8375,6 +8454,7 @@ export {
   makePoller,
   makePosition,
   memoizeOnSuccess,
+  nanoid,
   nn,
   objectToQuery,
   patchLiveObjectKey,