mirror of
https://github.com/nushell/nushell.git
synced 2025-04-27 22:58:20 +02:00
# Description
Possible fix of #11456
This PR fixes a bug where builtin commands did not respect the logic of
dynamically passed boolean flags. The reason is
[has_flag](6f59abaf43/crates/nu-protocol/src/ast/call.rs (L204C5-L212C6)
)
method did not evaluate and take into consideration expression used with
flag.
To address this issue a solution is proposed:
1. `has_flag` method is moved to `CallExt` and new logic to evaluate
expression and check if it is a boolean value is added
2. `has_flag_const` method is added to `CallExt` which is a constant
version of `has_flag`
3. `has_named` method is added to `Call` which is basically the old
logic of `has_flag`
4. All usages of `has_flag` in code are updated, mostly to pass
`engine_state` and `stack` to new `has_flag`. In `run_const` commands it
is replaced with `has_flag_const`. And in a few select places: parser,
`to nuon` and `into string` old logic via `has_named` is used.
# User-Facing Changes
Explicit values of boolean flags are now respected in builtin commands.
Before:

After:

Another example:
Before:

After:

# Tests + Formatting
Added test reproducing some variants of original issue.
117 lines
3.4 KiB
Rust
117 lines
3.4 KiB
Rust
use crate::formats::to::delimited::to_delimited_data;
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Config, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct ToCsv;
|
|
|
|
impl Command for ToCsv {
|
|
fn name(&self) -> &str {
|
|
"to csv"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("to csv")
|
|
.input_output_types(vec![
|
|
(Type::Record(vec![]), Type::String),
|
|
(Type::Table(vec![]), Type::String),
|
|
])
|
|
.named(
|
|
"separator",
|
|
SyntaxShape::String,
|
|
"a character to separate columns, defaults to ','",
|
|
Some('s'),
|
|
)
|
|
.switch(
|
|
"noheaders",
|
|
"do not output the columns names as the first row",
|
|
Some('n'),
|
|
)
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Outputs an CSV string representing the contents of this table",
|
|
example: "[[foo bar]; [1 2]] | to csv",
|
|
result: Some(Value::test_string("foo,bar\n1,2\n")),
|
|
},
|
|
Example {
|
|
description: "Outputs an CSV string representing the contents of this table",
|
|
example: "[[foo bar]; [1 2]] | to csv --separator ';' ",
|
|
result: Some(Value::test_string("foo;bar\n1;2\n")),
|
|
},
|
|
Example {
|
|
description: "Outputs an CSV string representing the contents of this record",
|
|
example: "{a: 1 b: 2} | to csv",
|
|
result: Some(Value::test_string("a,b\n1,2\n")),
|
|
},
|
|
]
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert table into .csv text ."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let noheaders = call.has_flag(engine_state, stack, "noheaders")?;
|
|
let separator: Option<Spanned<String>> = call.get_flag(engine_state, stack, "separator")?;
|
|
let config = engine_state.get_config();
|
|
to_csv(input, noheaders, separator, head, config)
|
|
}
|
|
}
|
|
|
|
fn to_csv(
|
|
input: PipelineData,
|
|
noheaders: bool,
|
|
separator: Option<Spanned<String>>,
|
|
head: Span,
|
|
config: &Config,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let sep = match separator {
|
|
Some(Spanned { item: s, span, .. }) => {
|
|
if s == r"\t" {
|
|
'\t'
|
|
} else {
|
|
let vec_s: Vec<char> = s.chars().collect();
|
|
if vec_s.len() != 1 {
|
|
return Err(ShellError::TypeMismatch {
|
|
err_message: "Expected a single separator char from --separator"
|
|
.to_string(),
|
|
span,
|
|
});
|
|
};
|
|
vec_s[0]
|
|
}
|
|
}
|
|
_ => ',',
|
|
};
|
|
|
|
to_delimited_data(noheaders, sep, "CSV", input, head, config)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(ToCsv {})
|
|
}
|
|
}
|