add concrete error

dsherret · Jan 23, 2025 · d011744 · d011744
1 parent b048dec
commit d011744
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/deno_json/mod.rs b/src/deno_json/mod.rs
@@ -64,6 +64,15 @@ pub enum IntoResolvedErrorKind {
   InvalidExclude(crate::glob::FromExcludeRelativePathOrPatternsError),
 }
 
+#[derive(Debug, Error, JsError)]
+#[class(generic)]
+#[error("Failed deserilaizing \"compilerOptions\".\"types\" in {}", self.specifier)]
+pub struct CompilerOptionTypesDeserializeError {
+  specifier: Url,
+  #[source]
+  source: serde_json::Error,
+}
+
 #[derive(Clone, Debug, Default, Deserialize, PartialEq)]
 #[serde(default, deny_unknown_fields)]
 struct SerializedFilesConfig {
@@ -1580,15 +1589,21 @@ impl ConfigFile {
 
   pub fn to_compiler_option_types(
     &self,
-  ) -> Result<Vec<(Url, Vec<String>)>, serde_json::Error> {
+  ) -> Result<Vec<(Url, Vec<String>)>, CompilerOptionTypesDeserializeError> {
     let Some(compiler_options_value) = self.json.compiler_options.as_ref()
     else {
       return Ok(Vec::new());
     };
     let Some(types) = compiler_options_value.get("types") else {
       return Ok(Vec::new());
     };
-    let imports: Vec<String> = serde_json::from_value(types.clone())?;
+    let imports: Vec<String> =
+      serde_json::from_value(types.clone()).map_err(|source| {
+        CompilerOptionTypesDeserializeError {
+          specifier: self.specifier.clone(),
+          source,
+        }
+      })?;
     if !imports.is_empty() {
       let referrer = self.specifier.clone();
       Ok(vec![(referrer, imports)])

diff --git a/src/workspace/mod.rs b/src/workspace/mod.rs
@@ -33,6 +33,7 @@ use url::Url;
 use crate::deno_json;
 use crate::deno_json::get_ts_config_for_emit;
 use crate::deno_json::BenchConfig;
+use crate::deno_json::CompilerOptionTypesDeserializeError;
 use crate::deno_json::ConfigFile;
 use crate::deno_json::ConfigFileError;
 use crate::deno_json::ConfigFileRc;
@@ -1384,7 +1385,7 @@ impl WorkspaceDirectory {
 
   pub fn to_compiler_option_types(
     &self,
-  ) -> Result<Vec<(Url, Vec<String>)>, serde_json::Error> {
+  ) -> Result<Vec<(Url, Vec<String>)>, CompilerOptionTypesDeserializeError> {
     self
       .deno_json_for_compiler_options()
       .map(|c| c.to_compiler_option_types())