forked from extern/nushell
# 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.
109 lines
3.5 KiB
Rust
109 lines
3.5 KiB
Rust
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Spanned,
|
|
SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct Decode;
|
|
|
|
impl Command for Decode {
|
|
fn name(&self) -> &str {
|
|
"decode"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Decode bytes as a string."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["text", "encoding", "decoding"]
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("decode")
|
|
.input_output_types(vec![(Type::Binary, Type::String)])
|
|
.required("encoding", SyntaxShape::String, "the text encoding to use")
|
|
.category(Category::Strings)
|
|
}
|
|
|
|
fn extra_usage(&self) -> &str {
|
|
r#"Multiple encodings are supported, here is an example of a few:
|
|
big5, euc-jp, euc-kr, gbk, iso-8859-1, utf-16, cp1252, latin5
|
|
|
|
For a more complete list of encodings please refer to the encoding_rs
|
|
documentation link at https://docs.rs/encoding_rs/0.8.28/encoding_rs/#statics"#
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Decode the output of an external command",
|
|
example: "^cat myfile.q | decode utf-8",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Decode an UTF-16 string into nushell UTF-8 string",
|
|
example: r#"0x[00 53 00 6F 00 6D 00 65 00 20 00 44 00 61 00 74 00 61] | decode utf-16be"#,
|
|
result: Some(Value::String {
|
|
val: "Some Data".to_owned(),
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let encoding: Spanned<String> = call.req(engine_state, stack, 0)?;
|
|
|
|
match input {
|
|
PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::empty()),
|
|
PipelineData::ExternalStream {
|
|
stdout: Some(stream),
|
|
..
|
|
} => {
|
|
let bytes: Vec<u8> = stream.into_bytes()?.item;
|
|
super::encoding::decode(head, encoding, &bytes).map(|val| val.into_pipeline_data())
|
|
}
|
|
PipelineData::Value(v, ..) => match v {
|
|
Value::Binary { val: bytes, .. } => super::encoding::decode(head, encoding, &bytes)
|
|
.map(|val| val.into_pipeline_data()),
|
|
Value::Error { error } => Err(error),
|
|
_ => Err(ShellError::OnlySupportsThisInputType(
|
|
"binary".into(),
|
|
v.get_type().to_string(),
|
|
head,
|
|
v.expect_span(),
|
|
)),
|
|
},
|
|
// This should be more precise, but due to difficulties in getting spans
|
|
// from PipelineData::ListData, this is as it is.
|
|
_ => Err(ShellError::UnsupportedInput(
|
|
"non-binary input".into(),
|
|
"value originates from here".into(),
|
|
head,
|
|
input.span().unwrap_or(head),
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
crate::test_examples(Decode)
|
|
}
|
|
}
|