mirror of
https://github.com/nushell/nushell.git
synced 2025-05-02 00:54:25 +02:00
# Description This PR does a few things to help improve type hovers and, in the process, fixes a few outstanding issues in the type system. Here's a list of the changes: * `for` now will try to infer the type of the iteration variable based on the expression it's given. This fixes things like `for x in [1, 2, 3] { }` where `x` now properly gets the int type. * Removed old input/output type fields from the signature, focuses on the vec of signatures. Updated a bunch of dataframe commands that hadn't moved over. This helps tie things together a bit better * Fixed inference of types from subexpressions to use the last expression in the block * Fixed handling of explicit types in `let` and `mut` calls, so we now respect that as the authoritative type I also tried to add `def` input/output type inference, but unfortunately we only know the predecl types universally, which means we won't have enough information to properly know what the types of the custom commands are. # User-Facing Changes Script typechecking will get tighter in some cases Hovers should be more accurate in some cases that previously resorted to any. # 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 -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # 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. --> --------- Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
184 lines
6.4 KiB
Rust
184 lines
6.4 KiB
Rust
use super::super::super::values::{Column, NuDataFrame};
|
|
|
|
use chrono::DateTime;
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{Command, EngineState, Stack},
|
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
};
|
|
use polars::prelude::{IntoSeries, TimeUnit, Utf8Methods};
|
|
|
|
#[derive(Clone)]
|
|
pub struct AsDateTime;
|
|
|
|
impl Command for AsDateTime {
|
|
fn name(&self) -> &str {
|
|
"dfr as-datetime"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
r#"Converts string to datetime."#
|
|
}
|
|
|
|
fn extra_usage(&self) -> &str {
|
|
r#"Format example:
|
|
"%y/%m/%d %H:%M:%S" => 21/12/31 12:54:98
|
|
"%y-%m-%d %H:%M:%S" => 2021-12-31 24:58:01
|
|
"%y/%m/%d %H:%M:%S" => 21/12/31 24:58:01
|
|
"%y%m%d %H:%M:%S" => 210319 23:58:50
|
|
"%Y/%m/%d %H:%M:%S" => 2021/12/31 12:54:98
|
|
"%Y-%m-%d %H:%M:%S" => 2021-12-31 24:58:01
|
|
"%Y/%m/%d %H:%M:%S" => 2021/12/31 24:58:01
|
|
"%Y%m%d %H:%M:%S" => 20210319 23:58:50
|
|
"%FT%H:%M:%S" => 2019-04-18T02:45:55
|
|
"%FT%H:%M:%S.%6f" => microseconds
|
|
"%FT%H:%M:%S.%9f" => nanoseconds"#
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.required("format", SyntaxShape::String, "formatting date time string")
|
|
.switch("not-exact", "the format string may be contained in the date (e.g. foo-2021-01-01-bar could match 2021-01-01)", Some('n'))
|
|
.input_output_type(
|
|
Type::Custom("dataframe".into()),
|
|
Type::Custom("dataframe".into()),
|
|
)
|
|
.category(Category::Custom("dataframe".into()))
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Converts string to datetime",
|
|
example: r#"["2021-12-30 00:00:00" "2021-12-31 00:00:00"] | dfr into-df | dfr as-datetime "%Y-%m-%d %H:%M:%S""#,
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(vec![Column::new(
|
|
"datetime".to_string(),
|
|
vec![
|
|
Value::Date {
|
|
val: DateTime::parse_from_str(
|
|
"2021-12-30 00:00:00 +0000",
|
|
"%Y-%m-%d %H:%M:%S %z",
|
|
)
|
|
.expect("date calculation should not fail in test"),
|
|
span: Span::test_data(),
|
|
},
|
|
Value::Date {
|
|
val: DateTime::parse_from_str(
|
|
"2021-12-31 00:00:00 +0000",
|
|
"%Y-%m-%d %H:%M:%S %z",
|
|
)
|
|
.expect("date calculation should not fail in test"),
|
|
span: Span::test_data(),
|
|
},
|
|
],
|
|
)])
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
},
|
|
Example {
|
|
description: "Converts string to datetime with high resolutions",
|
|
example: r#"["2021-12-30 00:00:00.123456789" "2021-12-31 00:00:00.123456789"] | dfr into-df | dfr as-datetime "%Y-%m-%d %H:%M:%S.%9f""#,
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(vec![Column::new(
|
|
"datetime".to_string(),
|
|
vec![
|
|
Value::Date {
|
|
val: DateTime::parse_from_str(
|
|
"2021-12-30 00:00:00.123456789 +0000",
|
|
"%Y-%m-%d %H:%M:%S.%9f %z",
|
|
)
|
|
.expect("date calculation should not fail in test"),
|
|
span: Span::test_data(),
|
|
},
|
|
Value::Date {
|
|
val: DateTime::parse_from_str(
|
|
"2021-12-31 00:00:00.123456789 +0000",
|
|
"%Y-%m-%d %H:%M:%S.%9f %z",
|
|
)
|
|
.expect("date calculation should not fail in test"),
|
|
span: Span::test_data(),
|
|
},
|
|
],
|
|
)])
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
},
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
command(engine_state, stack, call, input)
|
|
}
|
|
}
|
|
|
|
fn command(
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let format: String = call.req(engine_state, stack, 0)?;
|
|
let not_exact = call.has_flag("not-exact");
|
|
|
|
let df = NuDataFrame::try_from_pipeline(input, call.head)?;
|
|
let series = df.as_series(call.head)?;
|
|
let casted = series.utf8().map_err(|e| {
|
|
ShellError::GenericError(
|
|
"Error casting to string".into(),
|
|
e.to_string(),
|
|
Some(call.head),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
})?;
|
|
|
|
let res = if not_exact {
|
|
casted.as_datetime_not_exact(Some(format.as_str()), TimeUnit::Nanoseconds, None)
|
|
} else {
|
|
casted.as_datetime(
|
|
Some(format.as_str()),
|
|
TimeUnit::Nanoseconds,
|
|
false,
|
|
false,
|
|
None,
|
|
)
|
|
};
|
|
|
|
let mut res = res
|
|
.map_err(|e| {
|
|
ShellError::GenericError(
|
|
"Error creating datetime".into(),
|
|
e.to_string(),
|
|
Some(call.head),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
})?
|
|
.into_series();
|
|
|
|
res.rename("datetime");
|
|
NuDataFrame::try_from_series(vec![res], call.head)
|
|
.map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::super::super::super::test_dataframe::test_dataframe;
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
test_dataframe(vec![Box::new(AsDateTime {})])
|
|
}
|
|
}
|