Normalise initiator domains

ghostery · Jan 4, 2024 · bf1ab13 · bf1ab13
1 parent 0c072b3
commit bf1ab13
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/src/converters/helpers.js b/src/converters/helpers.js
@@ -13,7 +13,7 @@ export function normalizeFilter(filter) {
   });
 
   // by default easylist syntax is case-insensitve
-  if (!params.find(p => p === 'match-case')) {
+  if (!params.find((p) => p === 'match-case')) {
     front = front.toLowerCase();
   }
 
@@ -49,5 +49,17 @@ export function normalizeRule(rule) {
   ) {
     newRule.condition.regexFilter = `/${newRule.condition.regexFilter}/`;
   }
+
+  if (newRule.condition && newRule.condition.excludedDomains) {
+    newRule.condition.excludedInitiatorDomains =
+      newRule.condition.excludedDomains;
+    delete newRule.condition.excludedDomains;
+  }
+
+  if (newRule.condition && newRule.condition.domains) {
+    newRule.condition.initiatorDomains = newRule.condition.domains;
+    delete newRule.condition.domains;
+  }
+
   return newRule;
 }
diff --git a/test/unit/converters/abp.spec.js b/test/unit/converters/abp.spec.js
@@ -24,7 +24,7 @@ describe('abp converter', () => {
       },
       condition: {
         domainType: "thirdParty",
-        domains: [
+        initiatorDomains: [
           "x.z"
         ],
         isUrlFilterCaseSensitive: false,

diff --git a/test/unit/converters/helpers.spec.js b/test/unit/converters/helpers.spec.js
@@ -86,7 +86,6 @@ describe('normalizeRule', () => {
     })
   })
 
-
   it('wraps regex rules in //', () => {
     expect(normalizeRule({
       condition: {
@@ -98,4 +97,28 @@ describe('normalizeRule', () => {
       },
     });
   });
+
+  it('replaces domains with initiatorDomains', () => {
+    expect(normalizeRule({
+      condition: {
+        domains: ['test'],
+      },
+    })).toEqual({
+      condition: {
+        initiatorDomains: ['test'],
+      },
+    });
+  });
+
+  it('replaces excludedDomains with excludedInitiatorDomains', () => {
+    expect(normalizeRule({
+      condition: {
+        excludedDomains: ['test'],
+      },
+    })).toEqual({
+      condition: {
+        excludedInitiatorDomains: ['test'],
+      },
+    });
+  });
 });
diff --git a/test/unit/helpers.js b/test/unit/helpers.js
@@ -9,16 +9,6 @@ function normalize(rule) {
   }
   delete rule.priority;
   delete rule.id;
-  if (rule.condition) {
-    if (rule.condition.excludedDomains) {
-      rule.condition.excludedInitiatorDomains = rule.condition.excludedDomains;
-      delete rule.condition.excludedDomains;
-    }
-    if (rule.condition.domains) {
-      rule.condition.initiatorDomains = rule.condition.domains;
-      delete rule.condition.domains;
-    }
-  }
   return rule;
 }