@pnpm/installing.deps-resolver 1100.2.3 → 1100.2.5

package/lib/dedupeInjectedDeps.js

@@ -27,19 +27,26 @@ function getDedupeMap(injectedDepsByProjects, opts) {
     for (const [id, deps] of injectedDepsByProjects.entries()) {
         const dedupedInjectedDeps = new Map();
         for (const [alias, dep] of deps.entries()) {
-            // Check for subgroup not equal.
-            // The injected project in the workspace may have dev deps
-            const children = Object.entries(opts.depGraph[dep.depPath].children);
+            const node = opts.depGraph[dep.depPath];
             const targetProjectDeps = opts.dependenciesByProjectId[dep.id];
-            // When the target project wasn't part of the current resolution (e.g. single-project
-            // operation), its dependencies aren't available. We can only deduplicate safely when the
-            // injected dep has no children (the empty set is always a subset).
+            // In single-project operations (e.g. `pnpm rm` from inside a workspace package) the target
+            // workspace project isn't being resolved, so its children aren't in
+            // `dependenciesByProjectId`. The injected dep was resolved against the same workspace
+            // package source, so dedupe is safe. The exception is peer-suffixed depPaths, whose
+            // resolution depends on the importer's peer context. A plain `link:` would lose that, so
+            // we skip dedupe for those. A depPath is `${pkgIdWithPatchHash}${peerDepGraphHash}`, so it
+            // carries a peer suffix exactly when it differs from its peer-free `pkgIdWithPatchHash`.
             if (!targetProjectDeps) {
-                if (children.length > 0)
-                    continue;
+                if (node.pkgIdWithPatchHash === dep.depPath) {
+                    dedupedInjectedDeps.set(alias, dep.id);
+                }
+                continue;
             }
+            // Check for subgroup not equal.
+            // The injected project in the workspace may have dev deps
+            const children = Object.entries(node.children);
             const isSubset = children
-                .every(([alias, depPath]) => targetProjectDeps?.get(alias) === depPath);
+                .every(([alias, depPath]) => targetProjectDeps.get(alias) === depPath);
             if (isSubset) {
                 dedupedInjectedDeps.set(alias, dep.id);
             }

package/lib/getNonDevWantedDependencies.d.ts

@@ -6,6 +6,8 @@ export interface WantedDependency {
     optional: boolean;
     injected?: boolean;
     saveCatalogName?: string;
+    /** Whether this dependency's spec should be (re)written to the manifest. */
+    updateSpec?: boolean;
 }
 type GetNonDevWantedDependenciesManifest = Pick<DependencyManifest, 'bundleDependencies' | 'bundledDependencies' | 'optionalDependencies' | 'dependencies' | 'dependenciesMeta'> & {
     name?: string;

package/lib/index.js

@@ -221,6 +221,7 @@ export async function resolveDependencies(importers, opts) {
             }
         }
     }
+    await waitForResolutionFetches(resolvedPkgsById);
     const newLockfile = updateLockfile({
         dependenciesGraph,
         lockfile: opts.wantedLockfile,
@@ -334,6 +335,21 @@ function alignDependencyTypes(manifest, projectSnapshot) {
         }
     }
 }
+/**
+ * Waits for fetches that complete resolution data used by the lockfile snapshot and
+ * virtual-store paths. Other package fetches are awaited later by `waitTillAllFetchingsFinish`.
+ */
+async function waitForResolutionFetches(resolvedPkgsById) {
+    const fetches = [];
+    for (const pkg of Object.values(resolvedPkgsById)) {
+        if (pkg.resolutionNeedsFetch && pkg.fetching != null) {
+            fetches.push(pkg.fetching());
+        }
+    }
+    if (fetches.length > 0) {
+        await Promise.all(fetches);
+    }
+}
 function getAliasToDependencyTypeMap(manifest) {
     const depTypesOfAliases = {};
     for (const depType of DEPENDENCIES_FIELDS) {

package/lib/resolveDependencies.d.ts

@@ -45,6 +45,11 @@ export interface PkgAddressOrLinkBase {
     optional: boolean;
     pkg: PackageManifest;
     pkgId: PkgResolutionId;
+    /**
+     * The wanted dependency this direct dependency was resolved from, carried so
+     * consumers can recover the request directly. See `updateProjectManifest`.
+     */
+    wantedDependency?: WantedDependency;
 }
 export interface LinkedDependency extends PkgAddressOrLinkBase {
     isLinkedDependency: true;
@@ -201,6 +206,12 @@ export interface ResolvedPackage {
     dev: boolean;
     optional: boolean;
     fetching: () => Promise<PkgRequestFetchResult>;
+    /**
+     * The resolution can't be completed without awaiting `fetching` (e.g. a registry tarball
+     * whose integrity is computed from the downloaded bytes). The lockfile snapshot and the
+     * virtual-store paths derived from the integrity must await `fetching` for these first.
+     */
+    resolutionNeedsFetch?: boolean;
     filesIndexFile: string;
     name: string;
     version: string;
@@ -278,6 +289,15 @@ export declare function resolveDependencies(ctx: ResolutionContext, preferredVer
     updateDepth?: number;
 }>, options: ResolvedDependenciesOptions): Promise<ResolvedDependenciesResult>;
 export declare function createNodeIdForLinkedLocalPkg(lockfileDir: string, pkgDir: string): NodeId;
+export declare function claimChildrenResolution(ctx: ResolutionContext, opts: {
+    currentDepth: number;
+    parentIds: PkgResolutionId[];
+    pkgId: PkgResolutionId;
+}): {
+    id: number;
+    isOwner: boolean;
+    missingPeersOfChildren?: MissingPeersOfChildren;
+};
 export declare function buildTree(ctx: {
     childrenByParentId: ChildrenByParentId;
     dependenciesTree: DependenciesTree<ResolvedPackage>;

package/lib/resolveDependencies.js

@@ -314,6 +314,7 @@ function getPublishedByDate(pkgAddresses, timeFromLockfile = {}) {
 export async function resolveDependencies(ctx, preferredVersions, wantedDependencies, options) {
     const extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
         preferredDependencies: options.preferredDependencies,
+        preferredVersions,
         prefix: options.prefix,
         proceed: options.proceed || ctx.forceFullResolution,
         registries: ctx.registries,
@@ -610,7 +611,7 @@ function hasActivePackageResolutionBeforeDepth(ctx, depth) {
     }
     return false;
 }
-function claimChildrenResolution(ctx, opts) {
+export function claimChildrenResolution(ctx, opts) {
     const owner = {
         depth: opts.currentDepth,
         importerOrder: ctx.importerResolutionOrder[opts.parentIds[0]] ?? Number.MAX_SAFE_INTEGER,
@@ -656,8 +657,13 @@ function claimChildrenResolution(ctx, opts) {
     if (ctx.hoistPeers &&
         !opts.parentIds.includes(opts.pkgId) &&
         existing.missingPeersOfChildren &&
-        (existing.owner.depth >= opts.currentDepth ||
-            existing.missingPeersOfChildren.resolved)) {
+        existing.owner.depth >= opts.currentDepth) {
+        // Gating reuse on the owner's depth keeps a transitive optional peer's
+        // presence in the resolved suffix a function of graph structure, not of
+        // which occurrence happened to finish resolving first. A strictly shallower
+        // owner is excluded because its promise may still be unsettled here, and
+        // awaiting it can deadlock under auto-install-peers
+        // (https://github.com/pnpm/pnpm/issues/5454).
         missingPeersOfChildren = existing.missingPeersOfChildren;
     }
     return {
@@ -849,12 +855,33 @@ function getDepsToResolve(wantedDependencies, wantedLockfile, options) {
     });
     for (const wantedDependency of wantedDependencies) {
         let reference = undefined;
+        let preferredVersion = undefined;
         let proceed = proceedAll;
         if (wantedDependency.alias) {
             const satisfiesWanted = satisfiesWanted2Args.bind(null, wantedDependency);
             if (resolvedDependencies[wantedDependency.alias] &&
                 (satisfiesWanted(resolvedDependencies[wantedDependency.alias]) || resolvedDependencies[wantedDependency.alias].startsWith('file:'))) {
-                reference = resolvedDependencies[wantedDependency.alias];
+                const pinnedRef = resolvedDependencies[wantedDependency.alias];
+                // Reusing a lockfile pin verbatim bypasses the preferred-versions
+                // walk, so a transitive edge stays on a stale lower version even
+                // when a direct dependency resolved to a higher version in range.
+                const pinned = pinnedRef.startsWith('file:')
+                    ? undefined
+                    : getPinnedNameVer(wantedLockfile, pinnedRef, wantedDependency.alias);
+                const higherDirectVersion = pinned == null
+                    ? undefined
+                    : findHigherDirectDepVersion(options.preferredVersions, pinned.name, pinned.version, wantedDependency.bareSpecifier);
+                if (higherDirectVersion != null) {
+                    // `preferredVersion` (singular) overrides the
+                    // EXISTING_VERSION_SELECTOR_WEIGHT stability bias that would
+                    // otherwise re-pick the lower version. The lower version is then
+                    // never resolved or fetched.
+                    proceed = true;
+                    preferredVersion = higherDirectVersion;
+                }
+                else {
+                    reference = pinnedRef;
+                }
             }
             else if (
             // If dependencies that were used by the previous version of the package
@@ -885,6 +912,7 @@ function getDepsToResolve(wantedDependencies, wantedLockfile, options) {
         }
         extendedWantedDeps.push({
             infoFromLockfile,
+            preferredVersion,
             proceed,
             wantedDependency,
         });
@@ -909,6 +937,44 @@ function referenceSatisfiesWantedSpec(opts, wantedDep, preferredRef) {
     }
     return semver.satisfies(version, wantedDep.bareSpecifier, true);
 }
+function getPinnedNameVer(lockfile, reference, alias) {
+    const depPath = dp.refToRelative(reference, alias);
+    if (depPath === null)
+        return undefined;
+    const pkgSnapshot = lockfile.packages?.[depPath];
+    if (pkgSnapshot == null)
+        return undefined;
+    return nameVerFromPkgSnapshot(depPath, pkgSnapshot);
+}
+// The highest version a direct dependency (the only deterministic,
+// resolved-first anchor) resolved to that is higher than the
+// lockfile-pinned `pinnedVersion` and still satisfies the edge's range, or
+// `undefined` when none exists. Direct-dependency versions are marked with
+// DIRECT_DEP_SELECTOR_WEIGHT in preferredVersions.
+function findHigherDirectDepVersion(preferredVersions, pinnedName, pinnedVersion, bareSpecifier) {
+    if (preferredVersions == null)
+        return undefined;
+    if (!semver.valid(pinnedVersion))
+        return undefined;
+    if (semver.validRange(bareSpecifier) === null)
+        return undefined;
+    const selectors = preferredVersions[pinnedName];
+    if (selectors == null)
+        return undefined;
+    let best;
+    for (const [candidate, selector] of Object.entries(selectors)) {
+        if (typeof selector === 'object' &&
+            selector.selectorType === 'version' &&
+            selector.weight === DIRECT_DEP_SELECTOR_WEIGHT &&
+            semver.valid(candidate) &&
+            semver.gt(candidate, pinnedVersion) &&
+            semver.satisfies(candidate, bareSpecifier, true) &&
+            (best == null || semver.gt(candidate, best))) {
+            best = candidate;
+        }
+    }
+    return best;
+}
 function getLockedPeerContext(dependencyLockfile) {
     if (dependencyLockfile.peerDependencies == null)
         return undefined;
@@ -1123,6 +1189,7 @@ async function resolveDependency(wantedDependency, ctx, options) {
                 version: pkgResponse.body.manifest.version,
                 normalizedBareSpecifier: pkgResponse.body.normalizedBareSpecifier,
                 pkg: pkgResponse.body.manifest,
+                wantedDependency,
             };
         }
         let prepare;
@@ -1303,6 +1370,7 @@ async function resolveDependency(wantedDependency, ctx, options) {
             resolvedVia: pkgResponse.body.resolvedVia,
             isNew,
             nodeId,
+            wantedDependency,
             normalizedBareSpecifier: pkgResponse.body.normalizedBareSpecifier,
             missingPeersOfChildren,
             childrenResolutionId: childrenResolution.id,
@@ -1372,6 +1440,7 @@ function getResolvedPackage(options) {
         pkgIdWithPatchHash: options.pkgIdWithPatchHash,
         dev: options.wantedDependency.dev,
         fetching: options.pkgResponse.fetching,
+        resolutionNeedsFetch: options.pkgResponse.resolutionNeedsFetch,
         filesIndexFile: options.pkgResponse.filesIndexFile,
         hasBin: options.hasBin,
         hasBundledDependencies: !((options.pkg.bundledDependencies ?? options.pkg.bundleDependencies) == null),

package/lib/resolveDependencyTree.d.ts

@@ -25,6 +25,11 @@ export interface ResolvedDirectDependency {
     name: string;
     catalogLookup?: CatalogLookupMetadata;
     normalizedBareSpecifier?: string;
+    /**
+     * The wanted dependency this was resolved from, carried so consumers can
+     * recover the request directly. See `updateProjectManifest`.
+     */
+    wantedDependency?: WantedDependency;
 }
 /**
  * Information related to the catalog entry for this dependency if it was

package/lib/resolveDependencyTree.js

@@ -164,6 +164,7 @@ export async function resolveDependencyTree(importers, opts) {
                     resolution: resolvedPackage.resolution,
                     version: resolvedPackage.version,
                     normalizedBareSpecifier: dep.normalizedBareSpecifier,
+                    wantedDependency: dep.wantedDependency,
                 };
             }),
             directNodeIdsByAlias: new Map(directNonLinkedDeps.map(({ alias, nodeId }) => [alias, nodeId])),

package/lib/resolvePeers.js

@@ -259,10 +259,11 @@ async function resolvePeersOfNode(currentAlias, nodeId, parentParentPkgs, ctx) {
         parentPkgs = { ...parentParentPkgs };
         const parentPkgNodes = [];
         for (const [alias, nodeId] of Object.entries(children)) {
-            if (ctx.allPeerDepNames.has(alias)) {
+            const childNode = ctx.dependenciesTree.get(nodeId);
+            if (ctx.allPeerDepNames.has(alias) || (alias !== childNode.resolvedPackage.name && ctx.allPeerDepNames.has(childNode.resolvedPackage.name))) {
                 parentPkgNodes.push({
                     alias,
-                    node: ctx.dependenciesTree.get(nodeId),
+                    node: childNode,
                     nodeId,
                     parentNodeIds,
                 });
@@ -391,7 +392,18 @@ async function resolvePeersOfNode(currentAlias, nodeId, parentParentPkgs, ctx) {
     }
     let cache;
     const isPure = allResolvedPeers.size === 0 && allMissingPeers.size === 0;
-    if (isPure) {
+    // A cycle re-entry resolves against truncated children (the cycle is broken by
+    // dropping the repeated package's subtree), so its empty/partial peer sets are
+    // not authoritative for the package as a whole. Recording that verdict — as
+    // pure or in peersCache — lets it short-circuit other occurrences that *can*
+    // see the full subtree, dropping their transitivePeerDependencies depending on
+    // traversal order and churning the lockfile (https://github.com/pnpm/pnpm/issues/5108).
+    const resolvedThroughCycle = ctx.parentDepPathsChain.includes(resolvedPackage.pkgIdWithPatchHash);
+    if (resolvedThroughCycle) {
+        // Leave both caches untouched so later occurrences re-resolve (or hit the
+        // authoritative entry of the same package) instead of reusing this partial one.
+    }
+    else if (isPure) {
         ctx.purePkgs.add(resolvedPackage.pkgIdWithPatchHash);
     }
     else {

package/lib/toResolveImporter.js

@@ -48,7 +48,7 @@ export async function toResolveImporter(opts, project) {
             ...project.wantedDependencies.map(defaultUpdateDepth < 0
                 ? updateLocalTarballs
                 : (dep) => ({ ...dep, updateDepth: defaultUpdateDepth })),
-            ...existingDeps.map(opts.noDependencySelectors && project.updateMatching != null
+            ...existingDeps.map(project.updateMatching != null
                 ? updateLocalTarballs
                 : (dep) => ({ ...dep, updateDepth: -1 })),
         ];

package/lib/updateProjectManifest.js

@@ -3,19 +3,24 @@ export async function updateProjectManifest(importer, opts) {
     if (!importer.manifest) {
         throw new Error('Cannot save because no package.json found');
     }
-    const specsToUpsert = opts.directDependencies
-        .filter((rdd, index) => importer.wantedDependencies[index]?.updateSpec)
-        .map((rdd, index) => {
-        const wantedDep = importer.wantedDependencies[index];
-        return {
+    const specsToUpsert = [];
+    for (const rdd of opts.directDependencies) {
+        const wantedDep = rdd.wantedDependency;
+        if (wantedDep?.updateSpec !== true)
+            continue;
+        specsToUpsert.push({
             alias: rdd.alias,
             peer: importer.peer,
-            bareSpecifier: rdd.catalogLookup?.userSpecifiedBareSpecifier ?? rdd.normalizedBareSpecifier ?? wantedDep.bareSpecifier,
+            bareSpecifier: getBareSpecifierToSave(wantedDep, rdd, opts.preserveWorkspaceProtocol),
             resolvedVersion: rdd.version,
             pinnedVersion: importer.pinnedVersion,
             saveType: importer.targetDependenciesField,
-        };
-    });
+        });
+    }
+    // Re-save a dependency flagged for update that failed to resolve (e.g. a
+    // missing optional, hence absent from `directDependencies`) carrying no
+    // specifier, so it keeps its existing version under the importer's target
+    // field (which is unset for a plain install/update, making this a no-op).
     for (const pkgToInstall of importer.wantedDependencies) {
         if (pkgToInstall.updateSpec && pkgToInstall.alias && !specsToUpsert.some(({ alias }) => alias === pkgToInstall.alias)) {
             specsToUpsert.push({
@@ -31,4 +36,19 @@ export async function updateProjectManifest(importer, opts) {
         : undefined;
     return [hookedManifest, originalManifest];
 }
+function getBareSpecifierToSave(wantedDep, resolvedDep, preserveWorkspaceProtocol) {
+    if (resolvedDep.catalogLookup != null) {
+        return resolvedDep.catalogLookup.userSpecifiedBareSpecifier;
+    }
+    if (preserveWorkspaceProtocol && isWorkspaceLocalPathSpecifier(wantedDep.bareSpecifier)) {
+        return wantedDep.bareSpecifier;
+    }
+    return resolvedDep.normalizedBareSpecifier ?? wantedDep.bareSpecifier;
+}
+function isWorkspaceLocalPathSpecifier(bareSpecifier) {
+    if (!bareSpecifier.startsWith('workspace:'))
+        return false;
+    const pref = bareSpecifier.slice('workspace:'.length);
+    return pref.startsWith('.') || pref.startsWith('/') || pref.startsWith('~/') || /^[A-Z]:/i.test(pref);
+}
 //# sourceMappingURL=updateProjectManifest.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-resolver",
-  "version": "1100.2.3",
+  "version": "1100.2.5",
   "description": "Resolves dependency graph of a package",
   "keywords": [
     "pnpm",
@@ -10,9 +10,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/installing/deps-resolver"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/deps-resolver"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/installing/deps-resolver#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/deps-resolver#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -45,28 +45,28 @@
     "version-selector-type": "^3.0.0",
     "@pnpm/catalogs.resolver": "1100.0.0",
     "@pnpm/catalogs.types": "1100.0.0",
-    "@pnpm/config.version-policy": "1100.1.5",
+    "@pnpm/config.version-policy": "1100.1.6",
     "@pnpm/constants": "1100.0.0",
     "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/deps.graph-hasher": "1100.2.5",
     "@pnpm/deps.path": "1100.0.8",
-    "@pnpm/error": "1100.0.0",
+    "@pnpm/deps.graph-hasher": "1100.2.6",
     "@pnpm/deps.peer-range": "1100.0.2",
-    "@pnpm/fetching.pick-fetcher": "1100.0.12",
-    "@pnpm/hooks.types": "1100.0.12",
-    "@pnpm/lockfile.preferred-versions": "1100.0.16",
-    "@pnpm/lockfile.pruner": "1100.0.11",
-    "@pnpm/lockfile.types": "1100.0.11",
-    "@pnpm/lockfile.utils": "1100.0.13",
-    "@pnpm/patching.config": "1100.0.8",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/fetching.pick-fetcher": "1100.0.13",
+    "@pnpm/hooks.types": "1100.1.0",
+    "@pnpm/lockfile.preferred-versions": "1100.0.17",
+    "@pnpm/lockfile.pruner": "1100.0.12",
+    "@pnpm/lockfile.types": "1100.0.12",
+    "@pnpm/lockfile.utils": "1100.1.0",
+    "@pnpm/patching.config": "1100.0.9",
     "@pnpm/patching.types": "1100.0.0",
-    "@pnpm/pkg-manifest.utils": "1100.2.5",
-    "@pnpm/pkg-manifest.reader": "1100.0.8",
-    "@pnpm/resolving.npm-resolver": "1102.0.0",
-    "@pnpm/store.controller-types": "1100.1.5",
+    "@pnpm/pkg-manifest.reader": "1100.0.9",
+    "@pnpm/pkg-manifest.utils": "1100.2.6",
+    "@pnpm/resolving.resolver-base": "1100.5.0",
+    "@pnpm/store.controller-types": "1100.1.6",
+    "@pnpm/resolving.npm-resolver": "1102.1.0",
     "@pnpm/types": "1101.3.2",
-    "@pnpm/workspace.spec-parser": "1100.0.0",
-    "@pnpm/resolving.resolver-base": "1100.4.2"
+    "@pnpm/workspace.spec-parser": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -77,7 +77,7 @@
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "@types/validate-npm-package-name": "^4.0.2",
-    "@pnpm/installing.deps-resolver": "1100.2.3",
+    "@pnpm/installing.deps-resolver": "1100.2.5",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {