@pnpm/pkg-manifest.utils 1100.3.0 → 1100.4.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @pnpm/manifest-utils
 
+## 1100.4.0
+
+### Minor 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.
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/error@1100.1.2
+
+## 1100.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/core-loggers@1100.3.2
+  - @pnpm/error@1100.1.1
+  - @pnpm/types@1101.9.0
+
 ## 1100.3.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import { getSpecFromPackageManifest } from './getSpecFromPackageManifest.js';
 export * from './convertEnginesRuntimeToDependencies.js';
 export * from './getAllDependenciesFromManifest.js';
 export * from './getDependencyTypeFromManifest.js';
+export * from './inferRangeSpecStyle.js';
 export * from './rangeSpecStyle.js';
 export * from './updateProjectManifestObject.js';
 export { getAllUniqueSpecs, getSpecFromPackageManifest };

package/lib/index.js

@@ -3,6 +3,7 @@ import { getSpecFromPackageManifest } from './getSpecFromPackageManifest.js';
 export * from './convertEnginesRuntimeToDependencies.js';
 export * from './getAllDependenciesFromManifest.js';
 export * from './getDependencyTypeFromManifest.js';
+export * from './inferRangeSpecStyle.js';
 export * from './rangeSpecStyle.js';
 export * from './updateProjectManifestObject.js';
 export { getAllUniqueSpecs, getSpecFromPackageManifest };

package/lib/inferRangeSpecStyle.d.ts

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

package/lib/inferRangeSpecStyle.js

@@ -0,0 +1,39 @@
+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

package/lib/rangeSpecStyle.d.ts

@@ -10,4 +10,19 @@ export declare function getRangeSpecStyle(opts: {
     saveExact?: boolean;
     savePrefix?: string;
 }): RangeSpecStyle;
+/**
+ * The manifest range that pins `version` for a dependency the user asked for
+ * as `bareSpecifier` and whose manifest entry, if it already had one, read
+ * `prevSpecifier`.
+ *
+ * The existing entry's range style wins over the requested specifier's, which
+ * wins over the configured default, so a re-add keeps the pinning style the
+ * manifest already used. A prerelease is pinned exactly: no range operator
+ * expresses "this prerelease and later ones".
+ */
+export declare function calcVersionRange(version: string, opts: {
+    prevSpecifier?: string;
+    bareSpecifier?: string;
+    defaultRangeSpecStyle?: RangeSpecStyle;
+}): string;
 export declare function versionWithRangeSpecStyle(version: string, rangeSpecStyle: RangeSpecStyle): string;

package/lib/rangeSpecStyle.js

@@ -1,3 +1,5 @@
+import semver from 'semver';
+import { inferRangeSpecStyle } from './inferRangeSpecStyle.js';
 export function rangeSpecGranularity(style) {
     return style === 'exact' ? 'patch' : style;
 }
@@ -16,6 +18,25 @@ export function getRangeSpecStyle(opts) {
         default: return 'major';
     }
 }
+/**
+ * The manifest range that pins `version` for a dependency the user asked for
+ * as `bareSpecifier` and whose manifest entry, if it already had one, read
+ * `prevSpecifier`.
+ *
+ * The existing entry's range style wins over the requested specifier's, which
+ * wins over the configured default, so a re-add keeps the pinning style the
+ * manifest already used. A prerelease is pinned exactly: no range operator
+ * expresses "this prerelease and later ones".
+ */
+export function calcVersionRange(version, opts) {
+    if (semver.parse(version)?.prerelease.length) {
+        return version;
+    }
+    const rangeSpecStyle = (opts.prevSpecifier ? inferRangeSpecStyle(opts.prevSpecifier) : undefined) ??
+        (opts.bareSpecifier ? inferRangeSpecStyle(opts.bareSpecifier) : undefined) ??
+        opts.defaultRangeSpecStyle;
+    return versionWithRangeSpecStyle(version, rangeSpecStyle ?? 'major');
+}
 export function versionWithRangeSpecStyle(version, rangeSpecStyle) {
     switch (rangeSpecStyle) {
         case 'none':

package/lib/updateProjectManifestObject.d.ts

@@ -9,4 +9,10 @@ export interface PackageSpecObject {
 }
 export declare function createVersionSpecFromResolvedVersion(resolvedVersion: string, rangeSpecStyle?: RangeSpecStyle): string | null;
 export declare function updateProjectManifestObject(prefix: string, packageManifest: ProjectManifest, packageSpecs: PackageSpecObject[]): Promise<ProjectManifest>;
+/**
+ * The manifest edit {@link updateProjectManifestObject} applies, without
+ * announcing it. Separate so a caller that may still discard the edited
+ * manifest reports the update only once it commits to it.
+ */
+export declare function applyPackageSpecs(packageManifest: ProjectManifest, packageSpecs: PackageSpecObject[]): ProjectManifest;
 export declare function guessDependencyType(alias: string, manifest: ProjectManifest): DependenciesOrPeersField | undefined;

package/lib/updateProjectManifestObject.js

@@ -18,6 +18,19 @@ export function createVersionSpecFromResolvedVersion(resolvedVersion, rangeSpecS
     return versionWithRangeSpecStyle(resolvedVersion, rangeSpecStyle ?? 'major');
 }
 export async function updateProjectManifestObject(prefix, packageManifest, packageSpecs) {
+    applyPackageSpecs(packageManifest, packageSpecs);
+    packageManifestLogger.debug({
+        prefix,
+        updated: packageManifest,
+    });
+    return packageManifest;
+}
+/**
+ * The manifest edit {@link updateProjectManifestObject} applies, without
+ * announcing it. Separate so a caller that may still discard the edited
+ * manifest reports the update only once it commits to it.
+ */
+export function applyPackageSpecs(packageManifest, packageSpecs) {
     for (const packageSpec of packageSpecs) {
         if (packageSpec.saveType) {
             const spec = packageSpec.bareSpecifier ?? findSpec(packageSpec.alias, packageManifest);
@@ -43,10 +56,6 @@ export async function updateProjectManifestObject(prefix, packageManifest, packa
             }
         }
     }
-    packageManifestLogger.debug({
-        prefix,
-        updated: packageManifest,
-    });
     return packageManifest;
 }
 function findSpec(alias, manifest) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/pkg-manifest.utils",
-  "version": "1100.3.0",
+  "version": "1100.4.0",
   "description": "Utils for dealing with package manifest",
   "keywords": [
     "pnpm",
@@ -27,11 +27,12 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/core-loggers": "1100.3.1",
+    "@pnpm/core-loggers": "1100.3.2",
     "@pnpm/deps.peer-range": "1100.1.1",
-    "@pnpm/error": "1100.1.0",
-    "@pnpm/types": "1101.8.0",
-    "semver": "^7.8.5"
+    "@pnpm/error": "1100.1.2",
+    "@pnpm/types": "1101.9.0",
+    "semver": "^7.8.5",
+    "semver-utils": "^1.1.4"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -39,8 +40,8 @@
   "devDependencies": {
     "@jest/globals": "30.4.1",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/pkg-manifest.utils": "1100.3.0",
-    "@types/semver": "7.7.1"
+    "@pnpm/pkg-manifest.utils": "1100.4.0",
+    "@types/semver": "7.8.0"
   },
   "engines": {
     "node": ">=22.13"