[mv3] Mind to= option when converting popup filters

Related issue:
uBlockOrigin/uBOL-home#745

Author: gorhill

platform/mv3/extension/js/scripting/prevent-popup.js

@@ -35,7 +35,7 @@
         a.slice(i).join('.')
     );
 
-    const hostnameSearch = (hostnames, targets) => {
+    const hostnameSearch = hostnames => {
         let l = 0, i = 0, d = 0;
         let r = hostnames.length;
         let candidate;
@@ -59,28 +59,33 @@
         return -1;
     };
 
-    const regexSearch = (regexes, target) => {
+    const regexSearch = regexes => {
         for ( let i = 0; i < regexes.length; i += 2 ) {
-            const key = regexes[i+0];
-            if ( target.includes(key.slice(1)) === false ) { continue; }
-            const re = new RegExp(regexes[i+1], key.charAt(0).trimEnd());
-            if ( re.test(target) ) { return i; }
+            if ( href.includes(regexes[i+0]) === false ) { continue; }
+            const entries = JSON.parse(regexes[i+1]);
+            for ( const entry of entries ) {
+                if ( entry.xto && hostnameSearch(entry.xto) ) { continue; }
+                if ( entry.to && hostnameSearch(entry.to) === -1 ) { continue; }
+                const re = new RegExp(entry.re, entry.f);
+                if ( re.test(href) === false ) { continue; }
+                return i;
+            }
         }
         return -1;
     }
 
     let shouldClose = false;
     for ( const { block } of preventPopupDetails ) {
-        if ( hostnameSearch(block.hostnames, targets) === -1 ) {
-            if ( regexSearch(block.regexes, href) === -1 ) { continue; }
+        if ( hostnameSearch(block.hostnames) === -1 ) {
+            if ( regexSearch(block.regexes) === -1 ) { continue; }
         }
         shouldClose = true;
         break;
     }
     if ( shouldClose === false ) { return; }
     for ( const { allow } of preventPopupDetails ) {
-        if ( hostnameSearch(allow.hostnames, targets) === -1 ) {
-            if ( regexSearch(allow.regexes, href) === -1 ) { continue; }
+        if ( hostnameSearch(allow.hostnames) === -1 ) {
+            if ( regexSearch(allow.regexes) === -1 ) { continue; }
         }
         shouldClose = false;
         break;

platform/mv3/make-rulesets.js

@@ -911,11 +911,17 @@ async function processPopupRules(assetDetails, popupRules) {
             }
             if ( re === undefined ) { return data; }
             const token = literalStrFromRegex(re).slice(0, 7);
-            const key = `${isUrlFilterCaseSensitive ? ' ' : 'i'}${token}`;
-            if ( realm.regexes.has(key) ) {
-                realm.regexes.set(key, `${realm.regexes.get(key)}|${re}`);
-            } else {
-                realm.regexes.set(key, re);
+            const details = realm.regexes.get(token) ?? { token, rules: [] };
+            if ( details.rules.length === 0 ) {
+                realm.regexes.set(token, details)
+            }
+            const entry = { re, f: isUrlFilterCaseSensitive ? '' : 'i' };
+            details.rules.push(entry);
+            if ( condition.requestDomains ) {
+                entry.to = condition.requestDomains.sort(hostnameCompare);
+            }
+            if ( condition.excludedRequestDomains ) {
+                entry.xto = condition.excludedRequestDomains.sort(hostnameCompare);
             }
             return data;
         }
@@ -949,9 +955,13 @@ async function processPopupRules(assetDetails, popupRules) {
     const count = data.block.hostnames.length + data.block.regexes.size;
     if ( count === 0 ) { return; }
     data.block.hostnames = data.block.hostnames.toSorted(hostnameCompare);
-    data.block.regexes = Array.from(data.block.regexes).flat();
+    data.block.regexes = Array.from(data.block.regexes.values()).map(a =>
+        [ a.token, JSON.stringify(a.rules) ]
+    ).flat();
     data.allow.hostnames = data.allow.hostnames.toSorted(hostnameCompare);
-    data.allow.regexes = Array.from(data.allow.regexes).flat();
+    data.allow.regexes = Array.from(data.allow.regexes.values()).map(a =>
+        [ a.token, JSON.stringify(a.rules) ]
+    ).flat();
     const originalScriptletMap = await loadAllSourceScriptlets();
     let patchedScriptlet = originalScriptletMap.get(`prevent-popup`);
     patchedScriptlet = safeReplace(patchedScriptlet,