resolve linting and misc typings

AdguardTeam · Jun 10, 2023 · d646852 · d646852
1 parent 48fd2b1
commit d646852
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/src/helpers/array-utils.ts b/src/helpers/array-utils.ts
@@ -32,7 +32,6 @@ export const flatten = <T>(input: Array<T | T[]>): T[] => {
  */
 export const isExisting = (item: unknown): boolean => !!item;
 
-
 /**
  * Converts NodeList to array
  *

diff --git a/src/helpers/cookie-utils.ts b/src/helpers/cookie-utils.ts
@@ -38,7 +38,7 @@ export const concatCookieNameValuePath = (
     rawValue: string,
     rawPath: string,
     shouldEncode = true,
-)=> {
+) => {
     const COOKIE_BREAKER = ';';
     // semicolon will cause the cookie to break
     if (!shouldEncode && (rawName.includes(COOKIE_BREAKER) || `${rawValue}`.includes(COOKIE_BREAKER))) {

diff --git a/src/helpers/observer.ts b/src/helpers/observer.ts
@@ -58,10 +58,10 @@ export const observeDOMChanges = (
 /**
  * Returns the list of added nodes from the list of mutations
  *
- * @param {MutationRecord[]} mutations list of mutations
- * @returns {Node[]} list of added nodes
+ * @param mutations list of mutations
+ * @returns list of added nodes
  */
-export const getAddedNodes = (mutations) => {
+export const getAddedNodes = (mutations: MutationRecord[]): Node[] => {
     const nodes = [];
     for (let i = 0; i < mutations.length; i += 1) {
         const { addedNodes } = mutations[i];
@@ -78,17 +78,21 @@ export const getAddedNodes = (mutations) => {
  *
  * @param {Function} callback MutationObserver callback
  * @param {Object} options MutationObserver options
- * @param {number|null} timeout Disconnect timeout in ms
+ * @param timeout Disconnect timeout in ms
  */
-export const observeDocumentWithTimeout = (callback, options, timeout = 10000) => {
-    const observer = new MutationObserver((mutations, observer) => {
+export const observeDocumentWithTimeout = (
+    callback: MutationCallback,
+    options: MutationObserverInit,
+    timeout = 10000,
+): void => {
+    const obs = new MutationObserver((mutations, observer) => {
         observer.disconnect();
-        callback(mutations);
+        callback(mutations, observer);
         observer.observe(document.documentElement, options);
     });
-    observer.observe(document.documentElement, options);
+    obs.observe(document.documentElement, options);
 
     if (typeof timeout === 'number') {
-        setTimeout(() => observer.disconnect(), timeout);
+        setTimeout(() => obs.disconnect(), timeout);
     }
 };
diff --git a/src/helpers/response-utils.ts b/src/helpers/response-utils.ts
@@ -1,6 +1,6 @@
 type ReplacementData = {
-    body: string,
-    type?: string,
+    body: string;
+    type?: string;
 };
 
 /**

diff --git a/src/helpers/script-source-utils.ts b/src/helpers/script-source-utils.ts
@@ -11,8 +11,8 @@ export const shouldAbortInlineOrInjectedScript = (stackMatch: string, stackTrace
     const INLINE_SCRIPT_STRING = 'inlineScript';
     const INJECTED_SCRIPT_STRING = 'injectedScript';
     const INJECTED_SCRIPT_MARKER = '<anonymous>';
-    const isInlineScript = (stackMatch: string) => stackMatch.includes(INLINE_SCRIPT_STRING);
-    const isInjectedScript = (stackMatch: string) => stackMatch.includes(INJECTED_SCRIPT_STRING);
+    const isInlineScript = (match: string) => match.includes(INLINE_SCRIPT_STRING);
+    const isInjectedScript = (match: string) => match.includes(INJECTED_SCRIPT_STRING);
 
     if (!(isInlineScript(stackMatch) || isInjectedScript(stackMatch))) {
         return false;

diff --git a/src/helpers/validator.ts b/src/helpers/validator.ts
@@ -7,6 +7,7 @@ import * as scriptletsList from '../scriptlets/scriptlets-list';
 import redirects from './compatibility-redirects';
 
 interface UboToAdgCompatibilityObject extends RedirectCompatibilityMap {
+    ubo: string;
 }
 
 interface AbpToAdgCompatibilityObject extends RedirectCompatibilityMap {