YizhePKU bdb6daa4b5
Migrate to a new PWD API (#12603)
This is the first PR towards migrating to a new `$env.PWD` API that
returns potentially un-canonicalized paths. Refer to PR #12515 for
motivations.

## New API: `EngineState::cwd()`

The goal of the new API is to cover both parse-time and runtime use
case, and avoid unintentional misuse. It takes an `Option<Stack>` as
argument, which if supplied, will search for `$env.PWD` on the stack in
additional to the engine state. I think with this design, there's less
confusion over parse-time and runtime environments. If you have access
to a stack, just supply it; otherwise supply `None`.

## Deprecation of other PWD-related APIs

Other APIs are re-implemented using `EngineState::cwd()` and properly
documented. They're marked deprecated, but their behavior is unchanged.
Unused APIs are deleted, and code that accesses `$env.PWD` directly
without using an API is rewritten.

Deprecated APIs:

* `EngineState::current_work_dir()`
* `StateWorkingSet::get_cwd()`
* `env::current_dir()`
* `env::current_dir_str()`
* `env::current_dir_const()`
* `env::current_dir_str_const()`

Other changes:

* `EngineState::get_cwd()` (deleted)
* `StateWorkingSet::list_env()` (deleted)
* `repl::do_run_cmd()` (rewritten with `env::current_dir_str()`)

## `cd` and `pwd` now use logical paths by default

This pulls the changes from PR #12515. It's currently somewhat broken
because using non-canonicalized paths exposed a bug in our path
normalization logic (Issue #12602). Once that is fixed, this should
work.

## Future plans

This PR needs some tests. Which test helpers should I use, and where
should I put those tests?

I noticed that unquoted paths are expanded within `eval_filepath()` and
`eval_directory()` before they even reach the `cd` command. This means
every paths is expanded twice. Is this intended?

Once this PR lands, the plan is to review all usages of the deprecated
APIs and migrate them to `EngineState::cwd()`. In the meantime, these
usages are annotated with `#[allow(deprecated)]` to avoid breaking CI.

---------

Co-authored-by: Jakub Žádník <kubouch@gmail.com>
2024-05-03 14:33:09 +03:00

203 lines
6.1 KiB
Rust

use super::PathSubcommandArguments;
#[allow(deprecated)]
use nu_engine::{
command_prelude::*,
env::{current_dir_str, current_dir_str_const},
};
use nu_path::{canonicalize_with, expand_path_with};
use nu_protocol::engine::StateWorkingSet;
use std::path::Path;
struct Arguments {
strict: bool,
cwd: String,
not_follow_symlink: bool,
}
impl PathSubcommandArguments for Arguments {}
#[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),
(
Type::List(Box::new(Type::String)),
Type::List(Box::new(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'))
.category(Category::Path)
}
fn usage(&self) -> &str {
"Try to expand a path to its absolute form."
}
fn is_const(&self) -> bool {
true
}
fn run(
&self,
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
input: PipelineData,
) -> Result<PipelineData, ShellError> {
let head = call.head;
#[allow(deprecated)]
let args = Arguments {
strict: call.has_flag(engine_state, stack, "strict")?,
cwd: current_dir_str(engine_state, stack)?,
not_follow_symlink: call.has_flag(engine_state, stack, "no-symlink")?,
};
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&expand, &args, value, head),
engine_state.ctrlc.clone(),
)
}
fn run_const(
&self,
working_set: &StateWorkingSet,
call: &Call,
input: PipelineData,
) -> Result<PipelineData, ShellError> {
let head = call.head;
#[allow(deprecated)]
let args = Arguments {
strict: call.has_flag_const(working_set, "strict")?,
cwd: current_dir_str_const(working_set)?,
not_follow_symlink: call.has_flag_const(working_set, "no-symlink")?,
};
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&expand, &args, value, head),
working_set.permanent().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 relative path",
example: r"'foo\..\bar' | path expand",
result: None,
},
Example {
description: "Expand a list of paths",
example: r"[ C:\foo\..\bar, C:\foo\..\baz ] | path expand",
result: Some(Value::test_list(vec![
Value::test_string(r"C:\bar"),
Value::test_string(r"C:\baz"),
])),
},
]
}
#[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 relative path",
example: "'foo/../bar' | path expand",
result: None,
},
Example {
description: "Expand a list of paths",
example: "[ /foo/../bar, /foo/../baz ] | path expand",
result: Some(Value::test_list(vec![
Value::test_string("/bar"),
Value::test_string("/baz"),
])),
},
]
}
}
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, true).to_string_lossy(),
span,
)
} else {
Value::string(p.to_string_lossy(), span)
}
}
Err(_) => Value::error(
ShellError::GenericError {
error: "Could not expand path".into(),
msg: "could not be expanded (path might not exist, non-final \
component is not a directory, or other cause)"
.into(),
span: Some(span),
help: None,
inner: vec![],
},
span,
),
}
} else if args.not_follow_symlink {
Value::string(
expand_path_with(path, &args.cwd, true).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, true).to_string_lossy(),
span,
)
})
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_examples() {
use crate::test_examples;
test_examples(SubCommand {})
}
}