Revert "More aggressive using of cache on engine settings changes (#4691)" (#4729)

This reverts commit 943cf21d34.
This commit is contained in:
Frank Noirot
2024-12-10 12:03:41 -05:00
committed by GitHub
parent ff2d161606
commit 3f1f40eeba
33 changed files with 615 additions and 893 deletions

View File

@ -1,13 +1,14 @@
import init, {
parse_wasm,
recast_wasm,
execute,
execute_wasm,
kcl_lint,
modify_ast_for_sketch_wasm,
is_points_ccw,
get_tangential_arc_to_info,
program_memory_init,
make_default_planes,
modify_grid,
coredump,
toml_stringify,
default_app_settings,
@ -42,9 +43,7 @@ import { Environment } from '../wasm-lib/kcl/bindings/Environment'
import { Node } from 'wasm-lib/kcl/bindings/Node'
import { CompilationError } from 'wasm-lib/kcl/bindings/CompilationError'
import { SourceRange as RustSourceRange } from 'wasm-lib/kcl/bindings/SourceRange'
import { getChangedSettingsAtLevel } from 'lib/settings/settingsUtils'
export type { Configuration } from 'wasm-lib/kcl/bindings/Configuration'
export type { Program } from '../wasm-lib/kcl/bindings/Program'
export type { Expr } from '../wasm-lib/kcl/bindings/Expr'
export type { ObjectExpression } from '../wasm-lib/kcl/bindings/ObjectExpression'
@ -494,20 +493,18 @@ export const _executor = async (
return Promise.reject(programMemoryOverride)
try {
let jsAppSettings = default_app_settings()
let baseUnit = 'mm'
if (!TEST) {
const getSettingsState = import('components/SettingsAuthProvider').then(
(module) => module.getSettingsState
)
const settings = (await getSettingsState)()
if (settings) {
jsAppSettings = getChangedSettingsAtLevel(settings, 'user')
}
baseUnit =
(await getSettingsState)()?.modeling.defaultUnit.current || 'mm'
}
const execState: RawExecState = await execute(
const execState: RawExecState = await execute_wasm(
JSON.stringify(node),
JSON.stringify(programMemoryOverride?.toRaw() || null),
JSON.stringify({ settings: jsAppSettings }),
baseUnit,
engineCommandManager,
fileSystemManager
)
@ -555,6 +552,20 @@ export const makeDefaultPlanes = async (
}
}
export const modifyGrid = async (
engineCommandManager: EngineCommandManager,
hidden: boolean
): Promise<void> => {
try {
await modify_grid(engineCommandManager, hidden)
return
} catch (e) {
// TODO: do something real with the error.
console.log('modify grid error', e)
return Promise.reject(e)
}
}
export const modifyAstForSketch = async (
engineCommandManager: EngineCommandManager,
ast: Node<Program>,