diff --git a/src/helpers/compatibility-redirects.ts b/src/helpers/compatibility-redirects.ts index bd5e5ae4..a8617aa4 100644 --- a/src/helpers/compatibility-redirects.ts +++ b/src/helpers/compatibility-redirects.ts @@ -6,7 +6,7 @@ * e.g. googletagmanager-gtm is removed and should be removed from compatibility table as well * but now it works as alias for google-analytics so it should stay valid for compiler */ -const redirects: RedirectCompatibilityObject[] = [ +const redirects: RedirectCompatibilityMap[] = [ { adg: '1x1-transparent.gif', ubo: '1x1.gif', diff --git a/src/helpers/validator.ts b/src/helpers/validator.ts index 2c2cd145..90b965a5 100644 --- a/src/helpers/validator.ts +++ b/src/helpers/validator.ts @@ -9,11 +9,11 @@ import { ADG_SCRIPTLET_MASK } from './parse-rule'; import * as scriptletsList from '../scriptlets/scriptlets-list'; import redirects from './compatibility-redirects'; -interface UboToAdgCompatibilityObject extends RedirectCompatibilityObject { +interface UboToAdgCompatibilityObject extends RedirectCompatibilityMap { ubo: string; } -interface AbpToAdgCompatibilityObject extends RedirectCompatibilityObject { +interface AbpToAdgCompatibilityObject extends RedirectCompatibilityMap { abp: string; } @@ -244,7 +244,7 @@ const ABSENT_SOURCE_TYPE_REPLACEMENT = [ }, ]; -const validAdgRedirects = redirects.filter((el): el is RedirectCompatibilityObject => !!el.adg); +const validAdgRedirects = redirects.filter((el): el is RedirectCompatibilityMap => !!el.adg); /** * Compatibility object where KEYS = UBO redirect names and VALUES = ADG redirect names diff --git a/src/scriptlets/abort-current-inline-script.js b/src/scriptlets/abort-current-inline-script.js index ba7a8636..c3945816 100644 --- a/src/scriptlets/abort-current-inline-script.js +++ b/src/scriptlets/abort-current-inline-script.js @@ -203,7 +203,7 @@ export function abortCurrentInlineScript(source, property, search) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid) + window.onerror = createOnErrorHandler(rid) .bind(); } diff --git a/src/scriptlets/abort-on-property-read.js b/src/scriptlets/abort-on-property-read.js index e34bc13d..3f7e0101 100644 --- a/src/scriptlets/abort-on-property-read.js +++ b/src/scriptlets/abort-on-property-read.js @@ -75,7 +75,7 @@ export function abortOnPropertyRead(source, property) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid) + window.onerror = createOnErrorHandler(rid) .bind(); } diff --git a/src/scriptlets/abort-on-property-write.js b/src/scriptlets/abort-on-property-write.js index b5a42980..32539845 100644 --- a/src/scriptlets/abort-on-property-write.js +++ b/src/scriptlets/abort-on-property-write.js @@ -68,7 +68,7 @@ export function abortOnPropertyWrite(source, property) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid).bind(); + window.onerror = createOnErrorHandler(rid).bind(); } abortOnPropertyWrite.names = [ diff --git a/src/scriptlets/abort-on-stack-trace.js b/src/scriptlets/abort-on-stack-trace.js index 16fa47c7..248e97e9 100644 --- a/src/scriptlets/abort-on-stack-trace.js +++ b/src/scriptlets/abort-on-stack-trace.js @@ -123,7 +123,7 @@ export function abortOnStackTrace(source, property, stack) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid) + window.onerror = createOnErrorHandler(rid) .bind(); } diff --git a/src/scriptlets/debug-current-inline-script.js b/src/scriptlets/debug-current-inline-script.js index 19af85d5..d2f9d492 100644 --- a/src/scriptlets/debug-current-inline-script.js +++ b/src/scriptlets/debug-current-inline-script.js @@ -114,7 +114,7 @@ export function debugCurrentInlineScript(source, property, search) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid) + window.onerror = createOnErrorHandler(rid) .bind(); } diff --git a/src/scriptlets/debug-on-property-read.js b/src/scriptlets/debug-on-property-read.js index 89abe1f7..b5bc8f61 100644 --- a/src/scriptlets/debug-on-property-read.js +++ b/src/scriptlets/debug-on-property-read.js @@ -62,7 +62,7 @@ export function debugOnPropertyRead(source, property) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid) + window.onerror = createOnErrorHandler(rid) .bind(); } diff --git a/src/scriptlets/debug-on-property-write.js b/src/scriptlets/debug-on-property-write.js index 0c032823..1064dbdb 100644 --- a/src/scriptlets/debug-on-property-write.js +++ b/src/scriptlets/debug-on-property-write.js @@ -56,7 +56,7 @@ export function debugOnPropertyWrite(source, property) { setChainPropAccess(window, property); - window.onerror = createOnErrorHandler(window, rid).bind(); + window.onerror = createOnErrorHandler(rid).bind(); } debugOnPropertyWrite.names = [ diff --git a/src/scriptlets/prevent-popads-net.js b/src/scriptlets/prevent-popads-net.js index d4834c32..bbabf584 100644 --- a/src/scriptlets/prevent-popads-net.js +++ b/src/scriptlets/prevent-popads-net.js @@ -29,7 +29,7 @@ export function preventPopadsNet(source) { popns: { set: throwError }, }); - window.onerror = createOnErrorHandler(window, rid).bind(); + window.onerror = createOnErrorHandler(rid).bind(); hit(source); } diff --git a/types/types.d.ts b/types/types.d.ts index 953b7dd1..2aa51163 100644 --- a/types/types.d.ts +++ b/types/types.d.ts @@ -57,7 +57,7 @@ type MarkerData = { marker: RedirectMarker; }; -interface RedirectCompatibilityObject { +interface RedirectCompatibilityMap { adg: string; ubo?: string; abp?: string;