update jsonpath-lib to 0.3.0, removing all atty deps

FamilySearch · Jul 31, 2023 · d6e7386 · d6e7386
1 parent a0b50d8
commit d6e7386
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/config/Cargo.toml b/lib/config/Cargo.toml
@@ -14,9 +14,7 @@ ether = { path = "../either" }
 futures = "0.3"
 http = "0.2"
 itertools = "0.10"
-# pinned to 0.2.3 because newer versions made a semver incompatible change by making `Node` no longer
-# public, which we depend on https://github.com/freestrings/jsonpath/issues/36
-jsonpath_lib = "=0.2.3"
+jsonpath_lib = "0.3.0"
 percent-encoding = "2"
 pest = "2"
 pest_derive = "2"
@@ -33,4 +31,4 @@ log = "0.4"
 [dev-dependencies]
 maplit = "1"
 test_common = { path = "../test_common" }
-tokio = "1"
+tokio = "1"
diff --git a/lib/config/src/expression_functions.rs b/lib/config/src/expression_functions.rs
@@ -741,7 +741,7 @@ impl Join {
 #[derive(Clone)]
 pub(super) struct JsonPath {
     provider: String,
-    selector: Arc<json_path::Node>,
+    selector: Arc<json_path::Compiled>,
     marker: Marker,
 }
 
@@ -784,7 +784,7 @@ impl JsonPath {
                 } else {
                     format!("$.{json_path}")
                 };
-                let json_path = json_path::Parser::compile(&json_path).map_err(|_| {
+                let json_path = json_path::Compiled::compile(&json_path).map_err(|_| {
                     ExecutingExpressionError::InvalidFunctionArguments("json_path", marker)
                 })?;
                 let j = JsonPath {
@@ -809,12 +809,12 @@ impl JsonPath {
     }
 
     fn evaluate_to_vec(&self, d: &json::Value) -> Vec<json::Value> {
-        let mut selector = json_path::Selector::new();
-        selector
-            .compiled_path(&self.selector)
-            .value(d)
-            .select_as()
+        self.selector
+            .select(d)
             .unwrap_or_default()
+            .into_iter()
+            .cloned()
+            .collect()
     }
 
     pub(super) fn evaluate<'a, 'b: 'a>(&'b self, d: Cow<'a, json::Value>) -> Cow<'a, json::Value> {