Skip to content

Optimize add dependency resolution #278

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

Draft
cijiugechu wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Optimize add dependency resolution #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions packages/zpm/src/commands/add.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::{HashMap, HashSet};
use std::{collections::{HashMap, HashSet}, time::UNIX_EPOCH};

use clipanion::cli;
use zpm_parsers::{Document, JsonDocument, Value};
Expand All @@ -11,6 +11,7 @@ use crate::{
descriptor_loose::{self, LooseDescriptor},
error::Error,
install::InstallContext,
manifest::helpers::parse_manifest_from_bytes,
project::{self, InstallMode}
};

Expand Down Expand Up @@ -194,7 +195,7 @@ pub struct Add {

impl Add {
pub async fn execute(&self) -> Result<(), Error> {
let project
let mut project
= project::Project::new(None).await?;

let range_kind = if self.fixed {
Expand Down Expand Up @@ -320,16 +321,30 @@ impl Add {
manifest_path
.fs_change(&document.input, false)?;

let mut project
= project::Project::new(None).await?;
let manifest_meta = manifest_path
.fs_metadata()?;
let last_changed_at = manifest_meta.modified()?
.duration_since(UNIX_EPOCH).unwrap()
.as_nanos();

let active_workspace = project.active_workspace_mut()?;
active_workspace.manifest = parse_manifest_from_bytes(&document.input)?;
active_workspace.last_changed_at = last_changed_at;
project.last_modified_at.update(last_changed_at);

let enforced_resolutions
= resolutions.iter()
.filter_map(|resolution| resolution.locator.clone().map(|locator| (resolution.descriptor.clone(), Some(locator))))
.collect();

let enforced_resolution_results
= resolutions.into_iter()
.filter_map(|resolution| resolution.locator.map(|locator| (resolution.descriptor, Some(locator))))
.filter_map(|resolution| resolution.resolution.map(|result| (resolution.descriptor, result)))
.collect();

project.run_install(project::RunInstallOptions {
mode: self.mode,
enforced_resolution_results,
enforced_resolutions,
silent_or_error: self.silent,
..Default::default()
Expand Down
Loading
Loading