@pnpm/installing.linking.real-hoist 1100.1.13 → 1100.1.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @pnpm/real-hoist
 
+## 1100.1.15
+
+### Patch Changes
+
+- Under `nodeLinker: hoisted`, peer-resolution variants of an injected directory dependency (a `file:` snapshot) are materialized as separate copies again instead of collapsing onto the first-seen variant. Each copy keeps its own peer-resolved dependency set, so a project pinning one peer version no longer resolves another project's variant — Bit root components with conflicting peers across injected copies rely on this.
+
+## 1100.1.14
+
+### Patch Changes
+
+- Under `nodeLinker: hoisted`, a dependency declared against a peer-resolution variant of a package version is no longer dropped from the installed layout. All variants of a version share one hoisted copy, and edges pointing at any of them now resolve to it, so the depending project keeps the package in its `.package-map.json` and the depending package keeps it in its `node_modules/.bin`.
+
+- Updated dependencies:
+  - @pnpm/deps.path@1101.0.0
+  - @pnpm/error@1100.1.3
+  - @pnpm/lockfile.types@1100.0.20
+  - @pnpm/lockfile.utils@1102.0.0
+
 ## 1100.1.13
 
 ### Patch Changes

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import type { PackageSnapshot } from '@pnpm/lockfile.types';
 import { type LockfileObject } from '@pnpm/lockfile.utils';
 import { type HoisterResult } from '@yarnpkg/nm/hoist';
 /**
@@ -14,6 +15,34 @@ import { type HoisterResult } from '@yarnpkg/nm/hoist';
  */
 export type HoistingLimits = 'none' | 'workspaces' | 'dependencies';
 export type { HoisterResult };
+/**
+ * The identity every peer variant of one package version collapses
+ * onto.
+ *
+ * `toTree` maps the id to the first depPath it sees for it and stamps
+ * that depPath on every variant as their shared `reference`, so only
+ * that one depPath survives into the result. Anything indexing the
+ * hoist result by package therefore has to key *and* look up by this
+ * id rather than by the depPath an edge declares — otherwise every
+ * edge on a collapsed variant finds nothing and drops out of the
+ * layout.
+ *
+ * One id can still cover several directories: nodes are interned per
+ * `(alias, depPath)`, so an alias exposing a package under a second
+ * name gets a node, and a directory, of its own. An index over the
+ * result holds the list and resolves an edge to its first entry.
+ *
+ * An injected directory dependency (a `directory` resolution) keeps
+ * its peer suffix: every variant of it is a separate on-disk copy of
+ * the local package, materialized with its own peer-resolved
+ * dependency set, so collapsing the variants would rewire every
+ * dependent of the losing one onto the survivor's children (Bit's
+ * root components pin conflicting peers across such copies on
+ * purpose). The registry collapse exists to stop peer-variant
+ * explosion on large lockfiles; directory snapshots are one per
+ * injected workspace package and cannot explode that way.
+ */
+export declare function getHoisterPkgId(depPath: string, pkgSnapshot: PackageSnapshot): string;
 /**
  * Translate the user-facing {@link HoistingLimits} mode into the
  * `@yarnpkg/nm` hoister's per-locator border map. A name in a

package/lib/index.js

@@ -2,6 +2,44 @@ import * as dp from '@pnpm/deps.path';
 import { LockfileMissingDependencyError } from '@pnpm/error';
 import { nameVerFromPkgSnapshot, } from '@pnpm/lockfile.utils';
 import { hoist as _hoist, HoisterDependencyKind } from '@yarnpkg/nm/hoist';
+/**
+ * The identity every peer variant of one package version collapses
+ * onto.
+ *
+ * `toTree` maps the id to the first depPath it sees for it and stamps
+ * that depPath on every variant as their shared `reference`, so only
+ * that one depPath survives into the result. Anything indexing the
+ * hoist result by package therefore has to key *and* look up by this
+ * id rather than by the depPath an edge declares — otherwise every
+ * edge on a collapsed variant finds nothing and drops out of the
+ * layout.
+ *
+ * One id can still cover several directories: nodes are interned per
+ * `(alias, depPath)`, so an alias exposing a package under a second
+ * name gets a node, and a directory, of its own. An index over the
+ * result holds the list and resolves an edge to its first entry.
+ *
+ * An injected directory dependency (a `directory` resolution) keeps
+ * its peer suffix: every variant of it is a separate on-disk copy of
+ * the local package, materialized with its own peer-resolved
+ * dependency set, so collapsing the variants would rewire every
+ * dependent of the losing one onto the survivor's children (Bit's
+ * root components pin conflicting peers across such copies on
+ * purpose). The registry collapse exists to stop peer-variant
+ * explosion on large lockfiles; directory snapshots are one per
+ * injected workspace package and cannot explode that way.
+ */
+export function getHoisterPkgId(depPath, pkgSnapshot) {
+    // `resolution` is typed as required, but the lockfile is parsed from
+    // untyped YAML — guard so a malformed snapshot degrades to the
+    // collapsed identity instead of a TypeError here.
+    const resolution = pkgSnapshot.resolution;
+    if (resolution != null && 'directory' in resolution && resolution.directory != null) {
+        return depPath;
+    }
+    const { name, version } = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
+    return `${name}@${version}`;
+}
 /**
  * Translate the user-facing {@link HoistingLimits} mode into the
  * `@yarnpkg/nm` hoister's per-locator border map. A name in a
@@ -121,8 +159,8 @@ function toTree({ nodes, lockfile, depPathByPkgId, autoInstallPeers }, deps) {
             if (!pkgSnapshot) {
                 throw new LockfileMissingDependencyError(depPath);
             }
-            const { name: pkgName, version } = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
-            const id = `${pkgName}@${version}`;
+            const { name: pkgName } = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
+            const id = getHoisterPkgId(depPath, pkgSnapshot);
             if (!depPathByPkgId.has(id)) {
                 depPathByPkgId.set(id, depPath);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.linking.real-hoist",
-  "version": "1100.1.13",
+  "version": "1100.1.15",
   "description": "Hoists dependencies in a node_modules created by pnpm",
   "keywords": [
     "pnpm",
@@ -27,17 +27,18 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/deps.path": "1100.1.0",
-    "@pnpm/error": "1100.1.2",
-    "@pnpm/lockfile.utils": "1101.1.0",
+    "@pnpm/deps.path": "1101.0.0",
+    "@pnpm/error": "1100.1.3",
+    "@pnpm/lockfile.types": "1100.0.20",
+    "@pnpm/lockfile.utils": "1102.0.0",
     "@yarnpkg/nm": "4.1.1"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/installing.linking.real-hoist": "1100.1.13",
-    "@pnpm/lockfile.fs": "1100.2.2",
+    "@pnpm/installing.linking.real-hoist": "1100.1.15",
+    "@pnpm/lockfile.fs": "1100.2.4",
     "@pnpm/test-fixtures": "1100.0.1",
-    "@pnpm/types": "1101.9.0"
+    "@pnpm/types": "1102.0.0"
   },
   "engines": {
     "node": ">=22.13"