mirror of
https://github.com/nushell/nushell.git
synced 2025-04-29 07:34:28 +02:00
# Description * I was dismayed to discover recently that UnsupportedInput and TypeMismatch are used *extremely* inconsistently across the codebase. UnsupportedInput is sometimes used for input type-checks (as per the name!!), but *also* used for argument type-checks. TypeMismatch is also used for both. I thus devised the following standard: input type-checking *only* uses UnsupportedInput, and argument type-checking *only* uses TypeMismatch. Moreover, to differentiate them, UnsupportedInput now has *two* error arrows (spans), one pointing at the command and the other at the input origin, while TypeMismatch only has the one (because the command should always be nearby) * In order to apply that standard, a very large number of UnsupportedInput uses were changed so that the input's span could be retrieved and delivered to it. * Additionally, I noticed many places where **errors are not propagated correctly**: there are lots of `match` sites which take a Value::Error, then throw it away and replace it with a new Value::Error with less/misleading information (such as reporting the error as an "incorrect type"). I believe that the earliest errors are the most important, and should always be propagated where possible. * Also, to standardise one broad subset of UnsupportedInput error messages, who all used slightly different wordings of "expected `<type>`, got `<type>`", I created OnlySupportsThisInputType as a variant of it. * Finally, a bunch of error sites that had "repeated spans" - i.e. where an error expected two spans, but `call.head` was given for both - were fixed to use different spans. # Example BEFORE ``` 〉20b | str starts-with 'a' Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #31:1:1] 1 │ 20b | str starts-with 'a' · ┬ · ╰── Input's type is filesize. This command only works with strings. ╰──── 〉'a' | math cos Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #33:1:1] 1 │ 'a' | math cos · ─┬─ · ╰── Only numerical values are supported, input type: String ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #38:1:1] 1 │ 0x[12] | encode utf8 · ───┬── · ╰── non-string input ╰──── ``` AFTER ``` 〉20b | str starts-with 'a' Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #1:1:1] 1 │ 20b | str starts-with 'a' · ┬ ───────┬─────── · │ ╰── only string input data is supported · ╰── input type: filesize ╰──── 〉'a' | math cos Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #2:1:1] 1 │ 'a' | math cos · ─┬─ ────┬─── · │ ╰── only numeric input data is supported · ╰── input type: string ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #3:1:1] 1 │ 0x[12] | encode utf8 · ───┬── ───┬── · │ ╰── only string input data is supported · ╰── input type: binary ╰──── ``` # User-Facing Changes Various error messages suddenly make more sense (i.e. have two arrows instead of one). # 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 -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # 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.
170 lines
5.1 KiB
Rust
170 lines
5.1 KiB
Rust
use std::path::Path;
|
|
|
|
use nu_engine::env::current_dir_str;
|
|
use nu_engine::CallExt;
|
|
use nu_path::{canonicalize_with, expand_path_with};
|
|
use nu_protocol::{
|
|
engine::Command, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
use super::PathSubcommandArguments;
|
|
|
|
struct Arguments {
|
|
strict: bool,
|
|
columns: Option<Vec<String>>,
|
|
cwd: String,
|
|
not_follow_symlink: bool,
|
|
}
|
|
|
|
impl PathSubcommandArguments for Arguments {
|
|
fn get_columns(&self) -> Option<Vec<String>> {
|
|
self.columns.clone()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"path expand"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("path expand")
|
|
.input_output_types(vec![(Type::String, Type::String)])
|
|
.switch(
|
|
"strict",
|
|
"Throw an error if the path could not be expanded",
|
|
Some('s'),
|
|
)
|
|
.switch("no-symlink", "Do not resolve symbolic links", Some('n'))
|
|
.named(
|
|
"columns",
|
|
SyntaxShape::Table,
|
|
"For a record or table input, expand strings at the given columns",
|
|
Some('c'),
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Try to expand a path to its absolute form"
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &nu_protocol::engine::EngineState,
|
|
stack: &mut nu_protocol::engine::Stack,
|
|
call: &nu_protocol::ast::Call,
|
|
input: nu_protocol::PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let head = call.head;
|
|
let args = Arguments {
|
|
strict: call.has_flag("strict"),
|
|
columns: call.get_flag(engine_state, stack, "columns")?,
|
|
cwd: current_dir_str(engine_state, stack)?,
|
|
not_follow_symlink: call.has_flag("no-symlink"),
|
|
};
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty(head));
|
|
}
|
|
input.map(
|
|
move |value| super::operate(&expand, &args, value, head),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Expand an absolute path",
|
|
example: r"'C:\Users\joe\foo\..\bar' | path expand",
|
|
result: Some(Value::test_string(r"C:\Users\joe\bar")),
|
|
},
|
|
Example {
|
|
description: "Expand a path in a column",
|
|
example: "ls | path expand -c [ name ]",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Expand a relative path",
|
|
example: r"'foo\..\bar' | path expand",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Expand an absolute path without following symlink",
|
|
example: r"'foo\..\bar' | path expand -n",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Expand an absolute path",
|
|
example: "'/home/joe/foo/../bar' | path expand",
|
|
result: Some(Value::test_string("/home/joe/bar")),
|
|
},
|
|
Example {
|
|
description: "Expand a path in a column",
|
|
example: "ls | path expand -c [ name ]",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Expand a relative path",
|
|
example: "'foo/../bar' | path expand",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn expand(path: &Path, span: Span, args: &Arguments) -> Value {
|
|
if args.strict {
|
|
match canonicalize_with(path, &args.cwd) {
|
|
Ok(p) => {
|
|
if args.not_follow_symlink {
|
|
Value::string(expand_path_with(path, &args.cwd).to_string_lossy(), span)
|
|
} else {
|
|
Value::string(p.to_string_lossy(), span)
|
|
}
|
|
}
|
|
Err(_) => Value::Error {
|
|
error: ShellError::GenericError(
|
|
"Could not expand path".into(),
|
|
"could not be expanded (path might not exist, non-final \
|
|
component is not a directory, or other cause)"
|
|
.into(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
),
|
|
},
|
|
}
|
|
} else if args.not_follow_symlink {
|
|
Value::string(expand_path_with(path, &args.cwd).to_string_lossy(), span)
|
|
} else {
|
|
canonicalize_with(path, &args.cwd)
|
|
.map(|p| Value::string(p.to_string_lossy(), span))
|
|
.unwrap_or_else(|_| {
|
|
Value::string(expand_path_with(path, &args.cwd).to_string_lossy(), span)
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|