Continuation of #8229 and #8326 # Description The `ShellError` enum at the moment is kind of messy. Many variants are basic tuple structs where you always have to reference the implementation with its macro invocation to know which field serves which purpose. Furthermore we have both variants that are kind of redundant or either overly broad to be useful for the user to match on or overly specific with few uses. So I set out to start fixing the lacking documentation and naming to make it feasible to critically review the individual usages and fix those. Furthermore we can decide to join or split up variants that don't seem to be fit for purpose. # Call to action **Everyone:** Feel free to add review comments if you spot inconsistent use of `ShellError` variants. # User-Facing Changes (None now, end goal more explicit and consistent error messages) # Tests + Formatting (No additional tests needed so far) # Commits (so far) - Remove `ShellError::FeatureNotEnabled` - Name fields on `SE::ExternalNotSupported` - Name field on `SE::InvalidProbability` - Name fields on `SE::NushellFailed` variants - Remove unused `SE::NushellFailedSpannedHelp` - Name field on `SE::VariableNotFoundAtRuntime` - Name fields on `SE::EnvVarNotFoundAtRuntime` - Name fields on `SE::ModuleNotFoundAtRuntime` - Remove usused `ModuleOrOverlayNotFoundAtRuntime` - Name fields on `SE::OverlayNotFoundAtRuntime` - Name field on `SE::NotFound`
168 lines
5.0 KiB
Rust
168 lines
5.0 KiB
Rust
use std::collections::HashMap;
|
|
|
|
use nu_engine::{eval_block, CallExt};
|
|
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{Closure, Command, EngineState, Stack},
|
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct WithEnv;
|
|
|
|
impl Command for WithEnv {
|
|
fn name(&self) -> &str {
|
|
"with-env"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("with-env")
|
|
.input_output_types(vec![(Type::Any, Type::Any)])
|
|
.required(
|
|
"variable",
|
|
SyntaxShape::Any,
|
|
"the environment variable to temporarily set",
|
|
)
|
|
.required(
|
|
"block",
|
|
SyntaxShape::Closure(None),
|
|
"the block to run once the variable is set",
|
|
)
|
|
.category(Category::Env)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Runs a block with an environment variable set."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
with_env(engine_state, stack, call, input)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Set the MYENV environment variable",
|
|
example: r#"with-env [MYENV "my env value"] { $env.MYENV }"#,
|
|
result: Some(Value::test_string("my env value")),
|
|
},
|
|
Example {
|
|
description: "Set by primitive value list",
|
|
example: r#"with-env [X Y W Z] { $env.X }"#,
|
|
result: Some(Value::test_string("Y")),
|
|
},
|
|
Example {
|
|
description: "Set by single row table",
|
|
example: r#"with-env [[X W]; [Y Z]] { $env.W }"#,
|
|
result: Some(Value::test_string("Z")),
|
|
},
|
|
Example {
|
|
description: "Set by key-value record",
|
|
example: r#"with-env {X: "Y", W: "Z"} { [$env.X $env.W] }"#,
|
|
result: Some(Value::list(
|
|
vec![Value::test_string("Y"), Value::test_string("Z")],
|
|
Span::test_data(),
|
|
)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn with_env(
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
// let external_redirection = args.call_info.args.external_redirection;
|
|
let variable: Value = call.req(engine_state, stack, 0)?;
|
|
|
|
let capture_block: Closure = call.req(engine_state, stack, 1)?;
|
|
let block = engine_state.get_block(capture_block.block_id);
|
|
let mut stack = stack.captures_to_stack(&capture_block.captures);
|
|
|
|
let mut env: HashMap<String, Value> = HashMap::new();
|
|
|
|
match &variable {
|
|
Value::List { vals: table, .. } => {
|
|
if table.len() == 1 {
|
|
// single row([[X W]; [Y Z]])
|
|
match &table[0] {
|
|
Value::Record { cols, vals, .. } => {
|
|
for (k, v) in cols.iter().zip(vals.iter()) {
|
|
env.insert(k.to_string(), v.clone());
|
|
}
|
|
}
|
|
x => {
|
|
return Err(ShellError::CantConvert {
|
|
to_type: "string list or single row".into(),
|
|
from_type: x.get_type().to_string(),
|
|
span: call
|
|
.positional_nth(1)
|
|
.expect("already checked through .req")
|
|
.span,
|
|
help: None,
|
|
});
|
|
}
|
|
}
|
|
} else {
|
|
// primitive values([X Y W Z])
|
|
for row in table.chunks(2) {
|
|
if row.len() == 2 {
|
|
env.insert(row[0].as_string()?, row[1].clone());
|
|
}
|
|
// TODO: else error?
|
|
}
|
|
}
|
|
}
|
|
// when get object by `open x.json` or `from json`
|
|
Value::Record { cols, vals, .. } => {
|
|
for (k, v) in cols.iter().zip(vals) {
|
|
env.insert(k.clone(), v.clone());
|
|
}
|
|
}
|
|
x => {
|
|
return Err(ShellError::CantConvert {
|
|
to_type: "string list or single row".into(),
|
|
from_type: x.get_type().to_string(),
|
|
span: call
|
|
.positional_nth(1)
|
|
.expect("already checked through .req")
|
|
.span,
|
|
help: None,
|
|
});
|
|
}
|
|
};
|
|
|
|
for (k, v) in env {
|
|
stack.add_env_var(k, v);
|
|
}
|
|
|
|
eval_block(
|
|
engine_state,
|
|
&mut stack,
|
|
block,
|
|
input,
|
|
call.redirect_stdout,
|
|
call.redirect_stderr,
|
|
)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(WithEnv {})
|
|
}
|
|
}
|