expensify-common 2.0.4 → 2.0.6

package/dist/ExpensiMark.js

@@ -277,20 +277,20 @@ class ExpensiMark {
                     return `<blockquote>${isStartingWithSpace ? ' ' : ''}${replacedText}</blockquote>`;
                 },
             },
+            /**
+             * Use \b in this case because it will match on words, letters,
+             * and _: https://www.rexegg.com/regex-boundaries.html#wordboundary
+             * Use [\s\S]* instead of .* to match newline
+             */
             {
-                /**
-                 * Use \b in this case because it will match on words, letters,
-                 * and _: https://www.rexegg.com/regex-boundaries.html#wordboundary
-                 * The !_blank is to prevent the `target="_blank">` section of the
-                 * link replacement from being captured Additionally, something like
-                 * `\b\_([^<>]*?)\_\b` doesn't work because it won't replace
-                 * `_https://www.test.com_`
-                 * Use [\s\S]* instead of .* to match newline
-                 */
                 name: 'italic',
-                regex: /(?<!<[^>]*)(\b_+|\b)(?!_blank")_((?![\s_])[\s\S]*?[^\s_](?<!\s))_(?![^\W_])(?![^<]*>)(?![^<]*(<\/pre>|<\/code>|<\/a>|<\/mention-user>|_blank))/g,
-                // We want to add extraLeadingUnderscores back before the <em> tag unless textWithinUnderscores starts with valid email
-                replacement: (match, extraLeadingUnderscores, textWithinUnderscores) => {
+                regex: /(<(pre|code|a|mention-user)[^>]*>(.*?)<\/\2>)|((\b_+|\b)_((?![\s_])[\s\S]*?[^\s_](?<!\s))_(?![^\W_])(?![^<]*>)(?![^<]*(<\/pre>|<\/code>|<\/a>|<\/mention-user>)))/g,
+                replacement: (match, html, tag, content, text, extraLeadingUnderscores, textWithinUnderscores) => {
+                    // Skip any <pre>, <code>, <a>, <mention-user> tag contents
+                    if (html) {
+                        return html;
+                    }
+                    // If any tags are included inside underscores, ignore it. ie. _abc <pre>pre tag</pre> abc_
                     if (textWithinUnderscores.includes('</pre>') || this.containsNonPairTag(textWithinUnderscores)) {
                         return match;
                     }
@@ -415,8 +415,28 @@ class ExpensiMark {
                         .replace(/(<h1>|<\/h1>)+/g, '\n')
                         .trim()
                         .split('\n');
-                    const prependGreaterSign = (m) => `> ${m}`;
-                    resultString = _.map(resultString, prependGreaterSign).join('\n');
+                    // Wrap each string in the array with <blockquote> and </blockquote>
+                    // Define a named function to wrap each line with blockquote
+                    function wrapWithBlockquote(line) {
+                        return `<blockquote>${line}</blockquote>`;
+                    }
+                    // Use _.map with the named function
+                    resultString = _.map(resultString, wrapWithBlockquote);
+                    function processString(m) {
+                        // Recursive function to replace nested <blockquote> with ">"
+                        function replaceBlockquotes(text) {
+                            let modifiedText = text;
+                            let depth;
+                            do {
+                                depth = (modifiedText.match(/<blockquote>/gi) || []).length;
+                                modifiedText = modifiedText.replace(/<blockquote>/gi, '');
+                                modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
+                            } while (/<blockquote>/i.test(modifiedText));
+                            return `${'>'.repeat(depth)} ${modifiedText}`;
+                        }
+                        return replaceBlockquotes(m);
+                    }
+                    resultString = _.map(resultString, processString).join('\n');
                     // We want to keep <blockquote> tag here and let method replaceBlockElementWithNewLine to handle the line break later
                     return `<blockquote>${resultString}</blockquote>`;
                 },

package/package.json

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