validate: bump jsonschema from 0.22 to 0.23 and adapt to new API

jqnatividad · Oct 13, 2024 · e3d5066 · e3d5066
1 parent 5718075
commit e3d5066
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -131,7 +131,7 @@ jaq-interpret = "1.5.0"
 jaq-parse = "1.0.3"
 jemallocator = { version = "0.5", optional = true }
 json-objects-to-csv = "0.1.3"
-jsonschema = { version = "0.22", features = [
+jsonschema = { version = "0.23", features = [
     "resolve-file",
     "resolve-http",
 ], default-features = false }
@@ -293,9 +293,6 @@ grex = { git = "https://github.com/pemistahl/grex", rev = "ff8533d" }
 # use modernized version of local_encoding
 local-encoding = { git = "https://github.com/slonopotamus/local-encoding-rs", branch = "travis-madness" }
 
-# use jsonschema with unreleased perf improvements & fixes
-jsonschema = { git = "https://github.com/Stranger6667/jsonschema-rs", rev = "eb630ef" }
-
 # use of fork of xlsxwriter with bumped bindgen dependency
 xlsxwriter = { git = "https://github.com/jqnatividad/xlsxwriter-rs", branch = "bump-bindgen-to-0.70.1" }
 

diff --git a/src/cmd/validate.rs b/src/cmd/validate.rs
@@ -149,7 +149,7 @@ use indicatif::HumanCount;
 use indicatif::{ProgressBar, ProgressDrawTarget};
 use jsonschema::{
     output::BasicOutput,
-    paths::{JsonPointer, JsonPointerNode, PathChunk},
+    paths::{LazyLocation, Location},
     ErrorIterator, Keyword, ValidationError, Validator,
 };
 use log::{debug, info, log_enabled};
@@ -179,8 +179,8 @@ macro_rules! fail_validation_error {
         let err = format!($($t)*);
         error!("{err}");
         Err(ValidationError::custom(
-            JsonPointer::default(),
-            JsonPointer::default(),
+            Location::default(),
+            Location::default(),
             &Value::Null,
             err,
         ))
@@ -260,13 +260,13 @@ impl Keyword for DynEnumValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.dynenum_set.contains(instance.as_str().unwrap()) {
             Box::new(std::iter::empty())
         } else {
             let error = ValidationError::custom(
-                JsonPointer::default(),
+                Location::default(),
                 instance_path.into(),
                 instance,
                 format!("{instance} is not a valid dynamicEnum value"),
@@ -289,7 +289,7 @@ impl Keyword for DynEnumValidator {
 fn dyn_enum_validator_factory<'a>(
     _parent: &'a Map<String, Value>,
     value: &'a Value,
-    jsonpointer: JsonPointer,
+    location: Location,
 ) -> Result<Box<dyn Keyword>, ValidationError<'a>> {
     if let Value::String(uri) = value {
         let temp_download = NamedTempFile::new()?;
@@ -340,8 +340,8 @@ fn dyn_enum_validator_factory<'a>(
         Ok(Box::new(DynEnumValidator::new(enum_set)))
     } else {
         Err(ValidationError::custom(
-            JsonPointer::default(),
-            jsonpointer,
+            Location::default(),
+            location,
             value,
             "'dynamicEnum' must be set to a CSV file on the local filesystem or on a URL.",
         ))
@@ -1164,34 +1164,22 @@ fn validate_json_instance(
     instance: &Value,
     schema_compiled: &Validator,
 ) -> Option<Vec<(String, String)>> {
-    let validation_output = schema_compiled.apply(instance);
-
-    // If validation output is Invalid, then grab field names and errors
-    if validation_output.flag() {
-        None
-    } else {
-        // get validation errors as String
-        let validation_errors: Vec<(String, String)> = match validation_output.basic() {
-            BasicOutput::Invalid(errors) => errors
+    match schema_compiled.apply(instance).basic() {
+        BasicOutput::Valid(_) => None,
+        BasicOutput::Invalid(errors) => Some(
+            errors
                 .iter()
                 .map(|e| {
-                    if let Some(PathChunk::Property(box_str)) = e.instance_location().last() {
-                        (box_str.to_string(), e.error_description().to_string())
-                    } else {
-                        (
-                            e.instance_location().to_string(),
-                            e.error_description().to_string(),
-                        )
-                    }
+                    (
+                        e.instance_location()
+                            .to_string()
+                            .trim_start_matches('/')
+                            .to_owned(),
+                        e.error_description().to_string(),
+                    )
                 })
                 .collect(),
-            BasicOutput::Valid(_annotations) => {
-                // shouldn't happen
-                unreachable!("Unexpected error.");
-            },
-        };
-
-        Some(validation_errors)
+        ),
     }
 }
 
@@ -1551,7 +1539,7 @@ fn test_dyn_enum_validator() {
         let err_info = e.into_iter().next().unwrap();
         assert_eq!(
             format!("{err_info:?}"),
-            r#"ValidationError { instance: String("lanzones"), kind: Custom { message: "\"lanzones\" is not a valid dynamicEnum value" }, instance_path: JsonPointer([]), schema_path: JsonPointer([]) }"#
+            r#"ValidationError { instance: String("lanzones"), kind: Custom { message: "\"lanzones\" is not a valid dynamicEnum value" }, instance_path: Location(""), schema_path: Location("") }"#
         );
     } else {
         unreachable!("Expected an error, but validation succeeded.");