address review

Author: balazsorban44

packages/next/src/client/components/react-dev-overlay/internal/helpers/group-stack-frames-by-framework.ts

@@ -1,7 +1,8 @@
+import type { SourcePackage } from '../../server/shared'
 import type { OriginalStackFrame } from './stack-frame'
 
 export type StackFramesGroup = {
-  framework?: OriginalStackFrame['sourcePackage']
+  framework?: SourcePackage | null
   stackFrames: OriginalStackFrame[]
 }
 

packages/next/src/client/components/react-dev-overlay/internal/helpers/stack-frame.ts

@@ -1,37 +1,13 @@
 import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
 import type { OriginalStackFrameResponse } from '../../server/shared'
 
-export type OriginalStackFrame =
-  | {
-      error: true
-      reason: string
-      external: false
-      expanded: false
-      sourceStackFrame: StackFrame
-      originalStackFrame: null
-      originalCodeFrame: null
-      sourcePackage: OriginalStackFrameResponse['sourcePackage']
-    }
-  | {
-      error: false
-      reason: null
-      external: false
-      expanded: boolean
-      sourceStackFrame: StackFrame
-      originalStackFrame: StackFrame
-      originalCodeFrame: string | null
-      sourcePackage: OriginalStackFrameResponse['sourcePackage']
-    }
-  | {
-      error: false
-      reason: null
-      external: true
-      expanded: false
-      sourceStackFrame: StackFrame
-      originalStackFrame: null
-      originalCodeFrame: null
-      sourcePackage: OriginalStackFrameResponse['sourcePackage']
-    }
+export interface OriginalStackFrame extends OriginalStackFrameResponse {
+  error: boolean
+  reason: string | null
+  external: boolean
+  expanded: boolean
+  sourceStackFrame: StackFrame
+}
 
 function getOriginalStackFrame(
   source: StackFrame,

packages/next/src/client/components/react-dev-overlay/server/middleware-turbopack.ts

@@ -71,7 +71,7 @@ async function batchedTraceSource(
 export async function createOriginalStackFrame(
   project: Project,
   frame: TurbopackStackFrame
-): Promise<Partial<OriginalStackFrameResponse> | null> {
+): Promise<OriginalStackFrameResponse | null> {
   const traced = await batchedTraceSource(project, frame)
   if (!traced) {
     const sourcePackage = findSourcePackage(frame.file)

packages/next/src/client/components/react-dev-overlay/server/shared.ts

@@ -1,10 +1,12 @@
 import type { StackFrame } from 'stacktrace-parser'
 
+export type SourcePackage = 'react' | 'next'
+
 export type OriginalStackFrameResponse = {
-  originalStackFrame: StackFrame
-  originalCodeFrame: string | null
+  originalStackFrame?: StackFrame | null
+  originalCodeFrame?: string | null
   /** We use this to group frames in the error overlay */
-  sourcePackage: 'react' | 'next' | null
+  sourcePackage?: SourcePackage | null
 }
 
 /** React that's compiled with `next`. Used by App Router. */