Merge pull request #772 from wanhose/v7.1.4

7.1.4

database.json

@@ -575,6 +575,369 @@
       "selector": "[title=\"ACCEPT AND CONTINUE\"]"
     }
   ],
+  "rules": [
+    {
+      "id": 1,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||app.usercentrics.eu^"
+      }
+    },
+    {
+      "id": 2,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||c.evidon.com^"
+      }
+    },
+    {
+      "id": 3,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||cdn.cookielaw.org^"
+      }
+    },
+    {
+      "id": 4,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||cdn.optable.co^"
+      }
+    },
+    {
+      "id": 5,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||cdntranscend.eventbrite.com^"
+      }
+    },
+    {
+      "id": 6,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||chollometro.com/assets/js/CookiesMessage*.js^"
+      }
+    },
+    {
+      "id": 7,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||cmp.inmobi.com^"
+      }
+    },
+    {
+      "id": 8,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||consent.trustarc.com^"
+      }
+    },
+    {
+      "id": 9,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||consent.cookiebot.com^"
+      }
+    },
+    {
+      "id": 10,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||consentcdn.cookiebot.com^"
+      }
+    },
+    {
+      "id": 11,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||cp.as.com^"
+      }
+    },
+    {
+      "id": 12,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||eu.fastcmp.com^"
+      }
+    },
+    {
+      "id": 13,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||lensois.com/wp-admin/admin-ajax.php"
+      }
+    },
+    {
+      "id": 14,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||optanon.blob.core.windows.net^"
+      }
+    },
+    {
+      "id": 15,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||redditstatic.com/onetrust.*.js"
+      }
+    },
+    {
+      "id": 16,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||sdk.privacy-center.org^"
+      }
+    },
+    {
+      "id": 17,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||static.fastcmp.com^"
+      }
+    },
+    {
+      "id": 18,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||wcpstatic.microsoft.com^"
+      }
+    },
+    {
+      "id": 19,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||webtools.europa.eu/js/webtools.cck.js^"
+      }
+    }
+  ],
   "skips": {
     "domains": [
       "app.diagrams.net",
@@ -834,6 +1197,7 @@
     ]
   },
   "tokens": {
+    "backdrops": [".modal-backdrop", ".offcanvas-backdrop", ".overlay"],
     "classes": [
       "appconsent_noscroll",
       "b-modal-banner--disabled",
@@ -13700,5 +14064,5 @@
       "ytd-consent-bump-v2-lightbox"
     ]
   },
-  "version": "1723359332975"
+  "version": "1723360939225"
 }

packages/browser-extension/src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Cookie Dialog Monster",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "default_locale": "en",
   "description": "__MSG_appDesc__",
   "icons": {
@@ -59,17 +59,8 @@
       "run_at": "document_start"
     }
   ],
-  "declarative_net_request": {
-    "rule_resources": [
-      {
-        "enabled": true,
-        "id": "ruleset",
-        "path": "rules.json"
-      }
-    ]
-  },
   "host_permissions": ["http://*/*", "https://*/*"],
-  "permissions": ["contextMenus", "declarativeNetRequest", "scripting", "storage"],
+  "permissions": ["contextMenus", "declarativeNetRequest", "scripting", "storage", "webRequest"],
   "web_accessible_resources": [
     {
       "matches": ["http://*/*", "https://*/*"],

packages/browser-extension/src/rules.json

@@ -1,325 +0,0 @@
-[
-  {
-    "id": 1,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||app.usercentrics.eu^"
-    }
-  },
-  {
-    "id": 2,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||c.evidon.com^"
-    }
-  },
-  {
-    "id": 3,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||cdn.cookielaw.org^"
-    }
-  },
-  {
-    "id": 4,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||cdn.optable.co^"
-    }
-  },
-  {
-    "id": 5,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||cdntranscend.eventbrite.com^"
-    }
-  },
-  {
-    "id": 6,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||cmp.inmobi.com^"
-    }
-  },
-  {
-    "id": 7,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||consent.trustarc.com^"
-    }
-  },
-  {
-    "id": 8,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||consent.cookiebot.com^"
-    }
-  },
-  {
-    "id": 10,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||consentcdn.cookiebot.com^"
-    }
-  },
-  {
-    "id": 11,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||cp.as.com^"
-    }
-  },
-  {
-    "id": 12,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||eu.fastcmp.com^"
-    }
-  },
-  {
-    "id": 13,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||lensois.com/wp-admin/admin-ajax.php"
-    }
-  },
-  {
-    "id": 14,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||optanon.blob.core.windows.net^"
-    }
-  },
-  {
-    "id": 15,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||redditstatic.com/onetrust.*.js"
-    }
-  },
-  {
-    "id": 16,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||static.fastcmp.com^"
-    }
-  },
-  {
-    "id": 17,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||wcpstatic.microsoft.com^"
-    }
-  },
-  {
-    "id": 18,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "resourceTypes": [
-        "font",
-        "image",
-        "media",
-        "object",
-        "script",
-        "stylesheet",
-        "xmlhttprequest"
-      ],
-      "urlFilter": "||webtools.europa.eu/js/webtools.cck.js^"
-    }
-  }
-]

packages/browser-extension/src/scripts/background.js

@@ -233,3 +233,43 @@ browser.runtime.onInstalled.addListener(() => {
 browser.runtime.onStartup.addListener(() => {
   refreshData();
 });
+
+/**
+ * @description Listen to the moment before a request is made to apply the rules
+ */
+browser.webRequest.onBeforeRequest.addListener(
+  async (details) => {
+    const { tabId, type, url } = details;
+
+    if (tabId > -1 && type === 'main_frame') {
+      const manifest = browser.runtime.getManifest();
+      const excludeMatches = manifest.content_scripts[0].exclude_matches;
+      const excludePatterns = excludeMatches.map(
+        (match) => `^${match.replaceAll('*.', '*(.)?').replaceAll('*', '.*')}$`
+      );
+
+      if (excludePatterns.some((pattern) => new RegExp(pattern).test(url))) {
+        return;
+      }
+
+      const hostname = url.split('.').slice(-3).join('.').replace('www.', '');
+      const store = await storage.get(hostname);
+      const state = store[hostname] ?? { enabled: true };
+
+      if (state.enabled) {
+        const { data } = await storage.get('data');
+
+        if (data?.rules?.length) {
+          browser.declarativeNetRequest.updateSessionRules({
+            addRules: data.rules.map((rule) => ({
+              ...rule,
+              condition: { ...rule.condition, tabIds: [tabId] },
+            })),
+            removeRuleIds: data.rules.map((rule) => rule.id),
+          });
+        }
+      }
+    }
+  },
+  { urls: ['<all_urls>'] }
+);

packages/browser-extension/src/scripts/content.js

@@ -1,28 +1,28 @@
 /**
  * @typedef {Object} ExtensionData
- * @property {string[] | undefined} commonWords
- * @property {Fix[] | undefined} fixes
- * @property {{ domains: string[] | undefined, tags: string[] | undefined } | undefined} skips
- * @property {{ classes: string[] | undefined, selectors: string[] | undefined } | undefined} tokens
+ * @property {string[]} commonWords
+ * @property {Fix[]} fixes
+ * @property {{ domains: string[], tags: string[] }} skips
+ * @property {{ backdrops: string[], classes: string[], selectors: string[] }} tokens
  */
 
 /**
  * @typedef {Object} Fix
  * @property {string} action
  * @property {string} domain
- * @property {string | undefined} property
+ * @property {string} [property]
  * @property {string} selector
  */
 
 /**
  * @typedef {Object} RunParams
- * @property {HTMLElement[] | undefined} elements
- * @property {boolean | undefined} skipMatch
+ * @property {HTMLElement[]} [elements]
+ * @property {boolean} [skipMatch]
  */
 
 /**
  * @typedef {Object} SetUpParams
- * @property {boolean | undefined} skipRunFn
+ * @property {boolean} [skipRunFn]
  */
 
 if (typeof browser === 'undefined') {
@@ -36,10 +36,22 @@ if (typeof browser === 'undefined') {
 let count = 0;
 
 /**
- * @description Data properties
+ * @description Data object with all the necessary information
  * @type {ExtensionData}
  */
-let { commonWords, fixes = [], skips, tokens } = {};
+let { commonWords, fixes, skips, tokens } = {
+  commonWords: [],
+  fixes: [],
+  skips: {
+    domains: [],
+    tags: [],
+  },
+  tokens: {
+    backdrops: [],
+    classes: [],
+    selectors: [],
+  },
+};
 
 /**
  * @description Attribute name
@@ -98,7 +110,7 @@ let state = { enabled: true };
 /**
  * @description Clean DOM
  * @param {Element[]} elements
- * @param {boolean?} skipMatch
+ * @param {boolean} [skipMatch]
  * @returns {void}
  */
 function clean(elements, skipMatch) {
@@ -146,7 +158,7 @@ function clean(elements, skipMatch) {
  * @param {HTMLElement} element
  */
 function containsCommonWord(element) {
-  return !!element.outerHTML.match(new RegExp(commonWords.join('|')));
+  return !!commonWords.length && !!element.outerHTML.match(new RegExp(commonWords.join('|')));
 }
 
 /**
@@ -156,7 +168,7 @@ function containsCommonWord(element) {
  */
 function forceClean(element) {
   const nodes = [...element.querySelectorAll(tokens.selectors)];
-  const elements = nodes.flatMap((node) => filterMapEarly(node));
+  const elements = nodes.flatMap((node) => filterNodeEarly(node));
 
   if (elements.length) {
     fix();
@@ -220,16 +232,11 @@ function isInViewport(element) {
 /**
  * @description Check if element element is removable
  * @param {Element} element
- * @param {boolean?} skipMatch
+ * @param {boolean} [skipMatch]
  * @returns {boolean}
  */
 function match(element, skipMatch) {
-  if (
-    !commonWords.length ||
-    !tokens?.classes?.length ||
-    !tokens?.selectors?.length ||
-    !skips?.tags?.length
-  ) {
+  if (!tokens.selectors.length || !skips.tags.length) {
     return false;
   }
 
@@ -245,7 +252,7 @@ function match(element, skipMatch) {
     return false;
   }
 
-  const tagName = element.tagName?.toUpperCase?.();
+  const tagName = element.tagName.toUpperCase();
 
   if (skips.tags.includes(tagName)) {
     return false;
@@ -283,13 +290,13 @@ function match(element, skipMatch) {
  * @param {Node} node
  * @param {boolean} stopRecursion
  */
-function filterMapEarly(node, stopRecursion) {
+function filterNodeEarly(node, stopRecursion) {
   if (node.nodeType !== Node.ELEMENT_NODE || !(node instanceof HTMLElement)) {
     return [];
   }
 
   if (commonWords && containsCommonWord(node) && !stopRecursion) {
-    return [node, ...[...node.children].flatMap((node) => filterMapEarly(node, true))];
+    return [node, ...[...node.children].flatMap((node) => filterNodeEarly(node, true))];
   }
 
   return [node];
@@ -300,12 +307,10 @@ function filterMapEarly(node, stopRecursion) {
  * @returns {void}
  */
 function fix() {
-  const backdrops = document.querySelectorAll([
-    '.modal-backdrop',
-    '.offcanvas-backdrop',
-    '.overlay',
-  ]);
-  const domains = (skips?.domains ?? []).map((x) => (x.split('.').length < 3 ? `*${x}` : x));
+  const backdrops = tokens.backdrops?.length
+    ? [...document.querySelectorAll(tokens.backdrops)]
+    : [];
+  const domains = skips.domains.map((x) => (x.split('.').length < 3 ? `*${x}` : x));
 
   for (const backdrop of backdrops) {
     if (backdrop.children.length === 0 && backdrop.style.display !== 'none') {
@@ -349,7 +354,7 @@ function fix() {
 
   if (domains.every((x) => !hostname.match(x.replaceAll(/\*/g, '[^ ]*')))) {
     for (const element of [document.body, document.documentElement]) {
-      element?.classList.remove(...(tokens?.classes ?? []));
+      element?.classList.remove(...(tokens.classes ?? []));
       element?.style.setProperty('position', 'initial', 'important');
       element?.style.setProperty('overflow-y', 'initial', 'important');
     }
@@ -361,10 +366,14 @@ function fix() {
  * @returns {void}
  */
 function restoreDOM() {
-  const backdrop = document.getElementsByClassName('modal-backdrop')[0];
+  const backdrops = tokens.backdrops?.length
+    ? [...document.querySelectorAll(tokens.backdrops)]
+    : [];
 
-  if (backdrop?.children.length === 0) {
-    backdrop.style.removeProperty('display');
+  for (const backdrop of backdrops) {
+    if (backdrop.children.length === 0 && backdrop.hasAttribute(dataAttributeName)) {
+      backdrop.style.removeProperty('display');
+    }
   }
 
   const elements = [...document.querySelectorAll(`[${dataAttributeName}]`)];
@@ -384,11 +393,11 @@ function restoreDOM() {
 
 /**
  * @description Clean DOM when this function is called
- * @param {RunParams} params
+ * @param {RunParams} [params]
  * @returns {void}
  */
 function run(params = {}) {
-  if (document.body?.children.length && !preview && state.enabled && tokens?.selectors?.length) {
+  if (document.body?.children.length && !preview && state.enabled && tokens.selectors.length) {
     fix();
 
     if (params.elements?.length) {
@@ -408,7 +417,7 @@ function run(params = {}) {
           ...[...(document.getElementById('app')?.children ?? [])],
           ...[...(document.getElementById('main')?.children ?? [])],
           ...[...(document.getElementById('root')?.children ?? [])],
-        ].flatMap((node) => filterMapEarly(node))
+        ].flatMap((node) => filterNodeEarly(node))
       );
     }
   }
@@ -417,19 +426,19 @@ function run(params = {}) {
 /**
  * @async
  * @description Set up the extension
- * @param {SetUpParams | undefined} params
+ * @param {SetUpParams} [params]
  */
-async function setUp(params) {
+async function setUp(params = {}) {
   state = (await dispatch({ hostname, type: 'GET_HOSTNAME_STATE' })) ?? state;
   dispatch({ type: 'ENABLE_POPUP' });
 
   if (state.enabled) {
     const data = await dispatch({ hostname, type: 'GET_DATA' });
 
-    commonWords = data?.commonWords;
-    fixes = data?.fixes;
-    skips = data?.skips;
-    tokens = data?.tokens;
+    commonWords = data?.commonWords ?? commonWords;
+    fixes = data?.fixes ?? fixes;
+    skips = data?.skips ?? skips;
+    tokens = data?.tokens ?? tokens;
 
     if (count > 0) {
       dispatch({ type: 'SET_BADGE', value: `${count}` });
@@ -438,7 +447,7 @@ async function setUp(params) {
     dispatch({ type: 'ENABLE_ICON' });
     observer.observe(document.body ?? document.documentElement, options);
 
-    if (!params?.skipRunFn) {
+    if (!params.skipRunFn) {
       run();
     }
   } else {
@@ -452,12 +461,12 @@ async function setUp(params) {
  * @type {MutationObserver}
  */
 const observer = new MutationObserver((mutations) => {
-  if (preview || !state.enabled || !tokens?.selectors.length) {
+  if (preview || !state.enabled || !tokens.selectors.length) {
     return;
   }
 
   const nodes = mutations.flatMap((mutation) => [...mutation.addedNodes]);
-  const elements = nodes.flatMap((node) => filterMapEarly(node));
+  const elements = nodes.flatMap((node) => filterNodeEarly(node));
 
   run({ elements });
 });