expensify-common 2.0.3 → 2.0.5

package/dist/ExpensiMark.js

@@ -197,7 +197,10 @@ class ExpensiMark {
                 name: 'userMentions',
                 regex: new RegExp(`(@here|[a-zA-Z0-9.!$%&+=?^\`{|}-]?)(@${Constants.CONST.REG_EXP.EMAIL_PART}|@${Constants.CONST.REG_EXP.PHONE_PART})(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, 'gim'),
                 replacement: (match, g1, g2) => {
-                    if (!str_1.default.isValidMention(match)) {
+                    const phoneNumberRegex = new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`);
+                    const mention = g2.slice(1);
+                    const mentionWithoutSMSDomain = str_1.default.removeSMSDomain(mention);
+                    if (!str_1.default.isValidMention(match) || (phoneNumberRegex.test(mentionWithoutSMSDomain) && !str_1.default.isValidPhoneNumber(mentionWithoutSMSDomain))) {
                         return match;
                     }
                     const phoneRegex = new RegExp(`^@${Constants.CONST.REG_EXP.PHONE_PART}$`);
@@ -412,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/dist/str.d.ts

@@ -478,9 +478,14 @@ declare const Str: {
     /**
      * Check for whether a phone number is valid.
      * @param phone
-     * @deprecated use isValidE164Phone to validate E.164 phone numbers or isValidPhoneFormat to validate phone numbers in general
+     * @deprecated use isValidE164Phone to validate E.164 phone numbers, isValidPhoneFormat to validate phone number format, or isValidPhoneNumber to validate phone numbers in general
      */
     isValidPhone(phone: string): boolean;
+    /**
+     * Check for whether a phone number is valid.
+     * @param phone
+     */
+    isValidPhoneNumber(phone: string): boolean;
     /**
      * Check for whether a phone number is valid according to E.164 standard.
      * @param phone

package/dist/str.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable no-control-regex */
 const underscore_1 = __importDefault(require("underscore"));
+const awesome_phonenumber_1 = require("awesome-phonenumber");
 const HtmlEntities = __importStar(require("html-entities"));
 const Constants = __importStar(require("./CONST"));
 const UrlPatterns = __importStar(require("./Url"));
@@ -868,6 +869,15 @@ const Str = {
     isValidPhone(phone) {
         return Constants.CONST.SMS.E164_REGEX.test(phone);
     },
+    /**
+     * Check for whether a phone number is valid.
+     * @param {String} phone
+     *
+     * @return {bool}
+     */
+    isValidPhoneNumber(phone) {
+        return (0, awesome_phonenumber_1.parsePhoneNumber)(phone).possible;
+    },
     /**
      * Check for whether a phone number is valid according to E.164 standard.
      * @param {String} phone

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",
@@ -28,6 +28,7 @@
     "url": "git+ssh://git@github.com/Expensify/JS-Libs.git"
   },
   "dependencies": {
+    "awesome-phonenumber": "^5.4.0",
     "classnames": "2.5.0",
     "clipboard": "2.0.11",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",