expensify-common 2.0.118 → 2.0.124

package/dist/CONST.d.ts

@@ -386,6 +386,10 @@ declare const CONST: {
          * @type RegExp
          */
         readonly EMOJI_RULE: RegExp;
+        /**
+         * Regex to match a piece of text or @here, needed for both shortMention and userMention
+         */
+        readonly PRE_MENTION_TEXT_PART: "(@here|[a-zA-Z0-9.!$%&+=?^\\`{|}-]?)";
     };
     readonly REPORT: {
         /**

package/dist/CONST.js

@@ -394,6 +394,10 @@ const CONST = {
          * @type RegExp
          */
         EMOJI_RULE: /[\p{Extended_Pictographic}](\u200D[\p{Extended_Pictographic}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/gu,
+        /**
+         * Regex to match a piece of text or @here, needed for both shortMention and userMention
+         */
+        PRE_MENTION_TEXT_PART: '(@here|[a-zA-Z0-9.!$%&+=?^\\`{|}-]?)',
     },
     REPORT: {
         /**

package/dist/ExpensiMark.js

@@ -269,7 +269,7 @@ 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'),
+                regex: new RegExp(`${Constants.CONST.REG_EXP.PRE_MENTION_TEXT_PART}(@${Constants.CONST.REG_EXP.EMAIL_PART}|@${Constants.CONST.REG_EXP.PHONE_PART})(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, 'gim'),
                 replacement: (_extras, match, g1, g2) => {
                     const phoneNumberRegex = new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`);
                     const mention = g2.slice(1);
@@ -374,6 +374,35 @@ class ExpensiMark {
                 replacement: '$1<a href="mailto:$2">$2</a>',
                 rawInputReplacement: '$1<a href="mailto:$2" data-raw-href="$2" data-link-variant="auto">$2</a>',
             },
+            /**
+             * This regex matches a short user mention in a string.
+             * A short-mention is a string that starts with the '@' symbol and is followed by a valid user's primary login without the email domain part
+             * Ex: @john.doe, @user12345, but NOT @user@email.com
+             *
+             * Notes:
+             * Phone is not a valid short mention.
+             * In reality these "short-mentions" are just possible candidates, because the parser has no way of verifying if there exists a user named ex: @john.examplename.
+             * The actual verification whether these mentions are pointing to real users is done in specific projects using ExpensiMark.
+             * Nevertheless, "@john.examplename" is a correct possible short-mention, and so would be parsed.
+             * This behaviour is similar to treating every user@something as valid user login.
+             *
+             * This regex will correctly preserve any @here mentions, the same way as "userMention" rule.
+             */
+            {
+                name: 'shortMentions',
+                regex: new RegExp(`${Constants.CONST.REG_EXP.PRE_MENTION_TEXT_PART}(@(?=((?=[\\w]+[\\w'#%+-]+(?:\\.[\\w'#%+-]+)*)[\\w\\.'#%+-]{1,64}(?= |_|\\b))(?!([:\\/\\\\]))(?<end>.*))(?!here)\\S{3,254}(?=\\k<end>$))(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>|<\\/mention-user>|<\\/mention-here>))`, 'gim'),
+                replacement: (_extras, match, g1, g2) => {
+                    if (!str_1.default.isValidMention(match)) {
+                        return match;
+                    }
+                    return `${g1}<mention-short>${g2}</mention-short>`;
+                },
+            },
+            {
+                name: 'hereMentionAfterShortMentions',
+                regex: /(<\/mention-short>)(@here)(?=\b)/gm,
+                replacement: '$1<mention-here>$2</mention-here>',
+            },
             {
                 // Use \B in this case because \b doesn't match * or ~.
                 // \B will match everything that \b doesn't, so it works
@@ -607,7 +636,7 @@ class ExpensiMark {
             },
             {
                 name: 'reportMentions',
-                regex: /<mention-report reportID="(\d+)"(?: *\/>|><\/mention-report>)/gi,
+                regex: /<mention-report reportID="?(\d+)"?(?: *\/>|><\/mention-report>)/gi,
                 replacement: (extras, _match, g1, _offset, _string) => {
                     const reportToNameMap = extras.reportIDToName;
                     if (!reportToNameMap || !reportToNameMap[g1]) {
@@ -619,7 +648,7 @@ class ExpensiMark {
             },
             {
                 name: 'userMention',
-                regex: /(?:<mention-user accountID="(\d+)"(?: *\/>|><\/mention-user>))|(?:<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) {
@@ -686,7 +715,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]) {
@@ -698,15 +727,18 @@ class ExpensiMark {
             },
             {
                 name: 'userMention',
-                regex: /<mention-user accountID="(\d+)" *\/>/gi,
-                replacement: (extras, _match, g1, _offset, _string) => {
+                regex: /(?:<mention-user accountID="?(\d+)"?(?: *\/>|><\/mention-user>))|(?:<mention-user>(.*?)<\/mention-user>)/gi,
+                replacement: (extras, _match, g1, g2, _offset, _string) => {
                     var _a, _b;
-                    const accountToNameMap = extras.accountIDToName;
-                    if (!accountToNameMap || !accountToNameMap[g1]) {
-                        ExpensiMark.Log.alert('[ExpensiMark] Missing account name', { accountID: g1 });
-                        return '@Hidden';
+                    if (g1) {
+                        const accountToNameMap = extras.accountIDToName;
+                        if (!accountToNameMap || !accountToNameMap[g1]) {
+                            ExpensiMark.Log.alert('[ExpensiMark] Missing account name', { accountID: g1 });
+                            return '@Hidden';
+                        }
+                        return `@${str_1.default.removeSMSDomain((_b = (_a = extras.accountIDToName) === null || _a === void 0 ? void 0 : _a[g1]) !== null && _b !== void 0 ? _b : '')}`;
                     }
-                    return `@${str_1.default.removeSMSDomain((_b = (_a = extras.accountIDToName) === null || _a === void 0 ? void 0 : _a[g1]) !== null && _b !== void 0 ? _b : '')}`;
+                    return str_1.default.removeSMSDomain(g2);
                 },
             },
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.118",
+  "version": "2.0.124",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",
@@ -25,7 +25,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/Expensify/JS-Libs.git"
+    "url": "git+ssh://git@github.com/Expensify/expensify-common.git"
   },
   "dependencies": {
     "awesome-phonenumber": "^5.4.0",
@@ -43,7 +43,7 @@
     "ua-parser-js": "^1.0.38"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.25.4",
+    "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.24.7",
     "@lwc/eslint-plugin-lwc": "^1.8.2",
     "@types/jest": "^29.5.13",
@@ -51,8 +51,8 @@
     "@types/lodash": "^4.17.10",
     "@types/react-dom": "^18.3.5",
     "@types/ua-parser-js": "^0.7.39",
-    "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.22.0",
+    "@typescript-eslint/parser": "^8.23.0",
     "babel-jest": "^29.0.0",
     "babelify": "10.0.0",
     "eslint": "^8.57.1",