2019-11-12 07:07:43 +00:00
|
|
|
use crate::commands::WholeStreamCommand;
|
|
|
|
use crate::prelude::*;
|
2020-01-04 04:00:39 +00:00
|
|
|
use crate::utils::data_processing::{evaluate, fetch};
|
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 02:30:48 +00:00
|
|
|
use nu_errors::ShellError;
|
|
|
|
use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
|
2019-11-21 14:33:14 +00:00
|
|
|
use nu_source::{SpannedItem, Tagged};
|
2019-12-09 18:52:01 +00:00
|
|
|
use nu_value_ext::ValueExt;
|
2019-11-21 14:33:14 +00:00
|
|
|
|
2019-11-12 07:07:43 +00:00
|
|
|
pub struct EvaluateBy;
|
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
pub struct EvaluateByArgs {
|
|
|
|
evaluate_with: Option<Tagged<String>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl WholeStreamCommand for EvaluateBy {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"evaluate-by"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("evaluate-by").named(
|
|
|
|
"evaluate_with",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"the name of the column to evaluate by",
|
2020-02-12 02:24:31 +00:00
|
|
|
Some('w'),
|
2019-11-12 07:07:43 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Creates a new table with the data from the tables rows evaluated by the column given."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-05-16 03:18:24 +00:00
|
|
|
evaluate_by(args, registry)
|
2019-11-12 07:07:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn evaluate_by(
|
2020-05-16 03:18:24 +00:00
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
2019-11-12 07:07:43 +00:00
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-05-16 03:18:24 +00:00
|
|
|
let registry = registry.clone();
|
2019-11-12 07:07:43 +00:00
|
|
|
let stream = async_stream! {
|
2020-05-16 03:18:24 +00:00
|
|
|
let name = args.call_info.name_tag.clone();
|
|
|
|
let (EvaluateByArgs { evaluate_with }, mut input) = args.process(®istry).await?;
|
Move external closer to internal (#1611)
* Refactor InputStream and affected commands.
First, making `values` private and leaning on the `Stream` implementation makes
consumes of `InputStream` less likely to have to change in the future, if we
change what an `InputStream` is internally.
Second, we're dropping `Option<InputStream>` as the input to pipelines,
internals, and externals. Instead, `InputStream.is_empty` can be used to check
for "emptiness". Empty streams are typically only ever used as the first input
to a pipeline.
* Add run_external internal command.
We want to push external commands closer to internal commands, eventually
eliminating the concept of "external" completely. This means we can consolidate
a couple of things:
- Variable evaluation (for example, `$it`, `$nu`, alias vars)
- Behaviour of whole stream vs per-item external execution
It should also make it easier for us to start introducing argument signatures
for external commands,
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
2020-04-20 03:30:44 +00:00
|
|
|
let values: Vec<Value> = input.collect().await;
|
2019-11-12 07:07:43 +00:00
|
|
|
|
|
|
|
if values.is_empty() {
|
|
|
|
yield Err(ShellError::labeled_error(
|
|
|
|
"Expected table from pipeline",
|
|
|
|
"requires a table input",
|
|
|
|
name
|
|
|
|
))
|
|
|
|
} else {
|
|
|
|
|
|
|
|
let evaluate_with = if let Some(evaluator) = evaluate_with {
|
|
|
|
Some(evaluator.item().clone())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
|
|
|
match evaluate(&values[0], evaluate_with, name) {
|
|
|
|
Ok(evaluated) => yield ReturnSuccess::value(evaluated),
|
|
|
|
Err(err) => yield Err(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
|
|
|
}
|
2020-05-18 12:56:01 +00:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::EvaluateBy;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn examples_work_as_expected() {
|
|
|
|
use crate::examples::test as test_examples;
|
|
|
|
|
|
|
|
test_examples(EvaluateBy {})
|
|
|
|
}
|
|
|
|
}
|