Ark/leporello-js
1
0
Fork 0
mirror of https://github.com/leporello-js/leporello-js synced 2026-01-13 21:14:28 -08:00
Code Issues Packages Projects Releases Wiki Activity

set status in Promise.then

Browse Source
This commit is contained in:
Dmitry Vasilev
2023-01-17 17:27:31 +08:00
parent 32b294c879
commit c4768bc0e6
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.js
View File

@@ -298,14 +298,18 @@ export const eval_modules = (
promise_then = Promise.prototype.then promise_then = Promise.prototype.then
Promise.prototype.then = function then(on_resolve, on_reject) { Promise.prototype.then = function then(on_resolve, on_reject) {
if(children == null) { if(children == null) {
children = [] children = []
} }
let children_copy = children let children_copy = children
const make_callback = cb => typeof(cb) != 'function' const make_callback = (cb, ok) => typeof(cb) != 'function'
? cb ? cb
: value => { : value => {
if(this.status == null) {
this.status = ok ? {ok, value} : {ok, error: value}
}
const current = children const current = children
children = children_copy children = children_copy
try { try {
@@ -317,8 +321,8 @@ export const eval_modules = (
return promise_then.call( return promise_then.call(
this, this,
make_callback(on_resolve), make_callback(on_resolve, true),
make_callback(on_reject), make_callback(on_reject, false),
) )
} }
} }

27
test/test.js
View File

@@ -2749,6 +2749,33 @@ const y = x()`
assert_equal(call_delay.fn.name, 'delay') assert_equal(call_delay.fn.name, 'delay')
}), }),
test('async/await Promise.all set child promises status ok', async () => {
const i = await test_initial_state_async(`
const async_fn = async () => 1
await Promise.all([1,2,3].map(async_fn))
`)
const async_fn_call =
root_calltree_node(i)
.children[0] // map
.children[0] // first call of async_fn
assert_equal(async_fn_call.value.status.ok, true)
assert_equal(async_fn_call.value.status.value, 1)
}),
test('async/await Promise.all set child promises status error',
async () => {
const i = await test_initial_state_async(`
const async_fn = async () => { throw 1 }
await Promise.all([1,2,3].map(async_fn))
`)
const async_fn_call =
root_calltree_node(i)
.children[0] // map
.children[0] // first call of async_fn
assert_equal(async_fn_call.value.status.ok, false)
assert_equal(async_fn_call.value.status.error, 1)
}),
test('async/await logs out of order', async () => { test('async/await logs out of order', async () => {
const i = await test_initial_state_async(` const i = await test_initial_state_async(`
// Init promises p1 and p2 that are resolved in different order (p2 then // Init promises p1 and p2 that are resolved in different order (p2 then