@pnpm/installing.deps-resolver 1008.3.1 → 1100.0.0

package/lib/hoistPeers.js

@@ -18,7 +18,8 @@ export function hoistPeers(opts, missingRequiredPeers) {
         if (opts.allPreferredVersions[peerName]) {
             const versions = [];
             const nonVersions = [];
-            for (const [spec, specType] of Object.entries(opts.allPreferredVersions[peerName])) {
+            for (const [spec, selector] of Object.entries(opts.allPreferredVersions[peerName])) {
+                const specType = typeof selector === 'string' ? selector : selector.selectorType;
                 if (specType === 'version') {
                     versions.push(spec);
                 }
@@ -44,7 +45,9 @@ export function hoistPeers(opts, missingRequiredPeers) {
                 dependencies[peerName] = range;
             }
             else {
-                dependencies[peerName] = [semver.maxSatisfying(versions, '*', { includePrerelease: true }), ...nonVersions].join(' || ');
+                dependencies[peerName] = [semver.maxSatisfying(versions, '*', { includePrerelease: true }), ...nonVersions]
+                    .filter(spec => spec != null)
+                    .join(' || ');
             }
         }
         else if (opts.autoInstallPeers) {

package/lib/index.d.ts

@@ -41,6 +41,7 @@ export interface ResolveDependenciesResult {
 export declare function resolveDependencies(importers: ImporterToResolve[], opts: ResolveDependenciesOptions & {
     defaultUpdateDepth: number;
     dedupePeerDependents?: boolean;
+    dedupePeers?: boolean;
     dedupeDirectDeps?: boolean;
     dedupeInjectedDeps?: boolean;
     excludeLinksFromLockfile?: boolean;

package/lib/index.js

@@ -74,6 +74,7 @@ export async function resolveDependencies(importers, opts) {
         allPeerDepNames,
         dependenciesTree,
         dedupePeerDependents: opts.dedupePeerDependents,
+        dedupePeers: opts.dedupePeers,
         dedupeInjectedDeps: opts.dedupeInjectedDeps,
         lockfileDir: opts.lockfileDir,
         projects: projectsToLink,

package/lib/resolveDependencyTree.js

@@ -2,7 +2,7 @@ import { resolveFromCatalog } from '@pnpm/catalogs.resolver';
 import { createPackageVersionPolicy } from '@pnpm/config.version-policy';
 import { PnpmError } from '@pnpm/error';
 import { globalWarn } from '@pnpm/logger';
-import { partition, zipObj } from 'ramda';
+import { partition } from 'ramda';
 import { nextNodeId } from './nextNodeId.js';
 import { parentIdsContainSequence } from './parentIdsContainSequence.js';
 import { resolveRootDependencies, } from './resolveDependencies.js';
@@ -104,7 +104,7 @@ export async function resolveDependencyTree(importers, opts) {
         };
     });
     const { pkgAddressesByImporters, time } = await resolveRootDependencies(ctx, resolveArgs);
-    const directDepsByImporterId = zipObj(importers.map(({ id }) => id), pkgAddressesByImporters);
+    const directDepsByImporterId = Object.fromEntries(importers.map(({ id }, i) => [id, pkgAddressesByImporters[i]]));
     for (const directDependencies of pkgAddressesByImporters) {
         for (const directDep of directDependencies) {
             const { alias, normalizedBareSpecifier, version, saveCatalogName } = directDep;

package/lib/resolvePeers.d.ts

@@ -48,6 +48,7 @@ export declare function resolvePeers<T extends PartialResolvedPackage>(opts: {
     lockfileDir: string;
     resolvePeersFromWorkspaceRoot?: boolean;
     dedupePeerDependents?: boolean;
+    dedupePeers?: boolean;
     dedupeInjectedDeps?: boolean;
     resolvedImporters: ResolvedImporters;
     peersSuffixMaxLength: number;

package/lib/resolvePeers.js

@@ -45,6 +45,7 @@ export async function resolvePeers(opts) {
             peersCache,
             peerDependencyIssues,
             purePkgs,
+            dedupePeers: opts.dedupePeers,
             peersSuffixMaxLength: opts.peersSuffixMaxLength,
             rootDir,
             virtualStoreDir: opts.virtualStoreDir,
@@ -336,20 +337,13 @@ async function resolvePeersOfNode(currentAlias, nodeId, parentParentPkgs, ctx) {
         const peerIds = [];
         const pendingPeers = [];
         for (const [alias, peerNodeId] of allResolvedPeers.entries()) {
-            if (typeof peerNodeId === 'string' && peerNodeId.startsWith('link:')) {
-                const linkedDir = peerNodeId.slice(5);
-                peerIds.push({
-                    name: alias,
-                    version: filenamify(linkedDir, { replacement: '+' }),
-                });
-                continue;
+            const peerId = peerNodeIdToPeerId(alias, peerNodeId, ctx);
+            if (peerId != null) {
+                peerIds.push(peerId);
             }
-            const peerDepPath = ctx.pathsByNodeId.get(peerNodeId);
-            if (peerDepPath) {
-                peerIds.push(peerDepPath);
-                continue;
+            else {
+                pendingPeers.push({ alias, nodeId: peerNodeId });
             }
-            pendingPeers.push({ alias, nodeId: peerNodeId });
         }
         if (pendingPeers.length === 0) {
             const peerDepGraphHash = createPeerDepGraphHash(peerIds, ctx.peersSuffixMaxLength);
@@ -384,6 +378,12 @@ async function resolvePeersOfNode(currentAlias, nodeId, parentParentPkgs, ctx) {
                     ctx.pathsByNodeIdPromises.get(pendingPeer.nodeId)?.resolve(id);
                     return id;
                 }
+                if (ctx.dedupePeers) {
+                    const peerNode = ctx.dependenciesTree.get(pendingPeer.nodeId);
+                    if (peerNode) {
+                        return { name: peerNode.resolvedPackage.name, version: peerNode.resolvedPackage.version };
+                    }
+                }
                 return ctx.pathsByNodeIdPromises.get(pendingPeer.nodeId).promise;
             })),
         ], ctx.peersSuffixMaxLength);
@@ -668,6 +668,23 @@ function getLocationFromParentNodeIds({ dependenciesTree, parentNodeIds, }) {
         parents,
     };
 }
+function peerNodeIdToPeerId(alias, peerNodeId, ctx) {
+    if (typeof peerNodeId === 'string' && peerNodeId.startsWith('link:')) {
+        return {
+            name: alias,
+            version: filenamify(peerNodeId.slice(5), { replacement: '+' }),
+        };
+    }
+    if (ctx.dedupePeers) {
+        // Use version-only peer identifiers instead of full dep paths.
+        // This eliminates nested peer suffixes like (foo@1.0.0(bar@2.0.0)).
+        const peerNode = ctx.dependenciesTree.get(peerNodeId);
+        if (peerNode) {
+            return { name: peerNode.resolvedPackage.name, version: peerNode.resolvedPackage.version };
+        }
+    }
+    return ctx.pathsByNodeId.get(peerNodeId);
+}
 function toPkgByName(nodes) {
     const pkgsByName = {};
     const _updateParentRefs = updateParentRefs.bind(null, pkgsByName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-resolver",
-  "version": "1008.3.1",
+  "version": "1100.0.0",
   "description": "Resolves dependency graph of a package",
   "keywords": [
     "pnpm",
@@ -25,8 +25,8 @@
   ],
   "dependencies": {
     "@pnpm/util.lex-comparator": "^3.0.2",
-    "@yarnpkg/core": "4.2.0",
-    "filenamify": "^6.0.0",
+    "@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",
@@ -35,45 +35,45 @@
     "path-exists": "^5.0.0",
     "promise-share": "^2.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "rename-overwrite": "^7.0.0",
+    "rename-overwrite": "^7.0.1",
     "safe-promise-defer": "^2.0.0",
     "semver": "^7.7.2",
     "semver-range-intersect": "^0.3.1",
     "version-selector-type": "^3.0.0",
-    "@pnpm/catalogs.resolver": "1000.0.5",
-    "@pnpm/catalogs.types": "1000.0.0",
-    "@pnpm/config.version-policy": "1000.0.0",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/core-loggers": "1001.0.4",
-    "@pnpm/deps.peer-range": "1000.0.0",
-    "@pnpm/deps.path": "1001.1.3",
-    "@pnpm/fetching.pick-fetcher": "1001.0.0",
-    "@pnpm/deps.graph-hasher": "1002.0.8",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/lockfile.preferred-versions": "1000.0.22",
-    "@pnpm/lockfile.types": "1002.0.2",
-    "@pnpm/hooks.types": "1001.0.12",
-    "@pnpm/lockfile.pruner": "1001.0.17",
-    "@pnpm/lockfile.utils": "1003.0.3",
-    "@pnpm/patching.config": "1001.0.11",
-    "@pnpm/patching.types": "1000.1.0",
-    "@pnpm/pkg-manifest.utils": "1001.0.6",
-    "@pnpm/resolving.npm-resolver": "1004.4.1",
-    "@pnpm/pkg-manifest.reader": "1000.1.2",
-    "@pnpm/store.controller-types": "1004.1.0",
-    "@pnpm/types": "1000.9.0",
-    "@pnpm/workspace.spec-parser": "1000.0.0",
-    "@pnpm/resolving.resolver-base": "1005.1.0"
+    "@pnpm/catalogs.resolver": "1100.0.0",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/catalogs.types": "1100.0.0",
+    "@pnpm/config.version-policy": "1100.0.0",
+    "@pnpm/core-loggers": "1100.0.0",
+    "@pnpm/deps.graph-hasher": "1100.0.0",
+    "@pnpm/deps.path": "1100.0.0",
+    "@pnpm/deps.peer-range": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/fetching.pick-fetcher": "1100.0.0",
+    "@pnpm/hooks.types": "1100.0.0",
+    "@pnpm/lockfile.preferred-versions": "1100.0.0",
+    "@pnpm/patching.config": "1100.0.0",
+    "@pnpm/lockfile.types": "1100.0.0",
+    "@pnpm/lockfile.utils": "1100.0.0",
+    "@pnpm/lockfile.pruner": "1100.0.0",
+    "@pnpm/patching.types": "1100.0.0",
+    "@pnpm/pkg-manifest.utils": "1100.0.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.0",
+    "@pnpm/store.controller-types": "1100.0.0",
+    "@pnpm/resolving.npm-resolver": "1100.0.0",
+    "@pnpm/resolving.resolver-base": "1100.0.0",
+    "@pnpm/types": "1100.0.0",
+    "@pnpm/workspace.spec-parser": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
     "@types/normalize-path": "^3.0.2",
-    "@types/ramda": "0.29.12",
+    "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@pnpm/installing.deps-resolver": "1008.3.1",
-    "@pnpm/logger": "1001.0.1"
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/installing.deps-resolver": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -83,9 +83,9 @@
   },
   "scripts": {
     "start": "tsgo --watch",
-    "test": "pnpm run compile && pnpm run _test",
+    "test": "pn compile && pn .test",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-    "compile": "tsgo --build && pnpm run lint --fix",
-    "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }