Skip to content
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

Jump to bottom

refactor: remove concept of pending resolution #57

Merged
merged 6 commits into from
Jun 10, 2024
Merged

refactor: remove concept of pending resolution #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift click to select a range
d7307f9
refactor: remove concept of pending resolution
dsherret Jun 6, 2024
fed25d5
fix comment
dsherret Jun 6, 2024
dfea357
Merge branch 'main' into refactor_remove_pending
dsherret Jun 7, 2024
aab9900
update
dsherret Jun 10, 2024
6859b7f
updates
dsherret Jun 10, 2024
7abf2c2
update
dsherret Jun 10, 2024
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
68 changes: 10 additions & 58 deletions src/resolution/graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 328,6 @@ pub struct Graph {
// This will be set when creating from a snapshot, then
// inform the final snapshot creation.
packages_to_copy_index: HashMap<NpmPackageId, u8>,
/// Packages that the resolver should resolve first.
pending_unresolved_packages: Vec<Rc<PackageNv>>,
}

impl Graph {
Expand Down Expand Up @@ -425,11 423,6 @@ impl Graph {
.into_iter()
.map(|(k, v)| (k, Rc::new(v)))
.collect(),
pending_unresolved_packages: snapshot
.pending_unresolved_packages
.into_iter()
.map(Rc::new)
.collect(),
nodes: Default::default(),
package_name_versions: Default::default(),
resolved_node_ids: Default::default(),
Expand All @@ -450,16 443,8 @@ impl Graph {
graph
}

pub fn take_pending_unresolved(&mut self) -> Vec<Rc<PackageNv>> {
std::mem::take(&mut self.pending_unresolved_packages)
}

pub fn has_package_req(&self, req: &PackageReq) -> bool {
self.package_reqs.contains_key(req)
}

pub fn has_root_package(&self, id: &PackageNv) -> bool {
self.root_packages.contains_key(id)
pub fn get_req_nv(&self, req: &PackageReq) -> Option<&Rc<PackageNv>> {
self.package_reqs.get(req)
}

fn get_npm_pkg_id(&self, node_id: NodeId) -> NpmPackageId {
Expand Down Expand Up @@ -706,11 691,6 @@ impl Graph {
.into_iter()
.map(|(req, nv)| (req, (*nv).clone()))
.collect(),
pending_unresolved_packages: self
.pending_unresolved_packages
.into_iter()
.map(|nv| (*nv).clone())
.collect(),
})
}

Expand Down Expand Up @@ -834,44 814,16 @@ impl<'a, TNpmRegistryApi: NpmRegistryApi>
}
}

pub fn add_root_package(
&mut self,
package_nv: &PackageNv,
package_info: &NpmPackageInfo,
) -> Result<(), NpmResolutionError> {
if self.graph.root_packages.contains_key(package_nv) {
return Ok(()); // already added
}

// todo(dsherret): using a version requirement here is a temporary hack
// to reuse code in a large refactor. We should resolve the node directly
// from the package name and version
let version_req =
VersionReq::parse_from_specifier(&format!("{}", package_nv.version))
.unwrap();
let (pkg_nv, node_id) = self.resolve_node_from_info(
&package_nv.name,
&version_req,
package_info,
None,
)?;
self.graph.root_packages.insert(pkg_nv.clone(), node_id);
self
.pending_unresolved_nodes
.push_back(GraphPath::for_root(node_id, pkg_nv));
Ok(())
}

pub fn add_package_req(
&mut self,
package_req: &PackageReq,
package_info: &NpmPackageInfo,
) -> Result<(), NpmResolutionError> {
if self.graph.package_reqs.contains_key(package_req) {
return Ok(()); // already added
) -> Result<Rc<PackageNv>, NpmResolutionError> {
if let Some(nv) = self.graph.get_req_nv(package_req) {
return Ok(nv.clone()); // already added
}

let (pkg_id, node_id) = self.resolve_node_from_info(
let (pkg_nv, node_id) = self.resolve_node_from_info(
&package_req.name,
&package_req.version_req,
package_info,
Expand All @@ -880,12 832,12 @@ impl<'a, TNpmRegistryApi: NpmRegistryApi>
self
.graph
.package_reqs
.insert(package_req.clone(), pkg_id.clone());
self.graph.root_packages.insert(pkg_id.clone(), node_id);
.insert(package_req.clone(), pkg_nv.clone());
self.graph.root_packages.insert(pkg_nv.clone(), node_id);
self
.pending_unresolved_nodes
.push_back(GraphPath::for_root(node_id, pkg_id));
Ok(())
.push_back(GraphPath::for_root(node_id, pkg_nv.clone()));
Ok(pkg_nv)
}

fn analyze_dependency(
Expand Down
1 change: 1 addition & 0 deletions src/resolution/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 10,7 @@ pub use common::NpmPackageVersionResolutionError;
pub use graph::NpmResolutionError;
pub use snapshot::incomplete_snapshot_from_lockfile;
pub use snapshot::snapshot_from_lockfile;
pub use snapshot::AddPkgReqsResult;
pub use snapshot::NpmPackagesPartitioned;
pub use snapshot::NpmResolutionSnapshot;
pub use snapshot::NpmResolutionSnapshotPendingResolver;
Expand Down
Loading
Loading