# Description As title, we can't provide examples for plugin commands, this pr would make it possible # User-Facing Changes Take plugin `nu-example-1` as example: ``` ❯ nu-example-1 -h PluginSignature test 1 for plugin. Returns Value::Nothing Usage: > nu-example-1 {flags} <a> <b> (opt) ...(rest) Flags: -h, --help - Display the help message for this command -f, --flag - a flag for the signature -n, --named <String> - named string Parameters: a <int>: required integer value b <string>: required string value (optional) opt <int>: Optional number ...rest <string>: rest value string Examples: running example with an int value and string value > nu-example-1 3 bb ``` The examples session is newly added. ## Basic idea behind these changes when nushell query plugin signatures, plugin just returns it's signature without any examples, so nushell have no idea about the examples of plugin commands. To adding the feature, we just making plugin returns it's signature with examples. Before: ``` 1. get signature ----------------> Nushell ------------------ Plugin <----------------- 2. returns Vec<Signature> ``` After: ``` 1. get signature ----------------> Nushell ------------------ Plugin <----------------- 2. returns Vec<PluginSignature> ``` When writing plugin signature to $nu.plugin-path: Serialize `<PluginSignature>` rather than `<Signature>`, which would enable us to serialize examples to `$nu.plugin-path` ## Shortcoming It's a breaking changes because `Plugin::signature` is changed, and it requires plugin authors to change their code for new signatures. Fortunally it should be easy to change, for rust based plugin, we just need to make a global replace from word `Signature` to word `PluginSignature` in their plugin project. Our content of plugin-path is really large, if one plugin have many examples, it'd results to larger body of $nu.plugin-path, which is not really scale. A solution would be save register information in other binary formats rather than `json`. But I think it'd be another story. # 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.
180 lines
6.1 KiB
Rust
180 lines
6.1 KiB
Rust
use crate::EvaluatedCall;
|
|
|
|
use super::{call_plugin, create_command, get_plugin_encoding};
|
|
use crate::protocol::{
|
|
CallInfo, CallInput, PluginCall, PluginCustomValue, PluginData, PluginResponse,
|
|
};
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{ast::Call, PluginSignature, Signature};
|
|
use nu_protocol::{Example, PipelineData, ShellError, Value};
|
|
|
|
#[derive(Clone)]
|
|
pub struct PluginDeclaration {
|
|
name: String,
|
|
signature: PluginSignature,
|
|
filename: PathBuf,
|
|
shell: Option<PathBuf>,
|
|
}
|
|
|
|
impl PluginDeclaration {
|
|
pub fn new(filename: PathBuf, signature: PluginSignature, shell: Option<PathBuf>) -> Self {
|
|
Self {
|
|
name: signature.sig.name.clone(),
|
|
signature,
|
|
filename,
|
|
shell,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Command for PluginDeclaration {
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
self.signature.sig.clone()
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
self.signature.sig.usage.as_str()
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
let mut res = vec![];
|
|
for e in self.signature.examples.iter() {
|
|
res.push(Example {
|
|
example: &e.example,
|
|
description: &e.description,
|
|
result: e.result.clone(),
|
|
})
|
|
}
|
|
res
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
// Call the command with self path
|
|
// Decode information from plugin
|
|
// Create PipelineData
|
|
let source_file = Path::new(&self.filename);
|
|
let mut plugin_cmd = create_command(source_file, &self.shell);
|
|
// We need the current environment variables for `python` based plugins
|
|
// Or we'll likely have a problem when a plugin is implemented in a virtual Python environment.
|
|
let current_envs = nu_engine::env::env_to_strings(engine_state, stack).unwrap_or_default();
|
|
plugin_cmd.envs(current_envs);
|
|
|
|
let mut child = plugin_cmd.spawn().map_err(|err| {
|
|
let decl = engine_state.get_decl(call.decl_id);
|
|
ShellError::GenericError(
|
|
format!("Unable to spawn plugin for {}", decl.name()),
|
|
format!("{err}"),
|
|
Some(call.head),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
})?;
|
|
|
|
let input = input.into_value(call.head);
|
|
let input = match input {
|
|
Value::CustomValue { val, span } => {
|
|
match val.as_any().downcast_ref::<PluginCustomValue>() {
|
|
Some(plugin_data) if plugin_data.filename == self.filename => {
|
|
CallInput::Data(PluginData {
|
|
data: plugin_data.data.clone(),
|
|
span,
|
|
})
|
|
}
|
|
_ => {
|
|
let custom_value_name = val.value_string();
|
|
return Err(ShellError::GenericError(
|
|
format!(
|
|
"Plugin {} can not handle the custom value {}",
|
|
self.name, custom_value_name
|
|
),
|
|
format!("custom value {custom_value_name}"),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
));
|
|
}
|
|
}
|
|
}
|
|
Value::LazyRecord { val, .. } => CallInput::Value(val.collect()?),
|
|
value => CallInput::Value(value),
|
|
};
|
|
|
|
let plugin_call = PluginCall::CallInfo(CallInfo {
|
|
name: self.name.clone(),
|
|
call: EvaluatedCall::try_from_call(call, engine_state, stack)?,
|
|
input,
|
|
});
|
|
|
|
let encoding = {
|
|
let stdout_reader = match &mut child.stdout {
|
|
Some(out) => out,
|
|
None => {
|
|
return Err(ShellError::PluginFailedToLoad(
|
|
"Plugin missing stdout reader".into(),
|
|
))
|
|
}
|
|
};
|
|
get_plugin_encoding(stdout_reader)?
|
|
};
|
|
let response = call_plugin(&mut child, plugin_call, &encoding, call.head).map_err(|err| {
|
|
let decl = engine_state.get_decl(call.decl_id);
|
|
ShellError::GenericError(
|
|
format!("Unable to decode call for {}", decl.name()),
|
|
err.to_string(),
|
|
Some(call.head),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
});
|
|
|
|
let pipeline_data = match response {
|
|
Ok(PluginResponse::Value(value)) => {
|
|
Ok(PipelineData::Value(value.as_ref().clone(), None))
|
|
}
|
|
Ok(PluginResponse::PluginData(name, plugin_data)) => Ok(PipelineData::Value(
|
|
Value::CustomValue {
|
|
val: Box::new(PluginCustomValue {
|
|
name,
|
|
data: plugin_data.data,
|
|
filename: self.filename.clone(),
|
|
shell: self.shell.clone(),
|
|
source: engine_state.get_decl(call.decl_id).name().to_owned(),
|
|
}),
|
|
span: plugin_data.span,
|
|
},
|
|
None,
|
|
)),
|
|
Ok(PluginResponse::Error(err)) => Err(err.into()),
|
|
Ok(PluginResponse::Signature(..)) => Err(ShellError::GenericError(
|
|
"Plugin missing value".into(),
|
|
"Received a signature from plugin instead of value".into(),
|
|
Some(call.head),
|
|
None,
|
|
Vec::new(),
|
|
)),
|
|
Err(err) => Err(err),
|
|
};
|
|
|
|
// We need to call .wait() on the child, or we'll risk summoning the zombie horde
|
|
let _ = child.wait();
|
|
|
|
pipeline_data
|
|
}
|
|
|
|
fn is_plugin(&self) -> Option<(&PathBuf, &Option<PathBuf>)> {
|
|
Some((&self.filename, &self.shell))
|
|
}
|
|
}
|