expensify-common 2.0.2 → 2.0.4

package/dist/ExpensiMark.d.ts

@@ -35,7 +35,7 @@ declare type Rule = {
 };
 
 declare type ExtrasObject = {
-    reportIdToName?: Record<string, string>;
+    reportIDToName?: Record<string, string>;
     accountIDToName?: Record<string, string>;
 };
 export default class ExpensiMark {

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}$`);
@@ -453,7 +456,7 @@ class ExpensiMark {
                 name: 'reportMentions',
                 regex: /<mention-report reportID="(\d+)" *\/>/gi,
                 replacement: (match, g1, offset, string, extras) => {
-                    const reportToNameMap = extras.reportIdToName;
+                    const reportToNameMap = extras.reportIDToName;
                     if (!reportToNameMap || !reportToNameMap[g1]) {
                         Log_1.default.alert('[ExpensiMark] Missing report name', { reportID: g1 });
                         return '#Hidden';
@@ -466,12 +469,12 @@ class ExpensiMark {
                 regex: /(?:<mention-user accountID="(\d+)" *\/>)|(?:<mention-user>(.*?)<\/mention-user>)/gi,
                 replacement: (match, g1, g2, offset, string, extras) => {
                     if (g1) {
-                        const accountToNameMap = extras.accountIdToName;
+                        const accountToNameMap = extras.accountIDToName;
                         if (!accountToNameMap || !accountToNameMap[g1]) {
                             Log_1.default.alert('[ExpensiMark] Missing account name', { accountID: g1 });
                             return '@Hidden';
                         }
-                        return `@${extras.accountIdToName[g1]}`;
+                        return `@${extras.accountIDToName[g1]}`;
                     }
                     return str_1.default.removeSMSDomain(g2);
                 },
@@ -522,7 +525,7 @@ class ExpensiMark {
                 name: 'reportMentions',
                 regex: /<mention-report reportID="(\d+)" *\/>/gi,
                 replacement: (match, g1, offset, string, extras) => {
-                    const reportToNameMap = extras.reportIdToName;
+                    const reportToNameMap = extras.reportIDToName;
                     if (!reportToNameMap || !reportToNameMap[g1]) {
                         Log_1.default.alert('[ExpensiMark] Missing report name', { reportID: g1 });
                         return '#Hidden';
@@ -534,12 +537,12 @@ class ExpensiMark {
                 name: 'userMention',
                 regex: /<mention-user accountID="(\d+)" *\/>/gi,
                 replacement: (match, g1, offset, string, extras) => {
-                    const accountToNameMap = extras.accountIdToName;
+                    const accountToNameMap = extras.accountIDToName;
                     if (!accountToNameMap || !accountToNameMap[g1]) {
                         Log_1.default.alert('[ExpensiMark] Missing account name', { accountID: g1 });
                         return '@Hidden';
                     }
-                    return `@${extras.accountIdToName[g1]}`;
+                    return `@${extras.accountIDToName[g1]}`;
                 },
             },
             {

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.2",
+  "version": "2.0.4",
   "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",