2021-11-19 02:51:42 +00:00
|
|
|
use serde::Deserialize;
|
|
|
|
use serde::Serialize;
|
|
|
|
|
2021-09-02 22:58:15 +00:00
|
|
|
use crate::ast::Call;
|
2022-03-07 20:08:56 +00:00
|
|
|
use crate::ast::Expression;
|
2021-09-02 18:21:37 +00:00
|
|
|
use crate::engine::Command;
|
2021-10-25 06:31:39 +00:00
|
|
|
use crate::engine::EngineState;
|
|
|
|
use crate::engine::Stack;
|
2021-09-02 08:25:22 +00:00
|
|
|
use crate::BlockId;
|
2021-10-25 04:01:02 +00:00
|
|
|
use crate::PipelineData;
|
2022-04-01 18:52:32 +00:00
|
|
|
use crate::ShellError;
|
2021-09-02 08:25:22 +00:00
|
|
|
use crate::SyntaxShape;
|
2022-06-25 21:23:56 +00:00
|
|
|
use crate::Type;
|
2021-09-02 01:29:43 +00:00
|
|
|
use crate::VarId;
|
2022-06-04 06:47:36 +00:00
|
|
|
use std::fmt::Write;
|
2021-07-01 22:40:08 +00:00
|
|
|
|
2022-03-07 20:08:56 +00:00
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
2021-07-01 22:40:08 +00:00
|
|
|
pub struct Flag {
|
|
|
|
pub long: String,
|
|
|
|
pub short: Option<char>,
|
|
|
|
pub arg: Option<SyntaxShape>,
|
|
|
|
pub required: bool,
|
|
|
|
pub desc: String,
|
2022-03-07 20:08:56 +00:00
|
|
|
|
2021-07-23 21:19:30 +00:00
|
|
|
// For custom commands
|
|
|
|
pub var_id: Option<VarId>,
|
2022-03-07 20:08:56 +00:00
|
|
|
pub default_value: Option<Expression>,
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
|
2022-03-07 20:08:56 +00:00
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
2021-07-01 22:40:08 +00:00
|
|
|
pub struct PositionalArg {
|
|
|
|
pub name: String,
|
|
|
|
pub desc: String,
|
|
|
|
pub shape: SyntaxShape,
|
2022-03-07 20:08:56 +00:00
|
|
|
|
2021-07-23 21:19:30 +00:00
|
|
|
// For custom commands
|
|
|
|
pub var_id: Option<VarId>,
|
2022-03-07 20:08:56 +00:00
|
|
|
pub default_value: Option<Expression>,
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
|
2022-06-04 06:47:36 +00:00
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
2021-11-17 04:22:37 +00:00
|
|
|
pub enum Category {
|
|
|
|
Default,
|
|
|
|
Conversions,
|
|
|
|
Core,
|
2022-07-30 09:25:44 +00:00
|
|
|
Bits,
|
2022-07-04 10:51:07 +00:00
|
|
|
Bytes,
|
2021-11-17 04:22:37 +00:00
|
|
|
Date,
|
|
|
|
Env,
|
|
|
|
Experimental,
|
|
|
|
FileSystem,
|
|
|
|
Filters,
|
|
|
|
Formats,
|
|
|
|
Math,
|
2022-06-16 16:58:38 +00:00
|
|
|
Misc,
|
2021-12-10 00:09:30 +00:00
|
|
|
Network,
|
2021-11-30 06:12:19 +00:00
|
|
|
Random,
|
2021-11-28 08:32:44 +00:00
|
|
|
Platform,
|
2021-11-26 08:00:57 +00:00
|
|
|
Shells,
|
2021-11-17 04:22:37 +00:00
|
|
|
Strings,
|
|
|
|
System,
|
|
|
|
Viewers,
|
2021-12-10 23:14:28 +00:00
|
|
|
Hash,
|
2021-12-11 03:07:39 +00:00
|
|
|
Generators,
|
2022-05-13 11:48:47 +00:00
|
|
|
Chart,
|
2021-11-23 08:14:40 +00:00
|
|
|
Custom(String),
|
2022-02-10 12:55:19 +00:00
|
|
|
Deprecated,
|
2021-11-17 04:22:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl std::fmt::Display for Category {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
|
|
let msg = match self {
|
|
|
|
Category::Default => "default",
|
|
|
|
Category::Conversions => "conversions",
|
|
|
|
Category::Core => "core",
|
|
|
|
Category::Date => "date",
|
|
|
|
Category::Env => "env",
|
|
|
|
Category::Experimental => "experimental",
|
|
|
|
Category::FileSystem => "filesystem",
|
|
|
|
Category::Filters => "filters",
|
|
|
|
Category::Formats => "formats",
|
|
|
|
Category::Math => "math",
|
2022-06-16 16:58:38 +00:00
|
|
|
Category::Misc => "misc",
|
2021-12-10 00:09:30 +00:00
|
|
|
Category::Network => "network",
|
2021-11-30 06:12:19 +00:00
|
|
|
Category::Random => "random",
|
2021-11-28 08:32:44 +00:00
|
|
|
Category::Platform => "platform",
|
2021-11-26 08:00:57 +00:00
|
|
|
Category::Shells => "shells",
|
2021-11-17 04:22:37 +00:00
|
|
|
Category::Strings => "strings",
|
|
|
|
Category::System => "system",
|
|
|
|
Category::Viewers => "viewers",
|
2021-12-10 23:14:28 +00:00
|
|
|
Category::Hash => "hash",
|
2021-12-11 03:07:39 +00:00
|
|
|
Category::Generators => "generators",
|
2022-05-13 11:48:47 +00:00
|
|
|
Category::Chart => "chart",
|
2021-11-23 08:14:40 +00:00
|
|
|
Category::Custom(name) => name,
|
2022-02-10 12:55:19 +00:00
|
|
|
Category::Deprecated => "deprecated",
|
2022-07-04 10:51:07 +00:00
|
|
|
Category::Bytes => "bytes",
|
2022-07-30 09:25:44 +00:00
|
|
|
Category::Bits => "bits",
|
2021-11-17 04:22:37 +00:00
|
|
|
};
|
|
|
|
|
2023-01-30 01:37:54 +00:00
|
|
|
write!(f, "{msg}")
|
2021-11-17 04:22:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-11-19 02:51:42 +00:00
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
2021-07-01 22:40:08 +00:00
|
|
|
pub struct Signature {
|
|
|
|
pub name: String,
|
|
|
|
pub usage: String,
|
|
|
|
pub extra_usage: String,
|
2022-03-27 19:25:30 +00:00
|
|
|
pub search_terms: Vec<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
pub required_positional: Vec<PositionalArg>,
|
|
|
|
pub optional_positional: Vec<PositionalArg>,
|
|
|
|
pub rest_positional: Option<PositionalArg>,
|
2022-11-09 21:55:05 +00:00
|
|
|
pub vectorizes_over_list: bool,
|
2021-07-01 22:40:08 +00:00
|
|
|
pub named: Vec<Flag>,
|
2022-06-25 21:23:56 +00:00
|
|
|
pub input_type: Type,
|
|
|
|
pub output_type: Type,
|
2022-11-09 21:55:05 +00:00
|
|
|
pub input_output_types: Vec<(Type, Type)>,
|
|
|
|
pub allow_variants_without_examples: bool,
|
2021-07-01 22:40:08 +00:00
|
|
|
pub is_filter: bool,
|
2021-10-09 16:10:46 +00:00
|
|
|
pub creates_scope: bool,
|
2022-12-21 22:33:26 +00:00
|
|
|
pub allows_unknown_args: bool,
|
2021-11-17 04:22:37 +00:00
|
|
|
// Signature category used to classify commands stored in the list of declarations
|
|
|
|
pub category: Category,
|
2019-05-28 06:45:18 +00:00
|
|
|
}
|
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 07:31:26 +00:00
|
|
|
/// Format argument type for user readable output.
|
2022-11-20 13:22:42 +00:00
|
|
|
///
|
|
|
|
/// In general:
|
|
|
|
/// if argument type is a simple type(like string), we'll wrapped with `<>`, the result will be `<string>`
|
|
|
|
/// if argument type is already contains `<>`, like `list<any>`, the result will be `list<any>`.
|
|
|
|
fn fmt_type(arg_type: &Type, optional: bool) -> String {
|
|
|
|
let arg_type = arg_type.to_string();
|
|
|
|
if arg_type.contains('<') && arg_type.contains('>') {
|
|
|
|
if optional {
|
|
|
|
format!("{arg_type}?")
|
|
|
|
} else {
|
|
|
|
arg_type
|
|
|
|
}
|
|
|
|
} else if optional {
|
|
|
|
format!("<{arg_type}?>")
|
|
|
|
} else {
|
|
|
|
format!("<{arg_type}>")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// in general, a commands signature should looks like this:
|
|
|
|
//
|
|
|
|
// <string> | <string>, <int?> => string
|
|
|
|
//
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 07:31:26 +00:00
|
|
|
// More detail explanation:
|
2022-11-20 13:22:42 +00:00
|
|
|
// the first one is the input from previous command, aka, pipeline input
|
|
|
|
// then followed by `|`, then positional arguments type
|
|
|
|
// then optional arguments type, which ends with `?`
|
|
|
|
// Then followed by `->`
|
|
|
|
// Finally output type.
|
|
|
|
//
|
|
|
|
// If a command contains multiple input/output types, separate them in different lines.
|
|
|
|
impl std::fmt::Display for Signature {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
|
|
let mut args = self
|
|
|
|
.required_positional
|
|
|
|
.iter()
|
|
|
|
.map(|p| fmt_type(&p.shape.to_type(), false))
|
|
|
|
.collect::<Vec<String>>();
|
|
|
|
args.append(
|
|
|
|
&mut self
|
|
|
|
.optional_positional
|
|
|
|
.iter()
|
|
|
|
.map(|p| fmt_type(&p.shape.to_type(), true))
|
|
|
|
.collect::<Vec<String>>(),
|
|
|
|
);
|
|
|
|
let args = args.join(", ");
|
|
|
|
|
|
|
|
let mut signatures = vec![];
|
|
|
|
for (input_type, output_type) in self.input_output_types.iter() {
|
|
|
|
// ident with two spaces for user friendly output.
|
|
|
|
let input_type = fmt_type(input_type, false);
|
|
|
|
let output_type = fmt_type(output_type, false);
|
|
|
|
if args.is_empty() {
|
|
|
|
signatures.push(format!(" {input_type} | {} -> {output_type}", self.name))
|
|
|
|
} else {
|
|
|
|
signatures.push(format!(
|
|
|
|
" {input_type} | {} {args} -> {output_type}",
|
|
|
|
self.name
|
|
|
|
))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
write!(f, "{}", signatures.join("\n"))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-18 07:53:49 +00:00
|
|
|
impl PartialEq for Signature {
|
|
|
|
fn eq(&self, other: &Self) -> bool {
|
|
|
|
self.name == other.name
|
|
|
|
&& self.usage == other.usage
|
2021-07-01 22:40:08 +00:00
|
|
|
&& self.required_positional == other.required_positional
|
|
|
|
&& self.optional_positional == other.optional_positional
|
2020-12-18 07:53:49 +00:00
|
|
|
&& self.rest_positional == other.rest_positional
|
|
|
|
&& self.is_filter == other.is_filter
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Eq for Signature {}
|
|
|
|
|
Restructure and streamline token expansion (#1123)
Restructure and streamline token expansion
The purpose of this commit is to streamline the token expansion code, by
removing aspects of the code that are no longer relevant, removing
pointless duplication, and eliminating the need to pass the same
arguments to `expand_syntax`.
The first big-picture change in this commit is that instead of a handful
of `expand_` functions, which take a TokensIterator and ExpandContext, a
smaller number of methods on the `TokensIterator` do the same job.
The second big-picture change in this commit is fully eliminating the
coloring traits, making coloring a responsibility of the base expansion
implementations. This also means that the coloring tracer is merged into
the expansion tracer, so you can follow a single expansion and see how
the expansion process produced colored tokens.
One side effect of this change is that the expander itself is marginally
more error-correcting. The error correction works by switching from
structured expansion to `BackoffColoringMode` when an unexpected token
is found, which guarantees that all spans of the source are colored, but
may not be the most optimal error recovery strategy.
That said, because `BackoffColoringMode` only extends as far as a
closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in
fairly granular correction strategy.
The current code still produces an `Err` (plus a complete list of
colored shapes) from the parsing process if any errors are encountered,
but this could easily be addressed now that the underlying expansion is
error-correcting.
This commit also colors any spans that are syntax errors in red, and
causes the parser to include some additional information about what
tokens were expected at any given point where an error was encountered,
so that completions and hinting could be more robust in the future.
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
2020-01-21 22:45:03 +00:00
|
|
|
impl Signature {
|
2021-07-01 22:40:08 +00:00
|
|
|
pub fn new(name: impl Into<String>) -> Signature {
|
2019-11-18 03:12:37 +00:00
|
|
|
Signature {
|
2019-12-04 21:14:52 +00:00
|
|
|
name: name.into(),
|
2019-11-18 03:12:37 +00:00
|
|
|
usage: String::new(),
|
2021-06-29 14:27:16 +00:00
|
|
|
extra_usage: String::new(),
|
2022-03-27 19:25:30 +00:00
|
|
|
search_terms: vec![],
|
2021-07-01 22:40:08 +00:00
|
|
|
required_positional: vec![],
|
|
|
|
optional_positional: vec![],
|
|
|
|
rest_positional: None,
|
2022-11-09 21:55:05 +00:00
|
|
|
vectorizes_over_list: false,
|
2022-06-25 21:23:56 +00:00
|
|
|
input_type: Type::Any,
|
|
|
|
output_type: Type::Any,
|
2022-11-09 21:55:05 +00:00
|
|
|
input_output_types: vec![],
|
|
|
|
allow_variants_without_examples: false,
|
2022-05-29 13:14:15 +00:00
|
|
|
named: vec![],
|
2021-07-01 22:40:08 +00:00
|
|
|
is_filter: false,
|
2021-10-09 16:10:46 +00:00
|
|
|
creates_scope: false,
|
2021-11-17 04:22:37 +00:00
|
|
|
category: Category::Default,
|
2022-12-21 22:33:26 +00:00
|
|
|
allows_unknown_args: false,
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
}
|
2022-03-27 19:25:30 +00:00
|
|
|
|
2022-05-29 13:14:15 +00:00
|
|
|
// Add a default help option to a signature
|
|
|
|
pub fn add_help(mut self) -> Signature {
|
|
|
|
// default help flag
|
|
|
|
let flag = Flag {
|
|
|
|
long: "help".into(),
|
|
|
|
short: Some('h'),
|
|
|
|
arg: None,
|
2022-10-26 16:36:42 +00:00
|
|
|
desc: "Display the help message for this command".into(),
|
2022-05-29 13:14:15 +00:00
|
|
|
required: false,
|
|
|
|
var_id: None,
|
|
|
|
default_value: None,
|
|
|
|
};
|
|
|
|
self.named.push(flag);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build an internal signature with default help option
|
2019-08-02 19:15:07 +00:00
|
|
|
pub fn build(name: impl Into<String>) -> Signature {
|
2022-05-29 13:14:15 +00:00
|
|
|
Signature::new(name.into()).add_help()
|
2019-07-24 04:10:48 +00:00
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a description to the signature
|
2022-03-27 19:25:30 +00:00
|
|
|
pub fn usage(mut self, msg: impl Into<String>) -> Signature {
|
|
|
|
self.usage = msg.into();
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Add an extra description to the signature
|
|
|
|
pub fn extra_usage(mut self, msg: impl Into<String>) -> Signature {
|
|
|
|
self.extra_usage = msg.into();
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Add search terms to the signature
|
|
|
|
pub fn search_terms(mut self, terms: Vec<String>) -> Signature {
|
|
|
|
self.search_terms = terms;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Update signature's fields from a Command trait implementation
|
2022-12-30 15:44:37 +00:00
|
|
|
pub fn update_from_command(mut self, name: String, command: &dyn Command) -> Signature {
|
|
|
|
self.name = name;
|
2022-03-27 19:25:30 +00:00
|
|
|
self.search_terms = command
|
|
|
|
.search_terms()
|
|
|
|
.into_iter()
|
|
|
|
.map(|term| term.to_string())
|
|
|
|
.collect();
|
|
|
|
self.extra_usage = command.extra_usage().to_string();
|
|
|
|
self.usage = command.usage().to_string();
|
2019-08-29 22:52:32 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-12-21 22:33:26 +00:00
|
|
|
/// Allow unknown signature parameters
|
|
|
|
pub fn allows_unknown_args(mut self) -> Signature {
|
|
|
|
self.allows_unknown_args = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a required positional argument to the signature
|
2019-10-28 05:15:35 +00:00
|
|
|
pub fn required(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
) -> Signature {
|
|
|
|
self.required_positional.push(PositionalArg {
|
|
|
|
name: name.into(),
|
|
|
|
desc: desc.into(),
|
|
|
|
shape: shape.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
2019-07-24 04:10:48 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-06-01 02:24:16 +00:00
|
|
|
/// Add an optional positional argument to the signature
|
2021-07-01 22:40:08 +00:00
|
|
|
pub fn optional(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
) -> Signature {
|
|
|
|
self.optional_positional.push(PositionalArg {
|
|
|
|
name: name.into(),
|
|
|
|
desc: desc.into(),
|
|
|
|
shape: shape.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-09-07 03:37:02 +00:00
|
|
|
pub fn rest(
|
|
|
|
mut self,
|
|
|
|
name: &str,
|
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
) -> Signature {
|
2021-07-30 03:26:06 +00:00
|
|
|
self.rest_positional = Some(PositionalArg {
|
2021-09-07 03:37:02 +00:00
|
|
|
name: name.into(),
|
2021-07-30 03:26:06 +00:00
|
|
|
desc: desc.into(),
|
|
|
|
shape: shape.into(),
|
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-30 03:26:06 +00:00
|
|
|
});
|
2019-07-24 04:10:48 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-11-09 21:55:05 +00:00
|
|
|
/// Is this command capable of operating on its input via cell paths?
|
|
|
|
pub fn operates_on_cell_paths(&self) -> bool {
|
|
|
|
self.required_positional
|
|
|
|
.iter()
|
|
|
|
.chain(self.rest_positional.iter())
|
|
|
|
.any(|pos| {
|
|
|
|
matches!(
|
|
|
|
pos,
|
|
|
|
PositionalArg {
|
|
|
|
shape: SyntaxShape::CellPath,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add an optional named flag argument to the signature
|
2019-10-28 05:15:35 +00:00
|
|
|
pub fn named(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
short: Option<char>,
|
|
|
|
) -> Signature {
|
2021-09-04 07:45:49 +00:00
|
|
|
let (name, s) = self.check_names(name, short);
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
self.named.push(Flag {
|
2021-09-04 08:19:07 +00:00
|
|
|
long: name,
|
2021-07-01 22:40:08 +00:00
|
|
|
short: s,
|
|
|
|
arg: Some(shape.into()),
|
|
|
|
required: false,
|
|
|
|
desc: desc.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
2019-08-02 19:15:07 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a required named flag argument to the signature
|
2019-08-02 19:15:07 +00:00
|
|
|
pub fn required_named(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
short: Option<char>,
|
|
|
|
) -> Signature {
|
2021-09-04 07:45:49 +00:00
|
|
|
let (name, s) = self.check_names(name, short);
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
self.named.push(Flag {
|
2021-09-04 08:19:07 +00:00
|
|
|
long: name,
|
2021-07-01 22:40:08 +00:00
|
|
|
short: s,
|
|
|
|
arg: Some(shape.into()),
|
|
|
|
required: true,
|
|
|
|
desc: desc.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
|
|
|
|
2019-08-02 19:15:07 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a switch to the signature
|
2020-02-12 02:24:31 +00:00
|
|
|
pub fn switch(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
short: Option<char>,
|
|
|
|
) -> Signature {
|
2021-09-04 07:45:49 +00:00
|
|
|
let (name, s) = self.check_names(name, short);
|
2021-07-01 22:40:08 +00:00
|
|
|
|
|
|
|
self.named.push(Flag {
|
2021-09-04 08:19:07 +00:00
|
|
|
long: name,
|
2021-07-01 22:40:08 +00:00
|
|
|
short: s,
|
|
|
|
arg: None,
|
|
|
|
required: false,
|
|
|
|
desc: desc.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
2021-09-04 07:45:49 +00:00
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-06-25 21:23:56 +00:00
|
|
|
/// Changes the input type of the command signature
|
|
|
|
pub fn input_type(mut self, input_type: Type) -> Signature {
|
|
|
|
self.input_type = input_type;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Changes the output type of the command signature
|
|
|
|
pub fn output_type(mut self, output_type: Type) -> Signature {
|
|
|
|
self.output_type = output_type;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-11-09 21:55:05 +00:00
|
|
|
pub fn vectorizes_over_list(mut self, vectorizes_over_list: bool) -> Signature {
|
|
|
|
self.vectorizes_over_list = vectorizes_over_list;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Set the input-output type signature variants of the command
|
|
|
|
pub fn input_output_types(mut self, input_output_types: Vec<(Type, Type)>) -> Signature {
|
|
|
|
self.input_output_types = input_output_types;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-11-17 04:22:37 +00:00
|
|
|
/// Changes the signature category
|
|
|
|
pub fn category(mut self, category: Category) -> Signature {
|
|
|
|
self.category = category;
|
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-10-09 16:10:46 +00:00
|
|
|
/// Sets that signature will create a scope as it parses
|
|
|
|
pub fn creates_scope(mut self) -> Signature {
|
|
|
|
self.creates_scope = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-11-09 21:55:05 +00:00
|
|
|
// Is it allowed for the type signature to feature a variant that has no corresponding example?
|
|
|
|
pub fn allow_variants_without_examples(mut self, allow: bool) -> Signature {
|
|
|
|
self.allow_variants_without_examples = allow;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-01-03 23:14:33 +00:00
|
|
|
pub fn call_signature(&self) -> String {
|
|
|
|
let mut one_liner = String::new();
|
|
|
|
one_liner.push_str(&self.name);
|
|
|
|
one_liner.push(' ');
|
|
|
|
|
2022-01-26 14:42:39 +00:00
|
|
|
// Note: the call signature needs flags first because on the nu commandline,
|
|
|
|
// flags will precede the script file name. Flags for internal commands can come
|
|
|
|
// either before or after (or around) positional parameters, so there isn't a strong
|
|
|
|
// preference, so we default to the more constrained example.
|
|
|
|
if self.named.len() > 1 {
|
|
|
|
one_liner.push_str("{flags} ");
|
|
|
|
}
|
|
|
|
|
2022-01-03 23:14:33 +00:00
|
|
|
for positional in &self.required_positional {
|
|
|
|
one_liner.push_str(&get_positional_short_name(positional, true));
|
|
|
|
}
|
|
|
|
for positional in &self.optional_positional {
|
|
|
|
one_liner.push_str(&get_positional_short_name(positional, false));
|
|
|
|
}
|
|
|
|
|
2022-01-26 14:42:39 +00:00
|
|
|
if let Some(rest) = &self.rest_positional {
|
2022-06-04 06:47:36 +00:00
|
|
|
let _ = write!(one_liner, "...{}", get_positional_short_name(rest, false));
|
2022-01-03 23:14:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if !self.subcommands.is_empty() {
|
|
|
|
// one_liner.push_str("<subcommand> ");
|
|
|
|
// }
|
|
|
|
|
|
|
|
one_liner
|
|
|
|
}
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
/// Get list of the short-hand flags
|
|
|
|
pub fn get_shorts(&self) -> Vec<char> {
|
2021-09-04 07:45:49 +00:00
|
|
|
self.named.iter().filter_map(|f| f.short).collect()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Get list of the long-hand flags
|
2021-09-04 08:10:31 +00:00
|
|
|
pub fn get_names(&self) -> Vec<&str> {
|
|
|
|
self.named.iter().map(|f| f.long.as_str()).collect()
|
2021-09-04 07:45:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks if short or long are already present
|
|
|
|
/// Panics if one of them is found
|
|
|
|
fn check_names(&self, name: impl Into<String>, short: Option<char>) -> (String, Option<char>) {
|
2020-07-17 17:57:15 +00:00
|
|
|
let s = short.map(|c| {
|
2020-07-11 21:49:44 +00:00
|
|
|
debug_assert!(
|
|
|
|
!self.get_shorts().contains(&c),
|
|
|
|
"There may be duplicate short flags, such as -h"
|
|
|
|
);
|
2020-07-17 17:57:15 +00:00
|
|
|
c
|
2020-02-12 02:24:31 +00:00
|
|
|
});
|
|
|
|
|
2021-09-04 07:45:49 +00:00
|
|
|
let name = {
|
2021-09-04 08:10:31 +00:00
|
|
|
let name: String = name.into();
|
2021-09-04 07:45:49 +00:00
|
|
|
debug_assert!(
|
2021-09-04 08:10:31 +00:00
|
|
|
!self.get_names().contains(&name.as_str()),
|
2021-09-04 07:45:49 +00:00
|
|
|
"There may be duplicate name flags, such as --help"
|
|
|
|
);
|
|
|
|
name
|
|
|
|
};
|
|
|
|
|
|
|
|
(name, s)
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_positional(&self, position: usize) -> Option<PositionalArg> {
|
|
|
|
if position < self.required_positional.len() {
|
|
|
|
self.required_positional.get(position).cloned()
|
|
|
|
} else if position < (self.required_positional.len() + self.optional_positional.len()) {
|
|
|
|
self.optional_positional
|
|
|
|
.get(position - self.required_positional.len())
|
|
|
|
.cloned()
|
|
|
|
} else {
|
|
|
|
self.rest_positional.clone()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-07-07 22:55:46 +00:00
|
|
|
pub fn num_positionals(&self) -> usize {
|
2021-07-24 05:57:17 +00:00
|
|
|
let mut total = self.required_positional.len() + self.optional_positional.len();
|
|
|
|
|
|
|
|
for positional in &self.required_positional {
|
2021-07-29 22:56:51 +00:00
|
|
|
if let SyntaxShape::Keyword(..) = positional.shape {
|
|
|
|
// Keywords have a required argument, so account for that
|
|
|
|
total += 1;
|
2021-07-24 05:57:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
for positional in &self.optional_positional {
|
2021-07-29 22:56:51 +00:00
|
|
|
if let SyntaxShape::Keyword(..) = positional.shape {
|
|
|
|
// Keywords have a required argument, so account for that
|
|
|
|
total += 1;
|
2021-07-24 05:57:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
total
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn num_positionals_after(&self, idx: usize) -> usize {
|
|
|
|
let mut total = 0;
|
|
|
|
|
2021-09-04 07:59:38 +00:00
|
|
|
for (curr, positional) in self.required_positional.iter().enumerate() {
|
2021-07-24 05:57:17 +00:00
|
|
|
match positional.shape {
|
|
|
|
SyntaxShape::Keyword(..) => {
|
|
|
|
// Keywords have a required argument, so account for that
|
|
|
|
if curr > idx {
|
|
|
|
total += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
if curr > idx {
|
|
|
|
total += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
total
|
2021-07-07 22:55:46 +00:00
|
|
|
}
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
/// Find the matching long flag
|
|
|
|
pub fn get_long_flag(&self, name: &str) -> Option<Flag> {
|
|
|
|
for flag in &self.named {
|
|
|
|
if flag.long == name {
|
|
|
|
return Some(flag.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Find the matching long flag
|
|
|
|
pub fn get_short_flag(&self, short: char) -> Option<Flag> {
|
|
|
|
for flag in &self.named {
|
|
|
|
if let Some(short_flag) = &flag.short {
|
|
|
|
if *short_flag == short {
|
|
|
|
return Some(flag.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
2020-01-17 22:46:18 +00:00
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Set the filter flag for the signature
|
2019-08-02 19:15:07 +00:00
|
|
|
pub fn filter(mut self) -> Signature {
|
|
|
|
self.is_filter = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-09-02 08:25:22 +00:00
|
|
|
/// Create a placeholder implementation of Command as a way to predeclare a definition's
|
|
|
|
/// signature so other definitions can see it. This placeholder is later replaced with the
|
|
|
|
/// full definition in a second pass of the parser.
|
|
|
|
pub fn predeclare(self) -> Box<dyn Command> {
|
|
|
|
Box::new(Predeclaration { signature: self })
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Combines a signature and a block into a runnable block
|
|
|
|
pub fn into_block_command(self, block_id: BlockId) -> Box<dyn Command> {
|
|
|
|
Box::new(BlockCommand {
|
|
|
|
signature: self,
|
|
|
|
block_id,
|
|
|
|
})
|
|
|
|
}
|
2022-12-13 12:45:33 +00:00
|
|
|
|
|
|
|
pub fn formatted_flags(self) -> String {
|
|
|
|
if self.named.len() < 11 {
|
|
|
|
let mut s = "Available flags:".to_string();
|
|
|
|
for flag in self.named {
|
|
|
|
if let Some(short) = flag.short {
|
|
|
|
let _ = write!(s, " --{}(-{}),", flag.long, short);
|
|
|
|
} else {
|
|
|
|
let _ = write!(s, " --{},", flag.long);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.remove(s.len() - 1);
|
|
|
|
let _ = write!(s, ". Use `--help` for more information.");
|
|
|
|
s
|
|
|
|
} else {
|
|
|
|
let mut s = "Some available flags:".to_string();
|
|
|
|
for flag in self.named {
|
|
|
|
if let Some(short) = flag.short {
|
|
|
|
let _ = write!(s, " --{}(-{}),", flag.long, short);
|
|
|
|
} else {
|
|
|
|
let _ = write!(s, " --{},", flag.long);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.remove(s.len() - 1);
|
|
|
|
let _ = write!(
|
|
|
|
s,
|
|
|
|
"... Use `--help` for a full list of flags and more information."
|
|
|
|
);
|
|
|
|
s
|
|
|
|
}
|
|
|
|
}
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
2021-07-16 01:10:22 +00:00
|
|
|
|
2021-10-25 04:01:02 +00:00
|
|
|
#[derive(Clone)]
|
2021-09-02 08:25:22 +00:00
|
|
|
struct Predeclaration {
|
|
|
|
signature: Signature,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Command for Predeclaration {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
&self.signature.name
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
self.signature.clone()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
&self.signature.usage
|
2021-07-29 22:56:51 +00:00
|
|
|
}
|
2021-09-02 18:21:37 +00:00
|
|
|
|
2022-12-30 15:44:37 +00:00
|
|
|
fn extra_usage(&self) -> &str {
|
|
|
|
&self.signature.extra_usage
|
|
|
|
}
|
|
|
|
|
2021-09-02 22:58:15 +00:00
|
|
|
fn run(
|
|
|
|
&self,
|
2021-10-25 06:31:39 +00:00
|
|
|
_engine_state: &EngineState,
|
|
|
|
_stack: &mut Stack,
|
2021-09-02 22:58:15 +00:00
|
|
|
_call: &Call,
|
2021-10-25 04:01:02 +00:00
|
|
|
_input: PipelineData,
|
|
|
|
) -> Result<PipelineData, crate::ShellError> {
|
2021-09-02 18:21:37 +00:00
|
|
|
panic!("Internal error: can't run a predeclaration without a body")
|
2021-07-29 22:56:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-03 23:14:33 +00:00
|
|
|
fn get_positional_short_name(arg: &PositionalArg, is_required: bool) -> String {
|
|
|
|
match &arg.shape {
|
|
|
|
SyntaxShape::Keyword(name, ..) => {
|
|
|
|
if is_required {
|
|
|
|
format!("{} <{}> ", String::from_utf8_lossy(name), arg.name)
|
|
|
|
} else {
|
|
|
|
format!("({} <{}>) ", String::from_utf8_lossy(name), arg.name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
if is_required {
|
|
|
|
format!("<{}> ", arg.name)
|
|
|
|
} else {
|
|
|
|
format!("({}) ", arg.name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-25 04:01:02 +00:00
|
|
|
#[derive(Clone)]
|
2021-09-02 08:25:22 +00:00
|
|
|
struct BlockCommand {
|
|
|
|
signature: Signature,
|
|
|
|
block_id: BlockId,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Command for BlockCommand {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
&self.signature.name
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2021-09-06 02:20:02 +00:00
|
|
|
self.signature.clone()
|
2021-09-02 08:25:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
&self.signature.usage
|
2021-07-16 01:10:22 +00:00
|
|
|
}
|
2021-09-02 18:21:37 +00:00
|
|
|
|
2022-12-30 15:44:37 +00:00
|
|
|
fn extra_usage(&self) -> &str {
|
|
|
|
&self.signature.extra_usage
|
|
|
|
}
|
|
|
|
|
2021-09-02 22:58:15 +00:00
|
|
|
fn run(
|
|
|
|
&self,
|
2021-10-25 06:31:39 +00:00
|
|
|
_engine_state: &EngineState,
|
|
|
|
_stack: &mut Stack,
|
2021-09-02 22:58:15 +00:00
|
|
|
_call: &Call,
|
2021-10-25 04:01:02 +00:00
|
|
|
_input: PipelineData,
|
|
|
|
) -> Result<crate::PipelineData, crate::ShellError> {
|
2022-04-18 12:34:10 +00:00
|
|
|
Err(ShellError::GenericError(
|
2022-04-01 18:52:32 +00:00
|
|
|
"Internal error: can't run custom command with 'run', use block_id".to_string(),
|
2022-04-18 12:34:10 +00:00
|
|
|
"".to_string(),
|
|
|
|
None,
|
|
|
|
None,
|
|
|
|
Vec::new(),
|
2022-04-01 18:52:32 +00:00
|
|
|
))
|
2021-09-02 18:21:37 +00:00
|
|
|
}
|
|
|
|
|
2021-09-05 23:16:27 +00:00
|
|
|
fn get_block_id(&self) -> Option<BlockId> {
|
2021-09-02 18:21:37 +00:00
|
|
|
Some(self.block_id)
|
2020-02-12 02:24:31 +00:00
|
|
|
}
|
2019-07-24 04:10:48 +00:00
|
|
|
}
|