mirror of
https://github.com/pesde-pkg/pesde.git
synced 2025-05-04 10:33:47 +01:00
refactor: avoid manually recreating graph
This commit is contained in:
parent
c05bfa5a76
commit
c835998621
1 changed files with 31 additions and 27 deletions
|
@ -66,26 +66,23 @@ impl DownloadAndLinkHooks for () {
|
|||
}
|
||||
|
||||
/// Options for which dependencies to install.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum InstallDependenciesMode {
|
||||
/// Install all dependencies.
|
||||
/// Install all dependencies
|
||||
All,
|
||||
/// Install only dependencies, not dev_dependencies.
|
||||
/// Install all dependencies, then remove [DependencyType::Dev] dependencies
|
||||
Prod,
|
||||
/// Install only dev_dependencies.
|
||||
/// Only install dependencies which are [DependencyType::Dev]
|
||||
Dev,
|
||||
}
|
||||
|
||||
impl InstallDependenciesMode {
|
||||
fn fits(self, dep_ty: DependencyType) -> bool {
|
||||
match (self, dep_ty) {
|
||||
(InstallDependenciesMode::All, _) => true,
|
||||
(InstallDependenciesMode::Prod, DependencyType::Standard) => true,
|
||||
(InstallDependenciesMode::Prod, DependencyType::Peer) => true,
|
||||
(InstallDependenciesMode::Prod, DependencyType::Dev) => false,
|
||||
(InstallDependenciesMode::Dev, DependencyType::Standard) => false,
|
||||
(InstallDependenciesMode::Dev, DependencyType::Peer) => false,
|
||||
(InstallDependenciesMode::Dev, DependencyType::Dev) => true,
|
||||
(InstallDependenciesMode::Dev, dep_ty) => dep_ty == DependencyType::Dev,
|
||||
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -247,6 +244,10 @@ impl Project {
|
|||
download_graph_options = download_graph_options.reporter(reporter);
|
||||
}
|
||||
|
||||
let correct_deps = if matches!(install_dependencies_mode, InstallDependenciesMode::All)
|
||||
{
|
||||
graph.clone()
|
||||
} else {
|
||||
let mut queue = graph
|
||||
.iter()
|
||||
.filter(|(_, node)| {
|
||||
|
@ -267,6 +268,9 @@ impl Project {
|
|||
.for_each(|x| queue.push_back(x));
|
||||
}
|
||||
|
||||
correct_deps
|
||||
};
|
||||
|
||||
let mut downloaded_graph = DependencyGraph::new();
|
||||
|
||||
let graph_to_download = if force {
|
||||
|
@ -464,7 +468,7 @@ impl Project {
|
|||
.map_err(errors::DownloadAndLinkError::Hook)?;
|
||||
}
|
||||
|
||||
if install_dependencies_mode != InstallDependenciesMode::All || !force {
|
||||
if matches!(install_dependencies_mode, InstallDependenciesMode::Prod) || !force {
|
||||
self.remove_unused(&graph).await?;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue