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 = { ...@@ -32,7 +32,7 @@ const frame = {
lineNumber: 10, lineNumber: 10,
column: 5, column: 5,
}, },
error: false, error: false as const,
reason: null, reason: null,
external: false, external: false,
ignored: false, ignored: false,
......
...@@ -33,7 +33,7 @@ const frame = { ...@@ -33,7 +33,7 @@ const frame = {
column: 5, column: 5,
}, },
originalCodeFrame: 'export default function MyComponent() {', originalCodeFrame: 'export default function MyComponent() {',
error: false, error: false as const,
reason: null, reason: null,
external: false, external: false,
ignored: false, ignored: false,
......
...@@ -8,21 +8,34 @@ import { ...@@ -8,21 +8,34 @@ import {
isWebpackInternalResource, isWebpackInternalResource,
formatFrameSourceFile, formatFrameSourceFile,
} from './webpack-module-path' } from './webpack-module-path'
export interface OriginalStackFrame extends OriginalStackFrameResponse {
error: boolean export interface ResolvedOriginalStackFrame extends OriginalStackFrameResponse {
reason: string | null error: false
reason: null
external: boolean external: boolean
ignored: boolean ignored: boolean
sourceStackFrame: StackFrame sourceStackFrame: StackFrame
} }
export interface RejectedOriginalStackFrame extends OriginalStackFrameResponse {
error: true
reason: string
external: boolean
ignored: boolean
sourceStackFrame: StackFrame
}
export type OriginalStackFrame =
| ResolvedOriginalStackFrame
| RejectedOriginalStackFrame
function getOriginalStackFrame( function getOriginalStackFrame(
source: StackFrame, source: StackFrame,
response: OriginalStackFrameResponseResult response: OriginalStackFrameResponseResult
): Promise<OriginalStackFrame> { ): Promise<OriginalStackFrame> {
async function _getOriginalStackFrame(): Promise<OriginalStackFrame> { async function _getOriginalStackFrame(): Promise<ResolvedOriginalStackFrame> {
if (response.status === 'rejected') { if (response.status === 'rejected') {
return Promise.reject(new Error(response.reason)) throw new Error(response.reason)
} }
const body: OriginalStackFrameResponse = response.value const body: OriginalStackFrameResponse = response.value
...@@ -53,7 +66,8 @@ function getOriginalStackFrame( ...@@ -53,7 +66,8 @@ function getOriginalStackFrame(
}) })
} }
return _getOriginalStackFrame().catch((err: Error) => ({ return _getOriginalStackFrame().catch(
(err: Error): RejectedOriginalStackFrame => ({
error: true, error: true,
reason: err?.message ?? err?.toString() ?? 'Unknown Error', reason: err?.message ?? err?.toString() ?? 'Unknown Error',
external: false, external: false,
...@@ -62,7 +76,8 @@ function getOriginalStackFrame( ...@@ -62,7 +76,8 @@ function getOriginalStackFrame(
originalCodeFrame: null, originalCodeFrame: null,
sourcePackage: null, sourcePackage: null,
ignored: false, ignored: false,
})) })
)
} }
export async function getOriginalStackFrames( 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