mirror of
https://github.com/nushell/nushell.git
synced 2025-01-15 18:58:45 +01:00
8da27a1a09
# 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}`.
121 lines
3.9 KiB
Rust
121 lines
3.9 KiB
Rust
use nu_engine::{current_dir, CallExt};
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, Record, ShellError, Signature, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct LoadEnv;
|
|
|
|
impl Command for LoadEnv {
|
|
fn name(&self) -> &str {
|
|
"load-env"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Loads an environment update from a record."
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("load-env")
|
|
.input_output_types(vec![
|
|
(Type::Record(vec![]), Type::Nothing),
|
|
(Type::Nothing, Type::Nothing),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.optional(
|
|
"update",
|
|
SyntaxShape::Record(vec![]),
|
|
"the record to use for updates",
|
|
)
|
|
.category(Category::FileSystem)
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let arg: Option<Record> = call.opt(engine_state, stack, 0)?;
|
|
let span = call.head;
|
|
|
|
match arg {
|
|
Some(record) => {
|
|
for (env_var, rhs) in record {
|
|
let env_var_ = env_var.as_str();
|
|
if ["FILE_PWD", "CURRENT_FILE", "PWD"].contains(&env_var_) {
|
|
return Err(ShellError::AutomaticEnvVarSetManually {
|
|
envvar_name: env_var,
|
|
span: call.head,
|
|
});
|
|
}
|
|
stack.add_env_var(env_var, rhs);
|
|
}
|
|
Ok(PipelineData::empty())
|
|
}
|
|
None => match input {
|
|
PipelineData::Value(Value::Record { val, .. }, ..) => {
|
|
for (env_var, rhs) in val {
|
|
let env_var_ = env_var.as_str();
|
|
if ["FILE_PWD", "CURRENT_FILE"].contains(&env_var_) {
|
|
return Err(ShellError::AutomaticEnvVarSetManually {
|
|
envvar_name: env_var,
|
|
span: call.head,
|
|
});
|
|
}
|
|
|
|
if env_var == "PWD" {
|
|
let cwd = current_dir(engine_state, stack)?;
|
|
let rhs = rhs.as_string()?;
|
|
let rhs = nu_path::expand_path_with(rhs, cwd);
|
|
stack.add_env_var(
|
|
env_var,
|
|
Value::string(rhs.to_string_lossy(), call.head),
|
|
);
|
|
} else {
|
|
stack.add_env_var(env_var, rhs);
|
|
}
|
|
}
|
|
Ok(PipelineData::empty())
|
|
}
|
|
_ => Err(ShellError::UnsupportedInput(
|
|
"'load-env' expects a single record".into(),
|
|
"value originated from here".into(),
|
|
span,
|
|
input.span().unwrap_or(span),
|
|
)),
|
|
},
|
|
}
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Load variables from an input stream",
|
|
example: r#"{NAME: ABE, AGE: UNKNOWN} | load-env; $env.NAME"#,
|
|
result: Some(Value::test_string("ABE")),
|
|
},
|
|
Example {
|
|
description: "Load variables from an argument",
|
|
example: r#"load-env {NAME: ABE, AGE: UNKNOWN}; $env.NAME"#,
|
|
result: Some(Value::test_string("ABE")),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::LoadEnv;
|
|
|
|
#[test]
|
|
fn examples_work_as_expected() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(LoadEnv {})
|
|
}
|
|
}
|