fix: entry state mutation in node compiler #550
Conversation
| Ok(self | ||
| .0 | ||
| .compiler | ||
| .compile(&world, &mut CompileEnv::default()) |
There was a problem hiding this comment.
call into the internal method directly, because we don't want to touch the driver wrapper with a default world.
There was a problem hiding this comment.
could we name the self.0.compiler so to make it slightly more beautiful?
let c = &self.0.compiler;
c.compile(&world, &mut CompileEnv::default())
| .mutate_entry(new_state) | ||
| .map(Some) | ||
| .map_err(map_node_error) | ||
| Ok(self.universe.snapshot_with(Some(TaskInputs { |
There was a problem hiding this comment.
I doubt that it's necessary for snapshot_with to have Option<TaskInputs> as its argument with all fields in TaskInputs already Option<T>.
| Some(root) => { | ||
| if let Ok(p) = root.strip_prefix(fp) { |
There was a problem hiding this comment.
Originallly, root.strip_prefix(fp) had its order of operands reversed.
There was a problem hiding this comment.
We may use world.entry_state().try_select_path_in_workspace(fp, true).
| } | ||
|
|
||
| pub fn compile_raw( | ||
| &mut self, | ||
| compile_by: CompileDocArgs, | ||
| ) -> napi::Result<NodeTypstCompileResult, NodeError> { | ||
| let e = self.setup_compiler_by(compile_by)?; | ||
| let world = self.setup_compiler_by(compile_by)?; | ||
|
|
||
| let res = if self.0.universe().entry_state().is_inactive() { | ||
| Err(map_node_error(error_once!("entry file is not set"))) |
There was a problem hiding this comment.
we can directly return errors here, since no state is to recover:
- if let Some(entry_file) = e {
- self.0
- .universe_mut()
- .mutate_entry(entry_file)
- .map_err(map_node_error)?;
- }| Some(root) => { | ||
| if let Ok(p) = root.strip_prefix(fp) { |
There was a problem hiding this comment.
We may use world.entry_state().try_select_path_in_workspace(fp, true).
The entry state handling in the ts-node-compiler is broken. This PR fixes the bug and do some other refactors:
setup_compiler_bypure and build it on the basis of universe snapshot mechanismBoxedCompiler::compile_rawandDynLayoutCompiler::vectorto the new signatureTest cases will come later.