refactor: move regex to matcher

duckduckgo · Dec 19, 2024 · 5a95320 · 5a95320
1 parent 6f5f58f
commit 5a95320
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
diff --git a/dist/autofill.js b/dist/autofill.js
diff --git a/src/Form/FormAnalyzer.js b/src/Form/FormAnalyzer.js
@@ -336,9 +336,6 @@ class FormAnalyzer {
             this.increaseSignalBy(relevantFields.length * 1.5, 'many fields: it is probably not a login');
         }
 
-        const passwordHintRegex =
-            /\b(?:password.*?(?:must|should|has to|needs to|can))?\b.*?(?:(at least|minimum|no fewer than)\s+\d+\s+(characters?|letters?|numbers?|special characters?)|(uppercase|lowercase|capital|digit|number|symbol|special character)|\b(no spaces|cannot contain your email|cannot repeat characters|must be unique|case sensitive)\b)/;
-
         // If the form contains password hints, it's highly likely a signup form.
         const hasPasswordHints = Array.from(this.form.querySelectorAll('div, span'))
             .filter(
@@ -348,7 +345,7 @@ class FormAnalyzer {
                     window.getComputedStyle(div).display !== 'none' &&
                     window.getComputedStyle(div).visibility !== 'hidden',
             )
-            .some((div) => div.textContent && safeRegexTest(passwordHintRegex, div.textContent));
+            .some((div) => div.textContent && safeRegexTest(this.matching.getDDGMatcherRegex('passwordHintsRegex'), div.textContent));
 
         if (hasPasswordHints) {
             this.increaseSignalBy(6, 'Password hints');

diff --git a/src/Form/matching-config/__generated__/compiled-matching-config.js b/src/Form/matching-config/__generated__/compiled-matching-config.js
diff --git a/src/Form/matching-config/matching-config-source.js b/src/Form/matching-config/matching-config-source.js
@@ -442,6 +442,9 @@ const matchingConfiguration = {
                         // French
                         '| avec ',
                 },
+                passwordHintsRegex: {
+                    match: '\\b(?:password.*?(?:must|should|has to|needs to|can))?\\b.*?(?:(at least|minimum|no fewer than)\\s+\\d+\\s+(characters?|letters?|numbers?|special characters?)|(uppercase|lowercase|capital|digit|number|symbol|special character)|\b(no spaces|cannot contain your email|cannot repeat characters|must be unique|case sensitive)\\b)',
+                },
                 submitButtonRegex: {
                     match:
                         'submit|send|confirm|save|continue|next|sign|log.?([io])n|buy|purchase|check.?out|subscribe|donate|update|\\bset\\b' +

diff --git a/src/Form/matching-types.d.ts b/src/Form/matching-types.d.ts
@@ -56,7 +56,7 @@ type MatcherTypeNames =
     | 'birthdayMonth'
     | 'birthdayYear';
 
-type FormMatcherNames = 'loginRegex' | 'signupRegex' | 'conservativeSignupRegex' | 'resetPasswordLink' | 'loginProvidersRegex';
+type FormMatcherNames = 'loginRegex' | 'signupRegex' | 'conservativeSignupRegex' | 'resetPasswordLink' | 'loginProvidersRegex' | 'passwordHintsRegex';
 
 type ButtonMatcherNames = 'submitButtonRegex' | 'submitButtonUnlikelyRegex';
 

diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js