forked from extern/nushell
# Description This PR creates a new `Record` type to reduce duplicate code and possibly bugs as well. (This is an edited version of #9648.) - `Record` implements `FromIterator` and `IntoIterator` and so can be iterated over or collected into. For example, this helps with conversions to and from (hash)maps. (Also, no more `cols.iter().zip(vals)`!) - `Record` has a `push(col, val)` function to help insure that the number of columns is equal to the number of values. I caught a few potential bugs thanks to this (e.g. in the `ls` command). - Finally, this PR also adds a `record!` macro that helps simplify record creation. It is used like so: ```rust record! { "key1" => some_value, "key2" => Value::string("text", span), "key3" => Value::int(optional_int.unwrap_or(0), span), "key4" => Value::bool(config.setting, span), } ``` Since macros hinder formatting, etc., the right hand side values should be relatively short and sweet like the examples above. Where possible, prefer `record!` or `.collect()` on an iterator instead of multiple `Record::push`s, since the first two automatically set the record capacity and do less work overall. # User-Facing Changes Besides the changes in `nu-protocol` the only other breaking changes are to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
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 { val, .. } => {
|
|
for (k, v) in val {
|
|
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 { val, .. } => {
|
|
for (k, v) in val {
|
|
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 {})
|
|
}
|
|
}
|