nushell/src/commands/command.rs

703 lines
19 KiB
Rust
Raw Normal View History

2019-07-24 00:22:11 +02:00
use crate::context::{SourceMap, SpanSource};
2019-05-10 18:59:12 +02:00
use crate::errors::ShellError;
2019-07-24 00:22:11 +02:00
use crate::evaluate::Scope;
2019-05-10 18:59:12 +02:00
use crate::object::Value;
2019-07-24 00:22:11 +02:00
use crate::parser::hir;
2019-08-09 06:51:21 +02:00
use crate::parser::{registry, ConfigDeserializer};
use crate::prelude::*;
2019-08-02 21:15:07 +02:00
use derive_new::new;
2019-06-22 05:43:37 +02:00
use getset::Getters;
2019-06-27 06:56:48 +02:00
use serde::{Deserialize, Serialize};
2019-07-24 00:22:11 +02:00
use std::fmt;
use std::ops::Deref;
2019-07-08 18:44:53 +02:00
use std::path::PathBuf;
use uuid::Uuid;
2019-05-10 18:59:12 +02:00
2019-07-24 00:22:11 +02:00
#[derive(Deserialize, Serialize, Debug, Clone)]
pub struct UnevaluatedCallInfo {
pub args: hir::Call,
pub source: Text,
pub source_map: SourceMap,
2019-08-09 06:51:21 +02:00
pub name_span: Span,
2019-07-24 00:22:11 +02:00
}
impl ToDebug for UnevaluatedCallInfo {
fn fmt_debug(&self, f: &mut fmt::Formatter, source: &str) -> fmt::Result {
self.args.fmt_debug(f, source)
}
}
impl UnevaluatedCallInfo {
2019-08-14 19:02:39 +02:00
pub fn evaluate(
2019-07-24 00:22:11 +02:00
self,
registry: &registry::CommandRegistry,
scope: &Scope,
) -> Result<CallInfo, ShellError> {
let args = self.args.evaluate(registry, scope, &self.source)?;
Ok(CallInfo {
args,
source_map: self.source_map,
name_span: self.name_span,
})
}
2019-08-15 07:46:19 +02:00
pub fn has_it_or_block(&self) -> bool {
use hir::RawExpression;
use hir::Variable;
if let Some(positional) = &self.args.positional() {
for pos in positional {
match pos {
Tagged {
item: RawExpression::Variable(Variable::It(_)),
..
} => {
return true;
}
Tagged {
item: RawExpression::Block(_),
..
} => {
return true;
}
_ => {}
}
}
}
false
}
2019-07-24 00:22:11 +02:00
}
#[derive(Deserialize, Serialize, Debug, Clone)]
pub struct CallInfo {
2019-07-24 00:22:11 +02:00
pub args: registry::EvaluatedArgs,
pub source_map: SourceMap,
pub name_span: Span,
}
impl CallInfo {
pub fn process<'de, T: Deserialize<'de>>(
&self,
shell_manager: &ShellManager,
2019-08-24 21:36:19 +02:00
callback: fn(T, &RunnablePerItemContext) -> Result<OutputStream, ShellError>,
) -> Result<RunnablePerItemArgs<T>, ShellError> {
let mut deserializer = ConfigDeserializer::from_call_info(self.clone());
Ok(RunnablePerItemArgs {
args: T::deserialize(&mut deserializer)?,
context: RunnablePerItemContext {
shell_manager: shell_manager.clone(),
name: self.name_span,
},
callback,
})
}
}
2019-06-22 05:43:37 +02:00
#[derive(Getters)]
#[get = "crate"]
pub struct CommandArgs {
2019-07-24 00:22:11 +02:00
pub host: Arc<Mutex<dyn Host>>,
2019-08-07 19:49:11 +02:00
pub shell_manager: ShellManager,
2019-07-24 00:22:11 +02:00
pub call_info: UnevaluatedCallInfo,
pub input: InputStream,
2019-05-16 02:21:46 +02:00
}
2019-08-14 19:02:39 +02:00
#[derive(Getters, Clone)]
2019-08-03 04:17:28 +02:00
#[get = "crate"]
pub struct RawCommandArgs {
pub host: Arc<Mutex<dyn Host>>,
2019-08-09 06:51:21 +02:00
pub shell_manager: ShellManager,
2019-08-03 04:17:28 +02:00
pub call_info: UnevaluatedCallInfo,
}
impl RawCommandArgs {
2019-08-09 06:51:21 +02:00
pub fn with_input(self, input: Vec<Tagged<Value>>) -> CommandArgs {
2019-08-03 04:17:28 +02:00
CommandArgs {
host: self.host,
2019-08-09 06:51:21 +02:00
shell_manager: self.shell_manager,
2019-08-03 04:17:28 +02:00
call_info: self.call_info,
input: input.into(),
}
}
}
2019-07-24 00:22:11 +02:00
impl ToDebug for CommandArgs {
fn fmt_debug(&self, f: &mut fmt::Formatter, source: &str) -> fmt::Result {
self.call_info.fmt_debug(f, source)
}
}
2019-06-22 05:43:37 +02:00
impl CommandArgs {
2019-07-24 00:22:11 +02:00
pub fn evaluate_once(
self,
registry: &registry::CommandRegistry,
2019-08-15 07:02:02 +02:00
) -> Result<EvaluatedWholeStreamCommandArgs, ShellError> {
2019-07-24 00:22:11 +02:00
let host = self.host.clone();
2019-08-09 06:51:21 +02:00
let shell_manager = self.shell_manager.clone();
2019-07-24 00:22:11 +02:00
let input = self.input;
let call_info = self.call_info.evaluate(registry, &Scope::empty())?;
2019-08-15 07:02:02 +02:00
Ok(EvaluatedWholeStreamCommandArgs::new(
2019-08-09 06:51:21 +02:00
host,
shell_manager,
call_info,
input,
))
2019-07-24 00:22:11 +02:00
}
2019-08-21 08:39:57 +02:00
// pub fn name_span(&self) -> Span {
// self.call_info.name_span
// }
2019-08-02 21:15:07 +02:00
pub fn process<'de, T: Deserialize<'de>>(
self,
registry: &CommandRegistry,
callback: fn(T, RunnableContext) -> Result<OutputStream, ShellError>,
) -> Result<RunnableArgs<T>, ShellError> {
2019-08-09 06:51:21 +02:00
let shell_manager = self.shell_manager.clone();
2019-08-09 07:36:43 +02:00
let source_map = self.call_info.source_map.clone();
2019-08-03 04:17:28 +02:00
let host = self.host.clone();
2019-08-02 21:15:07 +02:00
let args = self.evaluate_once(registry)?;
let (input, args) = args.split();
let name_span = args.call_info.name_span;
let mut deserializer = ConfigDeserializer::from_call_info(args.call_info);
2019-08-02 21:15:07 +02:00
Ok(RunnableArgs {
args: T::deserialize(&mut deserializer)?,
context: RunnableContext {
input: input,
2019-08-03 04:17:28 +02:00
commands: registry.clone(),
2019-08-09 06:51:21 +02:00
shell_manager,
2019-08-03 04:17:28 +02:00
name: name_span,
2019-08-09 07:36:43 +02:00
source_map,
2019-08-03 04:17:28 +02:00
host,
},
callback,
})
}
pub fn process_raw<'de, T: Deserialize<'de>>(
self,
registry: &CommandRegistry,
callback: fn(T, RunnableContext, RawCommandArgs) -> Result<OutputStream, ShellError>,
) -> Result<RunnableRawArgs<T>, ShellError> {
let raw_args = RawCommandArgs {
host: self.host.clone(),
2019-08-09 06:51:21 +02:00
shell_manager: self.shell_manager.clone(),
2019-08-03 04:17:28 +02:00
call_info: self.call_info.clone(),
};
2019-08-09 06:51:21 +02:00
let shell_manager = self.shell_manager.clone();
2019-08-09 07:36:43 +02:00
let source_map = self.call_info.source_map.clone();
2019-08-03 04:17:28 +02:00
let host = self.host.clone();
let args = self.evaluate_once(registry)?;
let (input, args) = args.split();
let name_span = args.call_info.name_span;
let mut deserializer = ConfigDeserializer::from_call_info(args.call_info);
2019-08-03 04:17:28 +02:00
Ok(RunnableRawArgs {
args: T::deserialize(&mut deserializer)?,
context: RunnableContext {
input: input,
commands: registry.clone(),
2019-08-09 06:51:21 +02:00
shell_manager,
2019-08-02 21:15:07 +02:00
name: name_span,
2019-08-09 07:36:43 +02:00
source_map,
2019-08-03 04:17:28 +02:00
host,
2019-08-02 21:15:07 +02:00
},
2019-08-03 04:17:28 +02:00
raw_args,
2019-08-02 21:15:07 +02:00
callback,
})
}
}
pub struct RunnablePerItemContext {
pub shell_manager: ShellManager,
pub name: Span,
}
impl RunnablePerItemContext {
pub fn cwd(&self) -> PathBuf {
PathBuf::from(self.shell_manager.path())
}
}
2019-08-02 21:15:07 +02:00
pub struct RunnableContext {
pub input: InputStream,
2019-08-09 06:51:21 +02:00
pub shell_manager: ShellManager,
2019-08-03 04:17:28 +02:00
pub host: Arc<Mutex<dyn Host>>,
pub commands: CommandRegistry,
2019-08-09 07:36:43 +02:00
pub source_map: SourceMap,
2019-08-09 06:51:21 +02:00
pub name: Span,
2019-08-02 21:15:07 +02:00
}
impl RunnableContext {
2019-08-21 14:08:23 +02:00
#[allow(unused)]
2019-08-02 21:15:07 +02:00
pub fn cwd(&self) -> PathBuf {
2019-08-09 06:51:21 +02:00
PathBuf::from(self.shell_manager.path())
2019-08-02 21:15:07 +02:00
}
2019-08-03 04:17:28 +02:00
pub fn expect_command(&self, name: &str) -> Arc<Command> {
self.commands
.get_command(name)
.expect(&format!("Expected command {}", name))
}
2019-08-02 21:15:07 +02:00
}
pub struct RunnablePerItemArgs<T> {
args: T,
context: RunnablePerItemContext,
2019-08-24 21:36:19 +02:00
callback: fn(T, &RunnablePerItemContext) -> Result<OutputStream, ShellError>,
}
impl<T> RunnablePerItemArgs<T> {
2019-08-24 21:36:19 +02:00
pub fn run(self) -> Result<OutputStream, ShellError> {
(self.callback)(self.args, &self.context)
}
}
2019-08-02 21:15:07 +02:00
pub struct RunnableArgs<T> {
args: T,
context: RunnableContext,
callback: fn(T, RunnableContext) -> Result<OutputStream, ShellError>,
}
impl<T> RunnableArgs<T> {
pub fn run(self) -> Result<OutputStream, ShellError> {
(self.callback)(self.args, self.context)
}
2019-07-24 00:22:11 +02:00
}
2019-08-03 04:17:28 +02:00
pub struct RunnableRawArgs<T> {
args: T,
raw_args: RawCommandArgs,
context: RunnableContext,
callback: fn(T, RunnableContext, RawCommandArgs) -> Result<OutputStream, ShellError>,
}
impl<T> RunnableRawArgs<T> {
pub fn run(self) -> OutputStream {
match (self.callback)(self.args, self.context, self.raw_args) {
Ok(stream) => stream,
Err(err) => OutputStream::one(Err(err)),
}
2019-08-03 04:17:28 +02:00
}
}
2019-08-15 07:02:02 +02:00
pub struct EvaluatedWholeStreamCommandArgs {
2019-07-24 00:22:11 +02:00
pub args: EvaluatedCommandArgs,
pub input: InputStream,
}
2019-08-15 07:02:02 +02:00
impl Deref for EvaluatedWholeStreamCommandArgs {
2019-07-24 00:22:11 +02:00
type Target = EvaluatedCommandArgs;
fn deref(&self) -> &Self::Target {
&self.args
}
}
2019-08-15 07:02:02 +02:00
impl EvaluatedWholeStreamCommandArgs {
2019-07-24 00:22:11 +02:00
pub fn new(
host: Arc<Mutex<dyn Host>>,
2019-08-09 06:51:21 +02:00
shell_manager: ShellManager,
2019-07-24 00:22:11 +02:00
call_info: CallInfo,
input: impl Into<InputStream>,
2019-08-15 07:02:02 +02:00
) -> EvaluatedWholeStreamCommandArgs {
EvaluatedWholeStreamCommandArgs {
2019-07-24 00:22:11 +02:00
args: EvaluatedCommandArgs {
host,
2019-08-09 06:51:21 +02:00
shell_manager,
2019-07-24 00:22:11 +02:00
call_info,
},
input: input.into(),
}
}
2019-08-09 06:51:21 +02:00
pub fn name_span(&self) -> Span {
2019-07-24 00:22:11 +02:00
self.args.call_info.name_span
}
pub fn parts(self) -> (InputStream, registry::EvaluatedArgs) {
2019-08-15 07:02:02 +02:00
let EvaluatedWholeStreamCommandArgs { args, input } = self;
2019-07-24 00:22:11 +02:00
(input, args.call_info.args)
}
2019-08-02 21:15:07 +02:00
pub fn split(self) -> (InputStream, EvaluatedCommandArgs) {
2019-08-15 07:02:02 +02:00
let EvaluatedWholeStreamCommandArgs { args, input } = self;
2019-08-02 21:15:07 +02:00
(input, args)
}
2019-07-24 00:22:11 +02:00
}
#[derive(Getters)]
#[get = "pub"]
pub struct EvaluatedFilterCommandArgs {
args: EvaluatedCommandArgs,
2019-07-24 06:10:48 +02:00
#[allow(unused)]
2019-08-09 06:51:21 +02:00
input: Tagged<Value>,
2019-07-24 00:22:11 +02:00
}
impl Deref for EvaluatedFilterCommandArgs {
type Target = EvaluatedCommandArgs;
fn deref(&self) -> &Self::Target {
&self.args
}
}
impl EvaluatedFilterCommandArgs {
pub fn new(
host: Arc<Mutex<dyn Host>>,
2019-08-09 06:51:21 +02:00
shell_manager: ShellManager,
2019-07-24 00:22:11 +02:00
call_info: CallInfo,
2019-08-09 06:51:21 +02:00
input: Tagged<Value>,
2019-07-24 00:22:11 +02:00
) -> EvaluatedFilterCommandArgs {
EvaluatedFilterCommandArgs {
args: EvaluatedCommandArgs {
host,
2019-08-09 06:51:21 +02:00
shell_manager,
2019-07-24 00:22:11 +02:00
call_info,
},
input,
}
}
}
2019-08-02 21:15:07 +02:00
#[derive(Getters, new)]
2019-07-24 00:22:11 +02:00
#[get = "crate"]
pub struct EvaluatedCommandArgs {
pub host: Arc<Mutex<dyn Host>>,
2019-08-09 06:51:21 +02:00
pub shell_manager: ShellManager,
2019-07-24 00:22:11 +02:00
pub call_info: CallInfo,
}
impl EvaluatedCommandArgs {
pub fn call_args(&self) -> &registry::EvaluatedArgs {
&self.call_info.args
}
2019-08-09 06:51:21 +02:00
pub fn nth(&self, pos: usize) -> Option<&Tagged<Value>> {
self.call_info.args.nth(pos)
2019-06-22 05:43:37 +02:00
}
2019-08-01 03:58:42 +02:00
pub fn expect_nth(&self, pos: usize) -> Result<&Tagged<Value>, ShellError> {
self.call_info.args.expect_nth(pos)
2019-06-22 05:43:37 +02:00
}
pub fn len(&self) -> usize {
self.call_info.args.len()
2019-06-22 05:43:37 +02:00
}
2019-08-01 03:58:42 +02:00
pub fn get(&self, name: &str) -> Option<&Tagged<Value>> {
self.call_info.args.get(name)
2019-06-22 05:43:37 +02:00
}
2019-08-09 06:51:21 +02:00
pub fn slice_from(&self, from: usize) -> Vec<Tagged<Value>> {
2019-08-02 21:15:07 +02:00
let positional = &self.call_info.args.positional;
match positional {
None => vec![],
Some(list) => list[from..].to_vec(),
}
}
2019-07-16 21:10:25 +02:00
#[allow(unused)]
2019-06-22 05:43:37 +02:00
pub fn has(&self, name: &str) -> bool {
self.call_info.args.has(name)
2019-06-22 05:43:37 +02:00
}
}
2019-06-27 06:56:48 +02:00
#[derive(Debug, Serialize, Deserialize)]
pub enum CommandAction {
2019-08-07 19:49:11 +02:00
ChangePath(String),
AddSpanSource(Uuid, SpanSource),
2019-06-13 23:47:25 +02:00
Exit,
2019-08-07 19:49:11 +02:00
EnterShell(String),
2019-08-14 19:02:39 +02:00
EnterValueShell(Tagged<Value>),
EnterHelpShell(Tagged<Value>),
2019-08-07 19:49:11 +02:00
PreviousShell,
NextShell,
LeaveShell,
2019-05-11 10:08:21 +02:00
}
Add support for ~ expansion This ended up being a bit of a yak shave. The basic idea in this commit is to expand `~` in paths, but only in paths. The way this is accomplished is by doing the expansion inside of the code that parses literal syntax for `SyntaxType::Path`. As a quick refresher: every command is entitled to expand its arguments in a custom way. While this could in theory be used for general-purpose macros, today the expansion facility is limited to syntactic hints. For example, the syntax `where cpu > 0` expands under the hood to `where { $it.cpu > 0 }`. This happens because the first argument to `where` is defined as a `SyntaxType::Block`, and the parser coerces binary expressions whose left-hand-side looks like a member into a block when the command is expecting one. This is mildly more magical than what most programming languages would do, but we believe that it makes sense to allow commands to fine-tune the syntax because of the domain nushell is in (command-line shells). The syntactic expansions supported by this facility are relatively limited. For example, we don't allow `$it` to become a bare word, simply because the command asks for a string in the relevant position. That would quickly become more confusing than it's worth. This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command declares a parameter as a `SyntaxType::Path`, string literals and bare words passed as an argument to that parameter are processed using the path expansion rules. Right now, that only means that `~` is expanded into the home directory, but additional rules are possible in the future. By restricting this expansion to a syntactic expansion when passed as an argument to a command expecting a path, we avoid making `~` a generally reserved character. This will also allow us to give good tab completion for paths with `~` characters in them when a command is expecting a path. In order to accomplish the above, this commit changes the parsing functions to take a `Context` instead of just a `CommandRegistry`. From the perspective of macro expansion, you can think of the `CommandRegistry` as a dictionary of in-scope macros, and the `Context` as the compile-time state used in expansion. This could gain additional functionality over time as we find more uses for the expansion system.
2019-08-26 21:21:03 +02:00
impl ToDebug for CommandAction {
fn fmt_debug(&self, f: &mut fmt::Formatter, _source: &str) -> fmt::Result {
match self {
CommandAction::ChangePath(s) => write!(f, "action:change-path={}", s),
CommandAction::AddSpanSource(u, source) => {
write!(f, "action:add-span-source={}@{:?}", u, source)
}
CommandAction::Exit => write!(f, "action:exit"),
CommandAction::EnterShell(s) => write!(f, "action:enter-shell={}", s),
CommandAction::EnterValueShell(t) => {
write!(f, "action:enter-value-shell={:?}", t.debug())
}
CommandAction::EnterHelpShell(t) => {
write!(f, "action:enter-help-shell={:?}", t.debug())
}
Add support for ~ expansion This ended up being a bit of a yak shave. The basic idea in this commit is to expand `~` in paths, but only in paths. The way this is accomplished is by doing the expansion inside of the code that parses literal syntax for `SyntaxType::Path`. As a quick refresher: every command is entitled to expand its arguments in a custom way. While this could in theory be used for general-purpose macros, today the expansion facility is limited to syntactic hints. For example, the syntax `where cpu > 0` expands under the hood to `where { $it.cpu > 0 }`. This happens because the first argument to `where` is defined as a `SyntaxType::Block`, and the parser coerces binary expressions whose left-hand-side looks like a member into a block when the command is expecting one. This is mildly more magical than what most programming languages would do, but we believe that it makes sense to allow commands to fine-tune the syntax because of the domain nushell is in (command-line shells). The syntactic expansions supported by this facility are relatively limited. For example, we don't allow `$it` to become a bare word, simply because the command asks for a string in the relevant position. That would quickly become more confusing than it's worth. This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command declares a parameter as a `SyntaxType::Path`, string literals and bare words passed as an argument to that parameter are processed using the path expansion rules. Right now, that only means that `~` is expanded into the home directory, but additional rules are possible in the future. By restricting this expansion to a syntactic expansion when passed as an argument to a command expecting a path, we avoid making `~` a generally reserved character. This will also allow us to give good tab completion for paths with `~` characters in them when a command is expecting a path. In order to accomplish the above, this commit changes the parsing functions to take a `Context` instead of just a `CommandRegistry`. From the perspective of macro expansion, you can think of the `CommandRegistry` as a dictionary of in-scope macros, and the `Context` as the compile-time state used in expansion. This could gain additional functionality over time as we find more uses for the expansion system.
2019-08-26 21:21:03 +02:00
CommandAction::PreviousShell => write!(f, "action:previous-shell"),
CommandAction::NextShell => write!(f, "action:next-shell"),
CommandAction::LeaveShell => write!(f, "action:leave-shell"),
}
}
}
2019-06-27 06:56:48 +02:00
#[derive(Debug, Serialize, Deserialize)]
pub enum ReturnSuccess {
2019-08-01 03:58:42 +02:00
Value(Tagged<Value>),
Action(CommandAction),
2019-05-11 10:08:21 +02:00
}
pub type ReturnValue = Result<ReturnSuccess, ShellError>;
Add support for ~ expansion This ended up being a bit of a yak shave. The basic idea in this commit is to expand `~` in paths, but only in paths. The way this is accomplished is by doing the expansion inside of the code that parses literal syntax for `SyntaxType::Path`. As a quick refresher: every command is entitled to expand its arguments in a custom way. While this could in theory be used for general-purpose macros, today the expansion facility is limited to syntactic hints. For example, the syntax `where cpu > 0` expands under the hood to `where { $it.cpu > 0 }`. This happens because the first argument to `where` is defined as a `SyntaxType::Block`, and the parser coerces binary expressions whose left-hand-side looks like a member into a block when the command is expecting one. This is mildly more magical than what most programming languages would do, but we believe that it makes sense to allow commands to fine-tune the syntax because of the domain nushell is in (command-line shells). The syntactic expansions supported by this facility are relatively limited. For example, we don't allow `$it` to become a bare word, simply because the command asks for a string in the relevant position. That would quickly become more confusing than it's worth. This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command declares a parameter as a `SyntaxType::Path`, string literals and bare words passed as an argument to that parameter are processed using the path expansion rules. Right now, that only means that `~` is expanded into the home directory, but additional rules are possible in the future. By restricting this expansion to a syntactic expansion when passed as an argument to a command expecting a path, we avoid making `~` a generally reserved character. This will also allow us to give good tab completion for paths with `~` characters in them when a command is expecting a path. In order to accomplish the above, this commit changes the parsing functions to take a `Context` instead of just a `CommandRegistry`. From the perspective of macro expansion, you can think of the `CommandRegistry` as a dictionary of in-scope macros, and the `Context` as the compile-time state used in expansion. This could gain additional functionality over time as we find more uses for the expansion system.
2019-08-26 21:21:03 +02:00
impl ToDebug for ReturnValue {
fn fmt_debug(&self, f: &mut fmt::Formatter, source: &str) -> fmt::Result {
match self {
Err(err) => write!(f, "{}", err.debug(source)),
Ok(ReturnSuccess::Value(v)) => write!(f, "{:?}", v.debug()),
Ok(ReturnSuccess::Action(a)) => write!(f, "{}", a.debug(source)),
}
}
}
2019-08-01 03:58:42 +02:00
impl From<Tagged<Value>> for ReturnValue {
fn from(input: Tagged<Value>) -> ReturnValue {
Ok(ReturnSuccess::Value(input))
}
}
impl ReturnSuccess {
2019-08-07 19:49:11 +02:00
pub fn change_cwd(path: String) -> ReturnValue {
Ok(ReturnSuccess::Action(CommandAction::ChangePath(path)))
}
2019-08-01 03:58:42 +02:00
pub fn value(input: impl Into<Tagged<Value>>) -> ReturnValue {
2019-07-08 18:44:53 +02:00
Ok(ReturnSuccess::Value(input.into()))
}
pub fn action(input: CommandAction) -> ReturnValue {
Ok(ReturnSuccess::Action(input))
}
2019-07-08 18:44:53 +02:00
pub fn spanned_value(input: Value, span: Span) -> ReturnValue {
Ok(ReturnSuccess::Value(Tagged::from_simple_spanned_item(
input, span,
)))
2019-05-11 10:08:21 +02:00
}
2019-05-10 18:59:12 +02:00
}
2019-08-15 07:02:02 +02:00
pub trait WholeStreamCommand: Send + Sync {
2019-08-02 21:15:07 +02:00
fn name(&self) -> &str;
fn signature(&self) -> Signature {
Signature {
2019-05-28 08:45:18 +02:00
name: self.name().to_string(),
usage: self.usage().to_string(),
positional: vec![],
Add support for ~ expansion This ended up being a bit of a yak shave. The basic idea in this commit is to expand `~` in paths, but only in paths. The way this is accomplished is by doing the expansion inside of the code that parses literal syntax for `SyntaxType::Path`. As a quick refresher: every command is entitled to expand its arguments in a custom way. While this could in theory be used for general-purpose macros, today the expansion facility is limited to syntactic hints. For example, the syntax `where cpu > 0` expands under the hood to `where { $it.cpu > 0 }`. This happens because the first argument to `where` is defined as a `SyntaxType::Block`, and the parser coerces binary expressions whose left-hand-side looks like a member into a block when the command is expecting one. This is mildly more magical than what most programming languages would do, but we believe that it makes sense to allow commands to fine-tune the syntax because of the domain nushell is in (command-line shells). The syntactic expansions supported by this facility are relatively limited. For example, we don't allow `$it` to become a bare word, simply because the command asks for a string in the relevant position. That would quickly become more confusing than it's worth. This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command declares a parameter as a `SyntaxType::Path`, string literals and bare words passed as an argument to that parameter are processed using the path expansion rules. Right now, that only means that `~` is expanded into the home directory, but additional rules are possible in the future. By restricting this expansion to a syntactic expansion when passed as an argument to a command expecting a path, we avoid making `~` a generally reserved character. This will also allow us to give good tab completion for paths with `~` characters in them when a command is expecting a path. In order to accomplish the above, this commit changes the parsing functions to take a `Context` instead of just a `CommandRegistry`. From the perspective of macro expansion, you can think of the `CommandRegistry` as a dictionary of in-scope macros, and the `Context` as the compile-time state used in expansion. This could gain additional functionality over time as we find more uses for the expansion system.
2019-08-26 21:21:03 +02:00
rest_positional: None,
2019-05-28 08:45:18 +02:00
named: indexmap::IndexMap::new(),
2019-07-02 09:56:20 +02:00
is_filter: true,
2019-05-28 08:45:18 +02:00
}
}
fn usage(&self) -> &str;
2019-08-14 19:02:39 +02:00
fn run(
&self,
args: CommandArgs,
registry: &registry::CommandRegistry,
2019-08-24 21:36:19 +02:00
) -> Result<OutputStream, ShellError>;
}
pub trait PerItemCommand: Send + Sync {
fn name(&self) -> &str;
2019-08-14 19:02:39 +02:00
fn signature(&self) -> Signature {
Signature {
name: self.name().to_string(),
usage: self.usage().to_string(),
2019-08-14 19:02:39 +02:00
positional: vec![],
Add support for ~ expansion This ended up being a bit of a yak shave. The basic idea in this commit is to expand `~` in paths, but only in paths. The way this is accomplished is by doing the expansion inside of the code that parses literal syntax for `SyntaxType::Path`. As a quick refresher: every command is entitled to expand its arguments in a custom way. While this could in theory be used for general-purpose macros, today the expansion facility is limited to syntactic hints. For example, the syntax `where cpu > 0` expands under the hood to `where { $it.cpu > 0 }`. This happens because the first argument to `where` is defined as a `SyntaxType::Block`, and the parser coerces binary expressions whose left-hand-side looks like a member into a block when the command is expecting one. This is mildly more magical than what most programming languages would do, but we believe that it makes sense to allow commands to fine-tune the syntax because of the domain nushell is in (command-line shells). The syntactic expansions supported by this facility are relatively limited. For example, we don't allow `$it` to become a bare word, simply because the command asks for a string in the relevant position. That would quickly become more confusing than it's worth. This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command declares a parameter as a `SyntaxType::Path`, string literals and bare words passed as an argument to that parameter are processed using the path expansion rules. Right now, that only means that `~` is expanded into the home directory, but additional rules are possible in the future. By restricting this expansion to a syntactic expansion when passed as an argument to a command expecting a path, we avoid making `~` a generally reserved character. This will also allow us to give good tab completion for paths with `~` characters in them when a command is expecting a path. In order to accomplish the above, this commit changes the parsing functions to take a `Context` instead of just a `CommandRegistry`. From the perspective of macro expansion, you can think of the `CommandRegistry` as a dictionary of in-scope macros, and the `Context` as the compile-time state used in expansion. This could gain additional functionality over time as we find more uses for the expansion system.
2019-08-26 21:21:03 +02:00
rest_positional: None,
2019-08-14 19:02:39 +02:00
named: indexmap::IndexMap::new(),
is_filter: true,
}
}
fn usage(&self) -> &str;
fn run(
&self,
call_info: &CallInfo,
registry: &CommandRegistry,
raw_args: &RawCommandArgs,
input: Tagged<Value>,
) -> Result<OutputStream, ShellError>;
2019-08-14 19:02:39 +02:00
}
2019-08-02 21:15:07 +02:00
pub enum Command {
2019-08-15 07:02:02 +02:00
WholeStream(Arc<dyn WholeStreamCommand>),
2019-08-14 19:02:39 +02:00
PerItem(Arc<dyn PerItemCommand>),
2019-08-02 21:15:07 +02:00
}
2019-06-07 08:34:42 +02:00
2019-08-02 21:15:07 +02:00
impl Command {
pub fn name(&self) -> &str {
match self {
2019-08-15 07:02:02 +02:00
Command::WholeStream(command) => command.name(),
2019-08-14 19:02:39 +02:00
Command::PerItem(command) => command.name(),
2019-08-02 21:15:07 +02:00
}
}
pub fn signature(&self) -> Signature {
match self {
2019-08-15 07:02:02 +02:00
Command::WholeStream(command) => command.signature(),
2019-08-14 19:02:39 +02:00
Command::PerItem(command) => command.signature(),
2019-08-02 21:15:07 +02:00
}
}
pub fn usage(&self) -> &str {
match self {
Command::WholeStream(command) => command.usage(),
Command::PerItem(command) => command.usage(),
}
}
pub fn run(&self, args: CommandArgs, registry: &registry::CommandRegistry) -> OutputStream {
2019-08-02 21:15:07 +02:00
match self {
Command::WholeStream(command) => match command.run(args, registry) {
Ok(stream) => stream,
Err(err) => OutputStream::one(Err(err)),
},
2019-08-14 19:02:39 +02:00
Command::PerItem(command) => self.run_helper(command.clone(), args, registry.clone()),
2019-06-07 08:34:42 +02:00
}
}
2019-08-14 19:02:39 +02:00
fn run_helper(
&self,
command: Arc<dyn PerItemCommand>,
args: CommandArgs,
registry: CommandRegistry,
) -> OutputStream {
2019-08-14 19:02:39 +02:00
let raw_args = RawCommandArgs {
host: args.host,
shell_manager: args.shell_manager,
call_info: args.call_info,
};
2019-08-15 07:02:02 +02:00
2019-08-15 07:46:19 +02:00
if raw_args.call_info.has_it_or_block() {
let out = args
.input
.values
.map(move |x| {
let call_info = raw_args
.clone()
.call_info
.evaluate(&registry, &Scope::it_value(x.clone()))
.unwrap();
2019-08-29 05:53:45 +02:00
match command.run(&call_info, &registry, &raw_args, x) {
2019-08-15 07:46:19 +02:00
Ok(o) => o,
2019-08-24 21:36:19 +02:00
Err(e) => VecDeque::from(vec![ReturnValue::Err(e)]).to_output_stream(),
2019-08-15 07:46:19 +02:00
}
})
.flatten();
out.to_output_stream()
2019-08-15 07:46:19 +02:00
} else {
let nothing = Value::nothing().tagged(Tag::unknown());
let call_info = raw_args
.clone()
.call_info
.evaluate(&registry, &Scope::it_value(nothing.clone()))
.unwrap();
// We don't have an $it or block, so just execute what we have
2019-08-29 05:53:45 +02:00
match command
.run(&call_info, &registry, &raw_args, nothing)
.into()
{
2019-08-29 03:12:10 +02:00
Ok(o) => o,
Err(e) => OutputStream::one(Err(e)),
}
2019-08-15 07:46:19 +02:00
}
2019-08-14 19:02:39 +02:00
}
2019-06-07 08:34:42 +02:00
}
2019-07-24 06:10:48 +02:00
#[allow(unused)]
2019-07-24 00:22:11 +02:00
pub struct FnFilterCommand {
2019-05-28 08:45:18 +02:00
name: String,
2019-07-24 00:22:11 +02:00
func: fn(EvaluatedFilterCommandArgs) -> Result<OutputStream, ShellError>,
}
2019-05-22 09:12:03 +02:00
2019-08-15 07:02:02 +02:00
impl WholeStreamCommand for FnFilterCommand {
2019-07-24 00:22:11 +02:00
fn name(&self) -> &str {
&self.name
}
fn usage(&self) -> &str {
"usage"
}
2019-07-24 00:22:11 +02:00
fn run(
&self,
args: CommandArgs,
registry: &registry::CommandRegistry,
) -> Result<OutputStream, ShellError> {
let CommandArgs {
host,
2019-08-09 06:51:21 +02:00
shell_manager,
2019-07-24 00:22:11 +02:00
call_info,
input,
} = args;
let host: Arc<Mutex<dyn Host>> = host.clone();
2019-08-09 06:51:21 +02:00
let shell_manager = shell_manager.clone();
2019-07-24 00:22:11 +02:00
let registry: registry::CommandRegistry = registry.clone();
let func = self.func;
let result = input.values.map(move |it| {
let registry = registry.clone();
let call_info = match call_info
.clone()
.evaluate(&registry, &Scope::it_value(it.clone()))
{
Err(err) => return OutputStream::from(vec![Err(err)]).values,
Ok(args) => args,
};
2019-08-09 06:51:21 +02:00
let args =
EvaluatedFilterCommandArgs::new(host.clone(), shell_manager.clone(), call_info, it);
2019-07-24 00:22:11 +02:00
match func(args) {
Err(err) => return OutputStream::from(vec![Err(err)]).values,
Ok(stream) => stream.values,
}
});
let result = result.flatten();
let result: BoxStream<ReturnValue> = result.boxed();
Ok(result.into())
}
}
2019-08-15 07:02:02 +02:00
pub fn whole_stream_command(command: impl WholeStreamCommand + 'static) -> Arc<Command> {
Arc::new(Command::WholeStream(Arc::new(command)))
2019-07-24 00:22:11 +02:00
}
2019-08-14 19:02:39 +02:00
pub fn per_item_command(command: impl PerItemCommand + 'static) -> Arc<Command> {
Arc::new(Command::PerItem(Arc::new(command)))
}
2019-07-24 06:10:48 +02:00
#[allow(unused)]
2019-07-24 00:22:11 +02:00
pub fn filter(
name: &str,
func: fn(EvaluatedFilterCommandArgs) -> Result<OutputStream, ShellError>,
2019-08-02 21:15:07 +02:00
) -> Arc<Command> {
2019-08-15 07:02:02 +02:00
Arc::new(Command::WholeStream(Arc::new(FnFilterCommand {
2019-06-07 08:34:42 +02:00
name: name.to_string(),
func,
2019-08-02 21:15:07 +02:00
})))
2019-06-07 08:34:42 +02:00
}