fix LegalRequestProp, improve :any typings, tweak hit() and remove 'h…

…it' prop from Source

src/helpers/injector.ts

@@ -54,9 +54,6 @@ export function passSourceAndProps(
     code: string,
     redirect = false,
 ): string {
-    if (source.hit) {
-        source.hit = source.hit.toString();
-    }
     const sourceString = JSON.stringify(source);
     const argsString = source.args ? `[${source.args.map((arg) => JSON.stringify(arg))}]` : undefined;
     const params = argsString ? `${sourceString}, ${argsString}` : sourceString;

src/helpers/object-utils.ts

@@ -21,8 +21,8 @@ export const getObjectEntries = (object: Record<string, unknown>): [string, any]
  * @param entries - array of pairs
  * @returns result object
  */
-export const getObjectFromEntries = (entries: [string, any][]): { [key: string]: any } => {
-    const initValue: { [key: string]: any } = {};
+export const getObjectFromEntries = <T>(entries: [string, T][]): { [key: string]: T } => {
+    const initValue: { [key: string]: T } = {};
     const output = entries
         .reduce((acc, el) => {
             const key = el[0];

src/helpers/prevent-utils.ts

@@ -28,7 +28,7 @@ export const isValidCallback = (callback: unknown): boolean => {
  * @param delay native method delay arg
  * @returns number as parsed delay or any input type if `delay` is not parsable
  */
-export const parseRawDelay = (delay: any): any => {
+export const parseRawDelay = <T>(delay: T): number | T => {
     const parsedDelay = Math.floor(parseInt(delay as string, 10));
     return typeof parsedDelay === 'number' && !nativeIsNaN(parsedDelay) ? parsedDelay : delay;
 };

src/helpers/request-utils.ts

@@ -3,26 +3,6 @@ import { getObjectFromEntries } from './object-utils';
 
 type FetchResource = Request | URL | string;
 
-/**
- * Fetch and xhr.open options that are valid props
- * to match for (trusted-)prevent-(fetch|xhr) scriptlets
- */
-export enum LegalRequestProp {
-    Url = 'url',
-    Method = 'method',
-    Headers = 'headers',
-    Body = 'body',
-    Credentials = 'credentials',
-    Cache = 'cache',
-    Redirect = 'redirect',
-    Referrer = 'referrer',
-    ReferrerPolicy = 'referrerPolicy',
-    Integrity = 'integrity',
-    Keepalive = 'keepalive',
-    Signal = 'signal',
-    Mode = 'mode',
-}
-
 /**
  * Aggregates fetch and XMLHttpRequest.open arguments
  * to operate on arbitrary request data objects
@@ -42,26 +22,38 @@ type ParsedMatchProps = SharedRequestData<string>;
  */
 export type MatchPropsData = SharedRequestData<RegExp>;
 
+/**
+ * Fetch and xhr.open options that are valid props
+ * to match for (trusted-)prevent-(fetch|xhr) scriptlets
+ *
+ * This type is being derived from getRequestProps return type
+ * as enums would be lost at build time disregarding 'const'
+ */
+export type LegalRequestProp = ReturnType<typeof getRequestProps>[number];
+
 /**
  * Returns array of request props that are supported by fetch/xhr scriptlets.
  * Includes common 'url' and 'method' props and all other fetch-specific props
  *
  * @returns list of request props
  */
-export const getRequestProps = (): Array<LegalRequestProp> => [
-    LegalRequestProp.Url,
-    LegalRequestProp.Method,
-    LegalRequestProp.Headers,
-    LegalRequestProp.Body,
-    LegalRequestProp.Credentials,
-    LegalRequestProp.Cache,
-    LegalRequestProp.Redirect,
-    LegalRequestProp.Referrer,
-    LegalRequestProp.ReferrerPolicy,
-    LegalRequestProp.Integrity,
-    LegalRequestProp.Keepalive,
-    LegalRequestProp.Signal,
-];
+export const getRequestProps = () => {
+    return [
+        'url',
+        'method',
+        'headers',
+        'body',
+        'credentials',
+        'cache',
+        'redirect',
+        'referrer',
+        'referrerPolicy',
+        'integrity',
+        'keepalive',
+        'signal',
+        'mode',
+    ] as const;
+};
 
 /**
  * Collects Request options to object
@@ -71,10 +63,10 @@ export const getRequestProps = (): Array<LegalRequestProp> => [
  */
 export const getRequestData = (request: Request): Partial<Request> => {
     const requestInitOptions = getRequestProps();
-    const entries: [string, any][] = requestInitOptions
+    const entries: [keyof Request, any][] = requestInitOptions
         .map((key) => {
             // if request has no such option, value will be undefined
-            const value = request[key as keyof typeof request];
+            const value = request[key];
             return [key, value];
         });
     return getObjectFromEntries(entries);

src/helpers/shadow-dom-utils.ts

@@ -19,7 +19,7 @@ export const hijackAttachShadow = (
     hostSelector: string,
     callback: AttachShadowCallback,
 ): void => {
-    const handlerWrapper = (target: AttachShadow, thisArg: any, args: unknown[]): ShadowRoot => {
+    const handlerWrapper = (target: AttachShadow, thisArg: Element, args: unknown[]): ShadowRoot => {
         const shadowRoot: ShadowRoot = Reflect.apply(target, thisArg, args);
 
         if (thisArg && thisArg.matches(hostSelector || '*')) {

src/helpers/string-utils.ts

@@ -276,7 +276,7 @@ export const parseDelayArg = (delay: string): DelayData => {
  * @param obj data object
  * @returns object's string representation
  */
-export const objectToString = (obj: Record<string, unknown>): string | StringConstructor => {
+export const objectToString = (obj: Record<string, unknown>): string => {
     // In case if the type of passed obj is different than Object
     // https://github.com/AdguardTeam/Scriptlets/issues/282
     if (!obj || typeof obj !== 'object') {
@@ -304,15 +304,15 @@ export const objectToString = (obj: Record<string, unknown>): string | StringCon
  * @param value input value type
  * @returns type's string representation
  */
-export const convertTypeToString = (value: any): string => {
+export const convertTypeToString = (value: unknown): string => {
     let output;
     if (typeof value === 'undefined') {
         output = 'undefined';
     } else if (typeof value === 'object') {
         if (value === null) {
             output = 'null';
         } else {
-            output = objectToString(value);
+            output = objectToString(value as Record<string, unknown>);
         }
     } else {
         output = value.toString();
@@ -392,7 +392,7 @@ export function generateRandomResponse(customResponseText: string): string | nul
  * @returns converted value
  * @throws an error on unexpected input
  */
-export function inferValue(value: string): any {
+export function inferValue(value: string): unknown {
     if (value === 'undefined') {
         return undefined;
     } if (value === 'false') {

src/helpers/validator.ts

@@ -328,7 +328,7 @@ const REDIRECT_RULE_TYPES: Record<RedirectRuleType, RedirectsData> = {
  * @param rule rule text
  * @returns list of rule modifiers
  */
-const parseModifiers = (rule: string): string[] => substringAfter(rule, '$')?.split(',');
+const parseModifiers = (rule: string): string[] => substringAfter(rule, '$').split(',');
 
 /**
  * Gets redirect resource name

types/types.d.ts

@@ -6,7 +6,6 @@ interface Source {
     verbose: boolean;
     ruleText: string;
     domainName?: string;
-    hit?: string;
 }
 
 type ValueOf<T> = T[keyof T];