mirror of
https://github.com/nushell/nushell.git
synced 2025-06-04 00:56:11 +02:00
# Description * I was dismayed to discover recently that UnsupportedInput and TypeMismatch are used *extremely* inconsistently across the codebase. UnsupportedInput is sometimes used for input type-checks (as per the name!!), but *also* used for argument type-checks. TypeMismatch is also used for both. I thus devised the following standard: input type-checking *only* uses UnsupportedInput, and argument type-checking *only* uses TypeMismatch. Moreover, to differentiate them, UnsupportedInput now has *two* error arrows (spans), one pointing at the command and the other at the input origin, while TypeMismatch only has the one (because the command should always be nearby) * In order to apply that standard, a very large number of UnsupportedInput uses were changed so that the input's span could be retrieved and delivered to it. * Additionally, I noticed many places where **errors are not propagated correctly**: there are lots of `match` sites which take a Value::Error, then throw it away and replace it with a new Value::Error with less/misleading information (such as reporting the error as an "incorrect type"). I believe that the earliest errors are the most important, and should always be propagated where possible. * Also, to standardise one broad subset of UnsupportedInput error messages, who all used slightly different wordings of "expected `<type>`, got `<type>`", I created OnlySupportsThisInputType as a variant of it. * Finally, a bunch of error sites that had "repeated spans" - i.e. where an error expected two spans, but `call.head` was given for both - were fixed to use different spans. # Example BEFORE ``` 〉20b | str starts-with 'a' Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #31:1:1] 1 │ 20b | str starts-with 'a' · ┬ · ╰── Input's type is filesize. This command only works with strings. ╰──── 〉'a' | math cos Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #33:1:1] 1 │ 'a' | math cos · ─┬─ · ╰── Only numerical values are supported, input type: String ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #38:1:1] 1 │ 0x[12] | encode utf8 · ───┬── · ╰── non-string input ╰──── ``` AFTER ``` 〉20b | str starts-with 'a' Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #1:1:1] 1 │ 20b | str starts-with 'a' · ┬ ───────┬─────── · │ ╰── only string input data is supported · ╰── input type: filesize ╰──── 〉'a' | math cos Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #2:1:1] 1 │ 'a' | math cos · ─┬─ ────┬─── · │ ╰── only numeric input data is supported · ╰── input type: string ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #3:1:1] 1 │ 0x[12] | encode utf8 · ───┬── ───┬── · │ ╰── only string input data is supported · ╰── input type: binary ╰──── ``` # User-Facing Changes Various error messages suddenly make more sense (i.e. have two arrows instead of one). # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
108 lines
3.0 KiB
Rust
108 lines
3.0 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::Any, 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 -s ';' ",
|
|
result: Some(Value::test_string("foo;bar\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<nu_protocol::PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let noheaders = call.has_flag("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(
|
|
"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 {})
|
|
}
|
|
}
|