@pnpm/installing.linking.real-hoist 1100.0.9 → 1100.1.0

package/lib/index.d.ts

@@ -1,7 +1,27 @@
 import { type LockfileObject } from '@pnpm/lockfile.utils';
 import { type HoisterResult } from '@yarnpkg/nm/hoist';
-export type HoistingLimits = Map<string, Set<string>>;
+/**
+ * Controls how far dependencies are hoisted, mirroring yarn's
+ * `nmHoistingLimits`. Given workspace package `A` → `B` → `C`:
+ *
+ * - `'none'` (default): hoist as far as possible.
+ *   - `/packages/A`, `/node_modules/B`, `/node_modules/C`
+ * - `'workspaces'`: hoist only as far as each workspace package.
+ *   - `/packages/A`, `/packages/A/node_modules/B`, `/packages/A/node_modules/C`
+ * - `'dependencies'`: hoist only up to each workspace package's direct
+ *   dependencies.
+ *   - `/packages/A`, `/packages/A/node_modules/B`, `/packages/A/node_modules/B/node_modules/C`
+ */
+export type HoistingLimits = 'none' | 'workspaces' | 'dependencies';
 export type { HoisterResult };
+/**
+ * Translate the user-facing {@link HoistingLimits} mode into the
+ * `@yarnpkg/nm` hoister's per-locator border map. A name in a
+ * locator's set is a hoisting border: that node's dependencies are
+ * not hoisted above it. Returns `undefined` for `'none'` (and when
+ * unset) so the hoister hoists as far as possible.
+ */
+export declare function getHoistingLimits(lockfile: Pick<LockfileObject, 'importers'>, mode: HoistingLimits | undefined): Map<string, Set<string>> | undefined;
 export declare function hoist(lockfile: LockfileObject, opts?: {
     hoistingLimits?: HoistingLimits;
     externalDependencies?: Set<string>;

package/lib/index.js

@@ -2,6 +2,43 @@ 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';
+/**
+ * Translate the user-facing {@link HoistingLimits} mode into the
+ * `@yarnpkg/nm` hoister's per-locator border map. A name in a
+ * locator's set is a hoisting border: that node's dependencies are
+ * not hoisted above it. Returns `undefined` for `'none'` (and when
+ * unset) so the hoister hoists as far as possible.
+ */
+export function getHoistingLimits(lockfile, mode) {
+    if (!mode || mode === 'none')
+        return undefined;
+    const hoistingLimits = new Map();
+    const rootHoistingLimit = new Set();
+    for (const [importerId, importer] of Object.entries(lockfile.importers)) {
+        const isWorkspaceRoot = importerId === '.';
+        const encodedId = encodeURIComponent(importerId);
+        if (!isWorkspaceRoot) {
+            rootHoistingLimit.add(encodedId);
+            if (mode !== 'dependencies') {
+                // In `'workspaces'` mode it's enough to border each workspace
+                // package at the root; their own direct deps don't need a
+                // per-importer border.
+                continue;
+            }
+        }
+        const reference = isWorkspaceRoot ? '' : `workspace:${importerId}`;
+        const hoistingLimit = isWorkspaceRoot ? rootHoistingLimit : new Set();
+        hoistingLimits.set(`${encodedId}@${reference}`, hoistingLimit);
+        for (const deps of [importer.dependencies, importer.devDependencies, importer.optionalDependencies]) {
+            if (!deps)
+                continue;
+            for (const dep of Object.keys(deps)) {
+                hoistingLimit.add(dep);
+            }
+        }
+    }
+    return hoistingLimits;
+}
 export function hoist(lockfile, opts) {
     const nodes = new Map();
     const ctx = {
@@ -47,7 +84,8 @@ export function hoist(lockfile, opts) {
         };
         node.dependencies.add(importerNode);
     }
-    const hoisterResult = _hoist(node, opts);
+    const hoistingLimits = getHoistingLimits(lockfile, opts?.hoistingLimits);
+    const hoisterResult = _hoist(node, { ...opts, hoistingLimits });
     if (opts?.externalDependencies) {
         for (const hoistedDep of hoisterResult.dependencies.values()) {
             if (opts.externalDependencies.has(hoistedDep.name)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.linking.real-hoist",
-  "version": "1100.0.9",
+  "version": "1100.1.0",
   "description": "Hoists dependencies in a node_modules created by pnpm",
   "keywords": [
     "pnpm",
@@ -25,16 +25,16 @@
   ],
   "dependencies": {
     "@yarnpkg/nm": "4.0.7",
-    "@pnpm/deps.path": "1100.0.4",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/lockfile.utils": "1100.0.9"
+    "@pnpm/deps.path": "1100.0.5",
+    "@pnpm/lockfile.utils": "1100.0.10",
+    "@pnpm/error": "1100.0.0"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/installing.linking.real-hoist": "1100.0.9",
-    "@pnpm/lockfile.fs": "1100.1.1",
+    "@pnpm/lockfile.fs": "1100.1.2",
+    "@pnpm/installing.linking.real-hoist": "1100.1.0",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/types": "1101.1.1"
+    "@pnpm/types": "1101.2.0"
   },
   "engines": {
     "node": ">=22.13"