2019-11-24 00:57:12 +01:00
|
|
|
use crate::commands::WholeStreamCommand;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use crate::context::CommandRegistry;
|
2019-11-24 00:57:12 +01:00
|
|
|
use crate::prelude::*;
|
|
|
|
use futures::stream::StreamExt;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
2020-05-16 05:18:24 +02:00
|
|
|
use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
|
2019-11-21 15:33:14 +01:00
|
|
|
use nu_source::Tagged;
|
2019-11-24 00:57:12 +01:00
|
|
|
|
|
|
|
pub struct Compact;
|
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
pub struct CompactArgs {
|
|
|
|
rest: Vec<Tagged<String>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl WholeStreamCommand for Compact {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"compact"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("compact").rest(SyntaxShape::Any, "the columns to compact from the table")
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Creates a table with non-empty rows"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-05-16 05:18:24 +02:00
|
|
|
compact(args, registry)
|
2019-11-24 00:57:12 +01:00
|
|
|
}
|
2020-05-12 03:00:55 +02:00
|
|
|
|
2020-05-18 14:56:01 +02:00
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![
|
|
|
|
Example {
|
|
|
|
description: "Filter out all null entries in a list",
|
|
|
|
example: "echo [1 2 $null 3 $null $null] | compact target",
|
|
|
|
result: Some(vec![
|
|
|
|
UntaggedValue::int(1).into(),
|
|
|
|
UntaggedValue::int(2).into(),
|
|
|
|
UntaggedValue::int(3).into(),
|
|
|
|
]),
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Filter out all directory entries having no 'target'",
|
|
|
|
example: "ls -af | compact target",
|
|
|
|
result: None,
|
|
|
|
},
|
|
|
|
]
|
2020-05-12 03:00:55 +02:00
|
|
|
}
|
2019-11-24 00:57:12 +01:00
|
|
|
}
|
|
|
|
|
2020-05-16 05:18:24 +02:00
|
|
|
pub fn compact(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
|
|
|
let registry = registry.clone();
|
|
|
|
let stream = async_stream! {
|
|
|
|
let (CompactArgs { rest: columns }, mut input) = args.process(®istry).await?;
|
|
|
|
while let Some(item) = input.next().await {
|
|
|
|
if columns.is_empty() {
|
|
|
|
if !item.is_empty() {
|
|
|
|
yield ReturnSuccess::value(item);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
match item {
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Row(ref r),
|
|
|
|
..
|
|
|
|
} => if columns
|
|
|
|
.iter()
|
|
|
|
.all(|field| r.get_data(field).borrow().is_some()) {
|
|
|
|
yield ReturnSuccess::value(item);
|
|
|
|
}
|
|
|
|
_ => {},
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
};
|
|
|
|
Ok(stream.to_output_stream())
|
2019-11-24 00:57:12 +01:00
|
|
|
}
|
2020-05-18 14:56:01 +02:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::Compact;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn examples_work_as_expected() {
|
|
|
|
use crate::examples::test as test_examples;
|
|
|
|
|
|
|
|
test_examples(Compact {})
|
|
|
|
}
|
|
|
|
}
|