expensify-common 2.0.149 → 2.0.151

package/dist/ExpenseRule.d.ts

@@ -2,9 +2,9 @@ export default class ExpenseRule {
     /**
      * Creates a new instance of this class.
      *
-     * @param {Array} ruleArray
+     * @param {Object|Array} ruleArray
      */
-    constructor(ruleArray: any[]);
+    constructor(ruleArray: Object | any[]);
     /**
      * Returns the applyWhen array associated with the passed field
      * i.e. field == category returns [field: 'category', condition: 'matches', value: 'car']

package/dist/ExpenseRule.js

@@ -4,12 +4,20 @@ class ExpenseRule {
     /**
      * Creates a new instance of this class.
      *
-     * @param {Array} ruleArray
+     * @param {Object|Array} ruleArray
      */
     constructor(ruleArray) {
-        ruleArray.forEach((value, key) => {
-            this[key] = value;
-        });
+        // It's not 100% certain that `ruleArray` is an array or an object, so support both of them so the app doesn't crash
+        if (Array.isArray(ruleArray)) {
+            ruleArray.forEach((value, key) => {
+                this[key] = value;
+            });
+        }
+        else if (ruleArray && typeof ruleArray === 'object') {
+            Object.keys(ruleArray).forEach((key) => {
+                this[key] = ruleArray[key];
+            });
+        }
     }
     /**
      * Returns the applyWhen array associated with the passed field

package/dist/ExpensiMark.d.ts

@@ -127,8 +127,7 @@ export default class ExpensiMark {
      * replace block element with '\n' if :
      * 1. We have text within the element.
      * 2. The text does not end with a new line.
-     * 3. The text does not have quote mark '>' .
-     * 4. It's not the last element in the string.
+     * 3. It's not the last element in the string.
      */
     replaceBlockElementWithNewLine(htmlString: string): string;
     /**

package/dist/ExpensiMark.js

@@ -532,7 +532,8 @@ class ExpensiMark {
                     let resultString = g2
                         .replace(/\n?(<h1># )/g, '$1')
                         .replace(/(<h1>|<\/h1>)+/g, '\n')
-                        .trim()
+                        // Replace trim() with manually removing line breaks at the beginning and end of the string to avoid adding extra lines
+                        .replace(/^(\n)+|(\n)+$/g, '')
                         .split('\n');
                     // Wrap each string in the array with <blockquote> and </blockquote>
                     resultString = resultString.map((line) => {
@@ -544,7 +545,9 @@ class ExpensiMark {
                         let depth;
                         do {
                             depth = (modifiedText.match(/<blockquote>/gi) || []).length;
-                            modifiedText = modifiedText.replace(/<blockquote>/gi, '');
+                            // Need (\s)? because the server usually sends a space character after <blockquote> so we need to consume it,
+                            // avoid being redundant because it is added in the return part
+                            modifiedText = modifiedText.replace(/<blockquote>(\s)?/gi, '');
                             modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
                         } while (/<blockquote>/i.test(modifiedText));
                         return `${'>'.repeat(depth)} ${modifiedText}`;
@@ -963,12 +966,14 @@ class ExpensiMark {
      * replace block element with '\n' if :
      * 1. We have text within the element.
      * 2. The text does not end with a new line.
-     * 3. The text does not have quote mark '>' .
-     * 4. It's not the last element in the string.
+     * 3. It's not the last element in the string.
      */
     replaceBlockElementWithNewLine(htmlString) {
         // eslint-disable-next-line max-len
-        let splitText = htmlString.split(/<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>|<blockquote>|<\/blockquote>/);
+        let splitText = htmlString
+            // Lines starting with quote mark '>' will have '\n' added to them so to avoid adding extra '\n', remove the block element right next to it
+            .replaceAll(/<blockquote>> (<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>)/gi, '<blockquote>> ')
+            .split(/<div.*?>|<\/div>|<comment.*?>|\n<\/comment>|<\/comment>|<h1>|<\/h1>|<h2>|<\/h2>|<h3>|<\/h3>|<h4>|<\/h4>|<h5>|<\/h5>|<h6>|<\/h6>|<p>|<\/p>|<li>|<\/li>|<blockquote>|<\/blockquote>/);
         const stripHTML = (text) => str_1.default.stripHTML(text);
         splitText = splitText.map(stripHTML);
         let joinedText = '';
@@ -983,9 +988,8 @@ class ExpensiMark {
             if (text.trim().length === 0 && !text.match(/\n/)) {
                 return;
             }
-            const nextItem = splitText === null || splitText === void 0 ? void 0 : splitText[index + 1];
-            // Insert '\n' unless it ends with '\n' or '>' or it's the last element, or if it's a header ('# ') with a space.
-            if ((nextItem && text.match(/>[\s]?$/) && !nextItem.startsWith('> ')) || text.match(/\n[\s]?$/) || index === splitText.length - 1 || text === '# ') {
+            // Insert '\n' unless it ends with '\n' or it's the last element, or if it's a header ('# ') with a space.
+            if (text.match(/\n[\s]?$/) || index === splitText.length - 1 || text === '# ') {
                 joinedText += text;
             }
             else {

package/package.json

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