fluencelabs/jsonpath
1
0
Fork 0
mirror of https://github.com/fluencelabs/jsonpath synced 2025-04-24 17:02:16 +00:00
Code Issues Projects Releases Wiki Activity

Failure to match "$..['']", "$..['ref']", but succeeds on $..ref #43

Browse Source
This commit is contained in:
freestrings 2020-04-14 10:52:18 +09:00
parent a168c46c04
commit 1512e9b72f
2 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/select/mod.rs
View File

@ -510,13 +510,26 @@ impl<'a, 'b> Selector<'a, 'b> {
self.tokens.pop(); self.tokens.pop();
self.tokens.pop(); self.tokens.pop();
if let Some(Some(e)) = self.selector_filter.pop_term() { if let Some(Some(e)) = self.selector_filter.pop_term() {
if let ExprTerm::Number(n) = &e { let selector_filter_consumed = match &e {
self.current = self.selector_filter.collect_all_with_num(&self.current, to_f64(n)); ExprTerm::Number(n) => {
self.selector_filter.pop_term(); self.current = self.selector_filter.collect_all_with_num(&self.current, to_f64(n));
self.selector_filter.pop_term();
true
}
ExprTerm::String(key) => {
self.current = self.selector_filter.collect_all_with_str(&self.current, key);
self.selector_filter.pop_term();
true
}
_ => {
self.selector_filter.push_term(Some(e));
false
}
};
if selector_filter_consumed {
return; return;
} }
self.selector_filter.push_term(Some(e));
} }
} }

52
tests/paths.rs
View File

@ -60,4 +60,56 @@ fn dolla_token_in_path() {
"Match 2.3.6.1" "Match 2.3.6.1"
]), ]),
); );
select_and_then_compare(
"$..['$ref']",
json!({
"Junk1": "This is a test to illustrate use of '$' in the attr for the expression $..['$ref'] ",
"$ref": "Match Root",
"Subset1":[
{"Junk2": "Data...",
"$ref": "Match Subset1"
}
],
"hierachy1":{
"hierachy2.1":{
"hierachy2.1.1":{ "$ref":"Match 2.1.1"},
"hierachy2.1.2":{ "ref":"Match 2.1.2"},
"hierachy2.1.3":{ "ref":"No Match 2.1.3"},
"hierachy2.1.4":{ "$ref":"Match 2.1.4"},
"hierachy2.1.5":{ "ref":"No Match 2.1.5"}
},
"hierachy2.2":{
"hierachy2.2.1":{ "ref":"No Match 2.2.1"},
"hierachy2.2.2":{ "$ref":"Match 2.2.2"},
"hierachy2.2.3":{ "ref":"No Match 2.2.3"},
"hierachy2.2.4":{ "ref":"No Match 2.2.5"},
"hierachy2.2.5":{ "$ref":"Match 2.2.5"}
},
"hierachy2.3":{
"hierachy2.3.1":{ "ref":"No Match 2.3.1"},
"hierachy2.3.2":{ "ref":"No Match 2.3.2"},
"hierachy2.3.3":{ "ref":"No Match 2.3.3"},
"hierachy2.3.4":{ "ref":"No Match 2.3.4"},
"hierachy2.3.5":{ "ref":"No Match 2.3.5"},
"hierachy2.3.6":{
"hierachy2.3.6.1":{ "$ref":"Match 2.3.6.1"},
"hierachy2.3.6.2":{ "ref":"No Match 2.3.6.2"},
"hierachy2.3.6.3":{ "ref":"No Match 2.3.6.3"},
"hierachy2.3.6.4":{ "ref":"No Match 2.3.6.4"},
"hierachy2.3.6.5":{ "ref":"No Match 2.3.6.5"}
}
}
}
}),
json!([
"Match Root",
"Match Subset1",
"Match 2.1.1",
"Match 2.1.4",
"Match 2.2.2",
"Match 2.2.5",
"Match 2.3.6.1"
]),
);
} }