fix: Remove circular dependency (#1750)

src/__tests__/request-utils.test.ts

@@ -1,5 +1,5 @@
 import { getQueryParam, formDataToQuery, maskQueryParams } from '../utils/request-utils'
-import { isMatchingRegex } from '../utils/string-utils'
+import { isMatchingRegex } from '../utils/regex-utils'
 
 describe('request utils', () => {
     describe('_HTTPBuildQuery', () => {

src/extensions/surveys/action-matcher.ts

@@ -4,7 +4,7 @@ import { SimpleEventEmitter } from '../../utils/simple-event-emitter'
 import { CaptureResult } from '../../types'
 import { isUndefined } from '../../utils/type-utils'
 import { window } from '../../utils/globals'
-import { isMatchingRegex } from '../../utils/string-utils'
+import { isMatchingRegex } from '../../utils/regex-utils'
 
 export class ActionMatcher {
     private readonly actionRegistry?: Set<SurveyActionType>

src/posthog-surveys.ts

@@ -12,7 +12,7 @@ import { RemoteConfig } from './types'
 import { Info } from './utils/event-utils'
 import { assignableWindow, document, userAgent, window } from './utils/globals'
 import { createLogger } from './utils/logger'
-import { isMatchingRegex } from './utils/string-utils'
+import { isMatchingRegex } from './utils/regex-utils'
 import { SurveyEventReceiver } from './utils/survey-event-receiver'
 import { isNullish } from './utils/type-utils'
 

src/utils/index.ts

@@ -107,15 +107,6 @@ export function entries<T = any>(obj: Record<string, T>): [string, T][] {
     return resArray
 }
 
-export const isValidRegex = function (str: string): boolean {
-    try {
-        new RegExp(str)
-    } catch {
-        return false
-    }
-    return true
-}
-
 export const trySafe = function <T>(fn: () => T): T | undefined {
     try {
         return fn()

src/utils/regex-utils.ts

@@ -0,0 +1,18 @@
+export const isValidRegex = function (str: string): boolean {
+    try {
+        new RegExp(str)
+    } catch {
+        return false
+    }
+    return true
+}
+
+export const isMatchingRegex = function (value: string, pattern: string): boolean {
+    if (!isValidRegex(pattern)) return false
+
+    try {
+        return new RegExp(pattern).test(value)
+    } catch {
+        return false
+    }
+}

src/utils/string-utils.ts

@@ -1,5 +1,3 @@
-import { isValidRegex } from '.'
-
 export function includes<T = any>(str: T[] | string, needle: T): boolean {
     return (str as any).indexOf(needle) !== -1
 }
@@ -16,12 +14,3 @@ export const stripLeadingDollar = function (s: string): string {
 export function isDistinctIdStringLike(value: string): boolean {
     return ['distinct_id', 'distinctid'].includes(value.toLowerCase())
 }
-
-export const isMatchingRegex = function (value: string, pattern: string): boolean {
-    if (!isValidRegex(pattern)) return false
-    try {
-        return new RegExp(pattern).test(value)
-    } catch {
-        return false
-    }
-}

src/web-experiments.ts

@@ -10,7 +10,7 @@ import {
 import { WEB_EXPERIMENTS } from './constants'
 import { isNullish, isString } from './utils/type-utils'
 import { getQueryParam } from './utils/request-utils'
-import { isMatchingRegex } from './utils/string-utils'
+import { isMatchingRegex } from './utils/regex-utils'
 import { logger } from './utils/logger'
 import { Info } from './utils/event-utils'
 import { isLikelyBot } from './utils/blocked-uas'