mirror of
https://github.com/leporello-js/leporello-js
synced 2026-01-13 13:04:30 -08:00
fix deferred calls bug
This commit is contained in:
2
src/effects.js
vendored
2
src/effects.js
vendored
@@ -183,7 +183,7 @@ export const render_common_side_effects = (prev, next, command, ui) => {
|
||||
next.eval_modules_state != null
|
||||
) {
|
||||
const s = next.eval_modules_state
|
||||
s.promise.then(result => {
|
||||
s.promise.__original_then(result => {
|
||||
exec('eval_modules_finished',
|
||||
next, /* becomes prev_state */
|
||||
result,
|
||||
|
||||
@@ -362,7 +362,7 @@ export const eval_modules = (
|
||||
})
|
||||
|
||||
if(is_async) {
|
||||
return result.then(make_result)
|
||||
return result.__original_then(make_result)
|
||||
} else {
|
||||
return make_result(result)
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ const io_patch = (path, use_context = false) => {
|
||||
: original.apply(this, args)
|
||||
|
||||
if(value instanceof cxt.window.Promise) {
|
||||
// TODO use cxt.promise_then, not finally which calls
|
||||
// TODO use __original_then, not finally which calls
|
||||
// patched 'then'?
|
||||
value = value.finally(() => {
|
||||
if(cxt_copy != cxt) {
|
||||
|
||||
@@ -16,8 +16,7 @@ const gen_to_promise = gen_fn => {
|
||||
} else {
|
||||
// If promise
|
||||
if(result.value?.then != null) {
|
||||
return result.value.then.__original.call(
|
||||
result.value,
|
||||
return result.value.__original_then(
|
||||
value => next(gen.next(value)),
|
||||
error => next(gen.throw(error)),
|
||||
)
|
||||
@@ -113,6 +112,10 @@ const apply_promise_patch = cxt => {
|
||||
|
||||
cxt.promise_then = cxt.window.Promise.prototype.then
|
||||
|
||||
if(cxt.window.Promise.prototype.__original_then == null) {
|
||||
cxt.window.Promise.prototype.__original_then = cxt.window.Promise.prototype.then
|
||||
}
|
||||
|
||||
cxt.window.Promise.prototype.then = function then(on_resolve, on_reject) {
|
||||
|
||||
if(cxt.children == null) {
|
||||
@@ -135,14 +138,11 @@ const apply_promise_patch = cxt => {
|
||||
}
|
||||
}
|
||||
|
||||
return cxt.promise_then.call(
|
||||
this,
|
||||
return this.__original_then(
|
||||
make_callback(on_resolve, true),
|
||||
make_callback(on_reject, false),
|
||||
)
|
||||
}
|
||||
|
||||
cxt.window.Promise.prototype.then.__original = cxt.promise_then
|
||||
}
|
||||
|
||||
const remove_promise_patch = cxt => {
|
||||
@@ -266,7 +266,7 @@ const __do_await = async (cxt, value) => {
|
||||
}
|
||||
const children_copy = cxt.children
|
||||
if(value instanceof cxt.window.Promise) {
|
||||
cxt.promise_then.call(value,
|
||||
value.__original_then(
|
||||
v => {
|
||||
value.status = {ok: true, value: v}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user