forked from extern/nushell
6cdfee3573
# Description As part of the refactor to split spans off of Value, this moves to using helper functions to create values, and using `.span()` instead of matching span out of Value directly. Hoping to get a few more helping hands to finish this, as there are a lot of commands to update :) # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # 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 std testing; testing run-tests --path crates/nu-std"` 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 > ``` --> # 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. --> --------- Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com> Co-authored-by: WindSoilder <windsoilder@outlook.com>
89 lines
2.7 KiB
Rust
89 lines
2.7 KiB
Rust
use nu_protocol::ast::CellPath;
|
|
use nu_protocol::{PipelineData, ShellError, Span, Value};
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::Arc;
|
|
|
|
pub trait CmdArgument {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>>;
|
|
}
|
|
|
|
/// Arguments with only cell_path.
|
|
///
|
|
/// If commands is going to use `operate` function, and it only required optional cell_paths
|
|
/// Using this to simplify code.
|
|
pub struct CellPathOnlyArgs {
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
}
|
|
|
|
impl CmdArgument for CellPathOnlyArgs {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
impl From<Vec<CellPath>> for CellPathOnlyArgs {
|
|
fn from(cell_paths: Vec<CellPath>) -> Self {
|
|
Self {
|
|
cell_paths: (!cell_paths.is_empty()).then_some(cell_paths),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A simple wrapper for `PipelineData::map` method.
|
|
///
|
|
/// In detail, for each elements, invoking relative `cmd` with `arg`.
|
|
///
|
|
/// If `arg` tell us that its cell path is not None, only map over data under these columns.
|
|
/// Else it will apply each column inside a table.
|
|
///
|
|
/// The validation of input element should be handle by `cmd` itself.
|
|
pub fn operate<C, A>(
|
|
cmd: C,
|
|
mut arg: A,
|
|
input: PipelineData,
|
|
span: Span,
|
|
ctrlc: Option<Arc<AtomicBool>>,
|
|
) -> Result<PipelineData, ShellError>
|
|
where
|
|
A: CmdArgument + Send + Sync + 'static,
|
|
C: Fn(&Value, &A, Span) -> Value + Send + Sync + 'static + Clone + Copy,
|
|
{
|
|
match arg.take_cell_paths() {
|
|
None => input.map(
|
|
move |v| {
|
|
match v {
|
|
// Propagate errors inside the input
|
|
Value::Error { .. } => v,
|
|
_ => cmd(&v, &arg, span),
|
|
}
|
|
},
|
|
ctrlc,
|
|
),
|
|
Some(column_paths) => {
|
|
let arg = Arc::new(arg);
|
|
input.map(
|
|
move |mut v| {
|
|
for path in &column_paths {
|
|
let opt = arg.clone();
|
|
let r = v.update_cell_path(
|
|
&path.members,
|
|
Box::new(move |old| {
|
|
match old {
|
|
// Propagate errors inside the input
|
|
Value::Error { .. } => old.clone(),
|
|
_ => cmd(old, &opt, span),
|
|
}
|
|
}),
|
|
);
|
|
if let Err(error) = r {
|
|
return Value::error(error, span);
|
|
}
|
|
}
|
|
v
|
|
},
|
|
ctrlc,
|
|
)
|
|
}
|
|
}
|
|
}
|