🐛 [RUMF-1267] remove last circular dependencies

packages/core/src/transport/eventBridge.ts

@@ -1,4 +1,4 @@
-import { getGlobalObject } from '..'
+import { getGlobalObject } from '../tools/utils'
 
 export interface BrowserWindowWithEventBridge extends Window {
   DatadogEventBridge?: DatadogEventBridge

packages/rum/src/domain/record/mutationObserver.spec.ts

@@ -7,10 +7,11 @@ import {
   PRIVACY_ATTR_VALUE_MASK,
   PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
 } from '../../constants'
+import type { AttributeMutation, Attributes } from '../../types'
+import { NodeType } from '../../types'
 import { serializeDocument } from './serialize'
 import { sortAddedAndMovedNodes, startMutationObserver, MutationController } from './mutationObserver'
-import type { AttributeMutation, Attributes, MutationCallBack } from './types'
-import { NodeType } from './types'
+import type { MutationCallBack } from './types'
 
 describe('startMutationCollection', () => {
   let sandbox: HTMLElement

packages/rum/src/domain/record/mutationObserver.ts

@@ -2,6 +2,7 @@ import type { DefaultPrivacyLevel } from '@datadog/browser-core'
 import { monitor, noop } from '@datadog/browser-core'
 import { getMutationObserverConstructor } from '@datadog/browser-rum-core'
 import { NodePrivacyLevel } from '../../constants'
+import type { AddedNodeMutation, AttributeMutation, RemovedNodeMutation, TextMutation } from '../../types'
 import { getNodePrivacyLevel, getTextContent } from './privacy'
 import type { NodeWithSerializedNode } from './serializationUtils'
 import {
@@ -12,15 +13,11 @@ import {
 } from './serializationUtils'
 import { serializeNodeWithId, serializeAttribute } from './serialize'
 import type {
-  AddedNodeMutation,
-  AttributeMutation,
   RumAttributesMutationRecord,
   RumCharacterDataMutationRecord,
   RumChildListMutationRecord,
   MutationCallBack,
   RumMutationRecord,
-  RemovedNodeMutation,
-  TextMutation,
 } from './types'
 import { forEach } from './utils'
 import { createMutationBatch } from './mutationBatch'

packages/rum/src/domain/record/observer.ts

@@ -11,12 +11,13 @@ import {
   noop,
 } from '@datadog/browser-core'
 import { NodePrivacyLevel } from '../../constants'
+import type { InputState, MousePosition, MouseInteraction } from '../../types'
+import { IncrementalSource, MediaInteractionType, MouseInteractionType } from '../../types'
 import { getNodePrivacyLevel, shouldMaskNode } from './privacy'
 import { getElementInputValue, getSerializedNodeId, hasSerializedNode } from './serializationUtils'
 import type {
   FocusCallback,
   InputCallback,
-  InputState,
   ListenerHandler,
   MediaInteractionCallback,
   MouseInteractionCallBack,
@@ -27,10 +28,7 @@ import type {
   StyleSheetRuleCallback,
   ViewportResizeCallback,
   VisualViewportResizeCallback,
-  MousePosition,
-  MouseInteractionParam,
 } from './types'
-import { IncrementalSource, MediaInteractions, MouseInteractions } from './types'
 import { forEach, isTouchEvent } from './utils'
 import type { MutationController } from './mutationObserver'
 import { startMutationObserver } from './mutationObserver'
@@ -115,15 +113,15 @@ function initMoveObserver(cb: MousemoveCallBack): ListenerHandler {
 }
 
 const eventTypeToMouseInteraction = {
-  [DOM_EVENT.MOUSE_UP]: MouseInteractions.MouseUp,
-  [DOM_EVENT.MOUSE_DOWN]: MouseInteractions.MouseDown,
-  [DOM_EVENT.CLICK]: MouseInteractions.Click,
-  [DOM_EVENT.CONTEXT_MENU]: MouseInteractions.ContextMenu,
-  [DOM_EVENT.DBL_CLICK]: MouseInteractions.DblClick,
-  [DOM_EVENT.FOCUS]: MouseInteractions.Focus,
-  [DOM_EVENT.BLUR]: MouseInteractions.Blur,
-  [DOM_EVENT.TOUCH_START]: MouseInteractions.TouchStart,
-  [DOM_EVENT.TOUCH_END]: MouseInteractions.TouchEnd,
+  [DOM_EVENT.MOUSE_UP]: MouseInteractionType.MouseUp,
+  [DOM_EVENT.MOUSE_DOWN]: MouseInteractionType.MouseDown,
+  [DOM_EVENT.CLICK]: MouseInteractionType.Click,
+  [DOM_EVENT.CONTEXT_MENU]: MouseInteractionType.ContextMenu,
+  [DOM_EVENT.DBL_CLICK]: MouseInteractionType.DblClick,
+  [DOM_EVENT.FOCUS]: MouseInteractionType.Focus,
+  [DOM_EVENT.BLUR]: MouseInteractionType.Blur,
+  [DOM_EVENT.TOUCH_START]: MouseInteractionType.TouchStart,
+  [DOM_EVENT.TOUCH_END]: MouseInteractionType.TouchEnd,
 }
 function initMouseInteractionObserver(
   cb: MouseInteractionCallBack,
@@ -135,7 +133,7 @@ function initMouseInteractionObserver(
       return
     }
     const { clientX, clientY } = isTouchEvent(event) ? event.changedTouches[0] : event
-    const position: MouseInteractionParam = {
+    const position: MouseInteraction = {
       id: getSerializedNodeId(target),
       type: eventTypeToMouseInteraction[event.type as keyof typeof eventTypeToMouseInteraction],
       x: clientX,
@@ -341,7 +339,7 @@ function initMediaInteractionObserver(
     }
     mediaInteractionCb({
       id: getSerializedNodeId(target),
-      type: event.type === DOM_EVENT.PLAY ? MediaInteractions.Play : MediaInteractions.Pause,
+      type: event.type === DOM_EVENT.PLAY ? MediaInteractionType.Play : MediaInteractionType.Pause,
     })
   }
   return addEventListeners(document, [DOM_EVENT.PLAY, DOM_EVENT.PAUSE], handler, { capture: true, passive: true }).stop

packages/rum/src/domain/record/record.ts

@@ -1,22 +1,20 @@
 import { assign, timeStampNow } from '@datadog/browser-core'
-import type { IncrementalSnapshotRecord } from '../../types'
-import { RecordType } from '../../types'
-import { serializeDocument } from './serialize'
-import { initObservers } from './observer'
-import { IncrementalSource } from './types'
 import type {
+  IncrementalSnapshotRecord,
   IncrementalData,
   InputData,
-  RecordAPI,
-  RecordOptions,
   MediaInteractionData,
   MouseInteractionData,
   MousemoveData,
   MutationData,
   ScrollData,
   StyleSheetRuleData,
   ViewportResizeData,
-} from './types'
+} from '../../types'
+import { RecordType, IncrementalSource } from '../../types'
+import { serializeDocument } from './serialize'
+import { initObservers } from './observer'
+import type { RecordAPI, RecordOptions } from './types'
 
 import { MutationController } from './mutationObserver'
 import { getVisualViewport, getScrollX, getScrollY, getWindowHeight, getWindowWidth } from './viewports'

packages/rum/src/domain/record/serialize.spec.ts

@@ -14,6 +14,8 @@ import {
   AST_MASK_USER_INPUT,
   generateLeanSerializedDoc,
 } from '../../../test/htmlAst'
+import type { ElementNode, SerializedNodeWithId, TextNode } from '../../types'
+import { NodeType } from '../../types'
 import { hasSerializedNode } from './serializationUtils'
 import type { SerializeOptions } from './serialize'
 import {
@@ -24,8 +26,6 @@ import {
   serializeAttribute,
 } from './serialize'
 import { MAX_ATTRIBUTE_VALUE_CHAR_LENGTH } from './privacy'
-import type { ElementNode, SerializedNodeWithId, TextNode } from './types'
-import { NodeType } from './types'
 
 const DEFAULT_OPTIONS: SerializeOptions = {
   document,

packages/rum/src/domain/record/serialize.ts

@@ -6,13 +6,6 @@ import {
   CENSORED_STRING_MARK,
   CENSORED_IMG_MARK,
 } from '../../constants'
-import {
-  getTextContent,
-  shouldMaskNode,
-  reducePrivacyLevel,
-  getNodeSelfPrivacyLevel,
-  MAX_ATTRIBUTE_VALUE_CHAR_LENGTH,
-} from './privacy'
 import type {
   SerializedNode,
   SerializedNodeWithId,
@@ -21,8 +14,15 @@ import type {
   ElementNode,
   TextNode,
   CDataNode,
-} from './types'
-import { NodeType } from './types'
+} from '../../types'
+import { NodeType } from '../../types'
+import {
+  getTextContent,
+  shouldMaskNode,
+  reducePrivacyLevel,
+  getNodeSelfPrivacyLevel,
+  MAX_ATTRIBUTE_VALUE_CHAR_LENGTH,
+} from './privacy'
 import { getSerializedNodeId, setSerializedNodeId, getElementInputValue } from './serializationUtils'
 import { forEach } from './utils'