expensify-common 2.0.223 → 2.0.225

package/dist/API.js

@@ -280,16 +280,6 @@ function API(network, args) {
             const newParameters = Object.assign(Object.assign({}, parameters), { api_setCookie: false });
             return performPOSTRequest(commandName, newParameters);
         },
-        /**
-         * @param  {Object} parameters
-         * @param  {String} parameters.email
-         * @returns {ExpensifyAPIDeferred}
-         */
-        Domain_RequestAccess(parameters) {
-            const commandName = 'Domain_RequestAccess';
-            requireParameters(['email'], parameters, commandName);
-            return performPOSTRequest(commandName, parameters);
-        },
         /**
          * @param {Object} parameters
          * @param {String[]} parameters.emailList

package/dist/ExpensiMark.js

@@ -269,14 +269,14 @@ function findKnownTldEnd(text, dotPosition) {
     return undefined;
 }
 /**
- * Validates a hostname and records a linkable prefix before a later malformed label.
- * Preserves known-TLD prefixes before oversized continuations without recovering text inside an invalid leading label.
+ * Validates a hostname and records a linkable prefix before malformed punctuation in a later label.
+ * Rejects the whole hostname when a label or its complete length exceeds a DNS limit.
  *
  * @param text - Text containing the URL candidate.
  * @param hostnameStart - Index of the hostname's first character.
  * @param hostnameEnd - Index immediately after the hostname.
  * @param hasProtocol - Whether the URL allows hostnames without a known TLD, including single-label hosts.
- * @returns The hostname validity and any prefix that can be linked before a malformed or oversized continuation.
+ * @returns The hostname validity and any prefix that can be linked before malformed punctuation.
  */
 function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
     let hostnameContentEnd = hostnameEnd;
@@ -288,7 +288,6 @@ function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
     }
     let labelStart = hostnameStart;
     let validHostnamePrefixEnd;
-    let validKnownTldPrefixEnd;
     for (let index = hostnameStart; index <= hostnameContentEnd; index++) {
         if (index !== hostnameContentEnd && text[index] !== '.') {
             continue;
@@ -303,7 +302,7 @@ function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
             labelContentEnd--;
         }
         if (labelContentEnd - labelStart > Constants.MAX_URL_HOSTNAME_LABEL_LENGTH || labelContentEnd - hostnameStart > Constants.MAX_URL_HOSTNAME_LENGTH) {
-            return { isValid: false, validHostnamePrefixEnd: validKnownTldPrefixEnd };
+            return { isValid: false };
         }
         // Protocol URLs can end at any valid label; bare URLs still need a known TLD.
         if (hasProtocol) {
@@ -312,13 +311,10 @@ function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
         if (validLabelEnd !== index) {
             return { isValid: false, validHostnamePrefixEnd };
         }
-        if (index !== hostnameContentEnd) {
+        if (!hasProtocol && index !== hostnameContentEnd) {
             const tldEnd = findKnownTldEnd(text, index);
             if (tldEnd !== undefined && tldEnd <= hostnameContentEnd && tldEnd - hostnameStart <= Constants.MAX_URL_HOSTNAME_LENGTH) {
-                validKnownTldPrefixEnd = tldEnd;
-                if (!hasProtocol) {
-                    validHostnamePrefixEnd = tldEnd;
-                }
+                validHostnamePrefixEnd = tldEnd;
             }
         }
         labelStart = index + 1;
@@ -1782,21 +1778,20 @@ class ExpensiMark {
         const invalidUrlRanges = shouldRejectPartialHostnameMatches ? findInvalidUrlRanges(textWithContext) : [];
         const maskedText = invalidUrlRanges.length > 0 ? maskInvalidUrlRanges(textWithContext, invalidUrlRanges) : textWithContext;
         const textToMatch = maskedText.slice(0, textToCheck.length);
-        const contextRegex = followingText ? new RegExp(regex.source, regex.flags.replace('g', 'y')) : undefined;
+        const contextRegex = followingText || invalidUrlRanges.length > 0 ? new RegExp(regex.source, regex.flags.replace('g', 'y')) : undefined;
         let match = matchingRegex.exec(textToMatch);
         let replacedText = '';
         let startIndex = 0;
         while (match !== null) {
-            if (contextRegex && match.index + match[0].length === textToCheck.length) {
-                // Recheck only this match with its following text, without searching outside the candidate.
+            const matchEnd = match.index + match[0].length;
+            if (contextRegex && (textWithContext[matchEnd] === '@' || (followingText.length > 0 && matchEnd === textToCheck.length))) {
+                // Check the original context so masking cannot turn an email's local part into a URL.
                 contextRegex.lastIndex = match.index;
-                const contextMatch = contextRegex.exec(maskedText);
-                if (contextMatch === null) {
+                const contextMatch = contextRegex.exec(textWithContext);
+                if (contextMatch === null || contextMatch[0].length < match[0].length) {
                     match = matchingRegex.exec(textToMatch);
                     continue;
                 }
-                match = contextMatch;
-                matchingRegex.lastIndex = contextRegex.lastIndex;
             }
             let url = match[2];
             const urlEnd = findUrlEndBeforeUnmatchedParenthesis(url, 0, url.length);

package/dist/esm/API.js

@@ -241,16 +241,6 @@ export default function API(network, args) {
             const newParameters = Object.assign(Object.assign({}, parameters), { api_setCookie: false });
             return performPOSTRequest(commandName, newParameters);
         },
-        /**
-         * @param  {Object} parameters
-         * @param  {String} parameters.email
-         * @returns {ExpensifyAPIDeferred}
-         */
-        Domain_RequestAccess(parameters) {
-            const commandName = 'Domain_RequestAccess';
-            requireParameters(['email'], parameters, commandName);
-            return performPOSTRequest(commandName, parameters);
-        },
         /**
          * @param {Object} parameters
          * @param {String[]} parameters.emailList

package/dist/esm/ExpensiMark.js

@@ -231,14 +231,14 @@ function findKnownTldEnd(text, dotPosition) {
     return undefined;
 }
 /**
- * Validates a hostname and records a linkable prefix before a later malformed label.
- * Preserves known-TLD prefixes before oversized continuations without recovering text inside an invalid leading label.
+ * Validates a hostname and records a linkable prefix before malformed punctuation in a later label.
+ * Rejects the whole hostname when a label or its complete length exceeds a DNS limit.
  *
  * @param text - Text containing the URL candidate.
  * @param hostnameStart - Index of the hostname's first character.
  * @param hostnameEnd - Index immediately after the hostname.
  * @param hasProtocol - Whether the URL allows hostnames without a known TLD, including single-label hosts.
- * @returns The hostname validity and any prefix that can be linked before a malformed or oversized continuation.
+ * @returns The hostname validity and any prefix that can be linked before malformed punctuation.
  */
 function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
     let hostnameContentEnd = hostnameEnd;
@@ -250,7 +250,6 @@ function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
     }
     let labelStart = hostnameStart;
     let validHostnamePrefixEnd;
-    let validKnownTldPrefixEnd;
     for (let index = hostnameStart; index <= hostnameContentEnd; index++) {
         if (index !== hostnameContentEnd && text[index] !== '.') {
             continue;
@@ -265,7 +264,7 @@ function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
             labelContentEnd--;
         }
         if (labelContentEnd - labelStart > Constants.MAX_URL_HOSTNAME_LABEL_LENGTH || labelContentEnd - hostnameStart > Constants.MAX_URL_HOSTNAME_LENGTH) {
-            return { isValid: false, validHostnamePrefixEnd: validKnownTldPrefixEnd };
+            return { isValid: false };
         }
         // Protocol URLs can end at any valid label; bare URLs still need a known TLD.
         if (hasProtocol) {
@@ -274,13 +273,10 @@ function analyzeHostname(text, hostnameStart, hostnameEnd, hasProtocol) {
         if (validLabelEnd !== index) {
             return { isValid: false, validHostnamePrefixEnd };
         }
-        if (index !== hostnameContentEnd) {
+        if (!hasProtocol && index !== hostnameContentEnd) {
             const tldEnd = findKnownTldEnd(text, index);
             if (tldEnd !== undefined && tldEnd <= hostnameContentEnd && tldEnd - hostnameStart <= Constants.MAX_URL_HOSTNAME_LENGTH) {
-                validKnownTldPrefixEnd = tldEnd;
-                if (!hasProtocol) {
-                    validHostnamePrefixEnd = tldEnd;
-                }
+                validHostnamePrefixEnd = tldEnd;
             }
         }
         labelStart = index + 1;
@@ -1744,21 +1740,20 @@ class ExpensiMark {
         const invalidUrlRanges = shouldRejectPartialHostnameMatches ? findInvalidUrlRanges(textWithContext) : [];
         const maskedText = invalidUrlRanges.length > 0 ? maskInvalidUrlRanges(textWithContext, invalidUrlRanges) : textWithContext;
         const textToMatch = maskedText.slice(0, textToCheck.length);
-        const contextRegex = followingText ? new RegExp(regex.source, regex.flags.replace('g', 'y')) : undefined;
+        const contextRegex = followingText || invalidUrlRanges.length > 0 ? new RegExp(regex.source, regex.flags.replace('g', 'y')) : undefined;
         let match = matchingRegex.exec(textToMatch);
         let replacedText = '';
         let startIndex = 0;
         while (match !== null) {
-            if (contextRegex && match.index + match[0].length === textToCheck.length) {
-                // Recheck only this match with its following text, without searching outside the candidate.
+            const matchEnd = match.index + match[0].length;
+            if (contextRegex && (textWithContext[matchEnd] === '@' || (followingText.length > 0 && matchEnd === textToCheck.length))) {
+                // Check the original context so masking cannot turn an email's local part into a URL.
                 contextRegex.lastIndex = match.index;
-                const contextMatch = contextRegex.exec(maskedText);
-                if (contextMatch === null) {
+                const contextMatch = contextRegex.exec(textWithContext);
+                if (contextMatch === null || contextMatch[0].length < match[0].length) {
                     match = matchingRegex.exec(textToMatch);
                     continue;
                 }
-                match = contextMatch;
-                matchingRegex.lastIndex = contextRegex.lastIndex;
             }
             let url = match[2];
             const urlEnd = findUrlEndBeforeUnmatchedParenthesis(url, 0, url.length);

package/package.json

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