mirror of
https://github.com/nushell/nushell.git
synced 2025-05-09 17:32:59 +00:00
[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
174 lines
6.0 KiB
Rust
174 lines
6.0 KiB
Rust
use gjson::Value as gjValue;
|
|
use nu_plugin::{EngineInterface, EvaluatedCall, LabeledError, SimplePluginCommand};
|
|
use nu_protocol::{Category, PluginSignature, Record, Span, Spanned, SyntaxShape, Value};
|
|
|
|
use crate::Query;
|
|
|
|
pub struct QueryJson;
|
|
|
|
impl SimplePluginCommand for QueryJson {
|
|
type Plugin = Query;
|
|
|
|
fn signature(&self) -> PluginSignature {
|
|
PluginSignature::build("query json")
|
|
.usage(
|
|
"execute json query on json file (open --raw <file> | query json 'query string')",
|
|
)
|
|
.required("query", SyntaxShape::String, "json 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_json_query(call, input, query)
|
|
}
|
|
}
|
|
|
|
pub fn execute_json_query(
|
|
call: &EvaluatedCall,
|
|
input: &Value,
|
|
query: Option<Spanned<String>>,
|
|
) -> Result<Value, LabeledError> {
|
|
let input_string = match input.coerce_str() {
|
|
Ok(s) => s,
|
|
Err(e) => {
|
|
return Err(LabeledError {
|
|
span: Some(call.head),
|
|
msg: e.to_string(),
|
|
label: "problem with input data".to_string(),
|
|
})
|
|
}
|
|
};
|
|
|
|
let query_string = match &query {
|
|
Some(v) => &v.item,
|
|
None => {
|
|
return Err(LabeledError {
|
|
msg: "problem with input data".to_string(),
|
|
label: "problem with input data".to_string(),
|
|
span: Some(call.head),
|
|
})
|
|
}
|
|
};
|
|
|
|
// Validate the json before trying to query it
|
|
let is_valid_json = gjson::valid(&input_string);
|
|
|
|
if !is_valid_json {
|
|
return Err(LabeledError {
|
|
msg: "invalid json".to_string(),
|
|
label: "invalid json".to_string(),
|
|
span: Some(call.head),
|
|
});
|
|
}
|
|
|
|
let val: gjValue = gjson::get(&input_string, query_string);
|
|
|
|
if query_contains_modifiers(query_string) {
|
|
let json_str = val.json();
|
|
Ok(Value::string(json_str, call.head))
|
|
} else {
|
|
Ok(convert_gjson_value_to_nu_value(&val, call.head))
|
|
}
|
|
}
|
|
|
|
fn query_contains_modifiers(query: &str) -> bool {
|
|
// https://github.com/tidwall/gjson.rs documents 7 modifiers as of 4/19/21
|
|
// Some of these modifiers mean we really need to output the data as a string
|
|
// instead of tabular data. Others don't matter.
|
|
|
|
// Output as String
|
|
// @ugly: Remove all whitespace from a json document.
|
|
// @pretty: Make the json document more human readable.
|
|
query.contains("@ugly") || query.contains("@pretty")
|
|
|
|
// Output as Tabular
|
|
// Since it's output as tabular, which is our default, we can just ignore these
|
|
// @reverse: Reverse an array or the members of an object.
|
|
// @this: Returns the current element. It can be used to retrieve the root element.
|
|
// @valid: Ensure the json document is valid.
|
|
// @flatten: Flattens an array.
|
|
// @join: Joins multiple objects into a single object.
|
|
}
|
|
|
|
fn convert_gjson_value_to_nu_value(v: &gjValue, span: Span) -> Value {
|
|
match v.kind() {
|
|
gjson::Kind::Array => {
|
|
let mut vals = vec![];
|
|
v.each(|_k, v| {
|
|
vals.push(convert_gjson_value_to_nu_value(&v, span));
|
|
true
|
|
});
|
|
|
|
Value::list(vals, span)
|
|
}
|
|
gjson::Kind::Null => Value::nothing(span),
|
|
gjson::Kind::False => Value::bool(false, span),
|
|
gjson::Kind::Number => {
|
|
let str_value = v.str();
|
|
if str_value.contains('.') {
|
|
Value::float(v.f64(), span)
|
|
} else {
|
|
Value::int(v.i64(), span)
|
|
}
|
|
}
|
|
gjson::Kind::String => Value::string(v.str(), span),
|
|
gjson::Kind::True => Value::bool(true, span),
|
|
gjson::Kind::Object => {
|
|
let mut record = Record::new();
|
|
v.each(|k, v| {
|
|
record.push(k.to_string(), convert_gjson_value_to_nu_value(&v, span));
|
|
true
|
|
});
|
|
Value::record(record, span)
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use gjson::{valid, Value as gjValue};
|
|
|
|
#[test]
|
|
fn validate_string() {
|
|
let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
|
|
let val = valid(json);
|
|
assert!(val);
|
|
}
|
|
|
|
#[test]
|
|
fn answer_from_get_age() {
|
|
let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
|
|
let val: gjValue = gjson::get(json, "age");
|
|
assert_eq!(val.str(), "37");
|
|
}
|
|
|
|
#[test]
|
|
fn answer_from_get_children() {
|
|
let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
|
|
let val: gjValue = gjson::get(json, "children");
|
|
assert_eq!(val.str(), r#"["Sara", "Alex", "Jack"]"#);
|
|
}
|
|
|
|
#[test]
|
|
fn answer_from_get_children_count() {
|
|
let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
|
|
let val: gjValue = gjson::get(json, "children.#");
|
|
assert_eq!(val.str(), "3");
|
|
}
|
|
|
|
#[test]
|
|
fn answer_from_get_friends_first_name() {
|
|
let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
|
|
let val: gjValue = gjson::get(json, "friends.#.first");
|
|
assert_eq!(val.str(), r#"["James","Roger"]"#);
|
|
}
|
|
}
|