@pnpm/installing.deps-resolver 1100.2.5 → 1100.2.6

package/lib/resolveDependencies.js

@@ -8,6 +8,7 @@ import { nameVerFromPkgSnapshot, pkgSnapshotToResolution, } from '@pnpm/lockfile
 import { logger } from '@pnpm/logger';
 import { getPatchInfo } from '@pnpm/patching.config';
 import { convertEnginesRuntimeToDependencies } from '@pnpm/pkg-manifest.utils';
+import { parseBareSpecifier } from '@pnpm/resolving.npm-resolver';
 import { DIRECT_DEP_SELECTOR_WEIGHT, } from '@pnpm/resolving.resolver-base';
 import { lexCompare } from '@pnpm/util.lex-comparator';
 import normalizePath from 'normalize-path';
@@ -39,7 +40,8 @@ export async function resolveRootDependencies(ctx, importers) {
         ctx.allPreferredVersions = getPreferredVersionsFromLockfileAndManifests(ctx.wantedLockfile.packages, []);
     }
     else if (ctx.hoistPeers) {
-        ctx.allPreferredVersions = {};
+        // Null-prototype: keyed by package names from resolved manifests.
+        ctx.allPreferredVersions = Object.create(null);
     }
     const { pkgAddressesByImportersWithoutPeers, publishedBy, time } = await resolveDependenciesOfImporters(ctx, importers);
     if (!ctx.hoistPeers) {
@@ -434,8 +436,14 @@ async function resolveDependenciesOfDependency(ctx, preferredVersions, options,
     const updateShouldContinue = options.currentDepth <= updateDepth;
     const updateRequested = updateShouldContinue &&
         ((options.updateMatching == null) ||
-            (extendedWantedDep.infoFromLockfile?.name != null &&
-                options.updateMatching(extendedWantedDep.infoFromLockfile.name, extendedWantedDep.infoFromLockfile.version)));
+            (extendedWantedDep.infoFromLockfile?.name != null
+                ? options.updateMatching(extendedWantedDep.infoFromLockfile.name, extendedWantedDep.infoFromLockfile.version)
+                // A changed specifier forgets the edge's lockfile reference before
+                // resolution (e.g. `pnpm audit --fix` widening a vulnerable pin), so
+                // the target would otherwise lose its updateRequested status — and
+                // keep its seeded lockfile pins — at the very moment it is being
+                // updated. Fall back to matching by the wanted dependency itself.
+                : wantedDependencyMatchesUpdateTarget(ctx, options.updateMatching, extendedWantedDep.wantedDependency)));
     const update = updateRequested ||
         ((extendedWantedDep.infoFromLockfile?.dependencyLockfile) == null) || Boolean((ctx.workspacePackages != null) &&
         ctx.linkWorkspacePackagesDepth !== -1 &&
@@ -557,6 +565,21 @@ async function resolveDependenciesOfDependency(ctx, preferredVersions, options,
         },
     };
 }
+/**
+ * Whether a wanted dependency without a lockfile reference matches the
+ * update target by package name. The name is parsed from the bare
+ * specifier, so an `npm:` alias matches by the real package name it
+ * installs — `foo@npm:bar@^4` matches an update target of `bar`, not
+ * `foo`. Exotic specifiers the npm parser rejects fall back to the alias.
+ */
+function wantedDependencyMatchesUpdateTarget(ctx, updateMatching, wantedDependency) {
+    const { alias, bareSpecifier } = wantedDependency;
+    const spec = alias && bareSpecifier
+        ? parseBareSpecifier(bareSpecifier, alias, ctx.defaultTag ?? 'latest', ctx.registries.default)
+        : null;
+    const name = spec?.name ?? alias;
+    return name != null && updateMatching(name, undefined);
+}
 export function createNodeIdForLinkedLocalPkg(lockfileDir, pkgDir) {
     return `link:${normalizePath(path.relative(lockfileDir, pkgDir))}`;
 }
@@ -1102,6 +1125,7 @@ async function resolveDependency(wantedDependency, ctx, options) {
                 trustPolicyExclude: ctx.trustPolicyExclude,
                 trustPolicyIgnoreAfter: ctx.trustPolicyIgnoreAfter,
                 update: options.update,
+                updateRequested: options.updateRequested,
                 updateChecksums: options.updateChecksums,
                 workspacePackages: ctx.workspacePackages,
                 supportedArchitectures: options.supportedArchitectures,
@@ -1163,7 +1187,8 @@ async function resolveDependency(wantedDependency, ctx, options) {
         }
         if (ctx.allPreferredVersions && pkgResponse.body.manifest?.version) {
             if (!ctx.allPreferredVersions[pkgResponse.body.manifest.name]) {
-                ctx.allPreferredVersions[pkgResponse.body.manifest.name] = {};
+                // Null-prototype: keyed by versions from the resolved manifest.
+                ctx.allPreferredVersions[pkgResponse.body.manifest.name] = Object.create(null);
             }
             ctx.allPreferredVersions[pkgResponse.body.manifest.name][pkgResponse.body.manifest.version] = 'version';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-resolver",
-  "version": "1100.2.5",
+  "version": "1100.2.6",
   "description": "Resolves dependency graph of a package",
   "keywords": [
     "pnpm",
@@ -44,28 +44,28 @@
     "validate-npm-package-name": "7.0.2",
     "version-selector-type": "^3.0.0",
     "@pnpm/catalogs.resolver": "1100.0.0",
-    "@pnpm/catalogs.types": "1100.0.0",
     "@pnpm/config.version-policy": "1100.1.6",
+    "@pnpm/catalogs.types": "1100.0.0",
     "@pnpm/constants": "1100.0.0",
     "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/deps.path": "1100.0.8",
-    "@pnpm/deps.graph-hasher": "1100.2.6",
+    "@pnpm/deps.graph-hasher": "1100.2.7",
     "@pnpm/deps.peer-range": "1100.0.2",
+    "@pnpm/deps.path": "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/hooks.types": "1100.1.1",
+    "@pnpm/fetching.pick-fetcher": "1100.0.14",
+    "@pnpm/lockfile.preferred-versions": "1100.0.18",
+    "@pnpm/lockfile.pruner": "1100.0.13",
+    "@pnpm/lockfile.types": "1100.0.13",
+    "@pnpm/lockfile.utils": "1100.1.1",
     "@pnpm/patching.config": "1100.0.9",
     "@pnpm/patching.types": "1100.0.0",
+    "@pnpm/resolving.npm-resolver": "1102.1.1",
     "@pnpm/pkg-manifest.reader": "1100.0.9",
+    "@pnpm/resolving.resolver-base": "1100.5.1",
     "@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/store.controller-types": "1100.1.7",
     "@pnpm/workspace.spec-parser": "1100.0.0"
   },
   "peerDependencies": {
@@ -77,8 +77,8 @@
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "@types/validate-npm-package-name": "^4.0.2",
-    "@pnpm/installing.deps-resolver": "1100.2.5",
-    "@pnpm/logger": "1100.0.0"
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/installing.deps-resolver": "1100.2.6"
   },
   "engines": {
     "node": ">=22.13"