Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 24 additions & 3 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions packages/zpm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ hickory-resolver = "0.25.2"
indexmap = {version = "2.11.0", features = ["serde"]}
sha2 = "0.10.8"
hex = "0.4.3"
dashmap = "6.1.0"
2 changes: 2 additions & 0 deletions packages/zpm/src/commands/debug/print_hoisting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ impl PrintHoisting {
= Hoister::new(&mut work_tree);

hoister.set_print_logs(self.verbose);
println!("Hoisting...");
hoister.hoist();
println!("Hoisted!");

let root_node
= hoist::TreeRenderer::new(&work_tree).convert();
Expand Down
10 changes: 9 additions & 1 deletion packages/zpm/src/install.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{collections::{BTreeMap, BTreeSet}, hash::Hash, marker::PhantomData, sync::LazyLock};

use dashmap::DashMap;
use rayon::iter::{IntoParallelIterator, ParallelIterator};
use zpm_config::PackageExtension;
use zpm_primitives::{Descriptor, Ident, Locator, PatchRange, PeerRange, Range, RegistrySemverRange, RegistryTagRange, SemverDescriptor, SemverPeerRange};
Expand All @@ -9,7 +10,7 @@ use serde::{Deserialize, Serialize};
use zpm_utils::{FromFileString, ToFileString};

use crate::{
build, cache::CompositeCache, content_flags::ContentFlags, error::Error, fetchers::{fetch_locator, patch::has_builtin_patch, try_fetch_locator_sync, PackageData, SyncFetchAttempt}, graph::{GraphCache, GraphIn, GraphOut, GraphTasks}, linker, lockfile::{Lockfile, LockfileEntry, LockfileMetadata}, primitives_exts::RangeExt, project::{InstallMode, Project}, report::{async_section, with_context_result, ReportContext}, resolvers::{resolve_descriptor, resolve_locator, try_resolve_descriptor_sync, validate_resolution, Resolution, SyncResolutionAttempt}, system, tree_resolver::{ResolutionTree, TreeResolver}
build, cache::CompositeCache, content_flags::ContentFlags, error::Error, fetchers::{fetch_locator, patch::has_builtin_patch, try_fetch_locator_sync, PackageData, SyncFetchAttempt}, graph::{GraphCache, GraphIn, GraphOut, GraphTasks}, linker, lockfile::{Lockfile, LockfileEntry, LockfileMetadata}, primitives_exts::RangeExt, project::{InstallMode, Project}, report::{async_section, with_context_result, ReportContext}, resolvers::{npm::NpmPayload, resolve_descriptor, resolve_locator, try_resolve_descriptor_sync, validate_resolution, Resolution, SyncResolutionAttempt}, system, tree_resolver::{ResolutionTree, TreeResolver}
};


Expand All @@ -21,6 +22,7 @@ pub struct InstallContext<'a> {
pub check_checksums: bool,
pub check_resolutions: bool,
pub enforced_resolutions: BTreeMap<Descriptor, Locator>,
pub npm_metadata_cache: Option<&'a DashMap<Ident, NpmPayload>>,
pub refresh_lockfile: bool,
pub mode: Option<InstallMode>,
}
Expand All @@ -34,13 +36,19 @@ impl<'a> Default for InstallContext<'a> {
check_checksums: false,
check_resolutions: false,
enforced_resolutions: BTreeMap::new(),
npm_metadata_cache: None,
refresh_lockfile: false,
mode: None,
}
}
}

impl<'a> InstallContext<'a> {
pub fn with_npm_metadata_cache(mut self, npm_metadata_cache: Option<&'a DashMap<Ident, NpmPayload>>) -> Self {
self.npm_metadata_cache = npm_metadata_cache;
self
}

pub fn with_package_cache(mut self, package_cache: Option<&'a CompositeCache>) -> Self {
self.package_cache = package_cache;
self
Expand Down
5 changes: 5 additions & 0 deletions packages/zpm/src/project.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{collections::{BTreeMap, HashSet}, io::ErrorKind, sync::Arc, time::UNIX_EPOCH};

use dashmap::DashMap;
use globset::{GlobBuilder, GlobSetBuilder};
use zpm_config::{Configuration, ConfigurationContext};
use zpm_macro_enum::zpm_enum;
Expand Down Expand Up @@ -625,7 +626,11 @@ impl Project {
}
}

let npm_metadata_cache
= DashMap::new();

let install_context = InstallContext::default()
.with_npm_metadata_cache(Some(&npm_metadata_cache))
.with_package_cache(Some(&package_cache))
.with_project(Some(self))
.set_check_checksums(options.check_checksums)
Expand Down
Loading