clean

Author: crowlKats

Cargo.lock

@@ -15,7 +15,7 @@ members = ["lib"]
 [workspace.dependencies]
 deno_unsync = { version = "0.4.0", default-features = false }
 thiserror = "2"
-deno_error = "0.5.1"
+deno_error = "0.5.2"
 
 [lib]
 name = "deno_graph"
@@ -82,3 +82,6 @@ codegen-units = 1
 incremental = true
 lto = true
 opt-level = "z"
+
+[patch.crates-io]
+deno_error = { path = "../deno_error" }

Cargo.toml

@@ -4782,7 +4782,9 @@ impl<'a, 'graph> Builder<'a, 'graph> {
               load_specifier.clone(),
               maybe_range.cloned(),
               if maybe_version_info.is_some() {
-                JsrLoadError::ContentChecksumIntegrity(err).into()
+                ModuleLoadError::Jsr(JsrLoadError::ContentChecksumIntegrity(
+                  err,
+                ))
               } else {
                 ModuleLoadError::HttpsChecksumIntegrity(err)
               },

src/graph.rs

@@ -193,6 +193,7 @@ mod tests {
 
   use super::*;
   use async_trait::async_trait;
+  use deno_error::JsErrorBox;
   use indexmap::IndexMap;
   use indexmap::IndexSet;
   use pretty_assertions::assert_eq;
@@ -4583,9 +4584,9 @@ export function a(a: A): B {
           ResolutionKind::Execution => {
             Ok(resolve_import(specifier_text, &referrer_range.specifier)?)
           }
-          ResolutionKind::Types => {
-            Err(source::ResolveError::Other(Box::new(FailedError)))
-          }
+          ResolutionKind::Types => Err(source::ResolveError::Other(
+            JsErrorBox::from_err(FailedError),
+          )),
         }
       }
     }

src/lib.rs

@@ -392,14 +392,8 @@ pub enum ResolveError {
   #[error(transparent)]
   ImportMap(#[from] import_map::ImportMapError),
   #[class(inherit)]
-  #[error("{0}")]
-  Other(Box<dyn JsErrorClass>),
-}
-
-impl<T: JsErrorClass> From<Box<T>> for ResolveError {
-  fn from(value: Box<T>) -> Self {
-    Self::Other(value)
-  }
+  #[error(transparent)]
+  Other(#[from] deno_error::JsErrorBox),
 }
 
 /// The kind of resolution currently being done by deno_graph.