Unverified Commit 6b393477 authored by Janka Uryga's avatar Janka Uryga Committed by GitHub

fix(after): improve error message if promise arg rejects (#73524)

This PR fixes a misleading error message. When a promise passed to
`unstable_after` rejected, we were accidentally printing this:
```
An error occurred in a function passed to `unstable_after()`: ...
                       ^^^^^^^^      
                  should be "promise"!
```
parent 774579e5
...@@ -49,7 +49,9 @@ export class AfterContext { ...@@ -49,7 +49,9 @@ export class AfterContext {
if (!this.waitUntil) { if (!this.waitUntil) {
errorWaitUntilNotAvailable() errorWaitUntilNotAvailable()
} }
this.waitUntil(task.catch((error) => this.reportTaskError(error))) this.waitUntil(
task.catch((error) => this.reportTaskError('promise', error))
)
} else if (typeof task === 'function') { } else if (typeof task === 'function') {
// TODO(after): implement tracing // TODO(after): implement tracing
this.addCallback(task) this.addCallback(task)
...@@ -98,7 +100,7 @@ export class AfterContext { ...@@ -98,7 +100,7 @@ export class AfterContext {
callback() callback()
) )
} catch (error) { } catch (error) {
this.reportTaskError(error) this.reportTaskError('function', error)
} }
}) })
...@@ -128,11 +130,13 @@ export class AfterContext { ...@@ -128,11 +130,13 @@ export class AfterContext {
}) })
} }
private reportTaskError(error: unknown) { private reportTaskError(taskKind: 'promise' | 'function', error: unknown) {
// TODO(after): this is fine for now, but will need better intergration with our error reporting. // TODO(after): this is fine for now, but will need better intergration with our error reporting.
// TODO(after): should we log this if we have a onTaskError callback? // TODO(after): should we log this if we have a onTaskError callback?
console.error( console.error(
'An error occurred in a function passed to `unstable_after()`:', taskKind === 'promise'
? `A promise passed to \`unstable_after()\` rejected:`
: `An error occurred in a function passed to \`unstable_after()\`:`,
error error
) )
if (this.onTaskError) { if (this.onTaskError) {
......
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