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.
186 lines
5.8 KiB
Rust
186 lines
5.8 KiB
Rust
use crate::input_handler::{operate, CmdArgument};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::ast::CellPath;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Category;
|
|
use nu_protocol::{Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value};
|
|
|
|
struct Arguments {
|
|
added_data: Vec<u8>,
|
|
index: Option<usize>,
|
|
end: bool,
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct BytesAdd;
|
|
|
|
impl Command for BytesAdd {
|
|
fn name(&self) -> &str {
|
|
"bytes add"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("bytes add")
|
|
.input_output_types(vec![(Type::Binary, Type::Binary)])
|
|
.vectorizes_over_list(true)
|
|
.required("data", SyntaxShape::Binary, "the binary to add")
|
|
.named(
|
|
"index",
|
|
SyntaxShape::Int,
|
|
"index to insert binary data",
|
|
Some('i'),
|
|
)
|
|
.switch("end", "add to the end of binary", Some('e'))
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"for a data structure input, add bytes to the data at the given cell paths",
|
|
)
|
|
.category(Category::Bytes)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Add specified bytes to the input"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["append", "truncate", "padding"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let added_data: Vec<u8> = call.req(engine_state, stack, 0)?;
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let index: Option<usize> = call.get_flag(engine_state, stack, "index")?;
|
|
let end = call.has_flag("end");
|
|
|
|
let arg = Arguments {
|
|
added_data,
|
|
index,
|
|
end,
|
|
cell_paths,
|
|
};
|
|
operate(add, arg, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Add bytes `0x[AA]` to `0x[1F FF AA AA]`",
|
|
example: "0x[1F FF AA AA] | bytes add 0x[AA]",
|
|
result: Some(Value::Binary {
|
|
val: vec![0xAA, 0x1F, 0xFF, 0xAA, 0xAA],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Add bytes `0x[AA BB]` to `0x[1F FF AA AA]` at index 1",
|
|
example: "0x[1F FF AA AA] | bytes add 0x[AA BB] -i 1",
|
|
result: Some(Value::Binary {
|
|
val: vec![0x1F, 0xAA, 0xBB, 0xFF, 0xAA, 0xAA],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Add bytes `0x[11]` to `0x[FF AA AA]` at the end",
|
|
example: "0x[FF AA AA] | bytes add 0x[11] -e",
|
|
result: Some(Value::Binary {
|
|
val: vec![0xFF, 0xAA, 0xAA, 0x11],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Add bytes `0x[11 22 33]` to `0x[FF AA AA]` at the end, at index 1(the index is start from end)",
|
|
example: "0x[FF AA BB] | bytes add 0x[11 22 33] -e -i 1",
|
|
result: Some(Value::Binary {
|
|
val: vec![0xFF, 0xAA, 0x11, 0x22, 0x33, 0xBB],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn add(val: &Value, args: &Arguments, span: Span) -> Value {
|
|
match val {
|
|
Value::Binary {
|
|
val,
|
|
span: val_span,
|
|
} => add_impl(val, args, *val_span),
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => val.clone(),
|
|
other => Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"integer".into(),
|
|
other.get_type().to_string(),
|
|
span,
|
|
// This line requires the Value::Error match above.
|
|
other.expect_span(),
|
|
),
|
|
},
|
|
}
|
|
}
|
|
|
|
fn add_impl(input: &[u8], args: &Arguments, span: Span) -> Value {
|
|
match args.index {
|
|
None => {
|
|
if args.end {
|
|
let mut added_data = args.added_data.clone();
|
|
let mut result = input.to_vec();
|
|
result.append(&mut added_data);
|
|
Value::Binary { val: result, span }
|
|
} else {
|
|
let mut result = args.added_data.clone();
|
|
let mut input = input.to_vec();
|
|
result.append(&mut input);
|
|
Value::Binary { val: result, span }
|
|
}
|
|
}
|
|
Some(mut indx) => {
|
|
let inserted_index = if args.end {
|
|
input.len().saturating_sub(indx)
|
|
} else {
|
|
if indx > input.len() {
|
|
indx = input.len()
|
|
}
|
|
indx
|
|
};
|
|
let mut result = vec![];
|
|
let mut prev_data = input[..inserted_index].to_vec();
|
|
result.append(&mut prev_data);
|
|
let mut added_data = args.added_data.clone();
|
|
result.append(&mut added_data);
|
|
let mut after_data = input[inserted_index..].to_vec();
|
|
result.append(&mut after_data);
|
|
Value::Binary { val: result, span }
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(BytesAdd {})
|
|
}
|
|
}
|