forked from extern/nushell
[Context on Discord](https://discord.com/channels/601130461678272522/855947301380947968/1216517833312309419) # Description This is a significant breaking change to the plugin API, but one I think is worthwhile. @ayax79 mentioned on Discord that while trying to start on a dataframes plugin, he was a little disappointed that more wasn't provided in terms of code organization for commands, particularly since there are *a lot* of `dfr` commands. This change treats plugins more like miniatures of the engine, with dispatch of the command name being handled inherently, each command being its own type, and each having their own signature within the trait impl for the command type rather than having to find a way to centralize it all into one `Vec`. For the example plugins that have multiple commands, I definitely like how this looks a lot better. This encourages doing code organization the right way and feels very good. For the plugins that have only one command, it's just a little bit more boilerplate - but still worth it, in my opinion. The `Box<dyn PluginCommand<Plugin = Self>>` type in `commands()` is a little bit hairy, particularly for Rust beginners, but ultimately not so bad, and it gives the desired flexibility for shared state for a whole plugin + the individual commands. # User-Facing Changes Pretty big breaking change to plugin API, but probably one that's worth making. ```rust use nu_plugin::*; use nu_protocol::{PluginSignature, PipelineData, Type, Value}; struct LowercasePlugin; struct Lowercase; // Plugins can now have multiple commands impl PluginCommand for Lowercase { type Plugin = LowercasePlugin; // The signature lives with the command fn signature(&self) -> PluginSignature { PluginSignature::build("lowercase") .usage("Convert each string in a stream to lowercase") .input_output_type(Type::List(Type::String.into()), Type::List(Type::String.into())) } // We also provide SimplePluginCommand which operates on Value like before fn run( &self, plugin: &LowercasePlugin, engine: &EngineInterface, call: &EvaluatedCall, input: PipelineData, ) -> Result<PipelineData, LabeledError> { let span = call.head; Ok(input.map(move |value| { value.as_str() .map(|string| Value::string(string.to_lowercase(), span)) // Errors in a stream should be returned as values. .unwrap_or_else(|err| Value::error(err, span)) }, None)?) } } // Plugin now just has a list of commands, and the custom value op stuff still goes here impl Plugin for LowercasePlugin { fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin=Self>>> { vec![Box::new(Lowercase)] } } fn main() { serve_plugin(&LowercasePlugin{}, MsgPackSerializer) } ``` Time this however you like - we're already breaking stuff for 0.92, so it might be good to do it now, but if it feels like a lot all at once, it could wait. # Tests + Formatting - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # After Submitting - [ ] Update examples in the book - [x] Fix #12088 to match - this change would actually simplify it a lot, because the methods are currently just duplicated between `Plugin` and `StreamingPlugin`, but they only need to be on `Plugin` with this change
200 lines
6.0 KiB
Rust
200 lines
6.0 KiB
Rust
use nu_plugin::{EngineInterface, EvaluatedCall, LabeledError, SimplePluginCommand};
|
|
use nu_protocol::{record, Category, PluginSignature, Record, Span, Spanned, SyntaxShape, Value};
|
|
use sxd_document::parser;
|
|
use sxd_xpath::{Context, Factory};
|
|
|
|
use crate::Query;
|
|
|
|
pub struct QueryXml;
|
|
|
|
impl SimplePluginCommand for QueryXml {
|
|
type Plugin = Query;
|
|
|
|
fn signature(&self) -> PluginSignature {
|
|
PluginSignature::build("query xml")
|
|
.usage("execute xpath query on xml")
|
|
.required("query", SyntaxShape::String, "xpath query")
|
|
.category(Category::Filters)
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
_plugin: &Query,
|
|
_engine: &EngineInterface,
|
|
call: &EvaluatedCall,
|
|
input: &Value,
|
|
) -> Result<Value, LabeledError> {
|
|
let query: Option<Spanned<String>> = call.opt(0)?;
|
|
|
|
execute_xpath_query(call, input, query)
|
|
}
|
|
}
|
|
|
|
pub fn execute_xpath_query(
|
|
call: &EvaluatedCall,
|
|
input: &Value,
|
|
query: Option<Spanned<String>>,
|
|
) -> Result<Value, LabeledError> {
|
|
let (query_string, span) = match &query {
|
|
Some(v) => (&v.item, v.span),
|
|
None => {
|
|
return Err(LabeledError {
|
|
msg: "problem with input data".to_string(),
|
|
label: "problem with input data".to_string(),
|
|
span: Some(call.head),
|
|
})
|
|
}
|
|
};
|
|
|
|
let xpath = build_xpath(query_string, span)?;
|
|
let input_string = input.coerce_str()?;
|
|
let package = parser::parse(&input_string);
|
|
|
|
if package.is_err() {
|
|
return Err(LabeledError {
|
|
label: "invalid xml document".to_string(),
|
|
msg: "invalid xml document".to_string(),
|
|
span: Some(call.head),
|
|
});
|
|
}
|
|
|
|
let package = package.expect("invalid xml document");
|
|
|
|
let document = package.as_document();
|
|
let context = Context::new();
|
|
|
|
// leaving this here for augmentation at some point
|
|
// build_variables(&arguments, &mut context);
|
|
// build_namespaces(&arguments, &mut context);
|
|
let res = xpath.evaluate(&context, document.root());
|
|
|
|
// Some xpath statements can be long, so let's truncate it with ellipsis
|
|
let mut key = query_string.clone();
|
|
if query_string.len() >= 20 {
|
|
key.truncate(17);
|
|
key += "...";
|
|
} else {
|
|
key = query_string.to_string();
|
|
};
|
|
|
|
match res {
|
|
Ok(r) => {
|
|
let mut record = Record::new();
|
|
let mut records: Vec<Value> = vec![];
|
|
|
|
match r {
|
|
sxd_xpath::Value::Nodeset(ns) => {
|
|
for n in ns.into_iter() {
|
|
record.push(key.clone(), Value::string(n.string_value(), call.head));
|
|
}
|
|
}
|
|
sxd_xpath::Value::Boolean(b) => {
|
|
record.push(key, Value::bool(b, call.head));
|
|
}
|
|
sxd_xpath::Value::Number(n) => {
|
|
record.push(key, Value::float(n, call.head));
|
|
}
|
|
sxd_xpath::Value::String(s) => {
|
|
record.push(key, Value::string(s, call.head));
|
|
}
|
|
};
|
|
|
|
// convert the cols and vecs to a table by creating individual records
|
|
// for each item so we can then use a list to make a table
|
|
for (k, v) in record {
|
|
records.push(Value::record(record! { k => v }, call.head))
|
|
}
|
|
|
|
Ok(Value::list(records, call.head))
|
|
}
|
|
Err(_) => Err(LabeledError {
|
|
label: "xpath query error".to_string(),
|
|
msg: "xpath query error".to_string(),
|
|
span: Some(call.head),
|
|
}),
|
|
}
|
|
}
|
|
|
|
fn build_xpath(xpath_str: &str, span: Span) -> Result<sxd_xpath::XPath, LabeledError> {
|
|
let factory = Factory::new();
|
|
|
|
if let Ok(xpath) = factory.build(xpath_str) {
|
|
xpath.ok_or_else(|| LabeledError {
|
|
label: "invalid xpath query".to_string(),
|
|
msg: "invalid xpath query".to_string(),
|
|
span: Some(span),
|
|
})
|
|
} else {
|
|
Err(LabeledError {
|
|
label: "expected valid xpath query".to_string(),
|
|
msg: "expected valid xpath query".to_string(),
|
|
span: Some(span),
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::execute_xpath_query as query;
|
|
use nu_plugin::EvaluatedCall;
|
|
use nu_protocol::{record, Span, Spanned, Value};
|
|
|
|
#[test]
|
|
fn position_function_in_predicate() {
|
|
let call = EvaluatedCall {
|
|
head: Span::test_data(),
|
|
positional: vec![],
|
|
named: vec![],
|
|
};
|
|
|
|
let text = Value::string(
|
|
r#"<?xml version="1.0" encoding="UTF-8"?><a><b/><b/></a>"#,
|
|
Span::test_data(),
|
|
);
|
|
|
|
let spanned_str: Spanned<String> = Spanned {
|
|
item: "count(//a/*[position() = 2])".to_string(),
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let actual = query(&call, &text, Some(spanned_str)).expect("test should not fail");
|
|
let expected = Value::list(
|
|
vec![Value::test_record(record! {
|
|
"count(//a/*[posit..." => Value::test_float(1.0),
|
|
})],
|
|
Span::test_data(),
|
|
);
|
|
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn functions_implicitly_coerce_argument_types() {
|
|
let call = EvaluatedCall {
|
|
head: Span::test_data(),
|
|
positional: vec![],
|
|
named: vec![],
|
|
};
|
|
|
|
let text = Value::string(
|
|
r#"<?xml version="1.0" encoding="UTF-8"?><a>true</a>"#,
|
|
Span::test_data(),
|
|
);
|
|
|
|
let spanned_str: Spanned<String> = Spanned {
|
|
item: "count(//*[contains(., true)])".to_string(),
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let actual = query(&call, &text, Some(spanned_str)).expect("test should not fail");
|
|
let expected = Value::list(
|
|
vec![Value::test_record(record! {
|
|
"count(//*[contain..." => Value::test_float(1.0),
|
|
})],
|
|
Span::test_data(),
|
|
);
|
|
|
|
assert_eq!(actual, expected);
|
|
}
|
|
}
|