@liveblocks/emails 2.18.2-test1 → 2.18.3

package/dist/index.js

@@ -3,7 +3,7 @@ var _core = require('@liveblocks/core');
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/emails";
-var PKG_VERSION = "2.18.2-test1";
+var PKG_VERSION = "2.18.3";
 var PKG_FORMAT = "cjs";
 
 // ../../node_modules/lib0/map.js
@@ -8137,12 +8137,12 @@ async function convertTextEditorNodesAsHtml(nodes, options) {
     switch (node.type) {
       case "mention": {
         const user = resolvedUsers.get(node.userId);
-        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${MENTION_CHARACTER}${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _14 => _14.name]), () => ( node.userId))}</span>`;
+        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${MENTION_CHARACTER}${_optionalChain([user, 'optionalAccess', _14 => _14.name]) ? _core.html`${_optionalChain([user, 'optionalAccess', _15 => _15.name])}` : node.userId}</span>`;
       }
       case "text": {
         let children2 = node.text;
         if (!children2) {
-          return children2;
+          return _core.html`${children2}`;
         }
         if (node.bold) {
           children2 = _core.html`<strong style="${toInlineCSSString(styles.strong)}">${children2}</strong>`;
@@ -8156,7 +8156,7 @@ async function convertTextEditorNodesAsHtml(nodes, options) {
         if (node.code) {
           children2 = _core.html`<code style="${toInlineCSSString(styles.code)}">${children2}</code>`;
         }
-        return children2;
+        return _core.html`${children2}`;
       }
     }
   }).join("");
@@ -8241,7 +8241,7 @@ var prepareTextMentionNotificationEmailBaseData = async ({
   const roomInfo = options.resolveRoomInfo ? await options.resolveRoomInfo({ roomId }) : void 0;
   const resolvedRoomInfo = {
     ...roomInfo,
-    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _15 => _15.name]), () => ( roomId))
+    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _16 => _16.name]), () => ( roomId))
   };
   const data = await extractTextMentionNotificationData({ client, event });
   if (data === null) {
@@ -8407,17 +8407,17 @@ var baseComponents2 = {
   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', _16 => _16.name]), () => ( element.id))
+    _nullishCoalesce(_optionalChain([user, 'optionalAccess', _17 => _17.name]), () => ( element.id))
   ] })
 };
 async function convertCommentBodyAsReact(body, options) {
   const Components = {
     ...baseComponents2,
-    ..._optionalChain([options, 'optionalAccess', _17 => _17.components])
+    ..._optionalChain([options, 'optionalAccess', _18 => _18.components])
   };
   const resolvedUsers = await _core.resolveUsersInCommentBody.call(void 0, 
     body,
-    _optionalChain([options, 'optionalAccess', _18 => _18.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _19 => _19.resolveUsers])
   );
   const blocks = body.content.map((block, index) => {
     switch (block.type) {
@@ -8487,10 +8487,10 @@ var baseStyles2 = {
   }
 };
 async function convertCommentBodyAsHtml(body, options) {
-  const styles = { ...baseStyles2, ..._optionalChain([options, 'optionalAccess', _19 => _19.styles]) };
+  const styles = { ...baseStyles2, ..._optionalChain([options, 'optionalAccess', _20 => _20.styles]) };
   const htmlBody = await _core.stringifyCommentBody.call(void 0, body, {
     format: "html",
-    resolveUsers: _optionalChain([options, 'optionalAccess', _20 => _20.resolveUsers]),
+    resolveUsers: _optionalChain([options, 'optionalAccess', _21 => _21.resolveUsers]),
     elements: {
       // NOTE: using prettier-ignore to preserve template strings
       paragraph: ({ children }) => (
@@ -8500,7 +8500,7 @@ async function convertCommentBodyAsHtml(body, options) {
       text: ({ element }) => {
         let children = element.text;
         if (!children) {
-          return children;
+          return _core.html`${children}`;
         }
         if (element.bold) {
           children = _core.html`<strong style="${toInlineCSSString(styles.strong)}">${children}</strong>`;
@@ -8514,13 +8514,13 @@ async function convertCommentBodyAsHtml(body, options) {
         if (element.code) {
           children = _core.html`<code style="${toInlineCSSString(styles.code)}">${children}</code>`;
         }
-        return children;
+        return _core.html`${children}`;
       },
       link: ({ element, href }) => {
-        return _core.html`<a href="${href}" target="_blank" rel="noopener noreferrer" style="${toInlineCSSString(styles.link)}">${_nullishCoalesce(element.text, () => ( element.url))}</a>`;
+        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}${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _21 => _21.name]), () => ( element.id))}</span>`;
+        return _core.html`<span data-mention style="${toInlineCSSString(styles.mention)}">${MENTION_CHARACTER}${_optionalChain([user, 'optionalAccess', _22 => _22.name]) ? _core.html`${_optionalChain([user, 'optionalAccess', _23 => _23.name])}` : element.id}</span>`;
       }
     }
   });
@@ -8544,7 +8544,6 @@ function filterCommentsWithBody(comments) {
 // src/thread-notification.tsx
 var getUnreadComments = ({
   comments,
-  previousUnreadInboxNotification,
   inboxNotification,
   userId
 }) => {
@@ -8555,9 +8554,6 @@ var getUnreadComments = ({
     if (readAt !== null) {
       return c.createdAt > readAt && c.createdAt <= inboxNotification.notifiedAt;
     }
-    if (previousUnreadInboxNotification !== null) {
-      return c.createdAt >= previousUnreadInboxNotification.notifiedAt && c.createdAt <= inboxNotification.notifiedAt;
-    }
     return c.createdAt <= inboxNotification.notifiedAt;
   });
 };
@@ -8575,17 +8571,12 @@ var extractThreadNotificationData = async ({
   event
 }) => {
   const { threadId, roomId, userId, inboxNotificationId } = event.data;
-  const [thread, inboxNotification, { data: inboxNotifications }] = await Promise.all([
+  const [thread, inboxNotification] = await Promise.all([
     client.getThread({ roomId, threadId }),
-    client.getInboxNotification({ inboxNotificationId, userId }),
-    client.getInboxNotifications({ userId, query: { unread: true } })
+    client.getInboxNotification({ inboxNotificationId, userId })
   ]);
-  const previousUnreadInboxNotification = _nullishCoalesce(inboxNotifications.sort((a, b) => b.notifiedAt.getTime() - a.notifiedAt.getTime()).filter(
-    ({ id: id2, kind }) => kind === "thread" && id2 !== inboxNotification.id
-  )[0], () => ( null));
   const unreadComments = getUnreadComments({
     comments: thread.comments,
-    previousUnreadInboxNotification,
     inboxNotification,
     userId
   });
@@ -8608,8 +8599,8 @@ var makeCommentEmailBaseData = ({
   roomInfo,
   comment
 }) => {
-  const url = _optionalChain([roomInfo, 'optionalAccess', _22 => _22.url]) ? _core.generateCommentUrl.call(void 0, {
-    roomUrl: _optionalChain([roomInfo, 'optionalAccess', _23 => _23.url]),
+  const url = _optionalChain([roomInfo, 'optionalAccess', _24 => _24.url]) ? _core.generateCommentUrl.call(void 0, {
+    roomUrl: _optionalChain([roomInfo, 'optionalAccess', _25 => _25.url]),
     commentId: comment.id
   }) : void 0;
   return {
@@ -8631,7 +8622,7 @@ var prepareThreadNotificationEmailBaseData = async ({
   const roomInfo = options.resolveRoomInfo ? await options.resolveRoomInfo({ roomId }) : void 0;
   const resolvedRoomInfo = {
     ...roomInfo,
-    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _24 => _24.name]), () => ( roomId))
+    name: _nullishCoalesce(_optionalChain([roomInfo, 'optionalAccess', _26 => _26.name]), () => ( roomId))
   };
   const data = await extractThreadNotificationData({ client, event });
   if (data === null) {