@pnpm/installing.deps-restorer 1102.0.0 → 1102.1.1

package/lib/index.d.ts

@@ -90,6 +90,8 @@ export interface HeadlessOptions {
     skipRuntimes?: boolean;
     enableModulesDir?: boolean;
     virtualStoreOnly?: boolean;
+    nodeExperimentalPackageMap?: boolean;
+    nodePackageMapType?: 'standard' | 'loose';
     nodeLinker?: 'isolated' | 'hoisted' | 'pnp';
     useGitBranchLockfile?: boolean;
     useLockfile?: boolean;

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,7 +388,13 @@ 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.
@@ -487,6 +523,12 @@ 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-restorer",
-  "version": "1102.0.0",
+  "version": "1102.1.1",
   "description": "Fast installation using only pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -12,9 +12,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/installing/deps-restorer"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/deps-restorer"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/installing/deps-restorer#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/deps-restorer#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -38,37 +38,37 @@
     "path-exists": "^5.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "realpath-missing": "^2.0.0",
-    "@pnpm/building.during-install": "1102.0.0",
-    "@pnpm/building.policy": "1100.0.10",
-    "@pnpm/config.package-is-installable": "1100.0.11",
-    "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/deps.graph-hasher": "1100.2.5",
+    "@pnpm/bins.linker": "1100.0.16",
+    "@pnpm/building.during-install": "1102.0.2",
+    "@pnpm/building.policy": "1100.0.11",
+    "@pnpm/config.package-is-installable": "1100.0.12",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/deps.graph-builder": "1100.0.16",
-    "@pnpm/bins.linker": "1100.0.14",
-    "@pnpm/error": "1100.0.0",
+    "@pnpm/core-loggers": "1100.2.1",
+    "@pnpm/deps.graph-hasher": "1100.2.6",
     "@pnpm/deps.path": "1100.0.8",
-    "@pnpm/exec.lifecycle": "1100.0.18",
+    "@pnpm/deps.graph-builder": "1100.0.18",
     "@pnpm/fs.symlink-dependency": "1100.0.10",
+    "@pnpm/installing.linking.hoist": "1100.0.16",
+    "@pnpm/error": "1100.0.1",
     "@pnpm/installing.linking.direct-dep-linker": "1100.0.10",
-    "@pnpm/installing.linking.hoist": "1100.0.14",
-    "@pnpm/installing.linking.modules-cleaner": "1100.1.8",
-    "@pnpm/installing.linking.real-hoist": "1100.1.3",
+    "@pnpm/installing.linking.modules-cleaner": "1100.1.9",
+    "@pnpm/exec.lifecycle": "1100.1.1",
     "@pnpm/installing.modules-yaml": "1100.0.9",
-    "@pnpm/installing.package-requester": "1102.0.0",
-    "@pnpm/lockfile.to-pnp": "1100.0.14",
-    "@pnpm/lockfile.fs": "1100.1.5",
-    "@pnpm/lockfile.utils": "1100.0.13",
-    "@pnpm/patching.config": "1100.0.8",
-    "@pnpm/pkg-manifest.reader": "1100.0.8",
-    "@pnpm/store.controller-types": "1100.1.5",
+    "@pnpm/lockfile.filtering": "1100.1.8",
+    "@pnpm/installing.linking.real-hoist": "1100.1.4",
+    "@pnpm/installing.package-requester": "1102.1.0",
+    "@pnpm/lockfile.fs": "1100.1.7",
+    "@pnpm/lockfile.utils": "1100.1.0",
+    "@pnpm/store.controller-types": "1100.1.6",
+    "@pnpm/patching.config": "1100.0.9",
     "@pnpm/types": "1101.3.2",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.13",
-    "@pnpm/lockfile.filtering": "1100.1.7"
+    "@pnpm/workspace.project-manifest-reader": "1100.0.14",
+    "@pnpm/lockfile.to-pnp": "1100.1.1",
+    "@pnpm/pkg-manifest.reader": "1100.0.9"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0",
-    "@pnpm/worker": "^1100.2.0"
+    "@pnpm/worker": "^1100.2.2"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
@@ -79,19 +79,19 @@
     "load-json-file": "^7.0.1",
     "tempy": "3.0.0",
     "write-json-file": "^7.0.0",
-    "@pnpm/installing.deps-restorer": "1102.0.0",
-    "@pnpm/assert-project": "1100.0.16",
     "@pnpm/crypto.object-hasher": "1100.0.0",
-    "@pnpm/installing.read-projects-context": "1100.0.15",
-    "@pnpm/prepare": "1100.0.16",
+    "@pnpm/assert-project": "1100.0.17",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/store.cafs": "1100.1.10",
-    "@pnpm/store.index": "1100.2.0",
-    "@pnpm/store.path": "1100.0.1",
+    "@pnpm/prepare": "1100.0.17",
+    "@pnpm/installing.read-projects-context": "1100.0.17",
+    "@pnpm/store.cafs": "1100.1.11",
+    "@pnpm/installing.deps-restorer": "1102.1.1",
+    "@pnpm/store.path": "1100.0.2",
+    "@pnpm/store.index": "1100.2.1",
     "@pnpm/test-fixtures": "1100.0.0",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/testing.temp-store": "1100.1.9",
-    "@pnpm/testing.registry-mock": "1100.0.6"
+    "@pnpm/testing.registry-mock": "1100.0.7",
+    "@pnpm/testing.temp-store": "1100.1.11"
   },
   "engines": {
     "node": ">=22.13"