ci(benchmark): compare against pnpm

.github/workflows/integrated-benchmark.yml

@@ -107,14 +107,14 @@ jobs:
       - name: 'Benchmark: Frozen Lockfile'
         shell: bash
         run: |
-          cargo run --bin=integrated-benchmark -- --scenario=frozen-lockfile --verdaccio HEAD main
+          cargo run --bin=integrated-benchmark -- --scenario=frozen-lockfile --verdaccio HEAD main --with-pnpm
           cp bench-work-env/BENCHMARK_REPORT.md bench-work-env/BENCHMARK_REPORT_FROZEN_LOCKFILE.md
           cp bench-work-env/BENCHMARK_REPORT.json bench-work-env/BENCHMARK_REPORT_FROZEN_LOCKFILE.json
 
       # - name: 'Benchmark: Clean Install'
       #   shell: bash
       #   run: |
-      #     cargo run --bin=integrated-benchmark -- --scenario=clean-install --verdaccio HEAD main
+      #     cargo run --bin=integrated-benchmark -- --scenario=clean-install --verdaccio HEAD main --with-pnpm
       #     cp bench-work-env/BENCHMARK_REPORT.md bench-work-env/BENCHMARK_REPORT_CLEAN_INSTALL.md
       #     cp bench-work-env/BENCHMARK_REPORT.json bench-work-env/BENCHMARK_REPORT_FROZEN_LOCKFILE.json
 

crates/package-manager/src/create_virtual_dir_by_snapshot.rs

@@ -57,17 +57,29 @@
             }
         })?;
 
-        // 1. Install the files from `cas_paths`
-        let save_path =
-            virtual_node_modules_dir.join(dependency_path.package_specifier.name.to_string());
-        create_cas_files(import_method, &save_path, cas_paths)
-            .map_err(CreateVirtualDirError::CreateCasFiles)?;
+        let mut result1: Result<(), CreateVirtualDirError> = Ok(());
+        let mut result2: Result<(), CreateVirtualDirError> = Ok(());
+        rayon::scope(|scope| {
+            // 1. Install the files from `cas_paths`
+            scope.spawn(|_| {
+                let save_path = virtual_node_modules_dir
+                    .join(dependency_path.package_specifier.name.to_string());
+                result1 = create_cas_files(import_method, &save_path, cas_paths)
+                    .map_err(CreateVirtualDirError::CreateCasFiles);
+            });
 
-        // 2. Create the symlink layout
-        if let Some(dependencies) = &package_snapshot.dependencies {
-            create_symlink_layout(dependencies, virtual_store_dir, &virtual_node_modules_dir)
-        }
-
-        Ok(())
+            // 2. Create the symlink layout
+            scope.spawn(|_| {
+                if let Some(dependencies) = &package_snapshot.dependencies {
+                    create_symlink_layout(
+                        dependencies,
+                        virtual_store_dir,
+                        &virtual_node_modules_dir,
+                    );
+                    result2 = Ok(());
+                }
+            })
+        });
+        result1.and(result2)
     }
 }

crates/package-manager/src/create_virtual_store.rs

@@ -2,15 +2,13 @@
 use futures_util::future;
 use pacquet_lockfile::{DependencyPath, PackageSnapshot, RootProjectSnapshot};
 use pacquet_npmrc::Npmrc;
-use pacquet_tarball::Cache;
 use pipe_trait::Pipe;
 use reqwest::Client;
 use std::collections::HashMap;
 
 /// This subroutine generates filesystem layout for the virtual store at `node_modules/.pacquet`.
 #[must_use]
 pub struct CreateVirtualStore<'a> {
-    pub tarball_cache: &'a Cache,
     pub http_client: &'a Client,
     pub config: &'static Npmrc,
     pub packages: Option<&'a HashMap<DependencyPath, PackageSnapshot>>,
@@ -20,8 +18,7 @@
 impl<'a> CreateVirtualStore<'a> {
     /// Execute the subroutine.
     pub async fn run(self) {
-        let CreateVirtualStore { tarball_cache, http_client, config, packages, project_snapshot } =
-            self;
+        let CreateVirtualStore { http_client, config, packages, project_snapshot } = self;
 
         let packages = packages.unwrap_or_else(|| {
             dbg!(project_snapshot);
@@ -31,16 +28,10 @@
         packages
             .iter()
             .map(|(dependency_path, package_snapshot)| async move {
-                InstallPackageBySnapshot {
-                    tarball_cache,
-                    http_client,
-                    config,
-                    dependency_path,
-                    package_snapshot,
-                }
-                .run()
-                .await
-                .unwrap(); // TODO: properly propagate this error
+                InstallPackageBySnapshot { http_client, config, dependency_path, package_snapshot }
+                    .run()
+                    .await
+                    .unwrap(); // TODO: properly propagate this error
             })
             .pipe(future::join_all)
             .await;

crates/package-manager/src/install.rs

@@ -58,7 +58,6 @@ where
                 assert_eq!(lockfile_version.major, 6); // compatibility check already happens at serde, but this still helps preventing programmer mistakes.
 
                 InstallFrozenLockfile {
-                    tarball_cache,
                     http_client,
                     config,
                     project_snapshot,

crates/package-manager/src/install_frozen_lockfile.rs

@@ -2,7 +2,6 @@
 use pacquet_lockfile::{DependencyPath, PackageSnapshot, RootProjectSnapshot};
 use pacquet_npmrc::Npmrc;
 use pacquet_package_manifest::DependencyGroup;
-use pacquet_tarball::Cache;
 use reqwest::Client;
 use std::collections::HashMap;
 
@@ -20,7 +19,6 @@
 where
     DependencyGroupList: IntoIterator<Item = DependencyGroup>,
 {
-    pub tarball_cache: &'a Cache,
     pub http_client: &'a Client,
     pub config: &'static Npmrc,
     pub project_snapshot: &'a RootProjectSnapshot,
@@ -35,7 +33,6 @@
     /// Execute the subroutine.
     pub async fn run(self) {
         let InstallFrozenLockfile {
-            tarball_cache,
             http_client,
             config,
             project_snapshot,
@@ -47,9 +44,7 @@
 
         assert!(config.prefer_frozen_lockfile, "Non frozen lockfile is not yet supported");
 
-        CreateVirtualStore { tarball_cache, http_client, config, packages, project_snapshot }
-            .run()
-            .await;
+        CreateVirtualStore { http_client, config, packages, project_snapshot }.run().await;
 
         SymlinkDirectDependencies { config, project_snapshot, dependency_groups }.run();
     }

crates/package-manager/src/install_package_by_snapshot.rs

@@ -3,7 +3,7 @@
 use miette::Diagnostic;
 use pacquet_lockfile::{DependencyPath, LockfileResolution, PackageSnapshot, PkgNameVerPeer};
 use pacquet_npmrc::Npmrc;
-use pacquet_tarball::{Cache, DownloadTarballToStore, TarballError};
+use pacquet_tarball::{DownloadTarballToStore, TarballError};
 use pipe_trait::Pipe;
 use reqwest::Client;
 use std::borrow::Cow;
@@ -12,7 +12,6 @@
 /// then creates the symlink layout for the package.
 #[must_use]
 pub struct InstallPackageBySnapshot<'a> {
-    pub tarball_cache: &'a Cache,
     pub http_client: &'a Client,
     pub config: &'static Npmrc,
     pub dependency_path: &'a DependencyPath,
@@ -29,13 +28,8 @@
 impl<'a> InstallPackageBySnapshot<'a> {
     /// Execute the subroutine.
     pub async fn run(self) -> Result<(), InstallPackageBySnapshotError> {
-        let InstallPackageBySnapshot {
-            tarball_cache,
-            http_client,
-            config,
-            dependency_path,
-            package_snapshot,
-        } = self;
+        let InstallPackageBySnapshot { http_client, config, dependency_path, package_snapshot } =
+            self;
         let PackageSnapshot { resolution, .. } = package_snapshot;
         let DependencyPath { custom_registry, package_specifier } = dependency_path;
 
@@ -64,14 +58,13 @@
 
         // TODO: skip when already exists in store?
         let cas_paths = DownloadTarballToStore {
-            tarball_cache,
             http_client,
             store_dir: &config.store_dir,
             package_integrity: integrity,
             package_unpacked_size: None,
             package_url: &tarball_url,
         }
-        .run()
+        .without_cache()
         .await
         .map_err(InstallPackageBySnapshotError::DownloadTarball)?;
 

crates/package-manager/src/install_package_from_registry.rs

@@ -75,7 +75,6 @@ impl<'a> InstallPackageFromRegistry<'a> {
 
         // TODO: skip when it already exists in store?
         let cas_paths = DownloadTarballToStore {
-            tarball_cache,
             http_client,
             store_dir: &config.store_dir,
             package_integrity: package_version
@@ -86,7 +85,7 @@ impl<'a> InstallPackageFromRegistry<'a> {
             package_unpacked_size: package_version.dist.unpacked_size,
             package_url: package_version.as_tarball_url(),
         }
-        .run()
+        .with_cache(tarball_cache)
         .await
         .map_err(InstallPackageFromRegistryError::DownloadTarballToStore)?;
 

crates/tarball/Cargo.toml

@@ -20,6 +20,7 @@ dashmap      = { workspace = true }
 derive_more  = { workspace = true }
 miette       = { workspace = true }
 pipe-trait   = { workspace = true }
+rayon        = { workspace = true }
 reqwest      = { workspace = true }
 serde        = { workspace = true }
 serde_json   = { workspace = true }