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.
168 lines
5.0 KiB
Rust
168 lines
5.0 KiB
Rust
use crate::date::utils::parse_date_from_string;
|
|
use chrono::{DateTime, Datelike, FixedOffset, Local, Timelike};
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Type;
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError::DatetimeParseError, ShellError::PipelineEmpty,
|
|
Signature, Span, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"date to-record"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("date to-record")
|
|
.input_output_types(vec![
|
|
(Type::Date, Type::Record(vec![])),
|
|
(Type::String, Type::Record(vec![])),
|
|
])
|
|
.allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
|
|
.category(Category::Date)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert the date into a record."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["structured", "table"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let head = call.head;
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(PipelineEmpty(head));
|
|
}
|
|
input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
let example_result_1 = || {
|
|
let span = Span::test_data();
|
|
let cols = vec![
|
|
"year".into(),
|
|
"month".into(),
|
|
"day".into(),
|
|
"hour".into(),
|
|
"minute".into(),
|
|
"second".into(),
|
|
"timezone".into(),
|
|
];
|
|
let 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,
|
|
},
|
|
];
|
|
Some(Value::Record { cols, vals, span })
|
|
};
|
|
|
|
vec![
|
|
Example {
|
|
description: "Convert the current date into a record.",
|
|
example: "date to-record",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert the current date into a record.",
|
|
example: "date now | date to-record",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert a date string into a record.",
|
|
example: "'2020-04-12 22:10:57 +0200' | date to-record",
|
|
result: example_result_1(),
|
|
},
|
|
// TODO: This should work but does not; see https://github.com/nushell/nushell/issues/7032
|
|
// Example {
|
|
// description: "Convert a date into a record.",
|
|
// example: "'2020-04-12 22:10:57 +0200' | into datetime | date to-record",
|
|
// result: example_result_1(),
|
|
// },
|
|
]
|
|
}
|
|
}
|
|
|
|
fn parse_date_into_table(date: Result<DateTime<FixedOffset>, Value>, head: 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(x.year() as i64, head),
|
|
Value::int(x.month() as i64, head),
|
|
Value::int(x.day() as i64, head),
|
|
Value::int(x.hour() as i64, head),
|
|
Value::int(x.minute() as i64, head),
|
|
Value::int(x.second() as i64, head),
|
|
Value::string(x.offset().to_string(), head),
|
|
];
|
|
Value::Record {
|
|
cols,
|
|
vals,
|
|
span: head,
|
|
}
|
|
}
|
|
Err(e) => e,
|
|
}
|
|
}
|
|
|
|
fn helper(val: Value, head: Span) -> Value {
|
|
match val {
|
|
Value::String {
|
|
val,
|
|
span: val_span,
|
|
} => {
|
|
let date = parse_date_from_string(&val, val_span);
|
|
parse_date_into_table(date, head)
|
|
}
|
|
Value::Nothing { span: _ } => {
|
|
let now = Local::now();
|
|
let n = now.with_timezone(now.offset());
|
|
parse_date_into_table(Ok(n), head)
|
|
}
|
|
Value::Date { val, span: _ } => parse_date_into_table(Ok(val), head),
|
|
_ => Value::Error {
|
|
error: DatetimeParseError(head),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|