🚚 [RUMF-848] move types and constants to respect the new ESLint rule

BenoitZugmeyer · BenoitZugmeyer · commit 62dd2d14a2dc · 2021-02-10T16:04:00.000+01:00
diff --git a/packages/rum-core/src/boot/rumPublicApi.spec.ts b/packages/rum-core/src/boot/rumPublicApi.spec.ts
@@ -1,6 +1,6 @@
 import { ErrorSource, ONE_SECOND } from '@datadog/browser-core'
 import { setup, TestSetupBuilder } from '../../test/specHelper'
-import { ActionType } from '../domain/rumEventsCollection/action/trackActions'
+import { ActionType } from '../rawRumEvent.types'
 import { makeRumPublicApi, RumPublicApi, RumUserConfiguration, StartRum } from './rumPublicApi'
 
 const noopStartRum = (): ReturnType<StartRum> => ({
diff --git a/packages/rum-core/src/boot/rumPublicApi.ts b/packages/rum-core/src/boot/rumPublicApi.ts
@@ -12,9 +12,9 @@ import {
   monitor,
   UserConfiguration,
 } from '@datadog/browser-core'
-import { ActionType, CustomAction } from '../domain/rumEventsCollection/action/trackActions'
+import { CustomAction } from '../domain/rumEventsCollection/action/trackActions'
 import { ProvidedError, ProvidedSource } from '../domain/rumEventsCollection/error/errorCollection'
-import { CommonContext, User } from '../rawRumEvent.types'
+import { CommonContext, User, ActionType } from '../rawRumEvent.types'
 import { RumEvent } from '../rumEvent.types'
 import { startRum } from './rum'
 
diff --git a/packages/rum-core/src/domain/rumEventsCollection/action/actionCollection.spec.ts b/packages/rum-core/src/domain/rumEventsCollection/action/actionCollection.spec.ts
@@ -1,8 +1,7 @@
 import { setup, TestSetupBuilder } from '../../../../test/specHelper'
-import { RumEventType } from '../../../rawRumEvent.types'
+import { RumEventType, ActionType } from '../../../rawRumEvent.types'
 import { LifeCycleEventType } from '../../lifeCycle'
 import { startActionCollection } from './actionCollection'
-import { ActionType } from './trackActions'
 
 describe('actionCollection', () => {
   let setupBuilder: TestSetupBuilder
diff --git a/packages/rum-core/src/domain/rumEventsCollection/action/actionCollection.ts b/packages/rum-core/src/domain/rumEventsCollection/action/actionCollection.ts
@@ -1,7 +1,7 @@
 import { combine, Configuration, getTimestamp, msToNs } from '@datadog/browser-core'
-import { CommonContext, RumEventType } from '../../../rawRumEvent.types'
+import { CommonContext, RumEventType, ActionType } from '../../../rawRumEvent.types'
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'
-import { ActionType, AutoAction, CustomAction, trackActions } from './trackActions'
+import { AutoAction, CustomAction, trackActions } from './trackActions'
 
 export function startActionCollection(lifeCycle: LifeCycle, configuration: Configuration) {
   lifeCycle.subscribe(LifeCycleEventType.AUTO_ACTION_COMPLETED, (action) =>
diff --git a/packages/rum-core/src/domain/rumEventsCollection/action/trackActions.spec.ts b/packages/rum-core/src/domain/rumEventsCollection/action/trackActions.spec.ts
@@ -1,10 +1,10 @@
 import { DOM_EVENT } from '@datadog/browser-core'
 import { createRawRumEvent } from '../../../../test/fixtures'
 import { setup, TestSetupBuilder } from '../../../../test/specHelper'
-import { RumEventType } from '../../../rawRumEvent.types'
+import { RumEventType, ActionType } from '../../../rawRumEvent.types'
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'
 import { PAGE_ACTIVITY_MAX_DURATION, PAGE_ACTIVITY_VALIDATION_DELAY } from '../../trackPageActivities'
-import { ActionType, AutoAction, trackActions } from './trackActions'
+import { AutoAction, trackActions } from './trackActions'
 
 // Used to wait some time after the creation of a action
 const BEFORE_PAGE_ACTIVITY_VALIDATION_DELAY = PAGE_ACTIVITY_VALIDATION_DELAY * 0.8
diff --git a/packages/rum-core/src/domain/rumEventsCollection/action/trackActions.ts b/packages/rum-core/src/domain/rumEventsCollection/action/trackActions.ts
@@ -2,13 +2,9 @@ import { addEventListener, Context, DOM_EVENT, generateUUID } from '@datadog/bro
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'
 import { EventCounts, trackEventCounts } from '../../trackEventCounts'
 import { waitIdlePageActivity } from '../../trackPageActivities'
+import { ActionType } from '../../../rawRumEvent.types'
 import { getActionNameFromElement } from './getActionNameFromElement'
 
-export enum ActionType {
-  CLICK = 'click',
-  CUSTOM = 'custom',
-}
-
 type AutoActionType = ActionType.CLICK
 
 export interface ActionCounts {
diff --git a/packages/rum-core/src/domain/rumEventsCollection/resource/resourceUtils.ts b/packages/rum-core/src/domain/rumEventsCollection/resource/resourceUtils.ts
@@ -8,13 +8,9 @@ import {
   ResourceType,
 } from '@datadog/browser-core'
 
+import { PerformanceResourceDetailsElement } from '../../../rawRumEvent.types'
 import { RumPerformanceResourceTiming } from '../../../browser/performanceCollection'
 
-export interface PerformanceResourceDetailsElement {
-  duration: number
-  start: number
-}
-
 export interface PerformanceResourceDetails {
   redirect?: PerformanceResourceDetailsElement
   dns?: PerformanceResourceDetailsElement
diff --git a/packages/rum-core/src/domain/rumEventsCollection/view/trackViews.spec.ts b/packages/rum-core/src/domain/rumEventsCollection/view/trackViews.spec.ts
@@ -5,14 +5,14 @@ import {
   RumPerformanceNavigationTiming,
   RumPerformancePaintTiming,
 } from '../../../browser/performanceCollection'
-import { RumEventType } from '../../../rawRumEvent.types'
+import { RumEventType, ViewLoadingType } from '../../../rawRumEvent.types'
 import { LifeCycleEventType } from '../../lifeCycle'
 import {
   PAGE_ACTIVITY_END_DELAY,
   PAGE_ACTIVITY_MAX_DURATION,
   PAGE_ACTIVITY_VALIDATION_DELAY,
 } from '../../trackPageActivities'
-import { THROTTLE_VIEW_UPDATE_PERIOD, trackViews, View, ViewCreatedEvent, ViewLoadingType } from './trackViews'
+import { THROTTLE_VIEW_UPDATE_PERIOD, trackViews, View, ViewCreatedEvent } from './trackViews'
 
 const AFTER_PAGE_ACTIVITY_MAX_DURATION = PAGE_ACTIVITY_MAX_DURATION * 1.1
 const BEFORE_PAGE_ACTIVITY_VALIDATION_DELAY = PAGE_ACTIVITY_VALIDATION_DELAY * 0.8
diff --git a/packages/rum-core/src/domain/rumEventsCollection/view/trackViews.ts b/packages/rum-core/src/domain/rumEventsCollection/view/trackViews.ts
@@ -4,6 +4,7 @@ import { supportPerformanceTimingEvent } from '../../../browser/performanceColle
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'
 import { EventCounts, trackEventCounts } from '../../trackEventCounts'
 import { waitIdlePageActivity } from '../../trackPageActivities'
+import { ViewLoadingType, ViewCustomTimings } from '../../../rawRumEvent.types'
 import { Timings, trackTimings } from './trackTimings'
 
 export interface View {
@@ -29,15 +30,6 @@ export interface ViewCreatedEvent {
   startTime: number
 }
 
-export enum ViewLoadingType {
-  INITIAL_LOAD = 'initial_load',
-  ROUTE_CHANGE = 'route_change',
-}
-
-export interface ViewCustomTimings {
-  [key: string]: number
-}
-
 export const THROTTLE_VIEW_UPDATE_PERIOD = 3000
 export const SESSION_KEEP_ALIVE_INTERVAL = 5 * ONE_MINUTE
 
diff --git a/packages/rum-core/src/domain/rumEventsCollection/view/viewCollection.spec.ts b/packages/rum-core/src/domain/rumEventsCollection/view/viewCollection.spec.ts
@@ -1,7 +1,6 @@
 import { setup, TestSetupBuilder } from '../../../../test/specHelper'
-import { RumEventType } from '../../../rawRumEvent.types'
+import { RumEventType, ViewLoadingType } from '../../../rawRumEvent.types'
 import { LifeCycleEventType } from '../../lifeCycle'
-import { ViewLoadingType } from './trackViews'
 import { startViewCollection } from './viewCollection'
 
 describe('viewCollection', () => {
diff --git a/packages/rum-core/src/rawRumEvent.types.ts b/packages/rum-core/src/rawRumEvent.types.ts
@@ -1,7 +1,4 @@
-import { Context, ErrorSource, ResourceType } from '@datadog/browser-core'
-import { ActionType } from './domain/rumEventsCollection/action/trackActions'
-import { PerformanceResourceDetailsElement } from './domain/rumEventsCollection/resource/resourceUtils'
-import { ViewCustomTimings, ViewLoadingType } from './domain/rumEventsCollection/view/trackViews'
+import type { Context, ErrorSource, ResourceType } from '@datadog/browser-core'
 
 export enum RumEventType {
   ACTION = 'action',
@@ -35,6 +32,11 @@ export interface RawRumResourceEvent {
   }
 }
 
+export interface PerformanceResourceDetailsElement {
+  duration: number
+  start: number
+}
+
 export interface RawRumErrorEvent {
   date: number
   type: RumEventType.ERROR
@@ -79,6 +81,15 @@ export interface RawRumViewEvent {
   }
 }
 
+export enum ViewLoadingType {
+  INITIAL_LOAD = 'initial_load',
+  ROUTE_CHANGE = 'route_change',
+}
+
+export interface ViewCustomTimings {
+  [key: string]: number
+}
+
 interface Count {
   count: number
 }
@@ -107,6 +118,11 @@ export interface RawRumActionEvent {
   }
 }
 
+export enum ActionType {
+  CLICK = 'click',
+  CUSTOM = 'custom',
+}
+
 export type RawRumEvent =
   | RawRumErrorEvent
   | RawRumResourceEvent
diff --git a/packages/rum-core/test/fixtures.ts b/packages/rum-core/test/fixtures.ts
@@ -1,8 +1,6 @@
 import { combine, Context, ErrorSource, ResourceType } from '@datadog/browser-core'
 import { RumPerformanceResourceTiming } from '../src/browser/performanceCollection'
-import { ActionType } from '../src/domain/rumEventsCollection/action/trackActions'
-import { ViewLoadingType } from '../src/domain/rumEventsCollection/view/trackViews'
-import { RawRumEvent, RumEventType } from '../src/rawRumEvent.types'
+import { RawRumEvent, RumEventType, ActionType, ViewLoadingType } from '../src/rawRumEvent.types'
 
 export function createRawRumEvent(type: RumEventType, overrides?: Context): RawRumEvent {
   switch (type) {
diff --git a/packages/rum-recorder/src/constants.ts b/packages/rum-recorder/src/constants.ts
@@ -0,0 +1,6 @@
+export const PRIVACY_ATTR_NAME = 'data-dd-privacy'
+export const PRIVACY_ATTR_VALUE_HIDDEN = 'hidden'
+export const PRIVACY_ATTR_VALUE_INPUT_IGNORED = 'input-ignored'
+
+export const PRIVACY_CLASS_HIDDEN = 'dd-privacy-hidden'
+export const PRIVACY_CLASS_INPUT_IGNORED = 'dd-privacy-input-ignored'
diff --git a/packages/rum-recorder/src/domain/privacy.ts b/packages/rum-recorder/src/domain/privacy.ts
@@ -1,9 +1,10 @@
-export const PRIVACY_ATTR_NAME = 'data-dd-privacy'
-export const PRIVACY_ATTR_VALUE_HIDDEN = 'hidden'
-export const PRIVACY_ATTR_VALUE_INPUT_IGNORED = 'input-ignored'
-
-export const PRIVACY_CLASS_HIDDEN = 'dd-privacy-hidden'
-export const PRIVACY_CLASS_INPUT_IGNORED = 'dd-privacy-input-ignored'
+import {
+  PRIVACY_ATTR_NAME,
+  PRIVACY_ATTR_VALUE_HIDDEN,
+  PRIVACY_CLASS_HIDDEN,
+  PRIVACY_ATTR_VALUE_INPUT_IGNORED,
+  PRIVACY_CLASS_INPUT_IGNORED,
+} from '../constants'
 
 // PRIVACY_INPUT_TYPES_TO_IGNORE defines the input types whose input
 // events we want to ignore by default, as they often contain PII.
diff --git a/packages/rum-recorder/src/domain/rrweb/types.ts b/packages/rum-recorder/src/domain/rrweb/types.ts
@@ -1,4 +1,4 @@
-import { IdNodeMap, INode, MaskInputOptions, SerializedNodeWithId, SlimDOMOptions } from '../rrweb-snapshot'
+import { IdNodeMap, INode, MaskInputOptions, SerializedNodeWithId, SlimDOMOptions } from '../rrweb-snapshot/types'
 import type { RawRecord } from '../../types'
 
 export enum IncrementalSource {
diff --git a/packages/rum-recorder/src/internal.ts b/packages/rum-recorder/src/internal.ts
@@ -22,6 +22,6 @@ export {
   PRIVACY_ATTR_VALUE_INPUT_IGNORED,
   PRIVACY_CLASS_HIDDEN,
   PRIVACY_CLASS_INPUT_IGNORED,
-} from './domain/privacy'
+} from './constants'
 
 export * from './types'
diff --git a/packages/rum-recorder/src/types.ts b/packages/rum-recorder/src/types.ts
@@ -1,4 +1,4 @@
-import { SerializedNodeWithId } from './domain/rrweb-snapshot'
+import { SerializedNodeWithId } from './domain/rrweb-snapshot/types'
 import type { IncrementalData } from './domain/rrweb/types'
 
 export { IncrementalSource } from './domain/rrweb/types'
