@liveblocks/core 2.7.0-versions2 → 2.7.1

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.7.0-versions2";
+var PKG_VERSION = "2.7.1";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -590,6 +590,18 @@ function isPlainObject(blob) {
 function entries(obj) {
   return Object.entries(obj);
 }
+function mapValues(obj, mapFn) {
+  const result = {};
+  for (const pair of Object.entries(obj)) {
+    const key = pair[0];
+    if (key === "__proto__") {
+      continue;
+    }
+    const value = pair[1];
+    result[key] = mapFn(value, key);
+  }
+  return result;
+}
 function tryParseJson(rawMessage) {
   try {
     return JSON.parse(rawMessage);
@@ -1899,24 +1911,47 @@ function createBatchStore(callback, options) {
 
 // src/lib/create-store.ts
 function createStore(initialState) {
+  let notifyImmediately = true;
+  let dirty = false;
   let state = initialState;
   const subscribers = /* @__PURE__ */ new Set();
   function get() {
     return state;
   }
   function set(callback) {
-    const newState = callback(state);
-    if (state === newState) {
+    const oldState = state;
+    const newState = callback(oldState);
+    if (newState !== oldState) {
+      state = newState;
+      dirty = true;
+    }
+    if (notifyImmediately) {
+      notify();
+    }
+  }
+  function notify() {
+    if (!dirty) {
       return;
     }
-    state = newState;
+    dirty = false;
     for (const subscriber of subscribers) {
       subscriber(state);
     }
   }
+  function batch(cb) {
+    if (notifyImmediately === false) {
+      return cb();
+    }
+    notifyImmediately = false;
+    try {
+      cb();
+    } finally {
+      notifyImmediately = true;
+      notify();
+    }
+  }
   function subscribe(callback) {
     subscribers.add(callback);
-    callback(state);
     return () => {
       subscribers.delete(callback);
     };
@@ -1924,6 +1959,7 @@ function createStore(initialState) {
   return {
     get,
     set,
+    batch,
     subscribe
   };
 }
@@ -2152,8 +2188,14 @@ function createNotificationsApi({
       }
     );
   }
-  async function getThreads() {
-    const json = await fetchJson("/threads", void 0, {});
+  async function getThreads(options) {
+    let query;
+    if (options?.query) {
+      query = objectToQuery(options.query);
+    }
+    const json = await fetchJson("/threads", void 0, {
+      query
+    });
     return {
       threads: json.threads.map(convertToThreadData),
       inboxNotifications: json.inboxNotifications.map(
@@ -2163,8 +2205,13 @@ function createNotificationsApi({
     };
   }
   async function getThreadsSince(options) {
+    let query;
+    if (options?.query) {
+      query = objectToQuery(options.query);
+    }
     const json = await fetchJson("/threads", void 0, {
-      since: options.since.toISOString()
+      since: options.since.toISOString(),
+      query
     });
     return {
       threads: {
@@ -6552,7 +6599,7 @@ ${Array.from(traces).join("\n\n")}`
     );
     return convertToCommentData(comment);
   }
-  async function deleteComment2({
+  async function deleteComment({
     threadId,
     commentId
   }) {
@@ -6565,7 +6612,7 @@ ${Array.from(traces).join("\n\n")}`
       }
     );
   }
-  async function addReaction2({
+  async function addReaction({
     threadId,
     commentId,
     emoji
@@ -6584,7 +6631,7 @@ ${Array.from(traces).join("\n\n")}`
     );
     return convertToCommentUserReaction(reaction);
   }
-  async function removeReaction2({
+  async function removeReaction({
     threadId,
     commentId,
     emoji
@@ -6765,9 +6812,9 @@ ${Array.from(traces).join("\n\n")}`
       markThreadAsUnresolved,
       createComment,
       editComment,
-      deleteComment: deleteComment2,
-      addReaction: addReaction2,
-      removeReaction: removeReaction2,
+      deleteComment,
+      addReaction,
+      removeReaction,
       // Notifications
       getNotificationSettings,
       updateNotificationSettings,
@@ -6900,533 +6947,6 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
   };
 }
 
-// src/store.ts
-function createClientStore() {
-  const store = createStore({
-    threads: {},
-    queries: {},
-    optimisticUpdates: [],
-    inboxNotifications: {},
-    notificationSettings: {},
-    versions: {}
-  });
-  const optimisticUpdatesEventSource = makeEventSource();
-  return {
-    ...store,
-    deleteThread(threadId) {
-      store.set((state) => {
-        return {
-          ...state,
-          threads: deleteKeyImmutable(state.threads, threadId),
-          inboxNotifications: Object.fromEntries(
-            Object.entries(state.inboxNotifications).filter(
-              ([_id, notification]) => notification.kind === "thread" && notification.threadId === threadId
-            )
-          )
-        };
-      });
-    },
-    updateThreadAndNotification(thread, inboxNotification) {
-      store.set((state) => {
-        const existingThread = state.threads[thread.id];
-        return {
-          ...state,
-          threads: existingThread === void 0 || compareThreads(thread, existingThread) === 1 ? { ...state.threads, [thread.id]: thread } : state.threads,
-          inboxNotifications: inboxNotification === void 0 ? state.inboxNotifications : {
-            ...state.inboxNotifications,
-            [inboxNotification.id]: inboxNotification
-          }
-        };
-      });
-    },
-    updateRoomVersions(roomId, versions, queryKey) {
-      store.set((state) => ({
-        ...state,
-        versions: {
-          ...state.versions,
-          [roomId]: versions
-        },
-        queries: queryKey !== void 0 ? {
-          ...state.queries,
-          [queryKey]: { isLoading: false, data: void 0 }
-        } : state.queries
-      }));
-    },
-    updateThreadsAndNotifications(threads, inboxNotifications, deletedThreads, deletedInboxNotifications, queryKey) {
-      store.set((state) => ({
-        ...state,
-        threads: applyThreadUpdates(state.threads, {
-          newThreads: threads,
-          deletedThreads
-        }),
-        inboxNotifications: applyNotificationsUpdates(
-          state.inboxNotifications,
-          {
-            newInboxNotifications: inboxNotifications,
-            deletedNotifications: deletedInboxNotifications
-          }
-        ),
-        queries: queryKey !== void 0 ? {
-          ...state.queries,
-          [queryKey]: { isLoading: false, data: void 0 }
-        } : state.queries
-      }));
-    },
-    updateRoomInboxNotificationSettings(roomId, settings, queryKey) {
-      store.set((state) => ({
-        ...state,
-        notificationSettings: {
-          ...state.notificationSettings,
-          [roomId]: settings
-        },
-        queries: {
-          ...state.queries,
-          [queryKey]: { isLoading: false, data: void 0 }
-        }
-      }));
-    },
-    pushOptimisticUpdate(optimisticUpdate) {
-      optimisticUpdatesEventSource.notify(optimisticUpdate);
-      store.set((state) => ({
-        ...state,
-        optimisticUpdates: [...state.optimisticUpdates, optimisticUpdate]
-      }));
-    },
-    setQueryState(queryKey, queryState) {
-      store.set((state) => ({
-        ...state,
-        queries: {
-          ...state.queries,
-          [queryKey]: queryState
-        }
-      }));
-    },
-    optimisticUpdatesEventSource
-  };
-}
-function deleteKeyImmutable(record, key) {
-  if (Object.prototype.hasOwnProperty.call(record, key)) {
-    const { [key]: _toDelete, ...rest } = record;
-    return rest;
-  }
-  return record;
-}
-function compareThreads(thread1, thread2) {
-  if (thread1.updatedAt && thread2.updatedAt) {
-    return thread1.updatedAt > thread2.updatedAt ? 1 : thread1.updatedAt < thread2.updatedAt ? -1 : 0;
-  } else if (thread1.updatedAt || thread2.updatedAt) {
-    return thread1.updatedAt ? 1 : -1;
-  }
-  if (thread1.createdAt > thread2.createdAt) {
-    return 1;
-  } else if (thread1.createdAt < thread2.createdAt) {
-    return -1;
-  }
-  return 0;
-}
-function applyOptimisticUpdates(state) {
-  const result = {
-    threads: {
-      ...state.threads
-    },
-    inboxNotifications: {
-      ...state.inboxNotifications
-    },
-    notificationSettings: {
-      ...state.notificationSettings
-    }
-  };
-  for (const optimisticUpdate of state.optimisticUpdates) {
-    switch (optimisticUpdate.type) {
-      case "create-thread": {
-        result.threads[optimisticUpdate.thread.id] = optimisticUpdate.thread;
-        break;
-      }
-      case "edit-thread-metadata": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        if (thread.deletedAt !== void 0) {
-          break;
-        }
-        if (thread.updatedAt !== void 0 && thread.updatedAt > optimisticUpdate.updatedAt) {
-          break;
-        }
-        result.threads[thread.id] = {
-          ...thread,
-          updatedAt: optimisticUpdate.updatedAt,
-          metadata: {
-            ...thread.metadata,
-            ...optimisticUpdate.metadata
-          }
-        };
-        break;
-      }
-      case "mark-thread-as-resolved": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        if (thread.deletedAt !== void 0) {
-          break;
-        }
-        result.threads[thread.id] = {
-          ...thread,
-          resolved: true
-        };
-        break;
-      }
-      case "mark-thread-as-unresolved": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        if (thread.deletedAt !== void 0) {
-          break;
-        }
-        result.threads[thread.id] = {
-          ...thread,
-          resolved: false
-        };
-        break;
-      }
-      case "create-comment": {
-        const thread = result.threads[optimisticUpdate.comment.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = upsertComment(
-          thread,
-          optimisticUpdate.comment
-        );
-        const inboxNotification = Object.values(result.inboxNotifications).find(
-          (notification) => notification.kind === "thread" && notification.threadId === thread.id
-        );
-        if (inboxNotification === void 0) {
-          break;
-        }
-        result.inboxNotifications[inboxNotification.id] = {
-          ...inboxNotification,
-          notifiedAt: optimisticUpdate.comment.createdAt,
-          readAt: optimisticUpdate.comment.createdAt
-        };
-        break;
-      }
-      case "edit-comment": {
-        const thread = result.threads[optimisticUpdate.comment.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = upsertComment(
-          thread,
-          optimisticUpdate.comment
-        );
-        break;
-      }
-      case "delete-comment": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = deleteComment(
-          thread,
-          optimisticUpdate.commentId,
-          optimisticUpdate.deletedAt
-        );
-        break;
-      }
-      case "delete-thread": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[optimisticUpdate.threadId] = {
-          ...result.threads[optimisticUpdate.threadId],
-          deletedAt: optimisticUpdate.deletedAt,
-          updatedAt: optimisticUpdate.deletedAt,
-          comments: []
-        };
-        break;
-      }
-      case "add-reaction": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = addReaction(
-          thread,
-          optimisticUpdate.commentId,
-          optimisticUpdate.reaction
-        );
-        break;
-      }
-      case "remove-reaction": {
-        const thread = result.threads[optimisticUpdate.threadId];
-        if (thread === void 0) {
-          break;
-        }
-        result.threads[thread.id] = removeReaction(
-          thread,
-          optimisticUpdate.commentId,
-          optimisticUpdate.emoji,
-          optimisticUpdate.userId,
-          optimisticUpdate.removedAt
-        );
-        break;
-      }
-      case "mark-inbox-notification-as-read": {
-        result.inboxNotifications[optimisticUpdate.inboxNotificationId] = {
-          ...state.inboxNotifications[optimisticUpdate.inboxNotificationId],
-          readAt: optimisticUpdate.readAt
-        };
-        break;
-      }
-      case "mark-all-inbox-notifications-as-read": {
-        for (const id in result.inboxNotifications) {
-          result.inboxNotifications[id] = {
-            ...result.inboxNotifications[id],
-            readAt: optimisticUpdate.readAt
-          };
-        }
-        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],
-          ...optimisticUpdate.settings
-        };
-      }
-    }
-  }
-  return result;
-}
-function applyThreadUpdates(existingThreads, updates) {
-  const updatedThreads = { ...existingThreads };
-  updates.newThreads.forEach((thread) => {
-    const existingThread = updatedThreads[thread.id];
-    if (existingThread) {
-      const result = compareThreads(existingThread, thread);
-      if (result === 1) return;
-    }
-    updatedThreads[thread.id] = thread;
-  });
-  updates.deletedThreads.forEach(({ id, deletedAt }) => {
-    const existingThread = updatedThreads[id];
-    if (existingThread === void 0) return;
-    existingThread.deletedAt = deletedAt;
-    existingThread.updatedAt = deletedAt;
-    existingThread.comments = [];
-  });
-  return updatedThreads;
-}
-function applyNotificationsUpdates(existingInboxNotifications, updates) {
-  const updatedInboxNotifications = { ...existingInboxNotifications };
-  updates.newInboxNotifications.forEach((notification) => {
-    const existingNotification = updatedInboxNotifications[notification.id];
-    if (existingNotification) {
-      const result = compareInboxNotifications(
-        existingNotification,
-        notification
-      );
-      if (result === 1) return;
-    }
-    updatedInboxNotifications[notification.id] = notification;
-  });
-  updates.deletedNotifications.forEach(
-    ({ id }) => delete updatedInboxNotifications[id]
-  );
-  return updatedInboxNotifications;
-}
-function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
-  if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
-    return 1;
-  } else if (inboxNotificationA.notifiedAt < inboxNotificationB.notifiedAt) {
-    return -1;
-  }
-  if (inboxNotificationA.readAt && inboxNotificationB.readAt) {
-    return inboxNotificationA.readAt > inboxNotificationB.readAt ? 1 : inboxNotificationA.readAt < inboxNotificationB.readAt ? -1 : 0;
-  } else if (inboxNotificationA.readAt || inboxNotificationB.readAt) {
-    return inboxNotificationA.readAt ? 1 : -1;
-  }
-  return 0;
-}
-function upsertComment(thread, comment) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
-  }
-  if (comment.threadId !== thread.id) {
-    warn(
-      `Comment ${comment.id} does not belong to thread ${thread.id}`
-    );
-    return thread;
-  }
-  const existingComment = thread.comments.find(
-    (existingComment2) => existingComment2.id === comment.id
-  );
-  if (existingComment === void 0) {
-    const updatedAt = new Date(
-      Math.max(thread.updatedAt?.getTime() || 0, comment.createdAt.getTime())
-    );
-    const updatedThread = {
-      ...thread,
-      updatedAt,
-      comments: [...thread.comments, comment]
-    };
-    return updatedThread;
-  }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
-  }
-  if (existingComment.editedAt === void 0 || comment.editedAt === void 0 || existingComment.editedAt <= comment.editedAt) {
-    const updatedComments = thread.comments.map(
-      (existingComment2) => existingComment2.id === comment.id ? comment : existingComment2
-    );
-    const updatedThread = {
-      ...thread,
-      updatedAt: new Date(
-        Math.max(
-          thread.updatedAt?.getTime() || 0,
-          comment.editedAt?.getTime() || comment.createdAt.getTime()
-        )
-      ),
-      comments: updatedComments
-    };
-    return updatedThread;
-  }
-  return thread;
-}
-function deleteComment(thread, commentId, deletedAt) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
-  }
-  const existingComment = thread.comments.find(
-    (comment) => comment.id === commentId
-  );
-  if (existingComment === void 0) {
-    return thread;
-  }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
-  }
-  const updatedComments = thread.comments.map(
-    (comment) => comment.id === commentId ? {
-      ...comment,
-      deletedAt,
-      body: void 0
-    } : comment
-  );
-  if (!updatedComments.some((comment) => comment.deletedAt === void 0)) {
-    return {
-      ...thread,
-      deletedAt,
-      updatedAt: deletedAt,
-      comments: []
-    };
-  }
-  return {
-    ...thread,
-    updatedAt: deletedAt,
-    comments: updatedComments
-  };
-}
-function addReaction(thread, commentId, reaction) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
-  }
-  const existingComment = thread.comments.find(
-    (comment) => comment.id === commentId
-  );
-  if (existingComment === void 0) {
-    return thread;
-  }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
-  }
-  const updatedComments = thread.comments.map(
-    (comment) => comment.id === commentId ? {
-      ...comment,
-      reactions: upsertReaction(comment.reactions, reaction)
-    } : comment
-  );
-  return {
-    ...thread,
-    updatedAt: new Date(
-      Math.max(reaction.createdAt.getTime(), thread.updatedAt?.getTime() || 0)
-    ),
-    comments: updatedComments
-  };
-}
-function removeReaction(thread, commentId, emoji, userId, removedAt) {
-  if (thread.deletedAt !== void 0) {
-    return thread;
-  }
-  const existingComment = thread.comments.find(
-    (comment) => comment.id === commentId
-  );
-  if (existingComment === void 0) {
-    return thread;
-  }
-  if (existingComment.deletedAt !== void 0) {
-    return thread;
-  }
-  const updatedComments = thread.comments.map(
-    (comment) => comment.id === commentId ? {
-      ...comment,
-      reactions: comment.reactions.map(
-        (reaction) => reaction.emoji === emoji ? {
-          ...reaction,
-          users: reaction.users.filter((user) => user.id !== userId)
-        } : reaction
-      ).filter((reaction) => reaction.users.length > 0)
-      // Remove reactions with no users left
-    } : comment
-  );
-  return {
-    ...thread,
-    updatedAt: new Date(
-      Math.max(removedAt.getTime(), thread.updatedAt?.getTime() || 0)
-    ),
-    comments: updatedComments
-  };
-}
-function upsertReaction(reactions, reaction) {
-  const existingReaction = reactions.find(
-    (existingReaction2) => existingReaction2.emoji === reaction.emoji
-  );
-  if (existingReaction === void 0) {
-    return [
-      ...reactions,
-      {
-        emoji: reaction.emoji,
-        createdAt: reaction.createdAt,
-        users: [{ id: reaction.userId }]
-      }
-    ];
-  }
-  if (existingReaction.users.some((user) => user.id === reaction.userId) === false) {
-    return reactions.map(
-      (existingReaction2) => existingReaction2.emoji === reaction.emoji ? {
-        ...existingReaction2,
-        users: [...existingReaction2.users, { id: reaction.userId }]
-      } : existingReaction2
-    );
-  }
-  return reactions;
-}
-
 // src/client.ts
 var MIN_THROTTLE = 16;
 var MAX_THROTTLE = 1e3;
@@ -7570,7 +7090,6 @@ function createClient(options) {
     authManager,
     currentUserIdStore
   });
-  const cacheStore = createClientStore();
   const resolveUsers = clientOptions.resolveUsers;
   const warnIfNoResolveUsers = createDevelopmentWarning(
     () => !resolveUsers,
@@ -7616,7 +7135,6 @@ function createClient(options) {
       [kInternal]: {
         currentUserIdStore,
         resolveMentionSuggestions: clientOptions.resolveMentionSuggestions,
-        cacheStore,
         usersStore,
         roomsInfoStore,
         getRoomIds() {
@@ -8458,7 +7976,7 @@ function shallowArray(xs, ys) {
   return true;
 }
 function shallowObj(objA, objB) {
-  if (typeof objA !== "object" || objA === null || typeof objB !== "object" || objB === null || Object.prototype.toString.call(objA) !== "[object Object]" || Object.prototype.toString.call(objB) !== "[object Object]") {
+  if (!isPlainObject(objA) || !isPlainObject(objB)) {
     return false;
   }
   const keysA = Object.keys(objA);
@@ -8498,13 +8016,12 @@ export {
   ServerMsgCode,
   WebsocketCloseCodes,
   ackOp,
-  addReaction,
-  applyOptimisticUpdates,
   asPos,
   assert,
   assertNever,
   b64decode,
   cloneLson,
+  compactObject,
   fancy_console_exports as console,
   convertToCommentData,
   convertToCommentUserReaction,
@@ -8513,8 +8030,8 @@ export {
   createClient,
   createCommentId,
   createInboxNotificationId,
+  createStore,
   createThreadId,
-  deleteComment,
   deprecate,
   deprecateIf,
   detectDupes,
@@ -8534,20 +8051,19 @@ export {
   makeEventSource,
   makePoller,
   makePosition,
+  mapValues,
   memoizeOnSuccess,
   nanoid,
   nn,
   objectToQuery,
   patchLiveObjectKey,
   raise,
-  removeReaction,
   shallow,
   stringify,
   stringifyCommentBody,
   throwUsageError,
   toPlainLson,
   tryParseJson,
-  upsertComment,
   wait,
   withTimeout
 };