mirror of
https://github.com/nushell/nushell.git
synced 2025-05-29 02:51:20 +00:00
# Description This PR creates a new `Record` type to reduce duplicate code and possibly bugs as well. (This is an edited version of #9648.) - `Record` implements `FromIterator` and `IntoIterator` and so can be iterated over or collected into. For example, this helps with conversions to and from (hash)maps. (Also, no more `cols.iter().zip(vals)`!) - `Record` has a `push(col, val)` function to help insure that the number of columns is equal to the number of values. I caught a few potential bugs thanks to this (e.g. in the `ls` command). - Finally, this PR also adds a `record!` macro that helps simplify record creation. It is used like so: ```rust record! { "key1" => some_value, "key2" => Value::string("text", span), "key3" => Value::int(optional_int.unwrap_or(0), span), "key4" => Value::bool(config.setting, span), } ``` Since macros hinder formatting, etc., the right hand side values should be relatively short and sweet like the examples above. Where possible, prefer `record!` or `.collect()` on an iterator instead of multiple `Record::push`s, since the first two automatically set the record capacity and do less work overall. # User-Facing Changes Besides the changes in `nu-protocol` the only other breaking changes are to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
179 lines
5.5 KiB
Rust
179 lines
5.5 KiB
Rust
use nu_plugin::{EvaluatedCall, LabeledError};
|
|
use nu_protocol::{record, Record, Span, Spanned, Value};
|
|
use sxd_document::parser;
|
|
use sxd_xpath::{Context, Factory};
|
|
|
|
pub fn execute_xpath_query(
|
|
_name: &str,
|
|
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.as_string()?;
|
|
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 {
|
|
vals: records,
|
|
span: 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 {
|
|
vals: vec![Value::test_record(Record {
|
|
cols: vec!["count(//a/*[posit...".to_string()],
|
|
vals: vec![Value::test_float(1.0)],
|
|
})],
|
|
span: 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 {
|
|
vals: vec![Value::test_record(Record {
|
|
cols: vec!["count(//*[contain...".to_string()],
|
|
vals: vec![Value::test_float(1.0)],
|
|
})],
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
assert_eq!(actual, expected);
|
|
}
|
|
}
|