Skip to content

refactor: upgrade to deno_graph 0.106 #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsherret merged 2 commits into from
Jan 17, 2026
Merged

refactor: upgrade to deno_graph 0.106 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5635b68
refactor: upgrade to deno_graph 0.106
dsherret Jan 16, 2026
53d2cdb
update
dsherret Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"] }

2 changes: 1 addition & 1 deletion lib/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/examples/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
42 changes: 20 additions & 22 deletions src/v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()))?;
Expand Down Expand Up @@ -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;

Expand All @@ -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(),
Expand Down Expand Up @@ -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",
}
);

Expand Down Expand Up @@ -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", &[]),
Expand Down Expand Up @@ -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",
}
);

Expand Down Expand Up @@ -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", &[]),
Expand Down Expand Up @@ -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",
}
);

Expand Down