Support textNodes, remove commas from the end of addresses

duckduckgo · Jan 29, 2025 · fcedecd · fcedecd
1 parent 8e76460
commit fcedecd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/injected/src/features/broker-protection/actions/extract.js b/injected/src/features/broker-protection/actions/extract.js
@@ -160,15 +160,20 @@ export function createProfile(elementFactory, extractData) {
 }
 
 /**
- * @param {{innerText: string}[]} elements
+ * @param {(HTMLElement | { innerText: string })[]} elements
  * @param {string} key
  * @param {ExtractProfileProperty} extractField
  * @return {string[]}
  */
 function stringValuesFromElements(elements, key, extractField) {
     return elements.map((element) => {
-        // todo: should we use textContent here?
-        let elementValue = rules[key]?.(element) ?? element?.innerText ?? null;
+        let elementValue;
+
+        if ('nodeType' in element && element.nodeType === Node.TEXT_NODE) {
+            elementValue = element.textContent;
+        } else {
+            elementValue = rules[key]?.(element) ?? element?.innerText ?? null;
+        }
 
         if (extractField?.afterText) {
             elementValue = elementValue?.split(extractField.afterText)[1]?.trim() || elementValue;

diff --git a/injected/src/features/broker-protection/extractors/address.js b/injected/src/features/broker-protection/extractors/address.js
@@ -53,6 +53,9 @@ function getCityStateCombos(inputList) {
         // Strip out the zip code since we're only interested in city/state here.
         item = item.replace(/,?\s*\d{5}(-\d{4})?/, '');
 
+        // Replace any commas at the end of the string that could confuse the city/state split.
+        item = item.replace(/,$/, '');
+
         if (item.includes(',')) {
             words = item.split(',').map((item) => item.trim());
         } else {