@pnpm/installing.deps-restorer 1101.1.11 → 1102.1.0

package/lib/index.d.ts

@@ -90,12 +90,21 @@ export interface HeadlessOptions {
     skipRuntimes?: boolean;
     enableModulesDir?: boolean;
     virtualStoreOnly?: boolean;
+    nodeExperimentalPackageMap?: boolean;
+    nodePackageMapType?: 'standard' | 'loose';
     nodeLinker?: 'isolated' | 'hoisted' | 'pnp';
     useGitBranchLockfile?: boolean;
     useLockfile?: boolean;
     supportedArchitectures?: SupportedArchitectures;
     hoistWorkspacePackages?: boolean;
     modulesFile?: Modules | null;
+    /**
+     * Awaited right before dependency lifecycle scripts run. Lets the caller
+     * overlap lockfile verification with fetching and linking while still
+     * guaranteeing no dependency script executes on an unverified lockfile:
+     * the returned promise rejects when verification failed.
+     */
+    verifyLockfile?: () => Promise<void>;
 }
 export interface InstallationResultStats {
     added: number;

package/lib/index.js

@@ -9,7 +9,7 @@ import { lockfileToDepGraph, } from '@pnpm/deps.graph-builder';
 import { calcDepState, findRuntimeNodeVersion } from '@pnpm/deps.graph-hasher';
 import * as dp from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
-import { makeNodeRequireOption, runLifecycleHooksConcurrently, } from '@pnpm/exec.lifecycle';
+import { makeNodePackageMapOption, makeNodeRequireOption, runLifecycleHooksConcurrently, } from '@pnpm/exec.lifecycle';
 import { symlinkDependency } from '@pnpm/fs.symlink-dependency';
 import { linkDirectDeps } from '@pnpm/installing.linking.direct-dep-linker';
 import { hoist } from '@pnpm/installing.linking.hoist';
@@ -17,7 +17,7 @@ import { prune } from '@pnpm/installing.linking.modules-cleaner';
 import { writeModulesManifest, } from '@pnpm/installing.modules-yaml';
 import { filterLockfileByEngine, filterLockfileByImportersAndEngine, } from '@pnpm/lockfile.filtering';
 import { getLockfileImporterId, readCurrentLockfile, readWantedLockfile, writeCurrentLockfile, writeLockfiles, } from '@pnpm/lockfile.fs';
-import { writePnpFile } from '@pnpm/lockfile.to-pnp';
+import { PACKAGE_MAP_FILENAME, writePackageMap, writePackageMapFromDependenciesGraph, writePnpFile } from '@pnpm/lockfile.to-pnp';
 import { nameVerFromPkgSnapshot, } from '@pnpm/lockfile.utils';
 import { logger, streamParser, } from '@pnpm/logger';
 import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
@@ -322,6 +322,36 @@ export async function headlessInstall(opts) {
             });
         }
     }
+    const shouldWritePackageMap = opts.enableModulesDir !== false && opts.nodeLinker !== 'pnp' && !opts.virtualStoreOnly;
+    if (shouldWritePackageMap) {
+        // Omit the importer self-mapping when a project has no name: the map keys
+        // dependencies by package name, so falling back to the importer id (`.` or
+        // a path) would emit a non-package-name key. Matches pacquet.
+        const importerNames = Object.fromEntries(selectedProjects.map(({ manifest, id }) => [id, manifest.name]));
+        if (opts.nodeLinker === 'hoisted') {
+            await writePackageMapFromDependenciesGraph({
+                directDependenciesByImporterId,
+                graph,
+                importerNames,
+                lockfile: filteredLockfile,
+                lockfileDir,
+                packageMapType: opts.nodePackageMapType,
+                packageIdStrategy: 'path',
+                rootModulesDir,
+            });
+        }
+        else {
+            await writePackageMap(filteredLockfile, {
+                importerNames,
+                lockfileDir,
+                locationByDepPath: Object.fromEntries(Object.values(graph).map((node) => [node.depPath, node.dir])),
+                packageMapType: opts.nodePackageMapType,
+                rootModulesDir,
+                virtualStoreDir,
+                virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
+            });
+        }
+    }
     if (opts.ignoreScripts) {
         for (const { id, manifest } of selectedProjects) {
             if (opts.ignoreScripts && ((manifest?.scripts) != null) &&
@@ -358,9 +388,17 @@ export async function headlessInstall(opts) {
         if (opts.enablePnp) {
             extraEnv = {
                 ...extraEnv,
-                ...makeNodeRequireOption(path.join(opts.lockfileDir, '.pnp.cjs')),
+                ...makeNodeRequireOption(path.join(opts.lockfileDir, '.pnp.cjs'), extraEnv),
+            };
+        }
+        if (opts.nodeExperimentalPackageMap && shouldWritePackageMap) {
+            extraEnv = {
+                ...extraEnv,
+                ...makeNodePackageMapOption(path.join(rootModulesDir, PACKAGE_MAP_FILENAME), extraEnv),
             };
         }
+        // Dependency lifecycle scripts must not run on an unverified lockfile.
+        await opts.verifyLockfile?.();
         ignoredBuilds = (await buildModules(graph, Array.from(directNodes), {
             allowBuild,
             childConcurrency: opts.childConcurrency,
@@ -485,6 +523,16 @@ export async function headlessInstall(opts) {
     }));
     summaryLogger.debug({ prefix: lockfileDir });
     if (!opts.ignoreScripts && !opts.ignorePackageManifest && !skipPostImportLinking) {
+        if (opts.nodeExperimentalPackageMap && shouldWritePackageMap) {
+            scriptsOpts.extraEnv = {
+                ...scriptsOpts.extraEnv,
+                ...makeNodePackageMapOption(path.join(rootModulesDir, PACKAGE_MAP_FILENAME), scriptsOpts.extraEnv),
+            };
+        }
+        // The projects' own lifecycle scripts import dependency code linked from
+        // the lockfile, so they are held to the same gate as dependency builds —
+        // also on the `enableModulesDir: false` path that skips buildModules.
+        await opts.verifyLockfile?.();
         await runLifecycleHooksConcurrently(['preinstall', 'install', 'postinstall', 'preprepare', 'prepare', 'postprepare'], projectsToBeBuilt, opts.childConcurrency ?? 5, scriptsOpts);
     }
     if ((reporter != null) && typeof reporter === 'function') {

package/lib/lockfileToHoistedDepGraph.js

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import { packageIsInstallable } from '@pnpm/config.package-is-installable';
 import * as dp from '@pnpm/deps.path';
+import { safeJoinModulesDir } from '@pnpm/fs.symlink-dependency';
 import { hoist } from '@pnpm/installing.linking.real-hoist';
 import { nameVerFromPkgSnapshot, packageIdFromSnapshot, pkgSnapshotToResolution, } from '@pnpm/lockfile.utils';
 import { logger } from '@pnpm/logger';
@@ -134,7 +135,7 @@ async function fetchDeps(opts, modules, deps) {
             });
             return;
         }
-        const dir = path.join(modules, dep.name);
+        const dir = safeJoinModulesDir(modules, dep.name);
         const depLocation = path.relative(opts.lockfileDir, dir);
         const resolution = pkgSnapshotToResolution(depPath, pkgSnapshot, opts.registries);
         let fetchResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-restorer",
-  "version": "1101.1.11",
+  "version": "1102.1.0",
   "description": "Fast installation using only pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -38,60 +38,60 @@
     "path-exists": "^5.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "realpath-missing": "^2.0.0",
-    "@pnpm/bins.linker": "1100.0.13",
-    "@pnpm/building.policy": "1100.0.9",
-    "@pnpm/building.during-install": "1101.0.18",
-    "@pnpm/config.package-is-installable": "1100.0.10",
+    "@pnpm/building.during-install": "1102.0.1",
+    "@pnpm/building.policy": "1100.0.10",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/core-loggers": "1100.2.0",
-    "@pnpm/deps.path": "1100.0.7",
-    "@pnpm/deps.graph-builder": "1100.0.15",
+    "@pnpm/config.package-is-installable": "1100.0.11",
+    "@pnpm/deps.graph-hasher": "1100.2.5",
+    "@pnpm/core-loggers": "1100.2.1",
+    "@pnpm/deps.graph-builder": "1100.0.17",
+    "@pnpm/deps.path": "1100.0.8",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/exec.lifecycle": "1100.0.17",
-    "@pnpm/fs.symlink-dependency": "1100.0.9",
-    "@pnpm/installing.linking.direct-dep-linker": "1100.0.9",
-    "@pnpm/installing.linking.hoist": "1100.0.13",
-    "@pnpm/installing.linking.real-hoist": "1100.1.2",
-    "@pnpm/installing.modules-yaml": "1100.0.8",
-    "@pnpm/lockfile.fs": "1100.1.4",
-    "@pnpm/lockfile.to-pnp": "1100.0.13",
-    "@pnpm/deps.graph-hasher": "1100.2.4",
-    "@pnpm/lockfile.utils": "1100.0.12",
-    "@pnpm/patching.config": "1100.0.7",
-    "@pnpm/lockfile.filtering": "1100.1.6",
-    "@pnpm/pkg-manifest.reader": "1100.0.7",
-    "@pnpm/store.controller-types": "1100.1.4",
-    "@pnpm/types": "1101.3.1",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.12",
-    "@pnpm/installing.package-requester": "1101.1.0",
-    "@pnpm/installing.linking.modules-cleaner": "1100.1.7"
+    "@pnpm/exec.lifecycle": "1100.1.0",
+    "@pnpm/fs.symlink-dependency": "1100.0.10",
+    "@pnpm/installing.linking.direct-dep-linker": "1100.0.10",
+    "@pnpm/installing.linking.hoist": "1100.0.15",
+    "@pnpm/installing.linking.modules-cleaner": "1100.1.8",
+    "@pnpm/installing.linking.real-hoist": "1100.1.3",
+    "@pnpm/installing.package-requester": "1102.0.0",
+    "@pnpm/lockfile.filtering": "1100.1.7",
+    "@pnpm/installing.modules-yaml": "1100.0.9",
+    "@pnpm/lockfile.utils": "1100.0.13",
+    "@pnpm/lockfile.to-pnp": "1100.1.0",
+    "@pnpm/patching.config": "1100.0.8",
+    "@pnpm/store.controller-types": "1100.1.5",
+    "@pnpm/pkg-manifest.reader": "1100.0.8",
+    "@pnpm/lockfile.fs": "1100.1.6",
+    "@pnpm/types": "1101.3.2",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.13",
+    "@pnpm/bins.linker": "1100.0.15"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^1001.0.1",
-    "@pnpm/worker": "^1100.1.11"
+    "@pnpm/logger": "^1100.0.0",
+    "@pnpm/worker": "^1100.2.1"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "@types/fs-extra": "^11.0.4",
     "@types/ramda": "0.31.1",
-    "concurrently": "9.2.1",
+    "concurrently": "10.0.3",
     "isexe": "4.0.0",
     "load-json-file": "^7.0.1",
     "tempy": "3.0.0",
     "write-json-file": "^7.0.0",
-    "@pnpm/assert-project": "1100.0.15",
-    "@pnpm/installing.deps-restorer": "1101.1.11",
     "@pnpm/crypto.object-hasher": "1100.0.0",
-    "@pnpm/installing.read-projects-context": "1100.0.14",
+    "@pnpm/installing.read-projects-context": "1100.0.16",
+    "@pnpm/assert-project": "1100.0.16",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.15",
-    "@pnpm/store.cafs": "1100.1.9",
-    "@pnpm/store.index": "1100.1.0",
-    "@pnpm/test-ipc-server": "1100.0.0",
+    "@pnpm/store.cafs": "1100.1.10",
+    "@pnpm/prepare": "1100.0.16",
+    "@pnpm/store.index": "1100.2.0",
     "@pnpm/store.path": "1100.0.1",
-    "@pnpm/testing.registry-mock": "1100.0.5",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.temp-store": "1100.1.8"
+    "@pnpm/test-ipc-server": "1100.0.0",
+    "@pnpm/installing.deps-restorer": "1102.1.0",
+    "@pnpm/testing.temp-store": "1100.1.10",
+    "@pnpm/testing.registry-mock": "1100.0.6"
   },
   "engines": {
     "node": ">=22.13"