mirror of
https://github.com/nushell/nushell
synced 2024-12-29 06:23:11 +00:00
dd7b7311b3
# 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.
155 lines
4.8 KiB
Rust
155 lines
4.8 KiB
Rust
use super::parser::datetime_in_timezone;
|
|
use crate::date::utils::parse_date_from_string;
|
|
use chrono::{DateTime, Local, LocalResult};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
use chrono::{FixedOffset, TimeZone};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"date to-timezone"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("date to-timezone")
|
|
.input_output_types(vec![(Type::Date, Type::Date), (Type::String, Type::Date)])
|
|
.allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
|
|
.required("time zone", SyntaxShape::String, "time zone description")
|
|
.category(Category::Date)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert a date to a given time zone."
|
|
}
|
|
|
|
fn extra_usage(&self) -> &str {
|
|
"Use 'date list-timezone' to list all supported time zones."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec![
|
|
"tz",
|
|
"transform",
|
|
"convert",
|
|
"UTC",
|
|
"GMT",
|
|
"list",
|
|
"list-timezone",
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let head = call.head;
|
|
let timezone: Spanned<String> = call.req(engine_state, stack, 0)?;
|
|
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty(head));
|
|
}
|
|
input.map(
|
|
move |value| helper(value, head, &timezone),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
let example_result_1 = || match FixedOffset::east_opt(5 * 3600)
|
|
.expect("to timezone: help example is invalid")
|
|
.with_ymd_and_hms(2020, 10, 10, 13, 00, 00)
|
|
{
|
|
LocalResult::Single(dt) => Some(Value::Date {
|
|
val: dt,
|
|
span: Span::test_data(),
|
|
}),
|
|
_ => panic!("to timezone: help example is invalid"),
|
|
};
|
|
|
|
vec![
|
|
Example {
|
|
description: "Get the current date in UTC+05:00",
|
|
example: "date now | date to-timezone +0500",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Get the current local date",
|
|
example: "date now | date to-timezone local",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Get the current date in Hawaii",
|
|
example: "date now | date to-timezone US/Hawaii",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Get the current date in Hawaii",
|
|
example: r#""2020-10-10 10:00:00 +02:00" | date to-timezone "+0500""#,
|
|
result: example_result_1(),
|
|
},
|
|
// TODO: This should work but does not; see https://github.com/nushell/nushell/issues/7032
|
|
// Example {
|
|
// description: "Get the current date in Hawaii, from a datetime object",
|
|
// example: r#""2020-10-10 10:00:00 +02:00" | into datetime | date to-timezone "+0500""#,
|
|
// result: example_result_1(),
|
|
// },
|
|
]
|
|
}
|
|
}
|
|
|
|
fn helper(value: Value, head: Span, timezone: &Spanned<String>) -> Value {
|
|
match value {
|
|
Value::Date { val, span: _ } => _to_timezone(val, timezone, head),
|
|
Value::String {
|
|
val,
|
|
span: val_span,
|
|
} => {
|
|
let time = parse_date_from_string(&val, val_span);
|
|
match time {
|
|
Ok(dt) => _to_timezone(dt, timezone, head),
|
|
Err(e) => e,
|
|
}
|
|
}
|
|
|
|
Value::Nothing { span: _ } => {
|
|
let dt = Local::now();
|
|
_to_timezone(dt.with_timezone(dt.offset()), timezone, head)
|
|
}
|
|
_ => Value::Error {
|
|
error: ShellError::DatetimeParseError(head),
|
|
},
|
|
}
|
|
}
|
|
|
|
fn _to_timezone(dt: DateTime<FixedOffset>, timezone: &Spanned<String>, span: Span) -> Value {
|
|
match datetime_in_timezone(&dt, timezone.item.as_str()) {
|
|
Ok(dt) => Value::Date { val: dt, span },
|
|
Err(_) => Value::Error {
|
|
error: ShellError::TypeMismatch(String::from("invalid time zone"), timezone.span),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|