@pnpm/building.after-install 1101.0.18 → 1101.0.20

package/lib/extendBuildOptions.d.ts

@@ -41,6 +41,8 @@ export type StrictBuildOptions = {
     shamefullyHoist: boolean;
     deployAllFiles: boolean;
     allowBuilds?: Record<string, boolean | string>;
+    enableGlobalVirtualStore?: boolean;
+    globalVirtualStoreDir?: string;
     virtualStoreDirMaxLength: number;
     peersSuffixMaxLength: number;
     strictStorePkgContentCheck: boolean;

package/lib/index.js

@@ -1,4 +1,5 @@
 import assert from 'node:assert';
+import fs from 'node:fs';
 import path from 'node:path';
 import util from 'node:util';
 import { linkBins } from '@pnpm/bins.linker';
@@ -6,7 +7,7 @@ import { pkgRequiresBuild } from '@pnpm/building.pkg-requires-build';
 import { createAllowBuildFunction } from '@pnpm/building.policy';
 import { LAYOUT_VERSION, WANTED_LOCKFILE, } from '@pnpm/constants';
 import { skippedOptionalDependencyLogger } from '@pnpm/core-loggers';
-import { calcDepState, findRuntimeNodeVersion, lockfileToDepGraph } from '@pnpm/deps.graph-hasher';
+import { calcDepState, findRuntimeNodeVersion, iterateHashedGraphNodes, iteratePkgMeta, lockfileToDepGraph } from '@pnpm/deps.graph-hasher';
 import { graphSequencer } from '@pnpm/deps.graph-sequencer';
 import * as dp from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
@@ -25,6 +26,10 @@ import pLimit from 'p-limit';
 import { runGroups } from 'run-groups';
 import semver from 'semver';
 import { extendBuildOptions, } from './extendBuildOptions.js';
+// Serializes builds of a shared GVS projection across concurrent per-project
+// rebuilds: the first build proceeds, concurrent ones await it and reuse the
+// result. Keyed by the absolute projection directory.
+const gvsBuildLocks = new Map();
 function findPackages(packages, searched, opts) {
     return Object.keys(packages)
         .filter((relativeDepPath) => {
@@ -38,15 +43,18 @@ function findPackages(packages, searched, opts) {
             });
             return false;
         }
-        return matches(searched, pkgInfo);
+        return matches(searched, pkgInfo, dp.getPkgIdWithPatchHash(relativeDepPath));
     });
 }
 // TODO: move this logic to separate package as this is also used in tree-builder
-function matches(searched, manifest) {
+function matches(searched, manifest, pkgIdWithPatchHash) {
     return searched.some((searchedPkg) => {
         if (typeof searchedPkg === 'string') {
             return manifest.name === searchedPkg;
         }
+        if ('pkgIdWithPatchHash' in searchedPkg) {
+            return searchedPkg.pkgIdWithPatchHash === pkgIdWithPatchHash;
+        }
         return searchedPkg.name === manifest.name && !!manifest.version &&
             semver.satisfies(manifest.version, searchedPkg.range);
     });
@@ -62,6 +70,9 @@ export async function buildSelectedPkgs(projects, pkgSpecs, maybeOpts) {
         return {};
     const packages = ctx.currentLockfile.packages;
     const searched = pkgSpecs.map((arg) => {
+        if (matchesDepPath(packages, arg)) {
+            return { pkgIdWithPatchHash: dp.removePeersSuffix(arg) };
+        }
         const { fetchSpec, name, raw, type } = npa(arg);
         if (raw === name) {
             return name;
@@ -107,6 +118,10 @@ export async function buildSelectedPkgs(projects, pkgSpecs, maybeOpts) {
         ignoredBuilds: ignoredPkgs,
     };
 }
+function matchesDepPath(packages, pkgSpec) {
+    const normalizedPkgSpec = dp.removePeersSuffix(pkgSpec);
+    return Object.keys(packages).some((depPath) => dp.removePeersSuffix(depPath) === normalizedPkgSpec);
+}
 export async function buildProjects(projects, maybeOpts) {
     const reporter = maybeOpts?.reporter;
     if ((reporter != null) && typeof reporter === 'function') {
@@ -217,8 +232,8 @@ async function _rebuild(ctx, opts) {
     };
     const ignoredPkgs = new Set();
     const _allowBuild = createAllowBuildFunction(opts) ?? (() => undefined);
-    const allowBuild = (pkgName, version, depPath) => {
-        switch (_allowBuild(pkgName, version)) {
+    const allowBuild = (depPath) => {
+        switch (_allowBuild(depPath)) {
             case true: return true;
             case undefined: {
                 ignoredPkgs.add(depPath);
@@ -229,12 +244,28 @@ async function _rebuild(ctx, opts) {
     };
     const builtDepPaths = new Set();
     const storeIndex = opts.skipIfHasSideEffectsCache ? new StoreIndex(opts.storeDir) : undefined;
+    // Under GVS, packages live at `<globalVirtualStoreDir>/<hash>/node_modules/<name>`,
+    // not the classic virtualStoreDir layout. The hash is computed with the same inputs
+    // as the installer so rebuild resolves the exact directory the install created.
+    const gvsDirByDepPath = new Map();
+    if (opts.enableGlobalVirtualStore) {
+        const globalVirtualStoreDir = opts.globalVirtualStoreDir ?? path.join(opts.storeDir, 'links');
+        for (const { hash, pkgMeta } of iterateHashedGraphNodes(depGraph, iteratePkgMeta(ctx.currentLockfile, depGraph), _allowBuild, opts.supportedArchitectures, nodeVersion)) {
+            const preferredGvsDir = path.join(globalVirtualStoreDir, hash);
+            gvsDirByDepPath.set(pkgMeta.depPath, fs.existsSync(preferredGvsDir)
+                ? preferredGvsDir
+                : findLinkedGvsDir(pkgMeta.name, Object.values(ctx.projects), globalVirtualStoreDir) ?? preferredGvsDir);
+        }
+    }
+    const pkgModulesDir = (depPath) => gvsDirByDepPath.has(depPath)
+        ? path.join(gvsDirByDepPath.get(depPath), 'node_modules')
+        : path.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), 'node_modules');
     const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath) && !ctx.skipped.has(depPath)).map((depPath) => async () => {
         const pkgSnapshot = pkgSnapshots[depPath];
         const pkgInfo = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
         const pkgRoots = opts.nodeLinker === 'hoisted'
             ? (ctx.modulesFile?.hoistedLocations?.[depPath] ?? []).map((hoistedLocation) => path.join(opts.lockfileDir, hoistedLocation))
-            : [path.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), 'node_modules', pkgInfo.name)];
+            : [path.join(pkgModulesDir(depPath), pkgInfo.name)];
         if (pkgRoots.length === 0) {
             if (pkgSnapshot.optional)
                 return;
@@ -243,10 +274,32 @@ async function _rebuild(ctx, opts) {
             });
         }
         const pkgRoot = pkgRoots[0];
+        // If another project is already building this shared projection, wait for it
+        // and reuse the result instead of racing on the same directory.
+        const gvsDir = gvsDirByDepPath.get(depPath);
+        if (gvsDir != null) {
+            const inFlight = gvsBuildLocks.get(gvsDir);
+            if (inFlight != null) {
+                await inFlight.catch(() => { });
+                pkgsThatWereRebuilt.add(depPath);
+                return;
+            }
+        }
+        let releaseGvsLock;
+        if (gvsDir != null) {
+            let resolveLock;
+            gvsBuildLocks.set(gvsDir, new Promise((resolve) => {
+                resolveLock = resolve;
+            }));
+            releaseGvsLock = () => {
+                gvsBuildLocks.delete(gvsDir);
+                resolveLock();
+            };
+        }
         try {
             const extraBinPaths = ctx.extraBinPaths;
             if (opts.nodeLinker !== 'hoisted') {
-                const modules = path.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), 'node_modules');
+                const modules = pkgModulesDir(depPath);
                 const binPath = path.join(pkgRoot, 'node_modules', '.bin');
                 await linkBins(modules, binPath, { extraNodePaths: ctx.extraNodePaths, warn });
             }
@@ -281,7 +334,7 @@ async function _rebuild(ctx, opts) {
                 // However, currently rebuild doesn't work for such packages at all, which should be fixed.
                 requiresBuild = pkgRequiresBuild(pgkManifest, new Map());
             }
-            const hasSideEffects = requiresBuild && allowBuild(pkgInfo.name, pkgInfo.version, depPath) && await runPostinstallHooks({
+            const hasSideEffects = requiresBuild && allowBuild(depPath) && await runPostinstallHooks({
                 depPath,
                 extraBinPaths,
                 extraEnv: opts.extraEnv,
@@ -337,6 +390,9 @@ async function _rebuild(ctx, opts) {
             }
             throw err;
         }
+        finally {
+            releaseGvsLock?.();
+        }
         if (pkgRoots.length > 1) {
             await hardLinkDir(pkgRoot, pkgRoots.slice(1));
         }
@@ -351,7 +407,7 @@ async function _rebuild(ctx, opts) {
             .map(async (depPath) => limitLinking(async () => {
             const pkgSnapshot = pkgSnapshots[depPath];
             const pkgInfo = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
-            const modules = path.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath, opts.virtualStoreDirMaxLength), 'node_modules');
+            const modules = pkgModulesDir(depPath);
             const binPath = path.join(modules, pkgInfo.name, 'node_modules', '.bin');
             return linkBins(modules, binPath, { warn });
         })));
@@ -366,6 +422,35 @@ async function _rebuild(ctx, opts) {
     }
     return { pkgsThatWereRebuilt, ignoredPkgs };
 }
+// TODO: delete once rebuild relocates GVS projections to the newly computed
+// hash instead of building in place (https://github.com/pnpm/pnpm/issues/12302).
+function findLinkedGvsDir(pkgName, projects, globalVirtualStoreDir) {
+    const normalizedGvsRoot = `${path.resolve(globalVirtualStoreDir)}${path.sep}`;
+    for (const { rootDir } of projects) {
+        const pkgLink = path.join(rootDir, 'node_modules', pkgName);
+        try {
+            const target = fs.readlinkSync(pkgLink);
+            const pkgRoot = path.resolve(path.dirname(pkgLink), target);
+            if (!pkgRoot.startsWith(normalizedGvsRoot))
+                continue;
+            return nthAncestorDir(pkgRoot, pkgName.split('/').length + 1);
+        }
+        catch (err) {
+            // EINVAL: pkgLink exists but is not a symlink.
+            if (util.types.isNativeError(err) && 'code' in err && (err.code === 'EINVAL' || err.code === 'ENOENT'))
+                continue;
+            throw err;
+        }
+    }
+    return undefined;
+}
+function nthAncestorDir(dir, levels) {
+    let result = dir;
+    for (let i = 0; i < levels; i++) {
+        result = path.dirname(result);
+    }
+    return result;
+}
 function binDirsInAllParentDirs(pkgRoot, lockfileDir) {
     const binDirs = [];
     let dir = pkgRoot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/building.after-install",
-  "version": "1101.0.18",
+  "version": "1101.0.20",
   "description": "Rebuild packages that are already installed by running their lifecycle scripts",
   "keywords": [
     "pnpm",
@@ -9,7 +9,10 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/building/after-install",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pnpm/pnpm/tree/main/building/after-install"
+  },
   "homepage": "https://github.com/pnpm/pnpm/tree/main/building/after-install#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
@@ -30,37 +33,37 @@
     "p-limit": "^7.3.0",
     "run-groups": "^5.0.0",
     "semver": "^7.8.1",
-    "@pnpm/building.pkg-requires-build": "1100.0.5",
-    "@pnpm/building.policy": "1100.0.7",
-    "@pnpm/bins.linker": "1100.0.10",
-    "@pnpm/config.normalize-registries": "1100.0.5",
-    "@pnpm/config.reader": "1101.5.0",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/core-loggers": "1100.1.2",
-    "@pnpm/deps.graph-hasher": "1100.2.2",
+    "@pnpm/bins.linker": "1100.0.12",
+    "@pnpm/building.policy": "1100.0.9",
+    "@pnpm/config.reader": "1101.7.0",
+    "@pnpm/core-loggers": "1100.1.4",
+    "@pnpm/deps.graph-hasher": "1100.2.4",
     "@pnpm/deps.graph-sequencer": "1100.0.0",
-    "@pnpm/deps.path": "1100.0.5",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/exec.lifecycle": "1100.0.16",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/exec.lifecycle": "1100.0.14",
-    "@pnpm/installing.context": "1100.0.14",
-    "@pnpm/installing.modules-yaml": "1100.0.6",
-    "@pnpm/lockfile.types": "1100.0.8",
-    "@pnpm/lockfile.walker": "1100.0.8",
-    "@pnpm/pkg-manifest.reader": "1100.0.5",
-    "@pnpm/lockfile.utils": "1100.0.10",
-    "@pnpm/store.connection-manager": "1100.2.5",
-    "@pnpm/store.controller-types": "1100.1.2",
-    "@pnpm/store.cafs": "1100.1.7",
+    "@pnpm/deps.path": "1100.0.7",
+    "@pnpm/installing.context": "1100.0.16",
+    "@pnpm/lockfile.utils": "1100.0.12",
+    "@pnpm/lockfile.types": "1100.0.10",
+    "@pnpm/pkg-manifest.reader": "1100.0.7",
+    "@pnpm/config.normalize-registries": "1100.0.7",
+    "@pnpm/store.connection-manager": "1100.2.7",
+    "@pnpm/store.cafs": "1100.1.9",
+    "@pnpm/store.controller-types": "1100.1.4",
+    "@pnpm/types": "1101.3.1",
+    "@pnpm/installing.modules-yaml": "1100.0.8",
     "@pnpm/store.index": "1100.1.0",
-    "@pnpm/types": "1101.2.0"
+    "@pnpm/building.pkg-requires-build": "1100.0.7",
+    "@pnpm/lockfile.walker": "1100.0.10"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1001.0.1",
-    "@pnpm/worker": "^1100.1.8"
+    "@pnpm/worker": "^1100.1.10"
   },
   "devDependencies": {
     "@types/semver": "7.7.1",
-    "@pnpm/building.after-install": "1101.0.18"
+    "@pnpm/building.after-install": "1101.0.20"
   },
   "engines": {
     "node": ">=22.13"