Unverified Commit 71cb06d0 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[dev-overlay] Discriminate stack frame settled typed (#76517)

parent a606ff7e
......@@ -32,7 +32,7 @@ const frame = {
lineNumber: 10,
column: 5,
},
error: false,
error: false as const,
reason: null,
external: false,
ignored: false,
......
......@@ -33,7 +33,7 @@ const frame = {
column: 5,
},
originalCodeFrame: 'export default function MyComponent() {',
error: false,
error: false as const,
reason: null,
external: false,
ignored: false,
......
......@@ -8,21 +8,34 @@ import {
isWebpackInternalResource,
formatFrameSourceFile,
} from './webpack-module-path'
export interface OriginalStackFrame extends OriginalStackFrameResponse {
error: boolean
reason: string | null
export interface ResolvedOriginalStackFrame extends OriginalStackFrameResponse {
error: false
reason: null
external: boolean
ignored: boolean
sourceStackFrame: StackFrame
}
export interface RejectedOriginalStackFrame extends OriginalStackFrameResponse {
error: true
reason: string
external: boolean
ignored: boolean
sourceStackFrame: StackFrame
}
export type OriginalStackFrame =
| ResolvedOriginalStackFrame
| RejectedOriginalStackFrame
function getOriginalStackFrame(
source: StackFrame,
response: OriginalStackFrameResponseResult
): Promise<OriginalStackFrame> {
async function _getOriginalStackFrame(): Promise<OriginalStackFrame> {
async function _getOriginalStackFrame(): Promise<ResolvedOriginalStackFrame> {
if (response.status === 'rejected') {
return Promise.reject(new Error(response.reason))
throw new Error(response.reason)
}
const body: OriginalStackFrameResponse = response.value
......@@ -53,16 +66,18 @@ function getOriginalStackFrame(
})
}
return _getOriginalStackFrame().catch((err: Error) => ({
error: true,
reason: err?.message ?? err?.toString() ?? 'Unknown Error',
external: false,
sourceStackFrame: source,
originalStackFrame: null,
originalCodeFrame: null,
sourcePackage: null,
ignored: false,
}))
return _getOriginalStackFrame().catch(
(err: Error): RejectedOriginalStackFrame => ({
error: true,
reason: err?.message ?? err?.toString() ?? 'Unknown Error',
external: false,
sourceStackFrame: source,
originalStackFrame: null,
originalCodeFrame: null,
sourcePackage: null,
ignored: false,
})
)
}
export async function getOriginalStackFrames(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment