# Description This PR tries to resolve the overloading issue by going back to our original naming convention for dataframes. So, this PR renames all dataframe commands with a prefix of `dfr`. Some commands like `open-df` were renamed to `dfr open` and things like `into df` were renamed `dfr into-df`. I'm sure we can optimize naming a bit, but it seems to compile now. # User-Facing Changes All dataframe commands are prefixed with dfr. # 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.
115 lines
3.6 KiB
Rust
115 lines
3.6 KiB
Rust
use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
|
|
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::{lit, DataType};
|
|
|
|
#[derive(Clone)]
|
|
pub struct ExprIsIn;
|
|
|
|
impl Command for ExprIsIn {
|
|
fn name(&self) -> &str {
|
|
"dfr is-in"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Creates an is-in expression"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.required(
|
|
"list",
|
|
SyntaxShape::List(Box::new(SyntaxShape::Any)),
|
|
"List to check if values are in",
|
|
)
|
|
.input_type(Type::Custom("expression".into()))
|
|
.output_type(Type::Custom("expression".into()))
|
|
.category(Category::Custom("expression".into()))
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Creates a is-in expression",
|
|
example: r#"let df = ([[a b]; [one 1] [two 2] [three 3]] | dfr into-df);
|
|
$df | dfr with-column (dfr col a | dfr is-in [one two] | dfr as a_in)"#,
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(vec![
|
|
Column::new(
|
|
"a".to_string(),
|
|
vec![
|
|
Value::test_string("one"),
|
|
Value::test_string("two"),
|
|
Value::test_string("three"),
|
|
],
|
|
),
|
|
Column::new(
|
|
"b".to_string(),
|
|
vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
|
|
),
|
|
Column::new(
|
|
"a_in".to_string(),
|
|
vec![
|
|
Value::test_bool(true),
|
|
Value::test_bool(true),
|
|
Value::test_bool(false),
|
|
],
|
|
),
|
|
])
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
}]
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["check", "contained", "is-contain", "match"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let list: Vec<Value> = call.req(engine_state, stack, 0)?;
|
|
let expr = NuExpression::try_from_pipeline(input, call.head)?;
|
|
|
|
let values = NuDataFrame::try_from_columns(vec![Column::new("list".to_string(), list)])?;
|
|
let list = values.as_series(call.head)?;
|
|
|
|
if matches!(list.dtype(), DataType::Object(..)) {
|
|
return Err(ShellError::IncompatibleParametersSingle(
|
|
"Cannot use a mixed list as argument".into(),
|
|
call.head,
|
|
));
|
|
}
|
|
|
|
let expr: NuExpression = expr.into_polars().is_in(lit(list)).into();
|
|
Ok(PipelineData::Value(expr.into_value(call.head), None))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::super::super::test_dataframe::test_dataframe;
|
|
use super::*;
|
|
use crate::dataframe::eager::WithColumn;
|
|
use crate::dataframe::expressions::alias::ExprAlias;
|
|
use crate::dataframe::expressions::col::ExprCol;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
test_dataframe(vec![
|
|
Box::new(ExprIsIn {}),
|
|
Box::new(ExprAlias {}),
|
|
Box::new(ExprCol {}),
|
|
Box::new(WithColumn {}),
|
|
])
|
|
}
|
|
}
|