refactor: upgrade to deno_graph 0.106 (#237)

Author: dsherret

Cargo.lock

@@ -11,7 +11,7 @@ license = "MIT"
 members = ["lib"]
 
 [workspace.dependencies]
-deno_graph = { version = "0.105.0", default-features = false }
+deno_graph = { version = "0.106.0", default-features = false }
 deno_ast = { version = "0.52.0", features = ["transpiling"] }
 import_map = "0.24.0"
 serde = "1"
@@ -71,3 +71,4 @@ reqwest = { version = "0.11.23", features = ["rustls-tls"] }
 jsonc-parser = { version = "0.23.0", features = ["serde"] }
 insta = "1.34.0"
 criterion = { version = "0.5", features = ["async_tokio"] }
+

Cargo.toml

@@ -438,7 +438,7 @@ impl Resolver for GraphResolver {
     if let Some(import_map) = &self.0 {
       import_map
         .resolve(specifier, &referrer_range.specifier)
-        .map_err(ResolveError::ImportMap)
+        .map_err(ResolveError::from_err)
     } else {
       Ok(deno_graph::resolve_import(
         specifier,

lib/lib.rs

@@ -115,7 +115,7 @@ impl deno_graph::source::Resolver for Resolver {
     if let Some(import_map) = &self.0 {
       import_map
         .resolve(specifier, &referrer_range.specifier)
-        .map_err(ResolveError::ImportMap)
+        .map_err(ResolveError::from_err)
     } else {
       Ok(deno_graph::resolve_import(
         specifier,

src/examples/builder.rs

@@ -27,7 +27,6 @@ use deno_npm::resolution::SerializedNpmResolutionSnapshotPackage;
 use deno_npm::resolution::ValidSerializedNpmResolutionSnapshot;
 use deno_semver::StackString;
 use deno_semver::npm::NpmPackageNvReference;
-use deno_semver::npm::NpmPackageReqReference;
 use deno_semver::package::PackageNv;
 use deno_semver::package::PackageNvReference;
 use deno_semver::package::PackageReq;
@@ -1483,13 +1482,12 @@ impl EszipV2 {
           modules.insert(specifier_key.into_owned(), eszip_module);
           Ok(None)
         }
-        deno_graph::Module::Npm(_) => {
+        deno_graph::Module::Npm(module) => {
           let Some(npm_packages) = npm_packages else {
             return Ok(None);
           };
 
-          let req_ref =
-            NpmPackageReqReference::from_specifier(module.specifier())?;
+          let req_ref = &module.pkg_req_ref;
           let serialize_npm_snapshot = npm_snapshot.as_serialized();
           let pkg_id = serialize_npm_snapshot.root_packages.get(req_ref.req())
             .ok_or_else(|| anyhow::anyhow!("Could not resolve package req '{}' from graph because it was missing in the provided npm snapshot.", req_ref.req()))?;
@@ -2111,12 +2109,12 @@ mod tests {
       self
         .0
         .resolve(specifier, &referrer_range.specifier)
-        .map_err(ResolveError::ImportMap)
+        .map_err(ResolveError::from_err)
     }
   }
 
   macro_rules! mock_npm_resolver {
-    ($resolver_name:ident { $($req_name:literal => $nv:literal),+$(,)?} ) => {
+    ($resolver_name:ident { $($req_name:literal),+$(,)?} ) => {
       #[derive(Debug)]
       struct $resolver_name;
 
@@ -2132,7 +2130,7 @@ mod tests {
             results: package_reqs
               .iter()
               .map(|req| match &*req.name {
-                $($req_name => Ok(PackageNv::from_str($nv).unwrap())),+,
+                $($req_name => Ok(())),+,
                 _ => unreachable!(),
               })
               .collect(),
@@ -3228,9 +3226,9 @@ mod tests {
 
     mock_npm_resolver!(
       NpmResolver {
-        "a" => "a@1.2.2",
-        "d" => "d@5.0.0",
-        "other" => "other@99.99.99",
+        "a",
+        "d",
+        "other",
       }
     );
 
@@ -3289,9 +3287,9 @@ mod tests {
     );
     let npm_snapshot = SerializedNpmResolutionSnapshot {
       root_packages: root_pkgs(&[
-        ("a@1.2.2", "a@1.2.2"),
-        ("d@5.0.0", "d@5.0.0"),
-        ("other@99.99.99", "other@99.99.99"),
+        ("a@^1.2", "a@1.2.2"),
+        ("d", "d@5.0.0"),
+        ("other", "other@99.99.99"),
       ]),
       packages: Vec::from([
         new_package("a@1.2.2", &[]),
@@ -3371,9 +3369,9 @@ mod tests {
 
     mock_npm_resolver!(
       NpmResolver {
-        "a" => "a@1.2.2",
-        "d" => "d@5.0.0",
-        "other" => "other@99.99.99",
+        "a",
+        "d",
+        "other",
       }
     );
 
@@ -3449,10 +3447,10 @@ mod tests {
     );
     let npm_snapshot = SerializedNpmResolutionSnapshot {
       root_packages: root_pkgs(&[
-        ("a@1.2.2", "a@1.2.2"),
-        ("d@5.0.0", "d@5.0.0"),
+        ("a@^1.2", "a@1.2.2"),
+        ("d", "d@5.0.0"),
         ("z@0.1.2", "z@0.1.2"),
-        ("other@99.99.99", "other@99.99.99"),
+        ("other", "other@99.99.99"),
       ]),
       packages: Vec::from([
         new_package("a@1.2.2", &[]),
@@ -3604,9 +3602,9 @@ mod tests {
 
     mock_npm_resolver!(
       NpmResolver {
-        "a" => "a@1.2.2",
-        "d" => "d@5.0.0",
-        "other" => "other@99.99.99",
+        "a",
+        "d",
+        "other",
       }
     );