[mv3] Add topDomains/excludedTopDomains conditions to DNR parser

Author: gorhill

platform/mv3/extension/js/dnr-parser.js

@@ -280,6 +280,8 @@ const perScopeParsers = {
         case 'excludedInitiatorDomains':
         case 'requestDomains':
         case 'excludedRequestDomains':
+        case 'topDomains':
+        case 'excludedTopDomains':
         case 'resourceTypes':
         case 'excludedResourceTypes':
         case 'requestMethods':
@@ -328,6 +330,16 @@ const perScopeParsers = {
         rule.condition.excludedRequestDomains.push(node.val);
         return true;
     },
+    'condition.topDomains': function(scope, rule, node) {
+        if ( node.list !== true ) { return false; }
+        rule.condition.topDomains.push(node.val);
+        return true;
+    },
+    'condition.excludedTopDomains': function(scope, rule, node) {
+        if ( node.list !== true ) { return false; }
+        rule.condition.excludedTopDomains.push(node.val);
+        return true;
+    },
     'condition.resourceTypes': function(scope, rule, node) {
         if ( node.list !== true ) { return false; }
         if ( validResourceTypeValues.includes(node.val) === false ) { return false; }

platform/mv3/extension/js/rw-dnr-editor.js

@@ -194,6 +194,8 @@ export class ReadWriteDNREditor extends DNREditor {
                     { token: 'excludedInitiatorDomains:', after: '\n    - ' },
                     { token: 'requestDomains:', after: '\n    - ' },
                     { token: 'excludedRequestDomains:', after: '\n    - ' },
+                    { token: 'topDomains:', after: '\n    - ' },
+                    { token: 'excludedTopDomains:', after: '\n    - ' },
                     { token: 'resourceTypes:', after: '\n    - ' },
                     { token: 'excludedResourceTypes:', after: '\n    - ' },
                     { token: 'requestMethods:', after: '\n    - ' },

platform/mv3/extension/js/ubo-parser.js

@@ -162,6 +162,8 @@ function minimizeRuleset(rules) {
     rules = mergeArrays(rules, 'condition.excludedRequestDomains');
     rules = mergeArrays(rules, 'condition.initiatorDomains');
     rules = mergeArrays(rules, 'condition.excludedInitiatorDomains');
+    rules = mergeArrays(rules, 'condition.topDomains');
+    rules = mergeArrays(rules, 'condition.excludedTopDomains');
     rules = mergeArrays(rules, 'condition.resourceTypes');
     rules = mergeArrays(rules, 'condition.excludedRequestMethods');
     rules = mergeArrays(rules, 'condition.requestMethods');