Update toRegExp

AdguardTeam · May 23, 2024 · 609c544 · 609c544
1 parent 1f671bd
commit 609c544
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/helpers/string-utils.ts b/src/helpers/string-utils.ts
@@ -50,10 +50,11 @@ export const escapeRegExp = (str: string): string => str.replace(/[.*+?^${}()|[\
  * if string contains valid regexp flags it will be converted to regexp with flags
  * TODO think about nested dependencies, but be careful with dependency loops
  *
- * @param input literal string or regexp pattern; defaults to '' (empty string)
+ * @param rawInput literal string or regexp pattern; defaults to '' (empty string)
  * @returns regular expression; defaults to /.?/
  */
-export const toRegExp = (input: RawStrPattern = ''): RegExp => {
+export const toRegExp = (rawInput?: RawStrPattern | null): RegExp => {
+    const input = rawInput || '';
     const DEFAULT_VALUE = '.?';
     const FORWARD_SLASH = '/';
     if (input === '') {

diff --git a/src/scriptlets/trusted-click-element.ts b/src/scriptlets/trusted-click-element.ts
@@ -196,7 +196,7 @@ export function trustedClickElement(
             // Avoid getting /.?/ result from toRegExp on undefined
             // as cookie may be set without value,
             // on which cookie parsing will return cookieKey:undefined pair
-            const valueMatch = parsedCookieMatches[key] ? toRegExp(parsedCookieMatches[key] || '') : null;
+            const valueMatch = parsedCookieMatches[key] ? toRegExp(parsedCookieMatches[key]) : null;
             const keyMatch = toRegExp(key);
 
             return cookieKeys.some((cookieKey) => {