2019-08-15 07:02:02 +02: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::prelude::*;
|
2020-01-01 07:45:27 +01:00
|
|
|
use indexmap::map::IndexMap;
|
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-01-01 07:45:27 +01:00
|
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
|
|
|
|
use nu_source::Tagged;
|
2019-08-10 09:06:08 +02:00
|
|
|
|
|
|
|
pub struct Which;
|
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
impl WholeStreamCommand for Which {
|
2019-08-30 00:52:32 +02:00
|
|
|
fn name(&self) -> &str {
|
|
|
|
"which"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2020-01-01 07:45:27 +01:00
|
|
|
Signature::build("which")
|
2020-01-01 08:47:25 +01:00
|
|
|
.required("application", SyntaxShape::String, "application")
|
2020-02-12 03:24:31 +01:00
|
|
|
.switch("all", "list all executables", Some('a'))
|
2019-08-30 00:52:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Finds a program file."
|
|
|
|
}
|
|
|
|
|
2019-08-10 09:06:08 +02:00
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-01-01 07:45:27 +01:00
|
|
|
args.process(registry, which)?.run()
|
2019-08-10 09:06:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-01 07:45:27 +01:00
|
|
|
/// Shortcuts for creating an entry to the output table
|
|
|
|
fn entry(arg: impl Into<String>, path: Value, builtin: bool, tag: Tag) -> Value {
|
|
|
|
let mut map = IndexMap::new();
|
|
|
|
map.insert(
|
|
|
|
"arg".to_string(),
|
|
|
|
UntaggedValue::Primitive(Primitive::String(arg.into())).into_value(tag.clone()),
|
|
|
|
);
|
|
|
|
map.insert("path".to_string(), path);
|
|
|
|
map.insert(
|
|
|
|
"builtin".to_string(),
|
|
|
|
UntaggedValue::Primitive(Primitive::Boolean(builtin)).into_value(tag.clone()),
|
|
|
|
);
|
|
|
|
|
|
|
|
UntaggedValue::row(map).into_value(tag)
|
|
|
|
}
|
|
|
|
|
|
|
|
macro_rules! entry_builtin {
|
|
|
|
($arg:expr, $tag:expr) => {
|
|
|
|
entry(
|
|
|
|
$arg.clone(),
|
|
|
|
UntaggedValue::Primitive(Primitive::String("nushell built-in command".to_string()))
|
|
|
|
.into_value($tag.clone()),
|
|
|
|
true,
|
|
|
|
$tag,
|
|
|
|
)
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
macro_rules! entry_path {
|
|
|
|
($arg:expr, $path:expr, $tag:expr) => {
|
|
|
|
entry(
|
|
|
|
$arg.clone(),
|
|
|
|
UntaggedValue::Primitive(Primitive::Path($path)).into_value($tag.clone()),
|
|
|
|
false,
|
|
|
|
$tag,
|
|
|
|
)
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Deserialize, Debug)]
|
|
|
|
struct WhichArgs {
|
2020-01-01 08:47:25 +01:00
|
|
|
application: Tagged<String>,
|
2020-01-01 07:45:27 +01:00
|
|
|
all: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn which(
|
2020-01-01 08:47:25 +01:00
|
|
|
WhichArgs { application, all }: WhichArgs,
|
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 05:30:44 +02:00
|
|
|
RunnableContext { registry, .. }: RunnableContext,
|
2020-01-01 07:45:27 +01:00
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-01-01 08:47:25 +01:00
|
|
|
let external = application.starts_with('^');
|
2020-01-01 07:45:27 +01:00
|
|
|
let item = if external {
|
2020-01-01 08:47:25 +01:00
|
|
|
application.item[1..].to_string()
|
2020-01-01 07:45:27 +01:00
|
|
|
} else {
|
2020-01-01 08:47:25 +01:00
|
|
|
application.item.clone()
|
2020-01-01 07:45:27 +01:00
|
|
|
};
|
|
|
|
|
2020-03-22 14:11:39 +01:00
|
|
|
let stream = async_stream! {
|
|
|
|
if !external {
|
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 05:30:44 +02:00
|
|
|
let builtin = registry.has(&item);
|
2020-01-01 07:45:27 +01:00
|
|
|
if builtin {
|
2020-01-01 08:47:25 +01:00
|
|
|
yield ReturnSuccess::value(entry_builtin!(item, application.tag.clone()));
|
2020-01-01 07:45:27 +01:00
|
|
|
}
|
2020-03-22 14:11:39 +01:00
|
|
|
}
|
2020-01-01 07:45:27 +01:00
|
|
|
|
2020-03-22 14:11:39 +01:00
|
|
|
if let Ok(paths) = ichwh::which_all(&item).await {
|
|
|
|
for path in paths {
|
|
|
|
yield ReturnSuccess::value(entry_path!(item, path.into(), application.tag.clone()));
|
2019-08-10 09:06:08 +02:00
|
|
|
}
|
2020-03-22 14:11:39 +01:00
|
|
|
}
|
|
|
|
};
|
2020-01-01 07:45:27 +01:00
|
|
|
|
2020-03-22 14:11:39 +01:00
|
|
|
if all {
|
2020-01-01 07:45:27 +01:00
|
|
|
Ok(stream.to_output_stream())
|
2019-08-10 09:06:08 +02:00
|
|
|
} else {
|
2020-03-22 14:11:39 +01:00
|
|
|
Ok(stream.take(1).to_output_stream())
|
2020-01-01 07:45:27 +01:00
|
|
|
}
|
2019-08-10 09:06:08 +02:00
|
|
|
}
|