mirror of
https://github.com/nushell/nushell.git
synced 2024-12-25 16:39:08 +01:00
45fe3be83e
# Description Inspired by #7592 For brevity use `Value::test_{string,int,float,bool}` Includes fixes to commands that were abusing `Span::test_data` in their implementation. Now the call span is used where possible or the explicit `Span::unknonw` is used. ## Command fixes - Fix abuse of `Span::test_data()` in `query_xml` - Fix abuse of `Span::test_data()` in `term size` - Fix abuse of `Span::test_data()` in `seq date` - Fix two abuses of `Span::test_data` in `nu-cli` - Change `Span::test_data` to `Span::unknown` in `keybindings listen` - Add proper call span to `registry query` - Fix span use in `nu_plugin_query` - Fix span assignment in `select` - Use `Span::unknown` instead of `test_data` in more places ## Other - Use `Value::test_int`/`test_float()` consistently - More `test_string` and `test_bool` - Fix unused imports # User-Facing Changes Some commands may now provide more helpful spans for downstream use in errors
152 lines
5.4 KiB
Rust
152 lines
5.4 KiB
Rust
use gjson::Value as gjValue;
|
|
use nu_plugin::{EvaluatedCall, LabeledError};
|
|
use nu_protocol::{Span, Spanned, Value};
|
|
|
|
pub fn execute_json_query(
|
|
_name: &str,
|
|
call: &EvaluatedCall,
|
|
input: &Value,
|
|
query: Option<Spanned<String>>,
|
|
) -> Result<Value, LabeledError> {
|
|
let input_string = match &input.as_string() {
|
|
Ok(s) => s.clone(),
|
|
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 Tablular
|
|
// 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: *span }
|
|
}
|
|
gjson::Kind::Null => Value::nothing(*span),
|
|
gjson::Kind::False => Value::boolean(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::boolean(true, *span),
|
|
gjson::Kind::Object => {
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
v.each(|k, v| {
|
|
cols.push(k.to_string());
|
|
vals.push(convert_gjson_value_to_nu_value(&v, span));
|
|
true
|
|
});
|
|
Value::Record {
|
|
cols,
|
|
vals,
|
|
span: *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"]"#);
|
|
}
|
|
}
|