mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 16:33:37 +01:00
commands: any? all? (#3252)
* commands: any? all? We can check if `any` (or `all`) rows of tables match predicates. Small `all?` example: Given the following table with `services` running: ``` > echo [[status]; [UP] [UP]] ───┬──────── # │ status ───┼──────── 0 │ UP 1 │ UP ───┴──────── ``` We can ask if all services are UP, like so: ``` > echo [[status]; [UP] [UP]] | all? status == UP true ``` * Fix any? signature.
This commit is contained in:
parent
2146ede15d
commit
e278ca61d1
@ -4,7 +4,9 @@ pub(crate) mod macros;
|
|||||||
mod from_delimited_data;
|
mod from_delimited_data;
|
||||||
mod to_delimited_data;
|
mod to_delimited_data;
|
||||||
|
|
||||||
|
pub(crate) mod all;
|
||||||
pub(crate) mod ansi;
|
pub(crate) mod ansi;
|
||||||
|
pub(crate) mod any;
|
||||||
pub(crate) mod append;
|
pub(crate) mod append;
|
||||||
pub(crate) mod args;
|
pub(crate) mod args;
|
||||||
pub mod autoenv;
|
pub mod autoenv;
|
||||||
@ -176,6 +178,8 @@ pub(crate) use kill::Kill;
|
|||||||
pub(crate) mod clear;
|
pub(crate) mod clear;
|
||||||
pub(crate) use clear::Clear;
|
pub(crate) use clear::Clear;
|
||||||
pub(crate) mod touch;
|
pub(crate) mod touch;
|
||||||
|
pub(crate) use all::Command as All;
|
||||||
|
pub(crate) use any::Command as Any;
|
||||||
pub(crate) use enter::Enter;
|
pub(crate) use enter::Enter;
|
||||||
pub(crate) use every::Every;
|
pub(crate) use every::Every;
|
||||||
pub(crate) use exec::Exec;
|
pub(crate) use exec::Exec;
|
||||||
@ -286,7 +290,7 @@ pub(crate) use touch::Touch;
|
|||||||
pub(crate) use uniq::Uniq;
|
pub(crate) use uniq::Uniq;
|
||||||
pub(crate) use url_::{UrlCommand, UrlHost, UrlPath, UrlQuery, UrlScheme};
|
pub(crate) use url_::{UrlCommand, UrlHost, UrlPath, UrlQuery, UrlScheme};
|
||||||
pub(crate) use version::Version;
|
pub(crate) use version::Version;
|
||||||
pub(crate) use where_::Where;
|
pub(crate) use where_::Command as Where;
|
||||||
pub(crate) use which_::Which;
|
pub(crate) use which_::Which;
|
||||||
pub(crate) use with_env::WithEnv;
|
pub(crate) use with_env::WithEnv;
|
||||||
pub(crate) use wrap::Wrap;
|
pub(crate) use wrap::Wrap;
|
||||||
|
138
crates/nu-command/src/commands/all.rs
Normal file
138
crates/nu-command/src/commands/all.rs
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
use crate::prelude::*;
|
||||||
|
use nu_engine::evaluate_baseline_expr;
|
||||||
|
use nu_engine::WholeStreamCommand;
|
||||||
|
use nu_errors::ShellError;
|
||||||
|
use nu_protocol::{
|
||||||
|
hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape, UntaggedValue,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub struct Command;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct Arguments {
|
||||||
|
block: CapturedBlock,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl WholeStreamCommand for Command {
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"all?"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signature(&self) -> Signature {
|
||||||
|
Signature::build("all?").required(
|
||||||
|
"condition",
|
||||||
|
SyntaxShape::RowCondition,
|
||||||
|
"the condition that must match",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn usage(&self) -> &str {
|
||||||
|
"Find if the table rows matches the condition."
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
|
all(args).await
|
||||||
|
}
|
||||||
|
|
||||||
|
fn examples(&self) -> Vec<Example> {
|
||||||
|
use nu_protocol::Value;
|
||||||
|
|
||||||
|
vec![
|
||||||
|
Example {
|
||||||
|
description: "Find if services are running",
|
||||||
|
example: "echo [[status]; [UP] [UP]] | all? status == UP",
|
||||||
|
result: Some(vec![Value::from(true)]),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Check that all values are even",
|
||||||
|
example: "echo [2 4 6 8] | all? $(= $it mod 2) == 0",
|
||||||
|
result: Some(vec![Value::from(true)]),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn all(args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
|
let ctx = Arc::new(EvaluationContext::from_args(&args));
|
||||||
|
let tag = args.call_info.name_tag.clone();
|
||||||
|
let (Arguments { block }, input) = args.process().await?;
|
||||||
|
|
||||||
|
let condition = {
|
||||||
|
if block.block.block.len() != 1 {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Expected a condition",
|
||||||
|
"expected a condition",
|
||||||
|
tag,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
match block.block.block[0].pipelines.get(0) {
|
||||||
|
Some(item) => match item.list.get(0) {
|
||||||
|
Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
|
||||||
|
_ => {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Expected a condition",
|
||||||
|
"expected a condition",
|
||||||
|
tag,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Expected a condition",
|
||||||
|
"expected a condition",
|
||||||
|
tag,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let init = Ok(InputStream::one(
|
||||||
|
UntaggedValue::boolean(true).into_value(&tag),
|
||||||
|
));
|
||||||
|
|
||||||
|
Ok(input
|
||||||
|
.fold(init, move |acc, row| {
|
||||||
|
let condition = condition.clone();
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
ctx.scope.enter_scope();
|
||||||
|
ctx.scope.add_vars(&block.captured.entries);
|
||||||
|
ctx.scope.add_var("$it", row);
|
||||||
|
|
||||||
|
async move {
|
||||||
|
let condition = evaluate_baseline_expr(&condition, &*ctx).await.clone();
|
||||||
|
ctx.scope.exit_scope();
|
||||||
|
|
||||||
|
let curr = acc?.drain_vec().await;
|
||||||
|
let curr = curr
|
||||||
|
.get(0)
|
||||||
|
.ok_or_else(|| ShellError::unexpected("No value to check with"))?;
|
||||||
|
let cond = curr.as_bool()?;
|
||||||
|
|
||||||
|
match condition {
|
||||||
|
Ok(condition) => match condition.as_bool() {
|
||||||
|
Ok(b) => Ok(InputStream::one(
|
||||||
|
UntaggedValue::boolean(cond && b).into_value(&curr.tag),
|
||||||
|
)),
|
||||||
|
Err(e) => Err(e),
|
||||||
|
},
|
||||||
|
Err(e) => Err(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await?
|
||||||
|
.to_output_stream())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::Command;
|
||||||
|
use super::ShellError;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn examples_work_as_expected() -> Result<(), ShellError> {
|
||||||
|
use crate::examples::test as test_examples;
|
||||||
|
|
||||||
|
test_examples(Command {})
|
||||||
|
}
|
||||||
|
}
|
138
crates/nu-command/src/commands/any.rs
Normal file
138
crates/nu-command/src/commands/any.rs
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
use crate::prelude::*;
|
||||||
|
use nu_engine::evaluate_baseline_expr;
|
||||||
|
use nu_engine::WholeStreamCommand;
|
||||||
|
use nu_errors::ShellError;
|
||||||
|
use nu_protocol::{
|
||||||
|
hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape, UntaggedValue,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub struct Command;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct Arguments {
|
||||||
|
block: CapturedBlock,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl WholeStreamCommand for Command {
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"any?"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signature(&self) -> Signature {
|
||||||
|
Signature::build("any?").required(
|
||||||
|
"condition",
|
||||||
|
SyntaxShape::RowCondition,
|
||||||
|
"the condition that must match",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn usage(&self) -> &str {
|
||||||
|
"Find if the table rows matches the condition."
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
|
any(args).await
|
||||||
|
}
|
||||||
|
|
||||||
|
fn examples(&self) -> Vec<Example> {
|
||||||
|
use nu_protocol::Value;
|
||||||
|
|
||||||
|
vec![
|
||||||
|
Example {
|
||||||
|
description: "Find if a service is not running",
|
||||||
|
example: "echo [[status]; [UP] [DOWN] [UP]] | any? status == DOWN",
|
||||||
|
result: Some(vec![Value::from(true)]),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Check if any of the values is odd",
|
||||||
|
example: "echo [2 4 1 6 8] | any? $(= $it mod 2) == 1",
|
||||||
|
result: Some(vec![Value::from(true)]),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn any(args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
|
let ctx = Arc::new(EvaluationContext::from_args(&args));
|
||||||
|
let tag = args.call_info.name_tag.clone();
|
||||||
|
let (Arguments { block }, input) = args.process().await?;
|
||||||
|
|
||||||
|
let condition = {
|
||||||
|
if block.block.block.len() != 1 {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Expected a condition",
|
||||||
|
"expected a condition",
|
||||||
|
tag,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
match block.block.block[0].pipelines.get(0) {
|
||||||
|
Some(item) => match item.list.get(0) {
|
||||||
|
Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
|
||||||
|
_ => {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Expected a condition",
|
||||||
|
"expected a condition",
|
||||||
|
tag,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Expected a condition",
|
||||||
|
"expected a condition",
|
||||||
|
tag,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let cond = Ok(InputStream::one(
|
||||||
|
UntaggedValue::boolean(false).into_value(&tag),
|
||||||
|
));
|
||||||
|
|
||||||
|
Ok(input
|
||||||
|
.fold(cond, move |cond, row| {
|
||||||
|
let condition = condition.clone();
|
||||||
|
let ctx = ctx.clone();
|
||||||
|
ctx.scope.enter_scope();
|
||||||
|
ctx.scope.add_vars(&block.captured.entries);
|
||||||
|
ctx.scope.add_var("$it", row);
|
||||||
|
|
||||||
|
async move {
|
||||||
|
let condition = evaluate_baseline_expr(&condition, &*ctx).await.clone();
|
||||||
|
ctx.scope.exit_scope();
|
||||||
|
|
||||||
|
let curr = cond?.drain_vec().await;
|
||||||
|
let curr = curr
|
||||||
|
.get(0)
|
||||||
|
.ok_or_else(|| ShellError::unexpected("No value to check with"))?;
|
||||||
|
let cond = curr.as_bool()?;
|
||||||
|
|
||||||
|
match condition {
|
||||||
|
Ok(condition) => match condition.as_bool() {
|
||||||
|
Ok(b) => Ok(InputStream::one(
|
||||||
|
UntaggedValue::boolean(cond || b).into_value(&curr.tag),
|
||||||
|
)),
|
||||||
|
Err(e) => Err(e),
|
||||||
|
},
|
||||||
|
Err(e) => Err(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await?
|
||||||
|
.to_output_stream())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::Command;
|
||||||
|
use super::ShellError;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn examples_work_as_expected() -> Result<(), ShellError> {
|
||||||
|
use crate::examples::test as test_examples;
|
||||||
|
|
||||||
|
test_examples(Command {})
|
||||||
|
}
|
||||||
|
}
|
@ -124,6 +124,8 @@ pub fn create_default_context(interactive: bool) -> Result<EvaluationContext, Bo
|
|||||||
whole_stream_command(IntoInt),
|
whole_stream_command(IntoInt),
|
||||||
whole_stream_command(SplitBy),
|
whole_stream_command(SplitBy),
|
||||||
// Row manipulation
|
// Row manipulation
|
||||||
|
whole_stream_command(All),
|
||||||
|
whole_stream_command(Any),
|
||||||
whole_stream_command(Reverse),
|
whole_stream_command(Reverse),
|
||||||
whole_stream_command(Append),
|
whole_stream_command(Append),
|
||||||
whole_stream_command(Prepend),
|
whole_stream_command(Prepend),
|
||||||
|
@ -6,15 +6,15 @@ use nu_protocol::{
|
|||||||
hir::CapturedBlock, hir::ClassifiedCommand, ReturnSuccess, Signature, SyntaxShape,
|
hir::CapturedBlock, hir::ClassifiedCommand, ReturnSuccess, Signature, SyntaxShape,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub struct Where;
|
pub struct Command;
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
pub struct WhereArgs {
|
pub struct Arguments {
|
||||||
block: CapturedBlock,
|
block: CapturedBlock,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl WholeStreamCommand for Where {
|
impl WholeStreamCommand for Command {
|
||||||
fn name(&self) -> &str {
|
fn name(&self) -> &str {
|
||||||
"where"
|
"where"
|
||||||
}
|
}
|
||||||
@ -63,7 +63,7 @@ impl WholeStreamCommand for Where {
|
|||||||
async fn where_command(raw_args: CommandArgs) -> Result<OutputStream, ShellError> {
|
async fn where_command(raw_args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
let ctx = Arc::new(EvaluationContext::from_args(&raw_args));
|
let ctx = Arc::new(EvaluationContext::from_args(&raw_args));
|
||||||
let tag = raw_args.call_info.name_tag.clone();
|
let tag = raw_args.call_info.name_tag.clone();
|
||||||
let (WhereArgs { block }, input) = raw_args.process().await?;
|
let (Arguments { block }, input) = raw_args.process().await?;
|
||||||
let condition = {
|
let condition = {
|
||||||
if block.block.block.len() != 1 {
|
if block.block.block.len() != 1 {
|
||||||
return Err(ShellError::labeled_error(
|
return Err(ShellError::labeled_error(
|
||||||
@ -127,13 +127,13 @@ async fn where_command(raw_args: CommandArgs) -> Result<OutputStream, ShellError
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
use super::Command;
|
||||||
use super::ShellError;
|
use super::ShellError;
|
||||||
use super::Where;
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn examples_work_as_expected() -> Result<(), ShellError> {
|
fn examples_work_as_expected() -> Result<(), ShellError> {
|
||||||
use crate::examples::test as test_examples;
|
use crate::examples::test as test_examples;
|
||||||
|
|
||||||
test_examples(Where {})
|
test_examples(Command {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
41
crates/nu-command/tests/commands/all.rs
Normal file
41
crates/nu-command/tests/commands/all.rs
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
use nu_test_support::pipeline as input;
|
||||||
|
use nu_test_support::playground::{says, Playground};
|
||||||
|
|
||||||
|
use hamcrest2::assert_that;
|
||||||
|
use hamcrest2::prelude::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn checks_all_rows_are_true() {
|
||||||
|
Playground::setup("all_test_1", |_, nu| {
|
||||||
|
assert_that!(
|
||||||
|
nu.pipeline(&input(
|
||||||
|
r#"
|
||||||
|
echo [ "Andrés", "Andrés", "Andrés" ]
|
||||||
|
| all? $it == "Andrés"
|
||||||
|
"#
|
||||||
|
)),
|
||||||
|
says().to_stdout("true")
|
||||||
|
);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn checks_all_columns_of_a_table_is_true() {
|
||||||
|
Playground::setup("any_test_1", |_, nu| {
|
||||||
|
assert_that!(
|
||||||
|
nu.pipeline(&input(
|
||||||
|
r#"
|
||||||
|
echo [
|
||||||
|
[ first_name, last_name, rusty_at, likes ];
|
||||||
|
[ Andrés, Robalino, 10/11/2013, 1 ]
|
||||||
|
[ Jonathan, Turner, 10/12/2013, 1 ]
|
||||||
|
[ Darren, Schroeder, 10/11/2013, 1 ]
|
||||||
|
[ Yehuda, Katz, 10/11/2013, 1 ]
|
||||||
|
]
|
||||||
|
| all? likes > 0
|
||||||
|
"#
|
||||||
|
)),
|
||||||
|
says().to_stdout("true")
|
||||||
|
);
|
||||||
|
})
|
||||||
|
}
|
41
crates/nu-command/tests/commands/any.rs
Normal file
41
crates/nu-command/tests/commands/any.rs
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
use nu_test_support::pipeline as input;
|
||||||
|
use nu_test_support::playground::{says, Playground};
|
||||||
|
|
||||||
|
use hamcrest2::assert_that;
|
||||||
|
use hamcrest2::prelude::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn checks_any_row_is_true() {
|
||||||
|
Playground::setup("any_test_1", |_, nu| {
|
||||||
|
assert_that!(
|
||||||
|
nu.pipeline(&input(
|
||||||
|
r#"
|
||||||
|
echo [ "Ecuador", "USA", "New Zealand" ]
|
||||||
|
| any? $it == "New Zealand"
|
||||||
|
"#
|
||||||
|
)),
|
||||||
|
says().to_stdout("true")
|
||||||
|
);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn checks_any_column_of_a_table_is_true() {
|
||||||
|
Playground::setup("any_test_1", |_, nu| {
|
||||||
|
assert_that!(
|
||||||
|
nu.pipeline(&input(
|
||||||
|
r#"
|
||||||
|
echo [
|
||||||
|
[ first_name, last_name, rusty_at, likes ];
|
||||||
|
[ Andrés, Robalino, 10/11/2013, 1 ]
|
||||||
|
[ Jonathan, Turner, 10/12/2013, 1 ]
|
||||||
|
[ Darren, Schroeder, 10/11/2013, 1 ]
|
||||||
|
[ Yehuda, Katz, 10/11/2013, 1 ]
|
||||||
|
]
|
||||||
|
| any? rusty_at == 10/12/2013
|
||||||
|
"#
|
||||||
|
)),
|
||||||
|
says().to_stdout("true")
|
||||||
|
);
|
||||||
|
})
|
||||||
|
}
|
@ -1,3 +1,5 @@
|
|||||||
|
mod all;
|
||||||
|
mod any;
|
||||||
mod append;
|
mod append;
|
||||||
mod cal;
|
mod cal;
|
||||||
mod cd;
|
mod cd;
|
||||||
|
Loading…
Reference in New Issue
Block a user