Merge pull request #769 from SSWConsulting/phone-string-location

Improve phone highlighting for phone number rule
SSWConsulting · Nov 15, 2023 · 42121e1 · 42121e1
2 parents 24217cf + 4b080b8
commit 42121e1
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/docker/customHtmlRules.js b/docker/customHtmlRules.js
@@ -525,25 +525,29 @@ exports.addCustomHtmlRule = async (apiToken, url) => {
         parser.addListener("text", (event) => {
           // Replace "." and "/" characters to avoid false positives when parsing phone numbers
           const text = event.raw?.replace(/\.|\//g, "_");
-          if (text && event.lastEvent && findPhoneNumbersInText(text, optionValue.length > 0 ? optionValue : 'AU').length) {
-            const pageContent = event.lastEvent.raw;
-            if (pageContent && event.lastEvent.tagName) {
-              const tagName = event.lastEvent.tagName.toLowerCase();
-              const mapAttrs = parser.getMapAttrs(event.lastEvent.attrs);
-              const href = mapAttrs["href"];
-              const isLink = tagName === "a";
-              const isTelLink = isLink && href && href.startsWith("tel:");
-
-              if (!(isTelLink || isInCodeBlock)) {
-                reporter.warn(
-                  "Phone number must be in a hyperlink.",
-                  event.line,
-                  event.col,
-                  self,
-                  event.raw
-                );
+          if (text && event.lastEvent) {
+            const foundPhoneNumbers = findPhoneNumbersInText(text, optionValue.length > 0 ? optionValue : 'AU');
+
+            foundPhoneNumbers.forEach((phone) => {
+              const pageContent = event.lastEvent.raw;
+              if (pageContent && event.lastEvent.tagName) {
+                const tagName = event.lastEvent.tagName.toLowerCase();
+                const mapAttrs = parser.getMapAttrs(event.lastEvent.attrs);
+                const href = mapAttrs["href"];
+                const isLink = tagName === "a";
+                const isTelLink = isLink && href && href.startsWith("tel:");
+
+                if (!(isTelLink || isInCodeBlock)) {
+                  reporter.warn(
+                    "Phone number must be in a hyperlink.",
+                    event.line,
+                    event.col + phone.startsAt - 1,
+                    self,
+                    event.raw
+                  );
+                }
               }
-            }
+            });
           }
         });
       },