mirror of
https://github.com/nushell/nushell.git
synced 2025-05-05 23:42:56 +00:00
# Description This PR creates a new `Record` type to reduce duplicate code and possibly bugs as well. (This is an edited version of #9648.) - `Record` implements `FromIterator` and `IntoIterator` and so can be iterated over or collected into. For example, this helps with conversions to and from (hash)maps. (Also, no more `cols.iter().zip(vals)`!) - `Record` has a `push(col, val)` function to help insure that the number of columns is equal to the number of values. I caught a few potential bugs thanks to this (e.g. in the `ls` command). - Finally, this PR also adds a `record!` macro that helps simplify record creation. It is used like so: ```rust record! { "key1" => some_value, "key2" => Value::string("text", span), "key3" => Value::int(optional_int.unwrap_or(0), span), "key4" => Value::bool(config.setting, span), } ``` Since macros hinder formatting, etc., the right hand side values should be relatively short and sweet like the examples above. Where possible, prefer `record!` or `.collect()` on an iterator instead of multiple `Record::push`s, since the first two automatically set the record capacity and do less work overall. # User-Facing Changes Besides the changes in `nu-protocol` the only other breaking changes are to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
438 lines
14 KiB
Rust
438 lines
14 KiB
Rust
mod custom_value;
|
|
|
|
use nu_protocol::{record, PipelineData, ShellError, Span, Value};
|
|
use polars::prelude::{col, AggExpr, Expr, Literal};
|
|
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
|
|
|
// Polars Expression wrapper for Nushell operations
|
|
// Object is behind and Option to allow easy implementation of
|
|
// the Deserialize trait
|
|
#[derive(Default, Clone, Debug)]
|
|
pub struct NuExpression(Option<Expr>);
|
|
|
|
// Mocked serialization of the LazyFrame object
|
|
impl Serialize for NuExpression {
|
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
|
where
|
|
S: Serializer,
|
|
{
|
|
serializer.serialize_none()
|
|
}
|
|
}
|
|
|
|
// Mocked deserialization of the LazyFrame object
|
|
impl<'de> Deserialize<'de> for NuExpression {
|
|
fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
Ok(NuExpression::default())
|
|
}
|
|
}
|
|
|
|
// Referenced access to the real LazyFrame
|
|
impl AsRef<Expr> for NuExpression {
|
|
fn as_ref(&self) -> &polars::prelude::Expr {
|
|
// The only case when there cannot be an expr is if it is created
|
|
// using the default function or if created by deserializing something
|
|
self.0.as_ref().expect("there should always be a frame")
|
|
}
|
|
}
|
|
|
|
impl AsMut<Expr> for NuExpression {
|
|
fn as_mut(&mut self) -> &mut polars::prelude::Expr {
|
|
// The only case when there cannot be an expr is if it is created
|
|
// using the default function or if created by deserializing something
|
|
self.0.as_mut().expect("there should always be a frame")
|
|
}
|
|
}
|
|
|
|
impl From<Expr> for NuExpression {
|
|
fn from(expr: Expr) -> Self {
|
|
Self(Some(expr))
|
|
}
|
|
}
|
|
|
|
impl NuExpression {
|
|
pub fn into_value(self, span: Span) -> Value {
|
|
Value::CustomValue {
|
|
val: Box::new(self),
|
|
span,
|
|
}
|
|
}
|
|
|
|
pub fn try_from_value(value: Value) -> Result<Self, ShellError> {
|
|
match value {
|
|
Value::CustomValue { val, span } => match val.as_any().downcast_ref::<Self>() {
|
|
Some(expr) => Ok(NuExpression(expr.0.clone())),
|
|
None => Err(ShellError::CantConvert {
|
|
to_type: "lazy expression".into(),
|
|
from_type: "non-dataframe".into(),
|
|
span,
|
|
help: None,
|
|
}),
|
|
},
|
|
Value::String { val, .. } => Ok(val.lit().into()),
|
|
Value::Int { val, .. } => Ok(val.lit().into()),
|
|
Value::Bool { val, .. } => Ok(val.lit().into()),
|
|
Value::Float { val, .. } => Ok(val.lit().into()),
|
|
x => Err(ShellError::CantConvert {
|
|
to_type: "lazy expression".into(),
|
|
from_type: x.get_type().to_string(),
|
|
span: x.span()?,
|
|
help: None,
|
|
}),
|
|
}
|
|
}
|
|
|
|
pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result<Self, ShellError> {
|
|
let value = input.into_value(span);
|
|
Self::try_from_value(value)
|
|
}
|
|
|
|
pub fn can_downcast(value: &Value) -> bool {
|
|
match value {
|
|
Value::CustomValue { val, .. } => val.as_any().downcast_ref::<Self>().is_some(),
|
|
Value::List { vals, .. } => vals.iter().all(Self::can_downcast),
|
|
Value::String { .. } | Value::Int { .. } | Value::Bool { .. } | Value::Float { .. } => {
|
|
true
|
|
}
|
|
_ => false,
|
|
}
|
|
}
|
|
|
|
pub fn into_polars(self) -> Expr {
|
|
self.0.expect("Expression cannot be none to convert")
|
|
}
|
|
|
|
pub fn apply_with_expr<F>(self, other: NuExpression, f: F) -> Self
|
|
where
|
|
F: Fn(Expr, Expr) -> Expr,
|
|
{
|
|
let expr = self.0.expect("Lazy expression must not be empty to apply");
|
|
let other = other.0.expect("Lazy expression must not be empty to apply");
|
|
|
|
f(expr, other).into()
|
|
}
|
|
|
|
pub fn to_value(&self, span: Span) -> Value {
|
|
expr_to_value(self.as_ref(), span)
|
|
}
|
|
|
|
// Convenient function to extract multiple Expr that could be inside a nushell Value
|
|
pub fn extract_exprs(value: Value) -> Result<Vec<Expr>, ShellError> {
|
|
ExtractedExpr::extract_exprs(value).map(ExtractedExpr::into_exprs)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
// Enum to represent the parsing of the expressions from Value
|
|
enum ExtractedExpr {
|
|
Single(Expr),
|
|
List(Vec<ExtractedExpr>),
|
|
}
|
|
|
|
impl ExtractedExpr {
|
|
fn into_exprs(self) -> Vec<Expr> {
|
|
match self {
|
|
Self::Single(expr) => vec![expr],
|
|
Self::List(expressions) => expressions
|
|
.into_iter()
|
|
.flat_map(ExtractedExpr::into_exprs)
|
|
.collect(),
|
|
}
|
|
}
|
|
|
|
fn extract_exprs(value: Value) -> Result<ExtractedExpr, ShellError> {
|
|
match value {
|
|
Value::String { val, .. } => Ok(ExtractedExpr::Single(col(val.as_str()))),
|
|
Value::CustomValue { .. } => NuExpression::try_from_value(value)
|
|
.map(NuExpression::into_polars)
|
|
.map(ExtractedExpr::Single),
|
|
Value::List { vals, .. } => vals
|
|
.into_iter()
|
|
.map(Self::extract_exprs)
|
|
.collect::<Result<Vec<ExtractedExpr>, ShellError>>()
|
|
.map(ExtractedExpr::List),
|
|
x => Err(ShellError::CantConvert {
|
|
to_type: "expression".into(),
|
|
from_type: x.get_type().to_string(),
|
|
span: x.span()?,
|
|
help: None,
|
|
}),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn expr_to_value(expr: &Expr, span: Span) -> Value {
|
|
match expr {
|
|
Expr::Alias(expr, alias) => Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"alias" => Value::string(alias.as_ref(), span),
|
|
},
|
|
span,
|
|
),
|
|
|
|
Expr::Column(name) => Value::record(
|
|
record! {
|
|
"expr" => Value::string("column", span),
|
|
"value" => Value::string(name.to_string(), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Columns(columns) => {
|
|
let value = columns.iter().map(|col| Value::string(col, span)).collect();
|
|
Value::record(
|
|
record! {
|
|
"expr" => Value::string("columns", span),
|
|
"value" => Value::list(value, span),
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
Expr::Literal(literal) => Value::record(
|
|
record! {
|
|
"expr" => Value::string("literal", span),
|
|
"value" => Value::string(format!("{literal:?}"), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::BinaryExpr { left, op, right } => Value::record(
|
|
record! {
|
|
"left" => expr_to_value(left, span),
|
|
"op" => Value::string(format!("{op:?}"), span),
|
|
"right" => expr_to_value(right, span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Ternary {
|
|
predicate,
|
|
truthy,
|
|
falsy,
|
|
} => Value::record(
|
|
record! {
|
|
"predicate" => expr_to_value(predicate.as_ref(), span),
|
|
"truthy" => expr_to_value(truthy.as_ref(), span),
|
|
"falsy" => expr_to_value(falsy.as_ref(), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Agg(agg_expr) => {
|
|
let value = match agg_expr {
|
|
AggExpr::Min { input: expr, .. }
|
|
| AggExpr::Max { input: expr, .. }
|
|
| AggExpr::Median(expr)
|
|
| AggExpr::NUnique(expr)
|
|
| AggExpr::First(expr)
|
|
| AggExpr::Last(expr)
|
|
| AggExpr::Mean(expr)
|
|
| AggExpr::Implode(expr)
|
|
| AggExpr::Count(expr)
|
|
| AggExpr::Sum(expr)
|
|
| AggExpr::AggGroups(expr)
|
|
| AggExpr::Std(expr, _)
|
|
| AggExpr::Var(expr, _) => expr_to_value(expr.as_ref(), span),
|
|
AggExpr::Quantile {
|
|
expr,
|
|
quantile,
|
|
interpol,
|
|
} => Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"quantile" => expr_to_value(quantile.as_ref(), span),
|
|
"interpol" => Value::string(format!("{interpol:?}"), span),
|
|
},
|
|
span,
|
|
),
|
|
};
|
|
|
|
Value::record(
|
|
record! {
|
|
"expr" => Value::string("agg", span),
|
|
"value" => value,
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
Expr::Count => Value::record(record! { "expr" => Value::string("count", span) }, span),
|
|
Expr::Wildcard => {
|
|
Value::record(record! { "expr" => Value::string("wildcard", span) }, span)
|
|
}
|
|
Expr::Explode(expr) => Value::record(
|
|
record! { "expr" => expr_to_value(expr.as_ref(), span) },
|
|
span,
|
|
),
|
|
Expr::KeepName(expr) => Value::record(
|
|
record! { "expr" => expr_to_value(expr.as_ref(), span) },
|
|
span,
|
|
),
|
|
Expr::Nth(i) => Value::record(record! { "expr" => Value::int(*i, span) }, span),
|
|
Expr::DtypeColumn(dtypes) => {
|
|
let vals = dtypes
|
|
.iter()
|
|
.map(|d| Value::String {
|
|
val: format!("{d}"),
|
|
span,
|
|
})
|
|
.collect();
|
|
|
|
Value::List { vals, span }
|
|
}
|
|
Expr::Sort { expr, options } => Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"options" => Value::string(format!("{options:?}"), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Cast {
|
|
expr,
|
|
data_type,
|
|
strict,
|
|
} => Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"dtype" => Value::string(format!("{data_type:?}"), span),
|
|
"strict" => Value::bool(*strict, span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Take { expr, idx } => Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"idx" => expr_to_value(idx.as_ref(), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::SortBy {
|
|
expr,
|
|
by,
|
|
descending,
|
|
} => {
|
|
let by: Vec<Value> = by.iter().map(|b| expr_to_value(b, span)).collect();
|
|
let descending: Vec<Value> = descending
|
|
.iter()
|
|
.map(|r| Value::Bool { val: *r, span })
|
|
.collect();
|
|
|
|
Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"by" => Value::list(by, span),
|
|
"descending" => Value::list(descending, span),
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
Expr::Filter { input, by } => Value::record(
|
|
record! {
|
|
"input" => expr_to_value(input.as_ref(), span),
|
|
"by" => expr_to_value(by.as_ref(), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Slice {
|
|
input,
|
|
offset,
|
|
length,
|
|
} => Value::record(
|
|
record! {
|
|
"input" => expr_to_value(input.as_ref(), span),
|
|
"offset" => expr_to_value(offset.as_ref(), span),
|
|
"length" => expr_to_value(length.as_ref(), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Exclude(expr, excluded) => {
|
|
let excluded = excluded
|
|
.iter()
|
|
.map(|e| Value::String {
|
|
val: format!("{e:?}"),
|
|
span,
|
|
})
|
|
.collect();
|
|
|
|
Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"excluded" => Value::list(excluded, span),
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
Expr::RenameAlias { expr, function } => Value::record(
|
|
record! {
|
|
"expr" => expr_to_value(expr.as_ref(), span),
|
|
"function" => Value::string(format!("{function:?}"), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::AnonymousFunction {
|
|
input,
|
|
function,
|
|
output_type,
|
|
options,
|
|
} => {
|
|
let input: Vec<Value> = input.iter().map(|e| expr_to_value(e, span)).collect();
|
|
Value::record(
|
|
record! {
|
|
"input" => Value::list(input, span),
|
|
"function" => Value::string(format!("{function:?}"), span),
|
|
"output_type" => Value::string(format!("{output_type:?}"), span),
|
|
"options" => Value::string(format!("{options:?}"), span),
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
Expr::Function {
|
|
input,
|
|
function,
|
|
options,
|
|
} => {
|
|
let input: Vec<Value> = input.iter().map(|e| expr_to_value(e, span)).collect();
|
|
Value::record(
|
|
record! {
|
|
"input" => Value::list(input, span),
|
|
"function" => Value::string(format!("{function:?}"), span),
|
|
"options" => Value::string(format!("{options:?}"), span),
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
Expr::Cache { input, id } => Value::record(
|
|
record! {
|
|
"input" => expr_to_value(input.as_ref(), span),
|
|
"id" => Value::string(format!("{id:?}"), span),
|
|
},
|
|
span,
|
|
),
|
|
Expr::Window {
|
|
function,
|
|
partition_by,
|
|
order_by,
|
|
options,
|
|
} => {
|
|
let partition_by: Vec<Value> = partition_by
|
|
.iter()
|
|
.map(|e| expr_to_value(e, span))
|
|
.collect();
|
|
|
|
let order_by = order_by
|
|
.as_ref()
|
|
.map(|e| expr_to_value(e.as_ref(), span))
|
|
.unwrap_or_else(|| Value::nothing(span));
|
|
|
|
Value::record(
|
|
record! {
|
|
"function" => expr_to_value(function, span),
|
|
"partition_by" => Value::list(partition_by, span),
|
|
"order_by" => order_by,
|
|
"options" => Value::string(format!("{options:?}"), span),
|
|
},
|
|
span,
|
|
)
|
|
}
|
|
}
|
|
}
|