@pnpm/installing.deps-resolver 1100.0.2 → 1100.0.3

package/lib/index.js

@@ -323,7 +323,7 @@ function extendGraph(graph, opts) {
     const pkgMetaIter = iterateGraphPkgMetaEntries(graph, !opts.enableGlobalVirtualStore);
     // Only use allowBuild for engine-agnostic hash optimization when GVS is on
     const allowBuild = opts.enableGlobalVirtualStore ? opts.allowBuild : undefined;
-    for (const { pkgMeta: { depPath }, hash } of iterateHashedGraphNodes(graph, pkgMetaIter, allowBuild)) {
+    for (const { pkgMeta: { depPath }, hash } of iterateHashedGraphNodes(graph, pkgMetaIter, allowBuild, opts.supportedArchitectures)) {
         const modules = path.join(opts.globalVirtualStoreDir, hash, 'node_modules');
         const node = graph[depPath];
         Object.assign(node, {

package/lib/linkPathToPeerVersion.d.ts

@@ -0,0 +1 @@
+export declare function linkPathToPeerVersion(relPath: string): string;

package/lib/linkPathToPeerVersion.js

@@ -0,0 +1,54 @@
+// Converts a link: path into a stable, filename-safe token used as the
+// peer's "version" inside peer-suffix hashes. The output must stay stable
+// across pnpm versions so that lockfiles don't churn; it replicates what
+// filenamify v4 produced for these paths in pnpm <= 10.
+//
+// Note: this encoding is lossy and can collide. Any leading run of `.`
+// characters is dropped, and `/`, `\`, and literal `+` all collapse into
+// a single `+`. For example, `packages/b`, `./packages/b`, and
+// `../packages/b` all produce `packages+b`, and `.hidden/pkg` produces
+// `hidden+pkg`. The only way to make this collision-free is to hash the
+// normalized link target (or switch to a lossless escape encoding),
+// either of which would change every link-path peer suffix in existing
+// lockfiles. We accept the (extremely rare in practice) collision for
+// lockfile stability; see https://github.com/pnpm/pnpm/issues/11272.
+export function linkPathToPeerVersion(relPath) {
+    // Drop leading dots: v4 replaced `^\.+` with '+' and then stripOuter removed it.
+    let i = 0;
+    while (i < relPath.length && relPath[i] === '.')
+        i++;
+    let out = '';
+    let lastWasPlus = true; // pretend we just emitted '+' so leading '+' chars are suppressed
+    for (; i < relPath.length; i++) {
+        const c = relPath.charCodeAt(i);
+        // Reserved filename chars, C0 controls, and literal '+' all collapse into a single '+'.
+        const replace = c < 32 ||
+            c === 34 /* " */ || c === 42 /* * */ || c === 43 /* + */ ||
+            c === 47 /* / */ || c === 58 /* : */ || c === 60 /* < */ ||
+            c === 62 /* > */ || c === 63 /* ? */ || c === 92 /* \ */ ||
+            c === 124; /* | */
+        if (replace) {
+            if (!lastWasPlus) {
+                out += '+';
+                lastWasPlus = true;
+            }
+        }
+        else {
+            out += relPath[i];
+            lastWasPlus = false;
+        }
+    }
+    // Trim trailing '+' and '.' (v4 stripped trailing periods and outer replacement).
+    let end = out.length;
+    while (end > 0) {
+        const ch = out.charCodeAt(end - 1);
+        if (ch !== 43 /* + */ && ch !== 46 /* . */)
+            break;
+        end--;
+    }
+    if (end > 0)
+        return out.slice(0, end);
+    // Empty result with something consumed collapses to a single '+'.
+    return relPath.length === 0 ? '' : '+';
+}
+//# sourceMappingURL=linkPathToPeerVersion.js.map

package/lib/resolvePeers.js

@@ -1,12 +1,12 @@
 import path from 'node:path';
 import { createPeerDepGraphHash, depPathToFilename } from '@pnpm/deps.path';
 import * as semverUtils from '@yarnpkg/core/semverUtils';
-import filenamify from 'filenamify';
 import { analyzeGraph } from 'graph-cycles';
 import pDefer, {} from 'p-defer';
 import { partition, pick } from 'ramda';
 import semver from 'semver';
 import { dedupeInjectedDeps } from './dedupeInjectedDeps.js';
+import { linkPathToPeerVersion } from './linkPathToPeerVersion.js';
 import { mergePeers } from './mergePeers.js';
 export async function resolvePeers(opts) {
     const depGraph = {};
@@ -672,7 +672,7 @@ function peerNodeIdToPeerId(alias, peerNodeId, ctx) {
     if (typeof peerNodeId === 'string' && peerNodeId.startsWith('link:')) {
         return {
             name: alias,
-            version: filenamify(peerNodeId.slice(5), { replacement: '+' }),
+            version: linkPathToPeerVersion(peerNodeId.slice(5)),
         };
     }
     if (ctx.dedupePeers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-resolver",
-  "version": "1100.0.2",
+  "version": "1100.0.3",
   "description": "Resolves dependency graph of a package",
   "keywords": [
     "pnpm",
@@ -26,7 +26,6 @@
   "dependencies": {
     "@pnpm/util.lex-comparator": "^3.0.2",
     "@yarnpkg/core": "4.5.0",
-    "filenamify": "^7.0.1",
     "graph-cycles": "3.0.0",
     "is-inner-link": "^5.0.0",
     "is-subdir": "^2.0.0",
@@ -41,27 +40,27 @@
     "semver-range-intersect": "^0.3.1",
     "version-selector-type": "^3.0.0",
     "@pnpm/catalogs.resolver": "1100.0.0",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/catalogs.types": "1100.0.0",
-    "@pnpm/core-loggers": "1100.0.1",
-    "@pnpm/deps.graph-hasher": "1100.0.1",
     "@pnpm/config.version-policy": "1100.0.1",
+    "@pnpm/catalogs.types": "1100.0.0",
+    "@pnpm/constants": "1100.0.0",
     "@pnpm/deps.path": "1100.0.1",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.1",
+    "@pnpm/deps.graph-hasher": "1100.1.0",
     "@pnpm/deps.peer-range": "1100.0.0",
-    "@pnpm/lockfile.preferred-versions": "1100.0.2",
-    "@pnpm/lockfile.pruner": "1100.0.1",
-    "@pnpm/lockfile.types": "1100.0.1",
-    "@pnpm/hooks.types": "1100.0.1",
+    "@pnpm/core-loggers": "1100.0.1",
+    "@pnpm/fetching.pick-fetcher": "1100.0.2",
+    "@pnpm/hooks.types": "1100.0.2",
+    "@pnpm/lockfile.preferred-versions": "1100.0.3",
+    "@pnpm/lockfile.pruner": "1100.0.2",
+    "@pnpm/lockfile.types": "1100.0.2",
     "@pnpm/patching.config": "1100.0.1",
     "@pnpm/patching.types": "1100.0.0",
-    "@pnpm/lockfile.utils": "1100.0.1",
     "@pnpm/pkg-manifest.reader": "1100.0.1",
     "@pnpm/pkg-manifest.utils": "1100.1.0",
-    "@pnpm/resolving.npm-resolver": "1100.0.1",
-    "@pnpm/resolving.resolver-base": "1100.0.1",
-    "@pnpm/store.controller-types": "1100.0.1",
+    "@pnpm/lockfile.utils": "1100.0.2",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/resolving.npm-resolver": "1100.1.0",
+    "@pnpm/resolving.resolver-base": "1100.1.0",
+    "@pnpm/store.controller-types": "1100.0.2",
     "@pnpm/types": "1101.0.0",
     "@pnpm/workspace.spec-parser": "1100.0.0"
   },
@@ -72,7 +71,7 @@
     "@types/normalize-path": "^3.0.2",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@pnpm/installing.deps-resolver": "1100.0.2",
+    "@pnpm/installing.deps-resolver": "1100.0.3",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {