mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 08:23:24 +01:00
79ea70d4ec
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> This PR fixes the quoting and escaping of column names in `to nuon`. Before the PR, column names with quotes inside them would get quoted, but not escaped: ```nushell > { 'a"b': 2 } | to nuon { "a"b": 2 } > { 'a"b': 2 } | to nuon | from nuon Error: × error when loading nuon text ╭─[entry #1:1:27] 1 │ { "a\"b": 2 } | to nuon | from nuon · ────┬──── · ╰── could not load nuon text ╰──── Error: × error when parsing nuon text ╭─[entry #1:1:27] 1 │ { "a\"b": 2 } | to nuon | from nuon · ────┬──── · ╰── could not parse nuon text ╰──── Error: × error when parsing ╭──── 1 │ {"a"b": 2} · ┬ · ╰── Unexpected end of code. ╰──── > [['a"b']; [2] [3]] | to nuon [["a"b"]; [2], [3]] > [['a"b']; [2] [3]] | to nuon | from nuon Error: × error when loading nuon text ╭─[entry #1:1:32] 1 │ [['a"b']; [2] [3]] | to nuon | from nuon · ────┬──── · ╰── could not load nuon text ╰──── Error: × error when parsing nuon text ╭─[entry #1:1:32] 1 │ [['a"b']; [2] [3]] | to nuon | from nuon · ────┬──── · ╰── could not parse nuon text ╰──── Error: × error when parsing ╭──── 1 │ [["a"b"]; [2], [3]] · ┬ · ╰── Unexpected end of code. ╰──── ``` After this PR, the quote is escaped properly: ```nushell > { 'a"b': 2 } | to nuon { "a\"b": 2 } > { 'a"b': 2 } | to nuon | from nuon ╭─────┬───╮ │ a"b │ 2 │ ╰─────┴───╯ > [['a"b']; [2] [3]] | to nuon [["a\"b"]; [2], [3]] > [['a"b']; [2] [3]] | to nuon | from nuon ╭─────╮ │ a"b │ ├─────┤ │ 2 │ │ 3 │ ╰─────╯ ``` The cause of the issue was that `to nuon` simply wrapped column names in `'"'` instead of calling `escape_quote_string`. As part of this change, I also moved the functions related to quoting (`needs_quoting` and `escape_quote_string`) into `nu-utils`, since previously they were defined in very ad-hoc places (and, in the case of `escape_quote_string`, it was defined multiple times with the same body!). # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> `to nuon` now properly escapes quotes in column names. # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> All tests pass, including workspace and stdlib tests. # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
499 lines
18 KiB
Rust
499 lines
18 KiB
Rust
use nu_engine::{command_prelude::*, get_full_help};
|
|
use nu_parser::{escape_for_script_arg, parse};
|
|
use nu_protocol::{
|
|
ast::{Expr, Expression},
|
|
engine::StateWorkingSet,
|
|
report_parse_error,
|
|
};
|
|
use nu_utils::{escape_quote_string, stdout_write_all_and_flush};
|
|
|
|
pub(crate) fn gather_commandline_args() -> (Vec<String>, String, Vec<String>) {
|
|
// Would be nice if we had a way to parse this. The first flags we see will be going to nushell
|
|
// then it'll be the script name
|
|
// then the args to the script
|
|
let mut args_to_nushell = Vec::from(["nu".into()]);
|
|
let mut script_name = String::new();
|
|
let mut args = std::env::args();
|
|
|
|
// Mimic the behaviour of bash/zsh
|
|
if let Some(argv0) = args.next() {
|
|
if argv0.starts_with('-') {
|
|
args_to_nushell.push("--login".into());
|
|
}
|
|
}
|
|
|
|
while let Some(arg) = args.next() {
|
|
if !arg.starts_with('-') {
|
|
script_name = arg;
|
|
break;
|
|
}
|
|
|
|
let flag_value = match arg.as_ref() {
|
|
"--commands" | "-c" | "--table-mode" | "-m" | "--error-style" | "-e" | "--execute"
|
|
| "--config" | "--env-config" | "-I" | "ide-ast" => {
|
|
args.next().map(|a| escape_quote_string(&a))
|
|
}
|
|
#[cfg(feature = "plugin")]
|
|
"--plugin-config" => args.next().map(|a| escape_quote_string(&a)),
|
|
"--log-level" | "--log-target" | "--log-include" | "--log-exclude" | "--testbin"
|
|
| "--threads" | "-t" | "--include-path" | "--lsp" | "--ide-goto-def"
|
|
| "--ide-hover" | "--ide-complete" | "--ide-check" => args.next(),
|
|
#[cfg(feature = "plugin")]
|
|
"--plugins" => args.next(),
|
|
_ => None,
|
|
};
|
|
|
|
args_to_nushell.push(arg);
|
|
|
|
if let Some(flag_value) = flag_value {
|
|
args_to_nushell.push(flag_value);
|
|
}
|
|
}
|
|
|
|
let args_to_script = if !script_name.is_empty() {
|
|
args.map(|arg| escape_for_script_arg(&arg)).collect()
|
|
} else {
|
|
Vec::default()
|
|
};
|
|
(args_to_nushell, script_name, args_to_script)
|
|
}
|
|
|
|
pub(crate) fn parse_commandline_args(
|
|
commandline_args: &str,
|
|
engine_state: &mut EngineState,
|
|
) -> Result<NushellCliArgs, ShellError> {
|
|
let (block, delta) = {
|
|
let mut working_set = StateWorkingSet::new(engine_state);
|
|
working_set.add_decl(Box::new(Nu));
|
|
|
|
let output = parse(&mut working_set, None, commandline_args.as_bytes(), false);
|
|
if let Some(err) = working_set.parse_errors.first() {
|
|
report_parse_error(&working_set, err);
|
|
std::process::exit(1);
|
|
}
|
|
|
|
working_set.hide_decl(b"nu");
|
|
(output, working_set.render())
|
|
};
|
|
|
|
engine_state.merge_delta(delta)?;
|
|
|
|
let mut stack = Stack::new();
|
|
|
|
// We should have a successful parse now
|
|
if let Some(pipeline) = block.pipelines.first() {
|
|
if let Some(Expr::Call(call)) = pipeline.elements.first().map(|e| &e.expr.expr) {
|
|
let redirect_stdin = call.get_named_arg("stdin");
|
|
let login_shell = call.get_named_arg("login");
|
|
let interactive_shell = call.get_named_arg("interactive");
|
|
let commands = call.get_flag_expr("commands");
|
|
let testbin = call.get_flag_expr("testbin");
|
|
#[cfg(feature = "plugin")]
|
|
let plugin_file = call.get_flag_expr("plugin-config");
|
|
#[cfg(feature = "plugin")]
|
|
let plugins = call.get_flag_expr("plugins");
|
|
let no_config_file = call.get_named_arg("no-config-file");
|
|
let no_history = call.get_named_arg("no-history");
|
|
let no_std_lib = call.get_named_arg("no-std-lib");
|
|
let config_file = call.get_flag_expr("config");
|
|
let env_file = call.get_flag_expr("env-config");
|
|
let log_level = call.get_flag_expr("log-level");
|
|
let log_target = call.get_flag_expr("log-target");
|
|
let log_include = call.get_flag_expr("log-include");
|
|
let log_exclude = call.get_flag_expr("log-exclude");
|
|
let execute = call.get_flag_expr("execute");
|
|
let table_mode: Option<Value> =
|
|
call.get_flag(engine_state, &mut stack, "table-mode")?;
|
|
let error_style: Option<Value> =
|
|
call.get_flag(engine_state, &mut stack, "error-style")?;
|
|
let no_newline = call.get_named_arg("no-newline");
|
|
|
|
// ide flags
|
|
let lsp = call.has_flag(engine_state, &mut stack, "lsp")?;
|
|
let include_path = call.get_flag_expr("include-path");
|
|
let ide_goto_def: Option<Value> =
|
|
call.get_flag(engine_state, &mut stack, "ide-goto-def")?;
|
|
let ide_hover: Option<Value> = call.get_flag(engine_state, &mut stack, "ide-hover")?;
|
|
let ide_complete: Option<Value> =
|
|
call.get_flag(engine_state, &mut stack, "ide-complete")?;
|
|
let ide_check: Option<Value> = call.get_flag(engine_state, &mut stack, "ide-check")?;
|
|
let ide_ast: Option<Spanned<String>> = call.get_named_arg("ide-ast");
|
|
|
|
fn extract_contents(
|
|
expression: Option<&Expression>,
|
|
) -> Result<Option<Spanned<String>>, ShellError> {
|
|
if let Some(expr) = expression {
|
|
let str = expr.as_string();
|
|
if let Some(str) = str {
|
|
Ok(Some(Spanned {
|
|
item: str,
|
|
span: expr.span,
|
|
}))
|
|
} else {
|
|
Err(ShellError::TypeMismatch {
|
|
err_message: "string".into(),
|
|
span: expr.span,
|
|
})
|
|
}
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
fn extract_path(
|
|
expression: Option<&Expression>,
|
|
) -> Result<Option<Spanned<String>>, ShellError> {
|
|
if let Some(expr) = expression {
|
|
let tuple = expr.as_filepath();
|
|
if let Some((str, _)) = tuple {
|
|
Ok(Some(Spanned {
|
|
item: str,
|
|
span: expr.span,
|
|
}))
|
|
} else {
|
|
Err(ShellError::TypeMismatch {
|
|
err_message: "path".into(),
|
|
span: expr.span,
|
|
})
|
|
}
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
fn extract_list(
|
|
expression: Option<&Expression>,
|
|
type_name: &str,
|
|
mut extract_item: impl FnMut(&Expression) -> Option<String>,
|
|
) -> Result<Option<Vec<Spanned<String>>>, ShellError> {
|
|
expression
|
|
.map(|expr| match &expr.expr {
|
|
Expr::List(list) => list
|
|
.iter()
|
|
.map(|item| {
|
|
extract_item(item.expr())
|
|
.map(|s| s.into_spanned(item.expr().span))
|
|
.ok_or_else(|| ShellError::TypeMismatch {
|
|
err_message: type_name.into(),
|
|
span: item.expr().span,
|
|
})
|
|
})
|
|
.collect::<Result<Vec<Spanned<String>>, _>>(),
|
|
_ => Err(ShellError::TypeMismatch {
|
|
err_message: format!("list<{type_name}>"),
|
|
span: expr.span,
|
|
}),
|
|
})
|
|
.transpose()
|
|
}
|
|
|
|
let commands = extract_contents(commands)?;
|
|
let testbin = extract_contents(testbin)?;
|
|
#[cfg(feature = "plugin")]
|
|
let plugin_file = extract_path(plugin_file)?;
|
|
#[cfg(feature = "plugin")]
|
|
let plugins = extract_list(plugins, "path", |expr| expr.as_filepath().map(|t| t.0))?;
|
|
let config_file = extract_path(config_file)?;
|
|
let env_file = extract_path(env_file)?;
|
|
let log_level = extract_contents(log_level)?;
|
|
let log_target = extract_contents(log_target)?;
|
|
let log_include = extract_list(log_include, "string", |expr| expr.as_string())?;
|
|
let log_exclude = extract_list(log_exclude, "string", |expr| expr.as_string())?;
|
|
let execute = extract_contents(execute)?;
|
|
let include_path = extract_contents(include_path)?;
|
|
|
|
let help = call.has_flag(engine_state, &mut stack, "help")?;
|
|
|
|
if help {
|
|
let full_help = get_full_help(&Nu, engine_state, &mut stack);
|
|
|
|
let _ = std::panic::catch_unwind(move || stdout_write_all_and_flush(full_help));
|
|
|
|
std::process::exit(0);
|
|
}
|
|
|
|
if call.has_flag(engine_state, &mut stack, "version")? {
|
|
let version = env!("CARGO_PKG_VERSION").to_string();
|
|
let _ = std::panic::catch_unwind(move || {
|
|
stdout_write_all_and_flush(format!("{version}\n"))
|
|
});
|
|
|
|
std::process::exit(0);
|
|
}
|
|
|
|
return Ok(NushellCliArgs {
|
|
redirect_stdin,
|
|
login_shell,
|
|
interactive_shell,
|
|
commands,
|
|
testbin,
|
|
#[cfg(feature = "plugin")]
|
|
plugin_file,
|
|
#[cfg(feature = "plugin")]
|
|
plugins,
|
|
no_config_file,
|
|
no_history,
|
|
no_std_lib,
|
|
config_file,
|
|
env_file,
|
|
log_level,
|
|
log_target,
|
|
log_include,
|
|
log_exclude,
|
|
execute,
|
|
include_path,
|
|
ide_goto_def,
|
|
ide_hover,
|
|
ide_complete,
|
|
lsp,
|
|
ide_check,
|
|
ide_ast,
|
|
table_mode,
|
|
error_style,
|
|
no_newline,
|
|
});
|
|
}
|
|
}
|
|
|
|
// Just give the help and exit if the above fails
|
|
let full_help = get_full_help(&Nu, engine_state, &mut stack);
|
|
print!("{full_help}");
|
|
std::process::exit(1);
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct NushellCliArgs {
|
|
pub(crate) redirect_stdin: Option<Spanned<String>>,
|
|
pub(crate) login_shell: Option<Spanned<String>>,
|
|
pub(crate) interactive_shell: Option<Spanned<String>>,
|
|
pub(crate) commands: Option<Spanned<String>>,
|
|
pub(crate) testbin: Option<Spanned<String>>,
|
|
#[cfg(feature = "plugin")]
|
|
pub(crate) plugin_file: Option<Spanned<String>>,
|
|
#[cfg(feature = "plugin")]
|
|
pub(crate) plugins: Option<Vec<Spanned<String>>>,
|
|
pub(crate) no_config_file: Option<Spanned<String>>,
|
|
pub(crate) no_history: Option<Spanned<String>>,
|
|
pub(crate) no_std_lib: Option<Spanned<String>>,
|
|
pub(crate) config_file: Option<Spanned<String>>,
|
|
pub(crate) env_file: Option<Spanned<String>>,
|
|
pub(crate) log_level: Option<Spanned<String>>,
|
|
pub(crate) log_target: Option<Spanned<String>>,
|
|
pub(crate) log_include: Option<Vec<Spanned<String>>>,
|
|
pub(crate) log_exclude: Option<Vec<Spanned<String>>>,
|
|
pub(crate) execute: Option<Spanned<String>>,
|
|
pub(crate) table_mode: Option<Value>,
|
|
pub(crate) error_style: Option<Value>,
|
|
pub(crate) no_newline: Option<Spanned<String>>,
|
|
pub(crate) include_path: Option<Spanned<String>>,
|
|
pub(crate) lsp: bool,
|
|
pub(crate) ide_goto_def: Option<Value>,
|
|
pub(crate) ide_hover: Option<Value>,
|
|
pub(crate) ide_complete: Option<Value>,
|
|
pub(crate) ide_check: Option<Value>,
|
|
pub(crate) ide_ast: Option<Spanned<String>>,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
struct Nu;
|
|
|
|
impl Command for Nu {
|
|
fn name(&self) -> &str {
|
|
"nu"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
let mut signature = Signature::build("nu")
|
|
.description("The nushell language and shell.")
|
|
.named(
|
|
"commands",
|
|
SyntaxShape::String,
|
|
"run the given commands and then exit",
|
|
Some('c'),
|
|
)
|
|
.named(
|
|
"execute",
|
|
SyntaxShape::String,
|
|
"run the given commands and then enter an interactive shell",
|
|
Some('e'),
|
|
)
|
|
.named(
|
|
"include-path",
|
|
SyntaxShape::String,
|
|
"set the NU_LIB_DIRS for the given script (delimited by char record_sep ('\x1e'))",
|
|
Some('I'),
|
|
)
|
|
.switch("interactive", "start as an interactive shell", Some('i'))
|
|
.switch("login", "start as a login shell", Some('l'))
|
|
.named(
|
|
"table-mode",
|
|
SyntaxShape::String,
|
|
"the table mode to use. rounded is default.",
|
|
Some('m'),
|
|
)
|
|
.named(
|
|
"error-style",
|
|
SyntaxShape::String,
|
|
"the error style to use (fancy or plain). default: fancy",
|
|
None,
|
|
)
|
|
.switch("no-newline", "print the result for --commands(-c) without a newline", None)
|
|
.switch(
|
|
"no-config-file",
|
|
"start with no config file and no env file",
|
|
Some('n'),
|
|
)
|
|
.switch(
|
|
"no-history",
|
|
"disable reading and writing to command history",
|
|
None,
|
|
)
|
|
.switch("no-std-lib", "start with no standard library", None)
|
|
.named(
|
|
"threads",
|
|
SyntaxShape::Int,
|
|
"threads to use for parallel commands",
|
|
Some('t'),
|
|
)
|
|
.switch("version", "print the version", Some('v'))
|
|
.named(
|
|
"config",
|
|
SyntaxShape::Filepath,
|
|
"start with an alternate config file",
|
|
None,
|
|
)
|
|
.named(
|
|
"env-config",
|
|
SyntaxShape::Filepath,
|
|
"start with an alternate environment config file",
|
|
None,
|
|
)
|
|
.switch(
|
|
"lsp",
|
|
"start nu's language server protocol",
|
|
None,
|
|
)
|
|
.named(
|
|
"ide-goto-def",
|
|
SyntaxShape::Int,
|
|
"go to the definition of the item at the given position",
|
|
None,
|
|
)
|
|
.named(
|
|
"ide-hover",
|
|
SyntaxShape::Int,
|
|
"give information about the item at the given position",
|
|
None,
|
|
)
|
|
.named(
|
|
"ide-complete",
|
|
SyntaxShape::Int,
|
|
"list completions for the item at the given position",
|
|
None,
|
|
)
|
|
.named(
|
|
"ide-check",
|
|
SyntaxShape::Int,
|
|
"run a diagnostic check on the given source and limit number of errors returned to provided number",
|
|
None,
|
|
)
|
|
.switch("ide-ast", "generate the ast on the given source", None);
|
|
|
|
#[cfg(feature = "plugin")]
|
|
{
|
|
signature = signature
|
|
.named(
|
|
"plugin-config",
|
|
SyntaxShape::Filepath,
|
|
"start with an alternate plugin registry file",
|
|
None,
|
|
)
|
|
.named(
|
|
"plugins",
|
|
SyntaxShape::List(Box::new(SyntaxShape::Filepath)),
|
|
"list of plugin executable files to load, separately from the registry file",
|
|
None,
|
|
)
|
|
}
|
|
|
|
signature = signature
|
|
.named(
|
|
"log-level",
|
|
SyntaxShape::String,
|
|
"log level for diagnostic logs (error, warn, info, debug, trace). Off by default",
|
|
None,
|
|
)
|
|
.named(
|
|
"log-target",
|
|
SyntaxShape::String,
|
|
"set the target for the log to output. stdout, stderr(default), mixed or file",
|
|
None,
|
|
)
|
|
.named(
|
|
"log-include",
|
|
SyntaxShape::List(Box::new(SyntaxShape::String)),
|
|
"set the Rust module prefixes to include in the log output. default: [nu]",
|
|
None,
|
|
)
|
|
.named(
|
|
"log-exclude",
|
|
SyntaxShape::List(Box::new(SyntaxShape::String)),
|
|
"set the Rust module prefixes to exclude from the log output",
|
|
None,
|
|
)
|
|
.switch(
|
|
"stdin",
|
|
"redirect standard input to a command (with `-c`) or a script file",
|
|
None,
|
|
)
|
|
.named(
|
|
"testbin",
|
|
SyntaxShape::String,
|
|
"run internal test binary",
|
|
None,
|
|
)
|
|
.optional(
|
|
"script file",
|
|
SyntaxShape::Filepath,
|
|
"name of the optional script file to run",
|
|
)
|
|
.rest(
|
|
"script args",
|
|
SyntaxShape::String,
|
|
"parameters to the script file",
|
|
)
|
|
.category(Category::System);
|
|
|
|
signature
|
|
}
|
|
|
|
fn description(&self) -> &str {
|
|
"The nushell language and shell."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<nu_protocol::Example> {
|
|
vec![
|
|
Example {
|
|
description: "Run a script",
|
|
example: "nu myfile.nu",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Run nushell interactively (as a shell or REPL)",
|
|
example: "nu",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|