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

fix toJSON calls from value explorer

Browse Source
This commit is contained in:
Dmitry Vasilev
2023-06-10 23:44:43 +03:00
parent 05a43b617f
commit 624759e7a1
2 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/editor/value_explorer.js
View File

@@ -5,6 +5,7 @@
// content
import {el, stringify, scrollIntoViewIfNeeded} from './domutils.js'
import {with_code_execution} from '../index.js'
// We test both for Object and globalThis.run_window.Object because objects may
@@ -31,7 +32,9 @@ const isDate = object =>
const toJSON_safe = object => {
try {
return object.toJSON()
return with_code_execution(() => {
return object.toJSON()
})
} catch(e) {
return object
}

56
src/index.js
View File

@@ -177,6 +177,25 @@ export const init = (container, _COMMANDS) => {
export const get_state = () => state
export const with_code_execution = (action, state = get_state()) => {
/*
supress is_recording_deferred_calls while rendering, because rendering may
call toJSON(), which can call trigger deferred call (see lodash.js lazy
chaining)
*/
if(state.eval_cxt != null) {
state.eval_cxt.is_recording_deferred_calls = false
}
try {
return action()
} finally {
if(state.eval_cxt != null) {
state.eval_cxt.is_recording_deferred_calls = true
}
}
}
export const exec = (cmd, ...args) => {
if(cmd == 'input' || cmd == 'write') {
// Do not print file to console
@@ -210,32 +229,23 @@ export const exec = (cmd, ...args) => {
throw new Error('illegal state')
}
/*
supress is_recording_deferred_calls while rendering, because rendering may
call toJSON(), which can call trigger deferred call (see lodash.js lazy
chaining)
*/
if(nextstate.eval_cxt != null) {
nextstate.eval_cxt.is_recording_deferred_calls = false
}
render_common_side_effects(state, nextstate, cmd, ui);
with_code_execution(() => {
render_common_side_effects(state, nextstate, cmd, ui);
if(effects != null) {
(Array.isArray(effects) ? effects : [effects]).forEach(e => {
if(e.type == 'write' || e.type == 'save_to_localstorage') {
// do not spam to console
console.log('apply effect', e.type)
} else {
console.log('apply effect', e.type, ...(e.args ?? []))
}
EFFECTS[e.type](nextstate, e.args, ui)
})
}
if(effects != null) {
(Array.isArray(effects) ? effects : [effects]).forEach(e => {
if(e.type == 'write' || e.type == 'save_to_localstorage') {
// do not spam to console
console.log('apply effect', e.type)
} else {
console.log('apply effect', e.type, ...(e.args ?? []))
}
EFFECTS[e.type](nextstate, e.args, ui)
})
}
}, nextstate)
if(nextstate.eval_cxt != null) {
nextstate.eval_cxt.is_recording_deferred_calls = true
}
// Expose for debugging