@liveblocks/emails 3.6.2 → 3.7.0

package/dist/index.cjs

@@ -3,7 +3,7 @@ var _core = require('@liveblocks/core');
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/emails";
-var PKG_VERSION = "3.6.2";
+var PKG_VERSION = "3.7.0";
 var PKG_FORMAT = "cjs";
 
 // src/text-mention-notification.tsx
@@ -12,6 +12,10 @@ var PKG_FORMAT = "cjs";
 
 
 
+
+// src/lexical-editor.ts
+
+
 // ../../node_modules/lib0/map.js
 var create = () => /* @__PURE__ */ new Map();
 var copy = (m) => {
@@ -7524,6 +7528,16 @@ var isSerializedMentionNode = (node) => {
   const attributes = node.attributes;
   return isMentionNodeType(node.type) && isMentionNodeAttributeType(attributes.__type) && isMentionNodeAttributeId(attributes.__id) && isString(attributes.__userId);
 };
+var isGroupMentionNodeType = (type) => {
+  return type === "lb-group-mention";
+};
+var isGroupMentionNodeAttributeType = (type) => {
+  return isString(type) && type === "lb-group-mention";
+};
+var isSerializedGroupMentionNode = (node) => {
+  const attributes = node.attributes;
+  return isGroupMentionNodeType(node.type) && isGroupMentionNodeAttributeType(attributes.__type) && isMentionNodeAttributeId(attributes.__id) && isString(attributes.__groupId) && (attributes.__userIds === void 0 || Array.isArray(attributes.__userIds));
+};
 var isFlattenedLexicalElementNodeMarker = (node) => {
   return node.group === "element-marker";
 };
@@ -7551,14 +7565,13 @@ var flattenLexicalTree = (nodes) => {
 };
 function findLexicalMentionNodeWithContext({
   root,
-  mentionedUserId,
-  mentionId
+  textMentionId
 }) {
   const nodes = flattenLexicalTree(root.children);
   let mentionNodeIndex = -1;
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i];
-    if (node.group === "decorator" && isSerializedMentionNode(node) && node.attributes.__id === mentionId && node.attributes.__userId === mentionedUserId) {
+    if (node.group === "decorator" && (isSerializedMentionNode(node) || isSerializedGroupMentionNode(node)) && node.attributes.__id === textMentionId) {
       mentionNodeIndex = i;
       break;
     }
@@ -7595,112 +7608,112 @@ function findLexicalMentionNodeWithContext({
     mention: mentionNode
   };
 }
-
-// src/lib/authors.ts
-var resolveAuthorsInfo = async ({
-  userIds,
-  resolveUsers
-}) => {
-  const resolvedUsers = /* @__PURE__ */ new Map();
-  if (!resolveUsers) {
-    return resolvedUsers;
-  }
-  const users = await resolveUsers({ userIds });
-  for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _5 => _5[index]]);
-    if (user) {
-      resolvedUsers.set(userId, user);
-    }
-  }
-  return resolvedUsers;
-};
-
-// src/lib/batch-users-resolver.ts
-
-
-// src/lib/warning.ts
-var createDevelopmentWarning = (condition, ...args2) => {
-  let hasWarned = false;
-  if (process.env.NODE_ENV !== "production") {
-    return () => {
-      if (!hasWarned && (typeof condition === "function" ? condition() : condition)) {
-        console.warn(...args2);
-        hasWarned = true;
-      }
+function getMentionDataFromLexicalNode(node) {
+  if (isSerializedMentionNode(node)) {
+    return {
+      kind: "user",
+      id: node.attributes.__userId
     };
-  } else {
-    return () => {
+  } else if (isSerializedGroupMentionNode(node)) {
+    return {
+      kind: "group",
+      id: node.attributes.__groupId,
+      userIds: node.attributes.__userIds
     };
   }
-};
+  _core.assertNever.call(void 0, node, "Unknown mention kind");
+}
 
-// src/lib/batch-users-resolver.ts
-var BatchUsersResolver = (_class = class {
-  
-  
+// src/lib/batch-resolvers.ts
+
+function getResolvedForId(id2, ids, results) {
+  const index = ids.indexOf(id2);
+  return _optionalChain([results, 'optionalAccess', _5 => _5[index]]);
+}
+var BatchResolver = (_class = class {
+  __init() {this.ids = /* @__PURE__ */ new Set()}
+  __init2() {this.results = /* @__PURE__ */ new Map()}
+  __init3() {this.isResolved = false}
   
   
   
   
-  constructor(resolveUsers) {;_class.prototype.__init.call(this);
+  constructor(callback, missingCallbackWarning) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);
+    this.callback = callback;
     const { promise, resolve } = _core.Promise_withResolvers.call(void 0, );
-    this.isResolved = false;
-    this.markAsResolved = resolve;
-    this.resolvePromise = promise;
-    this.primeResolveUsersFn = resolveUsers;
-    this.usersById = /* @__PURE__ */ new Map();
-    this.warnAsAlreadyResolved = createDevelopmentWarning(
-      true,
-      "Batch users resolver promise already resolved. It can only resolve once."
-    );
+    this.promise = promise;
+    this.resolvePromise = resolve;
+    this.missingCallbackWarning = missingCallbackWarning;
   }
-  __init() {this.resolveUsers = async (args2) => {
+  /**
+   * Add IDs to the batch and return a promise that resolves when the entire batch is resolved.
+   * It can't be called after the batch is resolved.
+   */
+  async get(ids) {
     if (this.isResolved) {
-      this.warnAsAlreadyResolved();
-      return void 0;
-    }
-    for (const userId of args2.userIds) {
-      this.usersById.set(userId, void 0);
+      throw new Error("Batch has already been resolved.");
     }
-    await this.resolvePromise;
-    return args2.userIds.map((userId) => this.usersById.get(userId));
-  }}
+    ids.forEach((id2) => this.ids.add(id2));
+    await this.promise;
+    return ids.map((id2) => this.results.get(id2));
+  }
+  #resolveBatch() {
+    this.isResolved = true;
+    this.resolvePromise();
+  }
+  /**
+   * Resolve all the IDs in the batch.
+   * It can only be called once.
+   */
   async resolve() {
     if (this.isResolved) {
-      this.warnAsAlreadyResolved();
+      throw new Error("Batch has already been resolved.");
+    }
+    if (!this.callback) {
+      _core.warnOnce.call(void 0, this.missingCallbackWarning);
+      this.#resolveBatch();
       return;
     }
-    const userIds = Array.from(this.usersById.keys());
-    const users = await _optionalChain([this, 'access', _6 => _6.primeResolveUsersFn, 'optionalCall', _7 => _7({ userIds })]);
-    for (const [index, userId] of userIds.entries()) {
-      const user = _optionalChain([users, 'optionalAccess', _8 => _8[index]]);
-      this.usersById.set(userId, user);
+    const ids = Array.from(this.ids);
+    try {
+      const results = this.callback ? await this.callback(ids) : void 0;
+      if (results !== void 0) {
+        if (!Array.isArray(results)) {
+          throw new Error("Callback must return an array.");
+        } else if (ids.length !== results.length) {
+          throw new Error(
+            `Callback must return an array of the same length as the number of provided items. Expected ${ids.length}, but got ${results.length}.`
+          );
+        }
+      }
+      ids.forEach((id2, index) => {
+        this.results.set(id2, _optionalChain([results, 'optionalAccess', _6 => _6[index]]));
+      });
+    } catch (error) {
+      this.#resolveBatch();
+      throw error;
     }
-    this.isResolved = true;
-    this.markAsResolved();
+    this.#resolveBatch();
   }
 }, _class);
 function createBatchUsersResolver({
   resolveUsers,
   callerName
 }) {
-  const warnIfNoResolveUsers = createDevelopmentWarning(
-    () => !resolveUsers,
-    `Set "resolveUsers" option in "${callerName}" to specify users info`
+  return new BatchResolver(
+    resolveUsers ? (userIds) => resolveUsers({ userIds }) : void 0,
+    `Set "resolveUsers" in "${callerName}" to specify users info`
+  );
+}
+function createBatchGroupsInfoResolver({
+  resolveGroupsInfo,
+  callerName
+}) {
+  return new BatchResolver(
+    resolveGroupsInfo ? (groupIds) => resolveGroupsInfo({ groupIds }) : void 0,
+    `Set "resolveGroupsInfo" in "${callerName}" to specify groups info`
   );
-  const batchUsersResolver = new BatchUsersResolver(resolveUsers);
-  const resolve = async () => {
-    warnIfNoResolveUsers();
-    await batchUsersResolver.resolve();
-  };
-  return {
-    resolveUsers: batchUsersResolver.resolveUsers,
-    resolve
-  };
 }
-
-// src/lib/constants.ts
-var MENTION_CHARACTER = "@";
 
 // src/lib/css-properties.ts
 var VENDORS_PREFIXES = new RegExp(/^(webkit|moz|ms|o)-/);
@@ -7789,6 +7802,9 @@ function toInlineCSSString(styles) {
   return inline;
 }
 
+// src/tiptap-editor.ts
+
+
 // ../../node_modules/y-prosemirror/src/lib.js
 function yXmlFragmentToProsemirrorJSON(xmlFragment) {
   const items = xmlFragment.toArray();
@@ -7861,6 +7877,9 @@ var isSerializedTextNode = (node) => {
 var isSerializedMentionNode2 = (node) => {
   return node.type === "liveblocksMention" && isMentionNodeAttributeId(node.attrs.notificationId);
 };
+var isSerializedGroupMentionNode2 = (node) => {
+  return node.type === "liveblocksGroupMention" && isMentionNodeAttributeId(node.attrs.notificationId);
+};
 var isSerializedParagraphNode = (node) => {
   return node.type === "paragraph" && typeof node.content !== "undefined";
 };
@@ -7870,7 +7889,7 @@ var isFlattenedTiptapParagraphNodeMarker = (node) => {
 var flattenTiptapTree = (nodes) => {
   let flattenNodes = [];
   for (const node of nodes) {
-    if (isSerializedEmptyParagraphNode(node) || isSerializedHardBreakNode(node) || isSerializedTextNode(node) || isSerializedMentionNode2(node)) {
+    if (isSerializedEmptyParagraphNode(node) || isSerializedHardBreakNode(node) || isSerializedTextNode(node) || isSerializedMentionNode2(node) || isSerializedGroupMentionNode2(node)) {
       flattenNodes = [...flattenNodes, node];
     } else if (isSerializedParagraphNode(node)) {
       flattenNodes = [
@@ -7891,14 +7910,13 @@ var flattenTiptapTree = (nodes) => {
 };
 function findTiptapMentionNodeWithContext({
   root,
-  mentionedUserId,
-  mentionId
+  textMentionId
 }) {
   const nodes = flattenTiptapTree(root.content);
   let mentionNodeIndex = -1;
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i];
-    if (!isFlattenedTiptapParagraphNodeMarker(node) && isSerializedMentionNode2(node) && node.attrs.notificationId === mentionId && node.attrs.id === mentionedUserId) {
+    if (!isFlattenedTiptapParagraphNodeMarker(node) && (isSerializedMentionNode2(node) || isSerializedGroupMentionNode2(node)) && node.attrs.notificationId === textMentionId) {
       mentionNodeIndex = i;
       break;
     }
@@ -7929,6 +7947,35 @@ function findTiptapMentionNodeWithContext({
     mention: mentionNode
   };
 }
+function deserializeGroupUserIds(userIds) {
+  if (typeof userIds !== "string") {
+    return void 0;
+  }
+  try {
+    const parsedUserIds = JSON.parse(userIds);
+    if (Array.isArray(parsedUserIds)) {
+      return parsedUserIds;
+    }
+    return void 0;
+  } catch (e2) {
+    return void 0;
+  }
+}
+function getMentionDataFromTiptapNode(node) {
+  if (isSerializedMentionNode2(node)) {
+    return {
+      kind: "user",
+      id: node.attrs.id
+    };
+  } else if (isSerializedGroupMentionNode2(node)) {
+    return {
+      kind: "group",
+      id: node.attrs.id,
+      userIds: deserializeGroupUserIds(node.attrs.userIds)
+    };
+  }
+  _core.assertNever.call(void 0, node, "Unknown mention kind");
+}
 
 // src/liveblocks-text-editor.ts
 var baseLiveblocksTextEditorTextFormat = {
@@ -7972,14 +8019,20 @@ var transformLexicalMentionNodeWithContext = (mentionNodeWithContext) => {
           kind: "user",
           id: node.attributes.__userId
         });
+      } else if (node.group === "decorator" && isSerializedGroupMentionNode(node)) {
+        textEditorNodes.push({
+          type: "mention",
+          kind: "group",
+          id: node.attributes.__groupId
+        });
       }
     }
   };
   transform(before);
   textEditorNodes.push({
     type: "mention",
-    kind: "user",
-    id: mention.attributes.__userId
+    kind: mention.type === "lb-group-mention" ? "group" : "user",
+    id: mention.type === "lb-group-mention" ? mention.attributes.__groupId : mention.attributes.__userId
   });
   transform(after);
   return textEditorNodes;
@@ -8015,13 +8068,19 @@ var transformTiptapMentionNodeWithContext = (mentionNodeWithContext) => {
           kind: "user",
           id: node.attrs.id
         });
+      } else if (isSerializedGroupMentionNode2(node)) {
+        textEditorNodes.push({
+          type: "mention",
+          kind: "group",
+          id: node.attrs.id
+        });
       }
     }
   };
   transform(before);
   textEditorNodes.push({
     type: "mention",
-    kind: "user",
+    kind: mention.type === "liveblocksGroupMention" ? "group" : "user",
     id: mention.attrs.id
   });
   transform(after);
@@ -8041,19 +8100,32 @@ function transformAsLiveblocksTextEditorNodes(transformableMention) {
     }
   }
 }
-var resolveUsersInLiveblocksTextEditorNodes = async (nodes, resolveUsers) => {
+var resolveMentionsInLiveblocksTextEditorNodes = async (nodes, resolveUsers, resolveGroupsInfo) => {
   const resolvedUsers = /* @__PURE__ */ new Map();
-  if (!resolveUsers) {
-    return resolvedUsers;
+  const resolvedGroupsInfo = /* @__PURE__ */ new Map();
+  if (!resolveUsers && !resolveGroupsInfo) {
+    return {
+      users: resolvedUsers,
+      groups: resolvedGroupsInfo
+    };
   }
   const mentionedUserIds = /* @__PURE__ */ new Set();
+  const mentionedGroupIds = /* @__PURE__ */ new Set();
   for (const node of nodes) {
-    if (node.type === "mention" && node.kind === "user") {
-      mentionedUserIds.add(node.id);
+    if (node.type === "mention") {
+      if (node.kind === "user") {
+        mentionedUserIds.add(node.id);
+      } else if (node.kind === "group") {
+        mentionedGroupIds.add(node.id);
+      }
     }
   }
   const userIds = Array.from(mentionedUserIds);
-  const users = await resolveUsers({ userIds });
+  const groupIds = Array.from(mentionedGroupIds);
+  const [users, groups] = await Promise.all([
+    resolveUsers && userIds.length > 0 ? resolveUsers({ userIds }) : void 0,
+    resolveGroupsInfo && groupIds.length > 0 ? resolveGroupsInfo({ groupIds }) : void 0
+  ]);
   if (users) {
     for (const [index, userId] of userIds.entries()) {
       const user = users[index];
@@ -8062,24 +8134,36 @@ var resolveUsersInLiveblocksTextEditorNodes = async (nodes, resolveUsers) => {
       }
     }
   }
-  return resolvedUsers;
+  if (groups) {
+    for (const [index, groupId] of groupIds.entries()) {
+      const group = groups[index];
+      if (group) {
+        resolvedGroupsInfo.set(groupId, group);
+      }
+    }
+  }
+  return {
+    users: resolvedUsers,
+    groups: resolvedGroupsInfo
+  };
 };
 
-// src/mention-content.tsx
-
-async function convertMentionContent(nodes, options) {
-  const resolvedUsers = await resolveUsersInLiveblocksTextEditorNodes(
+// src/text-mention-content.tsx
+async function convertTextMentionContent(nodes, options) {
+  const { users: resolvedUsers, groups: resolvedGroupsInfo } = await resolveMentionsInLiveblocksTextEditorNodes(
     nodes,
-    _optionalChain([options, 'optionalAccess', _9 => _9.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _7 => _7.resolveUsers]),
+    _optionalChain([options, 'optionalAccess', _8 => _8.resolveGroupsInfo])
   );
   const blocks = nodes.map((node, index) => {
     switch (node.type) {
       case "mention": {
-        if (node.kind !== "user") {
-          return _core.assertNever.call(void 0, node.kind, "Unknown mention kind");
-        }
         return options.elements.mention(
-          { node, user: resolvedUsers.get(node.id) },
+          {
+            node,
+            user: node.kind === "user" ? resolvedUsers.get(node.id) : void 0,
+            group: node.kind === "group" ? resolvedGroupsInfo.get(node.id) : void 0
+          },
           index
         );
       }
@@ -8125,17 +8209,19 @@ var extractTextMentionNotificationData = async ({
       const state = getSerializedLexicalState({ buffer, key });
       const mentionNodeWithContext = findLexicalMentionNodeWithContext({
         root: state,
-        mentionedUserId: userId,
-        mentionId: inboxNotification.mentionId
+        textMentionId: inboxNotification.mentionId
       });
       if (mentionNodeWithContext === null) {
         return null;
       }
+      const mentionData = getMentionDataFromLexicalNode(
+        mentionNodeWithContext.mention
+      );
       return {
         editor: "lexical",
         mentionNodeWithContext,
+        mentionData,
         createdAt: mentionCreatedAt,
-        userId,
         createdBy: mentionAuthorUserId
       };
     }
@@ -8143,17 +8229,19 @@ var extractTextMentionNotificationData = async ({
       const state = getSerializedTiptapState({ buffer, key });
       const mentionNodeWithContext = findTiptapMentionNodeWithContext({
         root: state,
-        mentionedUserId: userId,
-        mentionId: inboxNotification.mentionId
+        textMentionId: inboxNotification.mentionId
       });
       if (mentionNodeWithContext === null) {
         return null;
       }
+      const mentionData = getMentionDataFromTiptapNode(
+        mentionNodeWithContext.mention
+      );
       return {
         editor: "tiptap",
         mentionNodeWithContext,
+        mentionData,
         createdAt: mentionCreatedAt,
-        userId,
         createdBy: mentionAuthorUserId
       };
     }
@@ -8168,16 +8256,18 @@ async function prepareTextMentionNotificationEmail(client, event, options, eleme
   const roomInfo = options.resolveRoomInfo ? await options.resolveRoomInfo({ roomId: event.data.roomId }) : void 0;
   const resolvedRoomInfo = {
     ...roomInfo,
-    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _10 => _10.name]), () => ( event.data.roomId))
+    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _9 => _9.name]), () => ( event.data.roomId))
   };
   const batchUsersResolver = createBatchUsersResolver({
     resolveUsers: options.resolveUsers,
     callerName
   });
-  const authorsInfoPromise = resolveAuthorsInfo({
-    userIds: [data.createdBy],
-    resolveUsers: batchUsersResolver.resolveUsers
+  const batchGroupsInfoResolver = createBatchGroupsInfoResolver({
+    resolveGroupsInfo: options.resolveGroupsInfo,
+    callerName
   });
+  const authorsIds = [data.createdBy];
+  const authorsInfoPromise = batchUsersResolver.get(authorsIds);
   let textEditorNodes = [];
   switch (data.editor) {
     case "lexical": {
@@ -8195,24 +8285,24 @@ async function prepareTextMentionNotificationEmail(client, event, options, eleme
       break;
     }
   }
-  const contentPromise = convertMentionContent(
+  const contentPromise = convertTextMentionContent(
     textEditorNodes,
     {
-      resolveUsers: batchUsersResolver.resolveUsers,
+      resolveUsers: ({ userIds }) => batchUsersResolver.get(userIds),
+      resolveGroupsInfo: ({ groupIds }) => batchGroupsInfoResolver.get(groupIds),
       elements
     }
   );
   await batchUsersResolver.resolve();
+  await batchGroupsInfoResolver.resolve();
   const [authorsInfo, content] = await Promise.all([
     authorsInfoPromise,
     contentPromise
   ]);
-  const authorInfo = authorsInfo.get(data.createdBy);
+  const authorInfo = getResolvedForId(data.createdBy, authorsIds, authorsInfo);
   return {
     mention: {
-      // TODO: When introducing new mention kinds (e.g. group mentions), this should be updated
-      kind: "user",
-      id: data.userId,
+      ...data.mentionData,
       textMentionId: mentionId,
       roomId,
       author: {
@@ -8227,9 +8317,9 @@ async function prepareTextMentionNotificationEmail(client, event, options, eleme
 }
 var baseComponents = {
   Container: ({ children }) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { children }),
-  Mention: ({ element, user }) => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { "data-mention": true, children: [
-    MENTION_CHARACTER,
-    _nullishCoalesce(_optionalChain([user, 'optionalAccess', _11 => _11.name]), () => ( element.id))
+  Mention: ({ element, user, group }) => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { "data-mention": true, children: [
+    _core.MENTION_CHARACTER,
+    _nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _10 => _10.name]), () => ( _optionalChain([group, 'optionalAccess', _11 => _11.name]))), () => ( element.id))
   ] }),
   Text: ({ element }) => {
     let children = element.text;
@@ -8310,8 +8400,8 @@ async function prepareTextMentionNotificationEmailAsHtml(client, event, options
         ];
         return content.join("\n");
       },
-      mention: ({ node, user }) => {
-        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${MENTION_CHARACTER}${_optionalChain([user, 'optionalAccess', _12 => _12.name]) ? _core.html`${_optionalChain([user, 'optionalAccess', _13 => _13.name])}` : node.id}</span>`;
+      mention: ({ node, user, group }) => {
+        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${_core.MENTION_CHARACTER}${_optionalChain([user, 'optionalAccess', _12 => _12.name]) ? _core.html`${_optionalChain([user, 'optionalAccess', _13 => _13.name])}` : _optionalChain([group, 'optionalAccess', _14 => _14.name]) ? _core.html`${_optionalChain([group, 'optionalAccess', _15 => _15.name])}` : node.id}</span>`;
       },
       text: ({ node }) => {
         let children = node.text;
@@ -8349,6 +8439,7 @@ async function prepareTextMentionNotificationEmailAsHtml(client, event, options
 
 
 
+
 // src/comment-body.tsx
 
 
@@ -8358,9 +8449,10 @@ async function prepareTextMentionNotificationEmailAsHtml(client, event, options
 
 
 async function convertCommentBody(body, options) {
-  const resolvedUsers = await _core.resolveUsersInCommentBody.call(void 0, 
+  const { users: resolvedUsers, groups: resolvedGroupsInfo } = await _core.resolveMentionsInCommentBody.call(void 0, 
     body,
-    _optionalChain([options, 'optionalAccess', _14 => _14.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _16 => _16.resolveUsers]),
+    _optionalChain([options, 'optionalAccess', _17 => _17.resolveGroupsInfo])
   );
   const blocks = body.content.map((block, index) => {
     switch (block.type) {
@@ -8370,7 +8462,8 @@ async function convertCommentBody(body, options) {
             return options.elements.mention(
               {
                 element: inline,
-                user: resolvedUsers.get(inline.id)
+                user: inline.kind === "user" ? resolvedUsers.get(inline.id) : void 0,
+                group: inline.kind === "group" ? resolvedGroupsInfo.get(inline.id) : void 0
               },
               inlineIndex
             );
@@ -8447,17 +8540,54 @@ var getUnreadComments = ({
     return c.createdAt >= notificationTriggerAt && c.createdAt <= inboxNotification.notifiedAt;
   });
 };
+async function getAllUserGroups(client, userId) {
+  const groups = /* @__PURE__ */ new Map();
+  let cursor = void 0;
+  while (true) {
+    const { nextCursor, data } = await client.getUserGroups({
+      userId,
+      startingAfter: cursor
+    });
+    for (const group of data) {
+      groups.set(group.id, group);
+    }
+    if (!nextCursor) {
+      break;
+    }
+    cursor = nextCursor;
+  }
+  return groups;
+}
 var getLastUnreadCommentWithMention = ({
   comments,
+  groups,
   mentionedUserId
 }) => {
-  return _nullishCoalesce(Array.from(comments).reverse().filter((c) => c.userId !== mentionedUserId).find((c) => {
-    const mentions = _core.getMentionsFromCommentBody.call(void 0, 
-      c.body,
-      (mention) => mention.kind === "user" && mention.id === mentionedUserId
-    );
-    return mentions.length > 0;
-  }), () => ( null));
+  if (!comments.length) {
+    return null;
+  }
+  for (let i = comments.length - 1; i >= 0; i--) {
+    const comment = comments[i];
+    if (comment.userId === mentionedUserId) {
+      continue;
+    }
+    const mentions = _core.getMentionsFromCommentBody.call(void 0, comment.body);
+    for (const mention of mentions) {
+      if (mention.kind === "user" && mention.id === mentionedUserId) {
+        return comment;
+      }
+      if (mention.kind === "group" && _optionalChain([mention, 'access', _18 => _18.userIds, 'optionalAccess', _19 => _19.includes, 'call', _20 => _20(mentionedUserId)])) {
+        return comment;
+      }
+      if (mention.kind === "group" && mention.userIds === void 0) {
+        const group = groups.get(mention.id);
+        if (_optionalChain([group, 'optionalAccess', _21 => _21.members, 'access', _22 => _22.some, 'call', _23 => _23((member) => member.id === mentionedUserId)])) {
+          return comment;
+        }
+      }
+    }
+  }
+  return null;
 };
 var extractThreadNotificationData = async ({
   client,
@@ -8478,8 +8608,10 @@ var extractThreadNotificationData = async ({
   if (unreadComments.length <= 0) {
     return null;
   }
+  const userGroups = await getAllUserGroups(client, userId);
   const lastUnreadCommentWithMention = getLastUnreadCommentWithMention({
     comments: unreadComments,
+    groups: userGroups,
     mentionedUserId: userId
   });
   if (lastUnreadCommentWithMention !== null) {
@@ -8507,33 +8639,41 @@ async function prepareThreadNotificationEmail(client, event, options, elements,
   const roomInfo = options.resolveRoomInfo ? await options.resolveRoomInfo({ roomId: event.data.roomId }) : void 0;
   const resolvedRoomInfo = {
     ...roomInfo,
-    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _15 => _15.name]), () => ( event.data.roomId))
+    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _24 => _24.name]), () => ( event.data.roomId))
   };
   const batchUsersResolver = createBatchUsersResolver({
     resolveUsers: options.resolveUsers,
     callerName
   });
+  const batchGroupsInfoResolver = createBatchGroupsInfoResolver({
+    resolveGroupsInfo: options.resolveGroupsInfo,
+    callerName
+  });
   switch (data.type) {
     case "unreadMention": {
       const { comment } = data;
-      const authorsInfoPromise = resolveAuthorsInfo({
-        userIds: [comment.userId],
-        resolveUsers: batchUsersResolver.resolveUsers
-      });
+      const authorsIds = [comment.userId];
+      const authorsInfoPromise = batchUsersResolver.get(authorsIds);
       const commentBodyPromise = convertCommentBody(comment.body, {
-        resolveUsers: batchUsersResolver.resolveUsers,
+        resolveUsers: ({ userIds }) => batchUsersResolver.get(userIds),
+        resolveGroupsInfo: ({ groupIds }) => batchGroupsInfoResolver.get(groupIds),
         elements
       });
       await batchUsersResolver.resolve();
+      await batchGroupsInfoResolver.resolve();
       const [authorsInfo, commentBody] = await Promise.all([
         authorsInfoPromise,
         commentBodyPromise
       ]);
-      const authorInfo = authorsInfo.get(comment.userId);
-      const url = generateCommentUrl({
-        roomUrl: _optionalChain([roomInfo, 'optionalAccess', _16 => _16.url]),
+      const authorInfo = getResolvedForId(
+        comment.userId,
+        authorsIds,
+        authorsInfo
+      );
+      const url = _optionalChain([roomInfo, 'optionalAccess', _25 => _25.url]) ? generateCommentUrl({
+        roomUrl: _optionalChain([roomInfo, 'optionalAccess', _26 => _26.url]),
         commentId: comment.id
-      });
+      }) : void 0;
       return {
         type: "unreadMention",
         comment: {
@@ -8553,17 +8693,17 @@ async function prepareThreadNotificationEmail(client, event, options, elements,
     }
     case "unreadReplies": {
       const { comments } = data;
-      const authorsInfoPromise = resolveAuthorsInfo({
-        userIds: comments.map((c) => c.userId),
-        resolveUsers: batchUsersResolver.resolveUsers
-      });
+      const authorsIds = comments.map((c) => c.userId);
+      const authorsInfoPromise = batchUsersResolver.get(authorsIds);
       const commentBodiesPromises = comments.map(
         (c) => convertCommentBody(c.body, {
-          resolveUsers: batchUsersResolver.resolveUsers,
+          resolveUsers: ({ userIds }) => batchUsersResolver.get(userIds),
+          resolveGroupsInfo: ({ groupIds }) => batchGroupsInfoResolver.get(groupIds),
           elements
         })
       );
       await batchUsersResolver.resolve();
+      await batchGroupsInfoResolver.resolve();
       const [authorsInfo, ...commentBodies] = await Promise.all([
         authorsInfoPromise,
         ...commentBodiesPromises
@@ -8571,10 +8711,14 @@ async function prepareThreadNotificationEmail(client, event, options, elements,
       return {
         type: "unreadReplies",
         comments: comments.map((comment, index) => {
-          const authorInfo = authorsInfo.get(comment.userId);
+          const authorInfo = getResolvedForId(
+            comment.userId,
+            authorsIds,
+            authorsInfo
+          );
           const commentBody = commentBodies[index];
           const url = generateCommentUrl({
-            roomUrl: _optionalChain([roomInfo, 'optionalAccess', _17 => _17.url]),
+            roomUrl: _optionalChain([roomInfo, 'optionalAccess', _27 => _27.url]),
             commentId: comment.id
           });
           return {
@@ -8616,12 +8760,13 @@ var baseStyles2 = {
   }
 };
 async function prepareThreadNotificationEmailAsHtml(client, event, options = {}) {
-  const styles = { ...baseStyles2, ..._optionalChain([options, 'optionalAccess', _18 => _18.styles]) };
+  const styles = { ...baseStyles2, ..._optionalChain([options, 'optionalAccess', _28 => _28.styles]) };
   const data = await prepareThreadNotificationEmail(
     client,
     event,
     {
       resolveUsers: options.resolveUsers,
+      resolveGroupsInfo: options.resolveGroupsInfo,
       resolveRoomInfo: options.resolveRoomInfo
     },
     {
@@ -8652,8 +8797,8 @@ async function prepareThreadNotificationEmailAsHtml(client, event, options = {})
       link: ({ element, href }) => {
         return _core.html`<a href="${href}" target="_blank" rel="noopener noreferrer" style="${toInlineCSSString(styles.link)}">${element.text ? _core.html`${element.text}` : element.url}</a>`;
       },
-      mention: ({ element, user }) => {
-        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${MENTION_CHARACTER}${_optionalChain([user, 'optionalAccess', _19 => _19.name]) ? _core.html`${_optionalChain([user, 'optionalAccess', _20 => _20.name])}` : element.id}</span>`;
+      mention: ({ element, user, group }) => {
+        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${_core.MENTION_CHARACTER}${_optionalChain([user, 'optionalAccess', _29 => _29.name]) ? _core.html`${_optionalChain([user, 'optionalAccess', _30 => _30.name])}` : _optionalChain([group, 'optionalAccess', _31 => _31.name]) ? _core.html`${_optionalChain([group, 'optionalAccess', _32 => _32.name])}` : element.id}</span>`;
       }
     },
     "prepareThreadNotificationEmailAsHtml"
@@ -8683,18 +8828,19 @@ var baseComponents2 = {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children });
   },
   Link: ({ element, href }) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "a", { href, target: "_blank", rel: "noopener noreferrer", children: _nullishCoalesce(element.text, () => ( element.url)) }),
-  Mention: ({ element, user }) => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { "data-mention": true, children: [
-    MENTION_CHARACTER,
-    _nullishCoalesce(_optionalChain([user, 'optionalAccess', _21 => _21.name]), () => ( element.id))
+  Mention: ({ element, user, group }) => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { "data-mention": true, children: [
+    _core.MENTION_CHARACTER,
+    _nullishCoalesce(_nullishCoalesce(_optionalChain([user, 'optionalAccess', _33 => _33.name]), () => ( _optionalChain([group, 'optionalAccess', _34 => _34.name]))), () => ( element.id))
   ] })
 };
 async function prepareThreadNotificationEmailAsReact(client, event, options = {}) {
-  const Components = { ...baseComponents2, ..._optionalChain([options, 'optionalAccess', _22 => _22.components]) };
+  const Components = { ...baseComponents2, ..._optionalChain([options, 'optionalAccess', _35 => _35.components]) };
   const data = await prepareThreadNotificationEmail(
     client,
     event,
     {
       resolveUsers: options.resolveUsers,
+      resolveGroupsInfo: options.resolveGroupsInfo,
       resolveRoomInfo: options.resolveRoomInfo
     },
     {
@@ -8715,11 +8861,12 @@ async function prepareThreadNotificationEmailAsReact(client, event, options = {}
         },
         `lb-comment-body-link-${index}`
       ),
-      mention: ({ element, user }, index) => element.id ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      mention: ({ element, user, group }, index) => element.id ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         Components.Mention,
         {
           element,
-          user
+          user,
+          group
         },
         `lb-comment-body-mention-${index}`
       ) : null