Improve error reporting #3

Author: cpg314

sqlsonnet/Cargo.toml

@@ -20,6 +20,7 @@ serde_with = "3.8.1"
 thiserror.workspace = true
 tracing-subscriber.workspace = true
 sqlsonnet-macros.workspace = true
+serde_path_to_error = "0.1.16"
 
 [features]
 fancy = ["miette/fancy", "miette/syntect-highlighter"]

sqlsonnet/src/error.rs

@@ -58,10 +58,11 @@ pub struct JsonError {
     pub span: miette::SourceOffset,
 }
 impl JsonError {
-    pub fn from(json: &str, e: serde_json::Error) -> Self {
+    pub fn from(json: &str, e: serde_path_to_error::Error<serde_json::Error>) -> Self {
+        let orig = e.inner();
         Self {
-            reason: e.to_string(),
-            span: miette::SourceOffset::from_location(json, e.line(), e.column()),
+            reason: format!("{}; path `{}`", orig, e.path()),
+            span: miette::SourceOffset::from_location(json, orig.line(), orig.column()),
             src: miette::NamedSource::new("source.json", json.into()),
         }
     }

sqlsonnet/src/lib.rs

@@ -36,7 +36,8 @@ macro_rules! impl_conversions {
             }
             /// Convert from JSON.
             pub fn from_json(json: &str) -> Result<Self, Error> {
-                Ok(serde_json::from_str(&json)
+                let mut deserializer = serde_json::Deserializer::from_str(&json);
+                Ok(serde_path_to_error::deserialize(&mut deserializer)
                     .map_err(|e| crate::error::JsonError::from(&json, e))?)
             }
             /// Convert from Jsonnet.