expensify-common 2.0.38 → 2.0.40

package/dist/ExpensiMark.js

@@ -449,7 +449,29 @@ class ExpensiMark {
             {
                 name: 'bold',
                 regex: /<(b|strong)(?:"[^"]*"|'[^']*'|[^'">])*>([\s\S]*?)<\/\1>(?![^<]*(<\/pre>|<\/code>))/gi,
-                replacement: '*$2*',
+                replacement: (extras, match, tagName, innerContent) => {
+                    // To check if style attribute contains bold font-weight
+                    const isBoldFromStyle = (style) => {
+                        return style ? style.replace(/\s/g, '').includes('font-weight:bold;') || style.replace(/\s/g, '').includes('font-weight:700;') : false;
+                    };
+                    const updateSpacesAndWrapWithAsterisksIfBold = (content, isBold) => {
+                        const trimmedContent = content.trim();
+                        const leadingSpace = content.startsWith(' ') ? ' ' : '';
+                        const trailingSpace = content.endsWith(' ') ? ' ' : '';
+                        return isBold ? `${leadingSpace}*${trimmedContent}*${trailingSpace}` : content;
+                    };
+                    // Determine if the outer tag is bold
+                    const styleAttributeMatch = match.match(/style="(.*?)"/);
+                    const isFontWeightBold = isBoldFromStyle(styleAttributeMatch ? styleAttributeMatch[1] : null);
+                    const isBold = styleAttributeMatch ? isFontWeightBold : tagName === 'b' || tagName === 'strong';
+                    // Process nested spans with potential bold style
+                    const processedInnerContent = innerContent.replace(/<span(?:"[^"]*"|'[^']*'|[^'">])*>([\s\S]*?)<\/span>/gi, (nestedMatch, nestedContent) => {
+                        const nestedStyleMatch = nestedMatch.match(/style="(.*?)"/);
+                        const isNestedBold = isBoldFromStyle(nestedStyleMatch ? nestedStyleMatch[1] : null);
+                        return updateSpacesAndWrapWithAsterisksIfBold(nestedContent, isNestedBold);
+                    });
+                    return updateSpacesAndWrapWithAsterisksIfBold(processedInnerContent, isBold);
+                },
             },
             {
                 name: 'strikethrough',
@@ -541,7 +563,7 @@ class ExpensiMark {
             },
             {
                 name: 'reportMentions',
-                regex: /<mention-report reportID="(\d+)" *\/>/gi,
+                regex: /<mention-report reportID="(\d+)"(?: *\/>|><\/mention-report>)/gi,
                 replacement: (extras, _match, g1, _offset, _string) => {
                     const reportToNameMap = extras.reportIDToName;
                     if (!reportToNameMap || !reportToNameMap[g1]) {
@@ -553,7 +575,7 @@ class ExpensiMark {
             },
             {
                 name: 'userMention',
-                regex: /(?:<mention-user accountID="(\d+)" *\/>)|(?:<mention-user>(.*?)<\/mention-user>)/gi,
+                regex: /(?:<mention-user accountID="(\d+)"(?: *\/>|><\/mention-user>))|(?:<mention-user>(.*?)<\/mention-user>)/gi,
                 replacement: (extras, _match, g1, g2, _offset, _string) => {
                     var _a, _b;
                     if (g1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",