Skip to content

Commit 20dbba2

Browse files
committed
fix: try with export_use.rs run
1 parent 29134fc commit 20dbba2

File tree

1 file changed

+116
-6
lines changed

1 file changed

+116
-6
lines changed

crates/nu-cmd-lang/src/core_commands/export_use.rs

Lines changed: 116 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
use nu_engine::command_prelude::*;
2-
use nu_protocol::engine::CommandType;
1+
use nu_engine::{
2+
command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block, redirect_env,
3+
};
4+
use nu_protocol::{
5+
ast::{Expr, Expression},
6+
engine::CommandType,
7+
};
38

49
#[derive(Clone)]
510
pub struct ExportUse;
@@ -36,11 +41,116 @@ impl Command for ExportUse {
3641

3742
fn run(
3843
&self,
39-
_engine_state: &EngineState,
40-
_stack: &mut Stack,
41-
_call: &Call,
42-
_input: PipelineData,
44+
engine_state: &EngineState,
45+
caller_stack: &mut Stack,
46+
call: &Call,
47+
input: PipelineData,
4348
) -> Result<PipelineData, ShellError> {
49+
if call.get_parser_info(caller_stack, "noop").is_some() {
50+
return Ok(PipelineData::empty());
51+
}
52+
let Some(Expression {
53+
expr: Expr::ImportPattern(import_pattern),
54+
..
55+
}) = call.get_parser_info(caller_stack, "import_pattern")
56+
else {
57+
return Err(ShellError::GenericError {
58+
error: "Unexpected import".into(),
59+
msg: "import pattern not supported".into(),
60+
span: Some(call.head),
61+
help: None,
62+
inner: vec![],
63+
});
64+
};
65+
66+
// Necessary so that we can modify the stack.
67+
let import_pattern = import_pattern.clone();
68+
69+
if let Some(module_id) = import_pattern.head.id {
70+
// Add constants
71+
for var_id in &import_pattern.constants {
72+
let var = engine_state.get_var(*var_id);
73+
74+
if let Some(constval) = &var.const_val {
75+
caller_stack.add_var(*var_id, constval.clone());
76+
} else {
77+
return Err(ShellError::NushellFailedSpanned {
78+
msg: "Missing Constant".to_string(),
79+
label: "constant not added by the parser".to_string(),
80+
span: var.declaration_span,
81+
});
82+
}
83+
}
84+
85+
// Evaluate the export-env block if there is one
86+
let module = engine_state.get_module(module_id);
87+
88+
if let Some(block_id) = module.env_block {
89+
let block = engine_state.get_block(block_id);
90+
91+
// See if the module is a file
92+
let module_arg_str = String::from_utf8_lossy(
93+
engine_state.get_span_contents(import_pattern.head.span),
94+
);
95+
96+
let maybe_file_path_or_dir = find_in_dirs_env(
97+
&module_arg_str,
98+
engine_state,
99+
caller_stack,
100+
get_dirs_var_from_call(caller_stack, call),
101+
)?;
102+
// module_arg_str maybe a directory, in this case
103+
// find_in_dirs_env returns a directory.
104+
let maybe_parent = maybe_file_path_or_dir.as_ref().and_then(|path| {
105+
if path.is_dir() {
106+
Some(path.to_path_buf())
107+
} else {
108+
path.parent().map(|p| p.to_path_buf())
109+
}
110+
});
111+
112+
let mut callee_stack = caller_stack
113+
.gather_captures(engine_state, &block.captures)
114+
.reset_pipes();
115+
116+
// If so, set the currently evaluated directory (file-relative PWD)
117+
if let Some(parent) = maybe_parent {
118+
let file_pwd = Value::string(parent.to_string_lossy(), call.head);
119+
callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
120+
}
121+
122+
if let Some(path) = maybe_file_path_or_dir {
123+
let module_file_path = if path.is_dir() {
124+
// the existence of `mod.nu` is verified in parsing time
125+
// so it's safe to use it here.
126+
Value::string(path.join("mod.nu").to_string_lossy(), call.head)
127+
} else {
128+
Value::string(path.to_string_lossy(), call.head)
129+
};
130+
callee_stack.add_env_var("CURRENT_FILE".to_string(), module_file_path);
131+
}
132+
133+
let eval_block = get_eval_block(engine_state);
134+
135+
// Run the block (discard the result)
136+
let _ = eval_block(engine_state, &mut callee_stack, block, input)?;
137+
138+
// Merge the block's environment to the current stack
139+
redirect_env(engine_state, caller_stack, &callee_stack);
140+
}
141+
} else {
142+
return Err(ShellError::GenericError {
143+
error: format!(
144+
"Could not import from '{}'",
145+
String::from_utf8_lossy(&import_pattern.head.name)
146+
),
147+
msg: "module does not exist".to_string(),
148+
span: Some(import_pattern.head.span),
149+
help: None,
150+
inner: vec![],
151+
});
152+
}
153+
44154
Ok(PipelineData::empty())
45155
}
46156

0 commit comments

Comments
 (0)