@pnpm/building.after-install 1101.0.19 → 1101.0.21

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';
@@ -42,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);
     });
@@ -66,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;
@@ -111,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') {
@@ -221,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);
@@ -240,7 +251,10 @@ async function _rebuild(ctx, opts) {
     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)) {
-            gvsDirByDepPath.set(pkgMeta.depPath, path.join(globalVirtualStoreDir, hash));
+            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)
@@ -320,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,
@@ -408,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.19",
+  "version": "1101.0.21",
   "description": "Rebuild packages that are already installed by running their lifecycle scripts",
   "keywords": [
     "pnpm",
@@ -33,37 +33,37 @@
     "p-limit": "^7.3.0",
     "run-groups": "^5.0.0",
     "semver": "^7.8.1",
-    "@pnpm/building.pkg-requires-build": "1100.0.6",
-    "@pnpm/config.normalize-registries": "1100.0.6",
-    "@pnpm/config.reader": "1101.6.0",
+    "@pnpm/bins.linker": "1100.0.13",
+    "@pnpm/building.pkg-requires-build": "1100.0.7",
+    "@pnpm/building.policy": "1100.0.9",
+    "@pnpm/config.normalize-registries": "1100.0.7",
+    "@pnpm/config.reader": "1101.8.0",
+    "@pnpm/core-loggers": "1100.2.0",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/building.policy": "1100.0.8",
-    "@pnpm/core-loggers": "1100.1.3",
+    "@pnpm/deps.graph-hasher": "1100.2.4",
     "@pnpm/deps.graph-sequencer": "1100.0.0",
-    "@pnpm/deps.path": "1100.0.6",
-    "@pnpm/deps.graph-hasher": "1100.2.3",
+    "@pnpm/deps.path": "1100.0.7",
+    "@pnpm/exec.lifecycle": "1100.0.17",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/installing.context": "1100.0.15",
-    "@pnpm/exec.lifecycle": "1100.0.15",
-    "@pnpm/installing.modules-yaml": "1100.0.7",
-    "@pnpm/lockfile.utils": "1100.0.11",
-    "@pnpm/lockfile.walker": "1100.0.9",
-    "@pnpm/pkg-manifest.reader": "1100.0.6",
-    "@pnpm/store.cafs": "1100.1.8",
-    "@pnpm/store.connection-manager": "1100.2.6",
-    "@pnpm/store.controller-types": "1100.1.3",
+    "@pnpm/installing.context": "1100.0.17",
+    "@pnpm/installing.modules-yaml": "1100.0.8",
+    "@pnpm/lockfile.types": "1100.0.10",
+    "@pnpm/lockfile.walker": "1100.0.10",
+    "@pnpm/lockfile.utils": "1100.0.12",
+    "@pnpm/pkg-manifest.reader": "1100.0.7",
+    "@pnpm/store.cafs": "1100.1.9",
+    "@pnpm/store.connection-manager": "1100.2.8",
+    "@pnpm/store.controller-types": "1100.1.4",
     "@pnpm/store.index": "1100.1.0",
-    "@pnpm/lockfile.types": "1100.0.9",
-    "@pnpm/types": "1101.3.0",
-    "@pnpm/bins.linker": "1100.0.11"
+    "@pnpm/types": "1101.3.1"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1001.0.1",
-    "@pnpm/worker": "^1100.1.9"
+    "@pnpm/worker": "^1100.1.11"
   },
   "devDependencies": {
     "@types/semver": "7.7.1",
-    "@pnpm/building.after-install": "1101.0.19"
+    "@pnpm/building.after-install": "1101.0.21"
   },
   "engines": {
     "node": ">=22.13"