@pnpm/lockfile.preferred-versions 1000.0.32 → 1100.0.0

package/lib/index.d.ts

@@ -1,4 +1,4 @@
 import { type PackageSnapshots } from '@pnpm/lockfile.utils';
-import { type PreferredVersions } from '@pnpm/resolver-base';
-import { type DependencyManifest, type ProjectManifest } from '@pnpm/types';
+import { type PreferredVersions } from '@pnpm/resolving.resolver-base';
+import type { DependencyManifest, ProjectManifest } from '@pnpm/types';
 export declare function getPreferredVersionsFromLockfileAndManifests(snapshots: PackageSnapshots | undefined, manifests: Array<DependencyManifest | ProjectManifest>): PreferredVersions;

package/lib/index.js

@@ -1,25 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreferredVersionsFromLockfileAndManifests = getPreferredVersionsFromLockfileAndManifests;
-const lockfile_utils_1 = require("@pnpm/lockfile.utils");
-const manifest_utils_1 = require("@pnpm/manifest-utils");
-const resolver_base_1 = require("@pnpm/resolver-base");
-const version_selector_type_1 = __importDefault(require("version-selector-type"));
-function getPreferredVersionsFromLockfileAndManifests(snapshots, manifests) {
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils';
+import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils';
+import { DIRECT_DEP_SELECTOR_WEIGHT, EXISTING_VERSION_SELECTOR_WEIGHT, } from '@pnpm/resolving.resolver-base';
+import getVersionSelectorType from 'version-selector-type';
+export function getPreferredVersionsFromLockfileAndManifests(snapshots, manifests) {
     const preferredVersions = {};
     for (const manifest of manifests) {
-        const specs = (0, manifest_utils_1.getAllDependenciesFromManifest)(manifest);
+        const specs = getAllDependenciesFromManifest(manifest);
         for (const [name, spec] of Object.entries(specs)) {
-            const selector = (0, version_selector_type_1.default)(spec);
+            const selector = getVersionSelectorType(spec);
             if (!selector)
                 continue;
             preferredVersions[name] = preferredVersions[name] ?? {};
             preferredVersions[name][spec] = {
                 selectorType: selector.type,
-                weight: resolver_base_1.DIRECT_DEP_SELECTOR_WEIGHT,
+                weight: DIRECT_DEP_SELECTOR_WEIGHT,
             };
         }
     }
@@ -29,14 +23,46 @@ function getPreferredVersionsFromLockfileAndManifests(snapshots, manifests) {
     return preferredVersions;
 }
 function addPreferredVersionsFromLockfile(snapshots, preferredVersions) {
+    // The snapshots object can contain multiple entries with the same package
+    // name and version. This is because a dependency can appear multiple times
+    // with the same version in the lockfile due to peer dependency resolution. To
+    // avoid inflating the weight of package versions that appear multiple times,
+    // generate a map with only the unique set to iterate over.
+    const uniqueNameVersions = {};
     for (const [depPath, snapshot] of Object.entries(snapshots)) {
-        const { name, version } = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, snapshot);
-        if (!preferredVersions[name]) {
-            preferredVersions[name] = { [version]: 'version' };
-        }
-        else if (!preferredVersions[name][version]) {
-            preferredVersions[name][version] = 'version';
+        const { name, version } = nameVerFromPkgSnapshot(depPath, snapshot);
+        uniqueNameVersions[name] ??= new Set();
+        uniqueNameVersions[name].add(version);
+    }
+    for (const [name, versions] of Object.entries(uniqueNameVersions)) {
+        for (const version of versions) {
+            preferredVersions[name] ??= {};
+            const existingSelector = preferredVersions[name][version];
+            if (existingSelector == null) {
+                preferredVersions[name][version] = { selectorType: 'version', weight: EXISTING_VERSION_SELECTOR_WEIGHT };
+                continue;
+            }
+            // The lookup for this selector was for an exact version and not a range
+            // or tag. If there's an existing selector and it's not for a version,
+            // that's unexpected and our program state is corrupted.
+            const existingSelectorType = typeof existingSelector === 'string'
+                ? existingSelector
+                : existingSelector.selectorType;
+            if (existingSelectorType !== 'version') {
+                throw new Error(`Encountered unexpected version selector '${existingSelectorType}' for dependency '${name}@${version}'`);
+            }
+            // There might be an existing selector on this exact version from a direct
+            // dependency. If so, we should increase its weight. This allows a version
+            // present in the lockfile that's also used by a direct dependency to be
+            // considered at a higher priority than a package with only one of the two
+            // criteria.
+            preferredVersions[name][version] = addWeightToVersionSelector(existingSelector, EXISTING_VERSION_SELECTOR_WEIGHT);
         }
     }
 }
+function addWeightToVersionSelector(selector, weight) {
+    return typeof selector === 'string'
+        ? { selectorType: selector, weight: weight + 1 }
+        : { selectorType: selector.selectorType, weight: selector.weight + weight };
+}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@pnpm/lockfile.preferred-versions",
-  "version": "1000.0.32",
+  "version": "1100.0.0",
   "description": "Get preferred version from lockfile",
   "keywords": [
     "pnpm",
-    "pnpm10",
+    "pnpm11",
     "lockfile",
     "shrinkwrap"
   ],
@@ -15,7 +15,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "type": "commonjs",
+  "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
@@ -27,23 +27,23 @@
   ],
   "dependencies": {
     "version-selector-type": "^3.0.0",
-    "@pnpm/lockfile.utils": "1004.0.3",
-    "@pnpm/manifest-utils": "1002.0.5",
-    "@pnpm/resolver-base": "1005.4.1",
-    "@pnpm/types": "1001.3.0"
+    "@pnpm/lockfile.utils": "1100.0.0",
+    "@pnpm/pkg-manifest.utils": "1100.0.0",
+    "@pnpm/types": "1100.0.0",
+    "@pnpm/resolving.resolver-base": "1100.0.0"
   },
   "devDependencies": {
-    "@pnpm/lockfile.preferred-versions": "1000.0.32"
+    "@pnpm/lockfile.preferred-versions": "1100.0.0"
   },
   "engines": {
-    "node": ">=18.12"
+    "node": ">=22.13"
   },
   "jest": {
     "preset": "@pnpm/jest-config"
   },
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
-    "test": "pnpm run compile",
-    "compile": "tsc --build && pnpm run lint --fix"
+    "test": "pn compile",
+    "compile": "tsgo --build && pn lint --fix"
   }
 }

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAMA,oGAoBC;AA1BD,yDAAoF;AACpF,yDAAqE;AACrE,uDAAwF;AAExF,kFAA0D;AAE1D,SAAgB,4CAA4C,CAC1D,SAAuC,EACvC,SAAsD;IAEtD,MAAM,iBAAiB,GAAsB,EAAE,CAAA;IAC/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,IAAA,+CAA8B,EAAC,QAAQ,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,MAAM,QAAQ,GAAG,IAAA,+BAAsB,EAAC,IAAI,CAAC,CAAA;YAC7C,IAAI,CAAC,QAAQ;gBAAE,SAAQ;YACvB,iBAAiB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;YACvD,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG;gBAC9B,YAAY,EAAE,QAAQ,CAAC,IAAI;gBAC3B,MAAM,EAAE,0CAA0B;aACnC,CAAA;QACH,CAAC;IACH,CAAC;IACD,IAAI,CAAC,SAAS;QAAE,OAAO,iBAAiB,CAAA;IACxC,gCAAgC,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAC9D,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAED,SAAS,gCAAgC,CAAE,SAA2B,EAAE,iBAAoC;IAC1G,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,uCAAsB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACnE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;QAC9C,CAAC;IACH,CAAC;AACH,CAAC"}