mirror of
https://github.com/nushell/nushell.git
synced 2025-07-30 20:20:48 +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.
296 lines
9.5 KiB
Rust
296 lines
9.5 KiB
Rust
use chrono::{DateTime, Datelike, FixedOffset, Timelike};
|
|
use nu_protocol::format_duration_as_timeperiod;
|
|
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{Command, EngineState, Stack},
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Type, Value,
|
|
};
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"into record"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("into record")
|
|
.input_output_types(vec![
|
|
(Type::Date, Type::Record(vec![])),
|
|
(Type::Duration, Type::Record(vec![])),
|
|
(Type::List(Box::new(Type::Any)), Type::Record(vec![])),
|
|
(Type::Range, Type::Record(vec![])),
|
|
(Type::Record(vec![]), Type::Record(vec![])),
|
|
(Type::Table(vec![]), Type::Record(vec![])),
|
|
])
|
|
.category(Category::Conversions)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert value to record"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["convert"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
into_record(engine_state, call, input)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
let span = Span::test_data();
|
|
vec![
|
|
Example {
|
|
description: "Convert from one row table to record",
|
|
example: "[[value]; [false]] | into record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["value".to_string()],
|
|
vals: vec![Value::boolean(false, span)],
|
|
span,
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Convert from list to record",
|
|
example: "[1 2 3] | into record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["0".to_string(), "1".to_string(), "2".to_string()],
|
|
vals: vec![
|
|
Value::Int { val: 1, span },
|
|
Value::Int { val: 2, span },
|
|
Value::Int { val: 3, span },
|
|
],
|
|
span,
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Convert from range to record",
|
|
example: "0..2 | into record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["0".to_string(), "1".to_string(), "2".to_string()],
|
|
vals: vec![
|
|
Value::Int { val: 0, span },
|
|
Value::Int { val: 1, span },
|
|
Value::Int { val: 2, span },
|
|
],
|
|
span,
|
|
}),
|
|
},
|
|
Example {
|
|
description: "convert duration to record",
|
|
example: "-500day | into record",
|
|
result: Some(Value::Record {
|
|
cols: vec![
|
|
"year".into(),
|
|
"month".into(),
|
|
"week".into(),
|
|
"day".into(),
|
|
"sign".into(),
|
|
],
|
|
vals: vec![
|
|
Value::Int { val: 1, span },
|
|
Value::Int { val: 4, span },
|
|
Value::Int { val: 2, span },
|
|
Value::Int { val: 1, span },
|
|
Value::String {
|
|
val: "-".into(),
|
|
span,
|
|
},
|
|
],
|
|
span,
|
|
}),
|
|
},
|
|
Example {
|
|
description: "convert record to record",
|
|
example: "{a: 1, b: 2} | into record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["a".to_string(), "b".to_string()],
|
|
vals: vec![Value::Int { val: 1, span }, Value::Int { val: 2, span }],
|
|
span,
|
|
}),
|
|
},
|
|
Example {
|
|
description: "convert date to record",
|
|
example: "2020-04-12T22:10:57+02:00 | into record",
|
|
result: Some(Value::Record {
|
|
cols: vec![
|
|
"year".into(),
|
|
"month".into(),
|
|
"day".into(),
|
|
"hour".into(),
|
|
"minute".into(),
|
|
"second".into(),
|
|
"timezone".into(),
|
|
],
|
|
vals: vec![
|
|
Value::Int { val: 2020, span },
|
|
Value::Int { val: 4, span },
|
|
Value::Int { val: 12, span },
|
|
Value::Int { val: 22, span },
|
|
Value::Int { val: 10, span },
|
|
Value::Int { val: 57, span },
|
|
Value::String {
|
|
val: "+02:00".to_string(),
|
|
span,
|
|
},
|
|
],
|
|
span,
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn into_record(
|
|
engine_state: &EngineState,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let input = input.into_value(call.head);
|
|
let input_type = input.get_type();
|
|
let res = match input {
|
|
Value::Date { val, span } => parse_date_into_record(Ok(val), span),
|
|
Value::Duration { val, span } => parse_duration_into_record(val, span),
|
|
Value::List { mut vals, span } => match input_type {
|
|
Type::Table(..) if vals.len() == 1 => vals.pop().expect("already checked 1 item"),
|
|
_ => {
|
|
let mut cols = vec![];
|
|
let mut values = vec![];
|
|
for (idx, val) in vals.into_iter().enumerate() {
|
|
cols.push(format!("{idx}"));
|
|
values.push(val);
|
|
}
|
|
Value::Record {
|
|
cols,
|
|
vals: values,
|
|
span,
|
|
}
|
|
}
|
|
},
|
|
Value::Range { val, span } => {
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
for (idx, val) in val.into_range_iter(engine_state.ctrlc.clone())?.enumerate() {
|
|
cols.push(format!("{idx}"));
|
|
vals.push(val);
|
|
}
|
|
Value::Record { cols, vals, span }
|
|
}
|
|
Value::Record { cols, vals, span } => Value::Record { cols, vals, span },
|
|
Value::Error { .. } => input,
|
|
other => Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"string".into(),
|
|
other.get_type().to_string(),
|
|
call.head,
|
|
// This line requires the Value::Error match above.
|
|
other.expect_span(),
|
|
),
|
|
},
|
|
};
|
|
Ok(res.into_pipeline_data())
|
|
}
|
|
|
|
fn parse_date_into_record(date: Result<DateTime<FixedOffset>, Value>, span: Span) -> Value {
|
|
let cols = vec![
|
|
"year".into(),
|
|
"month".into(),
|
|
"day".into(),
|
|
"hour".into(),
|
|
"minute".into(),
|
|
"second".into(),
|
|
"timezone".into(),
|
|
];
|
|
match date {
|
|
Ok(x) => {
|
|
let vals = vec![
|
|
Value::Int {
|
|
val: x.year() as i64,
|
|
span,
|
|
},
|
|
Value::Int {
|
|
val: x.month() as i64,
|
|
span,
|
|
},
|
|
Value::Int {
|
|
val: x.day() as i64,
|
|
span,
|
|
},
|
|
Value::Int {
|
|
val: x.hour() as i64,
|
|
span,
|
|
},
|
|
Value::Int {
|
|
val: x.minute() as i64,
|
|
span,
|
|
},
|
|
Value::Int {
|
|
val: x.second() as i64,
|
|
span,
|
|
},
|
|
Value::String {
|
|
val: x.offset().to_string(),
|
|
span,
|
|
},
|
|
];
|
|
Value::Record { cols, vals, span }
|
|
}
|
|
Err(e) => e,
|
|
}
|
|
}
|
|
|
|
fn parse_duration_into_record(duration: i64, span: Span) -> Value {
|
|
let (sign, periods) = format_duration_as_timeperiod(duration);
|
|
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
for p in periods {
|
|
let num_with_unit = p.to_text().to_string();
|
|
let split = num_with_unit.split(' ').collect::<Vec<&str>>();
|
|
cols.push(match split[1] {
|
|
"ns" => "nanosecond".into(),
|
|
"µs" => "microsecond".into(),
|
|
"ms" => "millisecond".into(),
|
|
"sec" => "second".into(),
|
|
"min" => "minute".into(),
|
|
"hr" => "hour".into(),
|
|
"day" => "day".into(),
|
|
"wk" => "week".into(),
|
|
"month" => "month".into(),
|
|
"yr" => "year".into(),
|
|
_ => "unknown".into(),
|
|
});
|
|
|
|
vals.push(Value::Int {
|
|
val: split[0].parse::<i64>().unwrap_or(0),
|
|
span,
|
|
});
|
|
}
|
|
|
|
cols.push("sign".into());
|
|
vals.push(Value::String {
|
|
val: if sign == -1 { "-".into() } else { "+".into() },
|
|
span,
|
|
});
|
|
|
|
Value::Record { cols, vals, span }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|