refactor: more specific error handling (#512)

Co-authored-by: David Sherret <[email protected]>

Author: crowlKats

Cargo.lock

@@ -14,6 +14,8 @@ members = ["lib"]
 
 [workspace.dependencies]
 deno_unsync = { version = "0.4.0", default-features = false }
+thiserror = "2"
+deno_error = "0.5.3"
 sys_traits = "0.1.0"
 
 [lib]
@@ -39,7 +41,6 @@ path = "tests/ecosystem_test.rs"
 harness = false
 
 [dependencies]
-anyhow = "1.0.43"
 async-trait = "0.1.68"
 capacity_builder = "0.5.0"
 data-url = "0.3.0"
@@ -50,7 +51,7 @@ deno_path_util = "0.3.0"
 deno_semver = "0.7.1"
 encoding_rs = "0.8.33"
 futures = "0.3.26"
-import_map = "0.20.0"
+import_map = "0.21.0"
 indexmap = { version = "2", features = ["serde"] }
 log = "0.4.20"
 monch = "0.5.0"
@@ -61,10 +62,11 @@ serde = { version = "1.0.130", features = ["derive", "rc"] }
 serde_json = { version = "1.0.67", features = ["preserve_order"] }
 sha2 = "^0.10.0"
 sys_traits.workspace = true
-thiserror = "2.0.3"
+thiserror.workspace = true
+deno_error.workspace = true
 twox-hash = { version = "1.6.3", optional = true }
-url = { version = "2.2.2", features = ["serde"] }
-wasm_dep_analyzer = "0.1.0"
+url = { version = "2.5.3", features = ["serde"] }
+wasm_dep_analyzer = "0.2.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 deno_unsync = { workspace = true, features = ["tokio"] }
@@ -76,7 +78,7 @@ pretty_assertions = "1.0.0"
 reqwest = { version = "0.12.4", default-features = false, features = ["http2", "charset", "rustls-tls-webpki-roots"] }
 tempfile = "3.4.0"
 tokio = { version = "1.10.1", features = ["macros", "rt-multi-thread", "sync"] }
-deno_terminal = "0.1.1"
+deno_terminal = "0.2.0"
 env_logger = "0.11.3"
 sys_traits = { workspace = true, features = ["memory"] }
 

Cargo.toml

@@ -14,7 +14,6 @@ path = "lib.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.43"
 console_error_panic_hook = "0.1.7"
 deno_graph = { path = "../", default-features = false }
 getrandom = { version = "*", features = ["js"] }
@@ -26,6 +25,8 @@ serde-wasm-bindgen = "0.5.0"
 sys_traits = { workspace = true, features = ["real", "wasm"] }
 wasm-bindgen = { version = "=0.2.91" }
 wasm-bindgen-futures = { version = "=0.4.41" }
+thiserror.workspace = true
+deno_error.workspace = true
 
 [dev-dependencies]
 pretty_assertions = "1.0.0"

lib/Cargo.toml

@@ -4,9 +4,9 @@
 #![allow(clippy::unused_unit)]
 #![deny(clippy::disallowed_methods)]
 #![deny(clippy::disallowed_types)]
+#![deny(clippy::unnecessary_wraps)]
 
-use std::collections::HashMap;
-
+use deno_error::JsErrorBox;
 use deno_graph::resolve_import;
 use deno_graph::source::load_data_url;
 use deno_graph::source::CacheInfo;
@@ -25,13 +25,28 @@ use deno_graph::ModuleSpecifier;
 use deno_graph::Range;
 use deno_graph::ReferrerImports;
 use deno_graph::SpecifierError;
+use std::collections::HashMap;
+use std::sync::Arc;
 
-use anyhow::anyhow;
 use futures::future;
 use serde::Deserialize;
 use serde::Serialize;
 use wasm_bindgen::prelude::*;
 
+#[derive(Debug, thiserror::Error, deno_error::JsError)]
+#[class(generic)]
+pub enum WasmError {
+  #[error("load rejected or errored")]
+  Load,
+  #[error("JavaScript resolve threw.")]
+  JavaScriptResolve,
+  #[error("JavaScript resolveTypes() function threw.")]
+  JavaScriptResolveTypes,
+  #[error("{0}")]
+  // String because serde_wasm_bindgen::Error is not thread-safe.
+  Deserialize(String),
+}
+
 pub struct JsLoader {
   load: js_sys::Function,
   maybe_cache_info: Option<js_sys::Function>,
@@ -76,7 +91,11 @@ impl Loader for JsLoader {
     }
 
     if specifier.scheme() == "data" {
-      Box::pin(future::ready(load_data_url(specifier)))
+      Box::pin(future::ready(load_data_url(specifier).map_err(|err| {
+        deno_graph::source::LoadError::Other(Arc::new(JsErrorBox::from_err(
+          err,
+        )))
+      })))
     } else {
       let specifier = specifier.clone();
       let context = JsValue::null();
@@ -100,7 +119,11 @@ impl Loader for JsLoader {
         };
         response
           .map(|value| serde_wasm_bindgen::from_value(value).unwrap())
-          .map_err(|_| anyhow!("load rejected or errored"))
+          .map_err(|_| {
+            deno_graph::source::LoadError::Other(Arc::new(
+              JsErrorBox::from_err(WasmError::Load),
+            ))
+          })
       };
       Box::pin(f)
     }
@@ -168,11 +191,18 @@ impl Resolver for JsResolver {
       let arg2 = JsValue::from(referrer_range.specifier.to_string());
       let value = match resolve.call2(&this, &arg1, &arg2) {
         Ok(value) => value,
-        Err(_) => return Err(anyhow!("JavaScript resolve threw.").into()),
+        Err(_) => {
+          return Err(JsErrorBox::from_err(WasmError::JavaScriptResolve).into())
+        }
       };
       let value: String = match serde_wasm_bindgen::from_value(value) {
         Ok(value) => value,
-        Err(err) => return Err(anyhow!("{}", err.to_string()).into()),
+        Err(err) => {
+          return Err(
+            JsErrorBox::from_err(WasmError::Deserialize(err.to_string()))
+              .into(),
+          )
+        }
       };
       ModuleSpecifier::parse(&value)
         .map_err(|err| ResolveError::Specifier(SpecifierError::InvalidUrl(err)))
@@ -191,10 +221,11 @@ impl Resolver for JsResolver {
       let arg1 = JsValue::from(specifier.to_string());
       let value = resolve_types
         .call1(&this, &arg1)
-        .map_err(|_| anyhow!("JavaScript resolveTypes() function threw."))?;
+        .map_err(|_| JsErrorBox::from_err(WasmError::JavaScriptResolveTypes))?;
       let result: Option<JsResolveTypesResponse> =
-        serde_wasm_bindgen::from_value(value)
-          .map_err(|err| anyhow!("{}", err.to_string()))?;
+        serde_wasm_bindgen::from_value(value).map_err(|err| {
+          JsErrorBox::from_err(WasmError::Deserialize(err.to_string()))
+        })?;
       Ok(result.map(|v| (v.types, v.source)))
     } else {
       Ok(None)

lib/lib.rs

@@ -47,19 +47,13 @@ impl FastCheckDtsDiagnostic {
     }
   }
 
-  pub fn range(&self) -> Option<&FastCheckDiagnosticRange> {
+  pub fn range(&self) -> &FastCheckDiagnosticRange {
     match self {
-      FastCheckDtsDiagnostic::UnableToInferType { range } => Some(range),
-      FastCheckDtsDiagnostic::UnableToInferTypeFallbackAny { range } => {
-        Some(range)
-      }
-      FastCheckDtsDiagnostic::UnableToInferTypeFromProp { range } => {
-        Some(range)
-      }
-      FastCheckDtsDiagnostic::UnableToInferTypeFromSpread { range } => {
-        Some(range)
-      }
-      FastCheckDtsDiagnostic::UnsupportedUsing { range } => Some(range),
+      FastCheckDtsDiagnostic::UnableToInferType { range } => range,
+      FastCheckDtsDiagnostic::UnableToInferTypeFallbackAny { range } => range,
+      FastCheckDtsDiagnostic::UnableToInferTypeFromProp { range } => range,
+      FastCheckDtsDiagnostic::UnableToInferTypeFromSpread { range } => range,
+      FastCheckDtsDiagnostic::UnsupportedUsing { range } => range,
     }
   }
 }
@@ -756,14 +750,14 @@ impl<'a> FastCheckDtsTransformer<'a> {
     expr: Expr,
     as_const: bool,
     as_readonly: bool,
-  ) -> Option<Box<TsTypeAnn>> {
+  ) -> Box<TsTypeAnn> {
     if let Some(ts_type) =
       self.expr_to_ts_type(expr.clone(), as_const, as_readonly)
     {
-      Some(type_ann(ts_type))
+      type_ann(ts_type)
     } else {
       self.mark_diagnostic_any_fallback(expr.range());
-      Some(any_type_ann())
+      any_type_ann()
     }
   }
 
@@ -915,35 +909,35 @@ impl<'a> FastCheckDtsTransformer<'a> {
     match &mut *assign_pat.left {
       Pat::Ident(ident) => {
         if ident.type_ann.is_none() {
-          ident.type_ann = self.infer_expr_fallback_any(
+          ident.type_ann = Some(self.infer_expr_fallback_any(
             *assign_pat.right.clone(),
             false,
             false,
-          );
+          ));
         }
 
         ident.optional = true;
         Some(Pat::Ident(ident.clone()))
       }
       Pat::Array(arr_pat) => {
         if arr_pat.type_ann.is_none() {
-          arr_pat.type_ann = self.infer_expr_fallback_any(
+          arr_pat.type_ann = Some(self.infer_expr_fallback_any(
             *assign_pat.right.clone(),
             false,
             false,
-          );
+          ));
         }
 
         arr_pat.optional = true;
         Some(Pat::Array(arr_pat.clone()))
       }
       Pat::Object(obj_pat) => {
         if obj_pat.type_ann.is_none() {
-          obj_pat.type_ann = self.infer_expr_fallback_any(
+          obj_pat.type_ann = Some(self.infer_expr_fallback_any(
             *assign_pat.right.clone(),
             false,
             false,
-          );
+          ));
         }
 
         obj_pat.optional = true;