@pnpm/resolving.npm-resolver 1103.2.0 → 1103.2.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @pnpm/npm-resolver
 
+## 1103.2.1
+
+### Patch Changes
+
+- `pnpm add` no longer re-resolves the dependency graph when `pnpm-lock.yaml` already holds a version satisfying the request — promoting a transitive dependency to a direct one, or adding to a second workspace package what a first one already depends on, now only saves the dependency in `package.json` and records its importer entry. A satisfying locked version is necessary but not sufficient: the install still falls back to a full resolution for a dist tag, an alias, a `workspace:`/`catalog:`/git/tarball specifier, `--save-peer`, an overridden package, a `catalogMode` other than `manual`, and — under `resolutionMode: time-based` or `lowest-direct`, which resolve a direct dependency to the low end of its range — a range several locked versions satisfy.
+
+- `resolutionMode` is no longer ignored when `minimumReleaseAge` is in effect. `lowest-direct` and `time-based` pick the lowest satisfying version of a direct dependency again; previously any active release-age cutoff — including the built-in default — silently forced the highest, so `resolutionMode` only worked when `minimumReleaseAge: 0` was set explicitly [#13752](https://github.com/pnpm/pnpm/issues/13752).
+
+- Updated dependencies:
+  - @pnpm/config.version-policy@1100.2.0
+  - @pnpm/error@1100.1.2
+  - @pnpm/pkg-manifest.utils@1100.4.0
+  - @pnpm/resolving.jsr-specifier-parser@1100.0.5
+  - @pnpm/store.cafs@1100.1.19
+  - @pnpm/store.index@1100.2.4
+
 ## 1103.2.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -20,7 +20,6 @@ export declare class NoMatchingVersionError extends PnpmError {
 export declare function formatTimeAgo(date: Date): string | null;
 export { BUILTIN_NAMED_REGISTRIES, fetchMetadataFromFromRegistry, type FetchMetadataFromFromRegistryOptions, type PackageMeta, type PackageMetaCache, parseBareSpecifier, pickPackageFromMeta, pickVersionByVersionRange, type RegistryPackageSpec, RegistryResponseError, workspacePrefToNpm, };
 export { createNpmResolutionVerifier, type CreateNpmResolutionVerifierOptions } from './createNpmResolutionVerifier.js';
-export { inferRangeSpecStyle } from './inferRangeSpecStyle.js';
 export { MINIMUM_RELEASE_AGE_VIOLATION_CODE, TRUST_DOWNGRADE_VIOLATION_CODE, } from './violationCodes.js';
 export interface ResolverFactoryOptions {
     cacheDir: string;

package/lib/index.js

@@ -3,7 +3,7 @@ import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package';
 import { isWellFormedRegistryName, RESERVED_VERSION_PREFIXES } from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
 import { globalWarn } from '@pnpm/logger';
-import { rangeSpecGranularity, versionWithRangeSpecStyle } from '@pnpm/pkg-manifest.utils';
+import { calcVersionRange, inferRangeSpecStyle, rangeSpecGranularity, versionWithRangeSpecStyle } from '@pnpm/pkg-manifest.utils';
 import { EXISTING_VERSION_SELECTOR_WEIGHT, } from '@pnpm/resolving.resolver-base';
 import { storeIndexKey } from '@pnpm/store.index';
 import { readPkgFromCafs, } from '@pnpm/worker';
@@ -16,7 +16,6 @@ import ssri from 'ssri';
 import versionSelectorType from 'version-selector-type';
 import { clearMeta, retainsFullMeta } from './clearMeta.js';
 import { fetchMetadataFromFromRegistry, RegistryResponseError } from './fetch.js';
-import { inferRangeSpecStyle } from './inferRangeSpecStyle.js';
 import { memoizeFetchMetadata } from './memoizeFetchMetadata.js';
 import { normalizeRegistryUrl } from './normalizeRegistryUrl.js';
 import { BUILTIN_NAMED_REGISTRIES, parseBareSpecifier, parseJsrSpecifierToRegistryPackageSpec, parseNamedRegistrySpecifierToRegistryPackageSpec, } from './parseBareSpecifier.js';
@@ -66,7 +65,6 @@ export function formatTimeAgo(date) {
 }
 export { BUILTIN_NAMED_REGISTRIES, fetchMetadataFromFromRegistry, parseBareSpecifier, pickPackageFromMeta, pickVersionByVersionRange, RegistryResponseError, workspacePrefToNpm, };
 export { createNpmResolutionVerifier } from './createNpmResolutionVerifier.js';
-export { inferRangeSpecStyle } from './inferRangeSpecStyle.js';
 export { MINIMUM_RELEASE_AGE_VIOLATION_CODE, TRUST_DOWNGRADE_VIOLATION_CODE, } from './violationCodes.js';
 export function createNpmResolver(fetchFromRegistry, getAuthHeader, opts) {
     if (typeof opts.cacheDir !== 'string') {
@@ -666,14 +664,13 @@ function calcSpecifier({ wantedDependency, spec, version, defaultRangeSpecStyle,
         return range;
     return `npm:${spec.name}@${range}`;
 }
+/** The manifest range `version` is saved as; see {@link calcVersionRange}. */
 function calcRange(version, wantedDependency, defaultRangeSpecStyle) {
-    if (semver.parse(version)?.prerelease.length) {
-        return version;
-    }
-    const rangeSpecStyle = (wantedDependency.prevSpecifier ? inferRangeSpecStyle(wantedDependency.prevSpecifier) : undefined) ??
-        (wantedDependency.bareSpecifier ? inferRangeSpecStyle(wantedDependency.bareSpecifier) : undefined) ??
-        defaultRangeSpecStyle;
-    return versionWithRangeSpecStyle(version, rangeSpecStyle ?? 'major');
+    return calcVersionRange(version, {
+        prevSpecifier: wantedDependency.prevSpecifier,
+        bareSpecifier: wantedDependency.bareSpecifier,
+        defaultRangeSpecStyle,
+    });
 }
 function tryResolveFromWorkspace(wantedDependency, opts) {
     if (!wantedDependency.bareSpecifier?.startsWith('workspace:')) {

package/lib/pickPackage.js

@@ -58,15 +58,17 @@ function pickMax(a, b) {
 }
 const pickHighest = pickPackageFromMeta.bind(null, pickVersionByVersionRange);
 const pickLowest = pickPackageFromMeta.bind(null, pickLowestVersionByVersionRange);
-// When minimumReleaseAge is active: try the highest mature version; if none
-// satisfies the range, fall back to the lowest version regardless of maturity
-// so the resolver can report the violation inline and let the install layer
-// (or other caller) decide what to do — never throw at this layer.
+// `minimumReleaseAge` narrows which versions are on offer; `pickLowestVersion`
+// decides which end of what is left to take. The fallback deliberately drops
+// the maturity filter so a range no mature version satisfies still yields a
+// pick, which the install layer reports as a violation rather than this layer
+// throwing.
 function pickRespectingMinReleaseAge(pickerOpts, spec, meta) {
     return runPicker(pickerOpts, spec, (targetSpec) => {
-        const highest = pickHighest(pickerOpts, meta, targetSpec);
-        if (highest)
-            return highest;
+        const pickMature = pickerOpts.pickLowestVersion ? pickLowest : pickHighest;
+        const mature = pickMature(pickerOpts, meta, targetSpec);
+        if (mature)
+            return mature;
         return pickLowest({
             preferredVersionSelectors: pickerOpts.preferredVersionSelectors,
         }, meta, targetSpec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/resolving.npm-resolver",
-  "version": "1103.2.0",
+  "version": "1103.2.1",
   "description": "Resolver for npm-hosted packages",
   "keywords": [
     "pnpm",
@@ -31,21 +31,21 @@
   "dependencies": {
     "@pnpm/config.normalize-registries": "1100.1.0",
     "@pnpm/config.pick-registry-for-package": "1100.1.0",
-    "@pnpm/config.version-policy": "1100.1.12",
+    "@pnpm/config.version-policy": "1100.2.0",
     "@pnpm/constants": "1101.0.0",
     "@pnpm/core-loggers": "1100.3.2",
     "@pnpm/crypto.hash": "1100.0.2",
     "@pnpm/deps.path": "1100.1.0",
-    "@pnpm/error": "1100.1.1",
+    "@pnpm/error": "1100.1.2",
     "@pnpm/fetching.types": "1100.0.3",
     "@pnpm/fs.graceful-fs": "1100.1.1",
-    "@pnpm/pkg-manifest.utils": "1100.3.1",
-    "@pnpm/resolving.jsr-specifier-parser": "1100.0.4",
+    "@pnpm/pkg-manifest.utils": "1100.4.0",
+    "@pnpm/resolving.jsr-specifier-parser": "1100.0.5",
     "@pnpm/resolving.registry.pkg-metadata-filter": "1100.0.16",
     "@pnpm/resolving.registry.types": "1100.1.9",
     "@pnpm/resolving.resolver-base": "1101.1.0",
-    "@pnpm/store.cafs": "1100.1.18",
-    "@pnpm/store.index": "1100.2.3",
+    "@pnpm/store.cafs": "1100.1.19",
+    "@pnpm/store.index": "1100.2.4",
     "@pnpm/types": "1101.9.0",
     "@pnpm/workspace.range-resolver": "1100.0.3",
     "@pnpm/workspace.spec-parser": "1100.0.1",
@@ -59,20 +59,19 @@
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "rename-overwrite": "^7.0.1",
     "semver": "^7.8.5",
-    "semver-utils": "^1.1.4",
     "ssri": "13.0.1",
     "validate-npm-package-name": "7.0.2",
     "version-selector-type": "^3.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0",
-    "@pnpm/worker": "^1100.2.10"
+    "@pnpm/worker": "^1100.2.11"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/network.fetch": "1100.1.11",
-    "@pnpm/resolving.npm-resolver": "1103.2.0",
+    "@pnpm/network.fetch": "1100.1.12",
+    "@pnpm/resolving.npm-resolver": "1103.2.1",
     "@pnpm/test-fixtures": "1100.0.1",
     "@pnpm/testing.mock-agent": "1101.0.7",
     "@types/normalize-path": "^3.0.2",

package/lib/inferRangeSpecStyle.d.ts

@@ -1,2 +0,0 @@
-import type { RangeSpecStyle } from '@pnpm/types';
-export declare function inferRangeSpecStyle(spec: string): RangeSpecStyle | undefined;

package/lib/inferRangeSpecStyle.js

@@ -1,39 +0,0 @@
-import { parseRange } from 'semver-utils';
-export function inferRangeSpecStyle(spec) {
-    // A catalog reference carries no version pinning of its own; the pinning is
-    // defined by the catalog entry it points to. Bail out so a catalog name that
-    // happens to look like a version (e.g. "catalog:express4-21") isn't misread
-    // as a pinned version.
-    if (spec.startsWith('catalog:'))
-        return undefined;
-    const colonIndex = spec.indexOf(':');
-    if (colonIndex !== -1) {
-        spec = spec.substring(colonIndex + 1);
-    }
-    const index = spec.lastIndexOf('@');
-    if (index !== -1) {
-        spec = spec.slice(index + 1);
-    }
-    if (spec === '*')
-        return 'none';
-    const parsedRange = parseRange(spec);
-    if (parsedRange.length !== 1)
-        return undefined;
-    const versionObject = parsedRange[0];
-    switch (versionObject.operator) {
-        case '~': return 'minor';
-        case '^': return 'major';
-        // A bare '=' before a full version is an explicit exact pin; a partial
-        // '=' pins the same way the plain version it prefixes does.
-        case '=':
-        case undefined:
-            if (versionObject.patch)
-                return versionObject.operator === '=' ? 'exact' : 'patch';
-            if (versionObject.minor)
-                return 'minor';
-            if (versionObject.major)
-                return 'major';
-    }
-    return undefined;
-}
-//# sourceMappingURL=inferRangeSpecStyle.js.map