remove generic

Author: billyvg

packages/replay/src/coreHandlers/handleScope.ts

@@ -47,8 +47,8 @@ export function handleScope(scope: Scope): Breadcrumb | null {
 
   if (
     typeof newBreadcrumb.category !== 'string' ||
-    (['fetch', 'xhr', 'sentry.event', 'sentry.transaction'].includes(newBreadcrumb.category) ||
-      newBreadcrumb.category.startsWith('ui.'))
+    ['fetch', 'xhr', 'sentry.event', 'sentry.transaction'].includes(newBreadcrumb.category) ||
+    newBreadcrumb.category.startsWith('ui.')
   ) {
     return null;
   }
@@ -61,7 +61,9 @@ export function handleScope(scope: Scope): Breadcrumb | null {
 }
 
 /** exported for tests only */
-export function normalizeConsoleBreadcrumb(breadcrumb: Omit<Breadcrumb, 'category'> & BreadcrumbWithCategory): ReplayFrame {
+export function normalizeConsoleBreadcrumb(
+  breadcrumb: Omit<Breadcrumb, 'category'> & BreadcrumbWithCategory,
+): ReplayFrame {
   const args = breadcrumb.data && breadcrumb.data.arguments;
 
   if (!Array.isArray(args) || args.length === 0) {

packages/replay/src/index.ts

@@ -1,2 +1,9 @@
 export { Replay } from './integration';
-export type { ReplayFrame, ReplayFrameEvent, CrumbFrame, CrumbFrameEvent, SpanFrame, SpanFrameEvent } from './types/replayFrame';
+export type {
+  ReplayFrame,
+  ReplayFrameEvent,
+  CrumbFrame,
+  CrumbFrameEvent,
+  SpanFrame,
+  SpanFrameEvent,
+} from './types/replayFrame';

packages/replay/src/types/replayFrame.ts

@@ -1,16 +1,16 @@
 import type { customEvent } from '@sentry-internal/rrweb';
-import type {Breadcrumb, FetchBreadcrumbData, XhrBreadcrumbData} from '@sentry/types';
+import type { Breadcrumb, FetchBreadcrumbData, XhrBreadcrumbData } from '@sentry/types';
 
 import type { AllEntryData } from '../types';
 
-interface BaseReplayFrame<T = undefined|Record<string, any>> {
+interface BaseReplayFrame {
   timestamp: number;
   /**
    * For compatibility reasons
    */
   type: string;
   category: string;
-  data?: T;
+  data?: Record<string, any>;
   message?: string;
 }
 
@@ -29,40 +29,45 @@ interface ConsoleFrameData {
   logger: string;
   arguments?: any[];
 }
-interface ConsoleFrame extends BaseReplayFrame<ConsoleFrameData> {
+interface ConsoleFrame extends BaseReplayFrame {
   category: 'console';
   level: Breadcrumb['level'];
   message: string;
+  data: ConsoleFrameData;
 }
 
 type ClickFrameData = BaseDomFrameData;
-interface ClickFrame extends BaseReplayFrame<ClickFrameData> {
+interface ClickFrame extends BaseReplayFrame {
   category: 'ui.click';
   message: string;
+  data: ClickFrameData;
 }
 
-interface FetchFrame extends BaseReplayFrame<FetchBreadcrumbData> {
+interface FetchFrame extends BaseReplayFrame {
   category: 'fetch';
   type: 'http';
+  data: FetchBreadcrumbData;
 }
 
 interface InputFrame extends BaseReplayFrame {
   category: 'ui.input';
   message: string;
 }
 
-interface XhrFrame extends BaseReplayFrame<XhrBreadcrumbData> {
+interface XhrFrame extends BaseReplayFrame {
   category: 'xhr';
   type: 'http';
+  data: XhrBreadcrumbData;
 }
 
 /* Crumbs from Replay */
 interface MutationFrameData {
   count: number;
   limit: boolean;
 }
-interface MutationFrame extends BaseReplayFrame<MutationFrameData> {
+interface MutationFrame extends BaseReplayFrame {
   category: 'replay.mutations';
+  data: MutationFrameData;
 }
 
 interface KeyboardEventFrameData extends BaseDomFrameData {
@@ -72,14 +77,16 @@ interface KeyboardEventFrameData extends BaseDomFrameData {
   altKey: boolean;
   key: string;
 }
-interface KeyboardEventFrame extends BaseReplayFrame<KeyboardEventFrameData>{
+interface KeyboardEventFrame extends BaseReplayFrame {
   category: 'ui.keyDown';
+  data: KeyboardEventFrameData;
 }
 
-interface BlurFrame extends BaseReplayFrame<undefined> {
+interface BlurFrame extends BaseReplayFrame {
   category: 'ui.blur';
 }
-interface FocusFrame extends BaseReplayFrame<undefined> {
+
+interface FocusFrame extends BaseReplayFrame {
   category: 'ui.focus';
 }
 
@@ -88,11 +95,23 @@ interface SlowClickFrameData extends ClickFrameData {
   timeAfterClickFs: number;
   endReason: string;
 }
-interface SlowClickFrame extends BaseReplayFrame<SlowClickFrameData> {
+interface SlowClickFrame extends BaseReplayFrame {
   category: 'ui.slowClickDetected';
-}
-
-export type CrumbFrame = ConsoleFrame | ClickFrame | FetchFrame | InputFrame | XhrFrame | KeyboardEventFrame | BlurFrame | FocusFrame | SlowClickFrame | MutationFrame | BaseReplayFrame;
+  data: SlowClickFrameData;
+}
+
+export type CrumbFrame =
+  | ConsoleFrame
+  | ClickFrame
+  | FetchFrame
+  | InputFrame
+  | XhrFrame
+  | KeyboardEventFrame
+  | BlurFrame
+  | FocusFrame
+  | SlowClickFrame
+  | MutationFrame
+  | BaseReplayFrame;
 
 export interface SpanFrame {
   op: string;

packages/replay/src/util/createBreadcrumb.ts

@@ -3,8 +3,8 @@ import type { CrumbFrame } from '../types/replayFrame';
 /**
  * Create a breadcrumb for a replay.
  */
-export function createBreadcrumb (
-  breadcrumb: Omit<CrumbFrame, 'timestamp'|'type'> & Partial<Pick<CrumbFrame, 'timestamp'>>,
+export function createBreadcrumb(
+  breadcrumb: Omit<CrumbFrame, 'timestamp' | 'type'> & Partial<Pick<CrumbFrame, 'timestamp'>>,
 ): CrumbFrame {
   return {
     timestamp: Date.now() / 1000,