2021-12-12 12:50:35 +01:00
|
|
|
mod evaluated_call;
|
2022-07-25 18:32:56 +02:00
|
|
|
mod plugin_custom_value;
|
2024-02-25 23:32:50 +01:00
|
|
|
mod protocol_info;
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests;
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
pub(crate) mod test_util;
|
2021-12-12 12:50:35 +01:00
|
|
|
|
|
|
|
pub use evaluated_call::EvaluatedCall;
|
2024-02-25 23:32:50 +01:00
|
|
|
use nu_protocol::{PluginSignature, RawStream, ShellError, Span, Spanned, Value};
|
2022-07-25 18:32:56 +02:00
|
|
|
pub use plugin_custom_value::PluginCustomValue;
|
2024-02-25 23:32:50 +01:00
|
|
|
pub(crate) use protocol_info::ProtocolInfo;
|
2021-12-12 12:50:35 +01:00
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
|
2024-02-25 23:32:50 +01:00
|
|
|
#[cfg(test)]
|
|
|
|
pub(crate) use protocol_info::Protocol;
|
|
|
|
|
|
|
|
/// A sequential identifier for a stream
|
|
|
|
pub type StreamId = usize;
|
|
|
|
|
|
|
|
/// A sequential identifier for a [`PluginCall`]
|
|
|
|
pub type PluginCallId = usize;
|
|
|
|
|
|
|
|
/// Information about a plugin command invocation. This includes an [`EvaluatedCall`] as a
|
|
|
|
/// serializable representation of [`nu_protocol::ast::Call`]. The type parameter determines
|
|
|
|
/// the input type.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
pub struct CallInfo<D> {
|
|
|
|
/// The name of the command to be run
|
2021-12-12 12:50:35 +01:00
|
|
|
pub name: String,
|
2024-02-25 23:32:50 +01:00
|
|
|
/// Information about the invocation, including arguments
|
2021-12-12 12:50:35 +01:00
|
|
|
pub call: EvaluatedCall,
|
2024-02-25 23:32:50 +01:00
|
|
|
/// Pipeline input. This is usually [`nu_protocol::PipelineData`] or [`PipelineDataHeader`]
|
|
|
|
pub input: D,
|
|
|
|
/// Plugin configuration, if available
|
2024-01-15 09:59:47 +01:00
|
|
|
pub config: Option<Value>,
|
2022-07-25 18:32:56 +02:00
|
|
|
}
|
|
|
|
|
2024-02-25 23:32:50 +01:00
|
|
|
/// The initial (and perhaps only) part of any [`nu_protocol::PipelineData`] sent over the wire.
|
|
|
|
///
|
|
|
|
/// This may contain a single value, or may initiate a stream with a [`StreamId`].
|
|
|
|
#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
|
|
|
|
pub enum PipelineDataHeader {
|
|
|
|
/// No input
|
|
|
|
Empty,
|
|
|
|
/// A single value
|
2022-07-25 18:32:56 +02:00
|
|
|
Value(Value),
|
2024-02-25 23:32:50 +01:00
|
|
|
/// Initiate [`nu_protocol::PipelineData::ListStream`].
|
|
|
|
///
|
|
|
|
/// Items are sent via [`StreamData`]
|
|
|
|
ListStream(ListStreamInfo),
|
|
|
|
/// Initiate [`nu_protocol::PipelineData::ExternalStream`].
|
|
|
|
///
|
|
|
|
/// Items are sent via [`StreamData`]
|
|
|
|
ExternalStream(ExternalStreamInfo),
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Additional information about list (value) streams
|
|
|
|
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
|
|
|
|
pub struct ListStreamInfo {
|
|
|
|
pub id: StreamId,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Additional information about external streams
|
|
|
|
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
|
|
|
|
pub struct ExternalStreamInfo {
|
|
|
|
pub span: Span,
|
|
|
|
pub stdout: Option<RawStreamInfo>,
|
|
|
|
pub stderr: Option<RawStreamInfo>,
|
|
|
|
pub exit_code: Option<ListStreamInfo>,
|
|
|
|
pub trim_end_newline: bool,
|
2021-12-12 12:50:35 +01:00
|
|
|
}
|
|
|
|
|
2024-02-25 23:32:50 +01:00
|
|
|
/// Additional information about raw (byte) streams
|
|
|
|
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
|
|
|
|
pub struct RawStreamInfo {
|
|
|
|
pub id: StreamId,
|
|
|
|
pub is_binary: bool,
|
|
|
|
pub known_size: Option<u64>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl RawStreamInfo {
|
|
|
|
pub(crate) fn new(id: StreamId, stream: &RawStream) -> Self {
|
|
|
|
RawStreamInfo {
|
|
|
|
id,
|
|
|
|
is_binary: stream.is_binary,
|
|
|
|
known_size: stream.known_size,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Calls that a plugin can execute. The type parameter determines the input type.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
pub enum PluginCall<D> {
|
2021-12-12 12:50:35 +01:00
|
|
|
Signature,
|
2024-02-25 23:32:50 +01:00
|
|
|
Run(CallInfo<D>),
|
|
|
|
CustomValueOp(Spanned<PluginCustomValue>, CustomValueOp),
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Operations supported for custom values.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
pub enum CustomValueOp {
|
|
|
|
/// [`to_base_value()`](nu_protocol::CustomValue::to_base_value)
|
|
|
|
ToBaseValue,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Any data sent to the plugin
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
pub enum PluginInput {
|
|
|
|
/// This must be the first message. Indicates supported protocol
|
|
|
|
Hello(ProtocolInfo),
|
|
|
|
/// Execute a [`PluginCall`], such as `Run` or `Signature`. The ID should not have been used
|
|
|
|
/// before.
|
|
|
|
Call(PluginCallId, PluginCall<PipelineDataHeader>),
|
2024-02-29 03:41:22 +01:00
|
|
|
/// Don't expect any more plugin calls. Exit after all currently executing plugin calls are
|
|
|
|
/// finished.
|
|
|
|
Goodbye,
|
2024-02-25 23:32:50 +01:00
|
|
|
/// Stream control or data message. Untagged to keep them as small as possible.
|
|
|
|
///
|
|
|
|
/// For example, `Stream(Ack(0))` is encoded as `{"Ack": 0}`
|
|
|
|
#[serde(untagged)]
|
|
|
|
Stream(StreamMessage),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TryFrom<PluginInput> for StreamMessage {
|
|
|
|
type Error = PluginInput;
|
|
|
|
|
|
|
|
fn try_from(msg: PluginInput) -> Result<StreamMessage, PluginInput> {
|
|
|
|
match msg {
|
|
|
|
PluginInput::Stream(stream_msg) => Ok(stream_msg),
|
|
|
|
_ => Err(msg),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<StreamMessage> for PluginInput {
|
|
|
|
fn from(stream_msg: StreamMessage) -> PluginInput {
|
|
|
|
PluginInput::Stream(stream_msg)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A single item of stream data for a stream.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
pub enum StreamData {
|
|
|
|
List(Value),
|
|
|
|
Raw(Result<Vec<u8>, ShellError>),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<Value> for StreamData {
|
|
|
|
fn from(value: Value) -> Self {
|
|
|
|
StreamData::List(value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<Result<Vec<u8>, ShellError>> for StreamData {
|
|
|
|
fn from(value: Result<Vec<u8>, ShellError>) -> Self {
|
|
|
|
StreamData::Raw(value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TryFrom<StreamData> for Value {
|
|
|
|
type Error = ShellError;
|
|
|
|
|
|
|
|
fn try_from(data: StreamData) -> Result<Value, ShellError> {
|
|
|
|
match data {
|
|
|
|
StreamData::List(value) => Ok(value),
|
|
|
|
StreamData::Raw(_) => Err(ShellError::PluginFailedToDecode {
|
|
|
|
msg: "expected list stream data, found raw data".into(),
|
|
|
|
}),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TryFrom<StreamData> for Result<Vec<u8>, ShellError> {
|
|
|
|
type Error = ShellError;
|
|
|
|
|
|
|
|
fn try_from(data: StreamData) -> Result<Result<Vec<u8>, ShellError>, ShellError> {
|
|
|
|
match data {
|
|
|
|
StreamData::Raw(value) => Ok(value),
|
|
|
|
StreamData::List(_) => Err(ShellError::PluginFailedToDecode {
|
|
|
|
msg: "expected raw stream data, found list data".into(),
|
|
|
|
}),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A stream control or data message.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
pub enum StreamMessage {
|
|
|
|
/// Append data to the stream. Sent by the stream producer.
|
|
|
|
Data(StreamId, StreamData),
|
|
|
|
/// End of stream. Sent by the stream producer.
|
|
|
|
End(StreamId),
|
|
|
|
/// Notify that the read end of the stream has closed, and further messages should not be
|
|
|
|
/// sent. Sent by the stream consumer.
|
|
|
|
Drop(StreamId),
|
|
|
|
/// Acknowledge that a message has been consumed. This is used to implement flow control by
|
|
|
|
/// the stream producer. Sent by the stream consumer.
|
|
|
|
Ack(StreamId),
|
2021-12-12 12:50:35 +01:00
|
|
|
}
|
|
|
|
|
2023-06-16 16:25:40 +02:00
|
|
|
/// An error message with debugging information that can be passed to Nushell from the plugin
|
|
|
|
///
|
|
|
|
/// The `LabeledError` struct is a structured error message that can be returned from
|
|
|
|
/// a [Plugin](crate::Plugin)'s [`run`](crate::Plugin::run()) method. It contains
|
|
|
|
/// the error message along with optional [Span] data to support highlighting in the
|
|
|
|
/// shell.
|
2024-02-25 23:32:50 +01:00
|
|
|
#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
|
2021-12-12 12:50:35 +01:00
|
|
|
pub struct LabeledError {
|
2023-06-16 16:25:40 +02:00
|
|
|
/// The name of the error
|
2021-12-12 12:50:35 +01:00
|
|
|
pub label: String,
|
2023-06-16 16:25:40 +02:00
|
|
|
/// A detailed error description
|
2021-12-12 12:50:35 +01:00
|
|
|
pub msg: String,
|
2023-06-16 16:25:40 +02:00
|
|
|
/// The [Span] in which the error occurred
|
2021-12-12 12:50:35 +01:00
|
|
|
pub span: Option<Span>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<LabeledError> for ShellError {
|
|
|
|
fn from(error: LabeledError) -> Self {
|
2024-02-25 23:32:50 +01:00
|
|
|
if error.span.is_some() {
|
|
|
|
ShellError::GenericError {
|
2023-12-07 00:40:03 +01:00
|
|
|
error: error.label,
|
|
|
|
msg: error.msg,
|
2024-02-25 23:32:50 +01:00
|
|
|
span: error.span,
|
2023-12-07 00:40:03 +01:00
|
|
|
help: None,
|
|
|
|
inner: vec![],
|
2024-02-25 23:32:50 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ShellError::GenericError {
|
2023-12-07 00:40:03 +01:00
|
|
|
error: error.label,
|
|
|
|
msg: "".into(),
|
|
|
|
span: None,
|
2024-02-25 23:32:50 +01:00
|
|
|
help: (!error.msg.is_empty()).then_some(error.msg),
|
2023-12-07 00:40:03 +01:00
|
|
|
inner: vec![],
|
2024-02-25 23:32:50 +01:00
|
|
|
}
|
2021-12-12 12:50:35 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<ShellError> for LabeledError {
|
|
|
|
fn from(error: ShellError) -> Self {
|
2024-02-25 23:32:50 +01:00
|
|
|
use miette::Diagnostic;
|
|
|
|
// This is not perfect - we can only take the first labeled span as that's all we have
|
|
|
|
// space for.
|
|
|
|
if let Some(labeled_span) = error.labels().and_then(|mut iter| iter.nth(0)) {
|
|
|
|
let offset = labeled_span.offset();
|
|
|
|
let span = Span::new(offset, offset + labeled_span.len());
|
|
|
|
LabeledError {
|
|
|
|
label: error.to_string(),
|
|
|
|
msg: labeled_span
|
|
|
|
.label()
|
|
|
|
.map(|label| label.to_owned())
|
|
|
|
.unwrap_or_else(|| "".into()),
|
2021-12-12 12:50:35 +01:00
|
|
|
span: Some(span),
|
2024-02-25 23:32:50 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
LabeledError {
|
|
|
|
label: error.to_string(),
|
|
|
|
msg: error
|
|
|
|
.help()
|
|
|
|
.map(|help| help.to_string())
|
|
|
|
.unwrap_or_else(|| "".into()),
|
2021-12-12 12:50:35 +01:00
|
|
|
span: None,
|
2024-02-25 23:32:50 +01:00
|
|
|
}
|
2021-12-12 12:50:35 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-25 23:32:50 +01:00
|
|
|
/// Response to a [`PluginCall`]. The type parameter determines the output type for pipeline data.
|
|
|
|
///
|
|
|
|
/// Note: exported for internal use, not public.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
2023-06-16 16:25:40 +02:00
|
|
|
#[doc(hidden)]
|
2024-02-25 23:32:50 +01:00
|
|
|
pub enum PluginCallResponse<D> {
|
2021-12-12 12:50:35 +01:00
|
|
|
Error(LabeledError),
|
Make plugin commands support examples. (#7984)
# 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.
2023-02-08 23:14:18 +01:00
|
|
|
Signature(Vec<PluginSignature>),
|
2024-02-25 23:32:50 +01:00
|
|
|
PipelineData(D),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PluginCallResponse<PipelineDataHeader> {
|
|
|
|
/// Construct a plugin call response with a single value
|
|
|
|
pub fn value(value: Value) -> PluginCallResponse<PipelineDataHeader> {
|
|
|
|
if value.is_nothing() {
|
|
|
|
PluginCallResponse::PipelineData(PipelineDataHeader::Empty)
|
|
|
|
} else {
|
|
|
|
PluginCallResponse::PipelineData(PipelineDataHeader::Value(value))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Information received from the plugin
|
|
|
|
///
|
|
|
|
/// Note: exported for internal use, not public.
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
|
|
#[doc(hidden)]
|
|
|
|
pub enum PluginOutput {
|
|
|
|
/// This must be the first message. Indicates supported protocol
|
|
|
|
Hello(ProtocolInfo),
|
|
|
|
/// A response to a [`PluginCall`]. The ID should be the same sent with the plugin call this
|
|
|
|
/// is a response to
|
|
|
|
CallResponse(PluginCallId, PluginCallResponse<PipelineDataHeader>),
|
|
|
|
/// Stream control or data message. Untagged to keep them as small as possible.
|
|
|
|
///
|
|
|
|
/// For example, `Stream(Ack(0))` is encoded as `{"Ack": 0}`
|
|
|
|
#[serde(untagged)]
|
|
|
|
Stream(StreamMessage),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TryFrom<PluginOutput> for StreamMessage {
|
|
|
|
type Error = PluginOutput;
|
|
|
|
|
|
|
|
fn try_from(msg: PluginOutput) -> Result<StreamMessage, PluginOutput> {
|
|
|
|
match msg {
|
|
|
|
PluginOutput::Stream(stream_msg) => Ok(stream_msg),
|
|
|
|
_ => Err(msg),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<StreamMessage> for PluginOutput {
|
|
|
|
fn from(stream_msg: StreamMessage) -> PluginOutput {
|
|
|
|
PluginOutput::Stream(stream_msg)
|
|
|
|
}
|
2021-12-12 12:50:35 +01:00
|
|
|
}
|