@pnpm/config.version-policy 1100.1.4 → 1100.1.6

package/lib/index.d.ts

@@ -21,4 +21,13 @@ export interface PublishedByPolicy {
  * instant and surfaces invalid exclude patterns under the same error code.
  */
 export declare function getPublishedByPolicy(opts: PublishedByPolicyOptions): PublishedByPolicy;
+/**
+ * Merges a list of package version policy specs (e.g. `minimumReleaseAgeExclude`
+ * entries) into one canonical entry per package. Specs for the same package are
+ * combined: a bare name/pattern (no version) excludes every version and absorbs
+ * any version-specific specs for that package, otherwise the exact versions are
+ * deduplicated, sorted by semver, and joined into a single `name@v1 || v2` entry.
+ * Packages keep their first-seen order so the output is stable.
+ */
+export declare function mergePackageVersionSpecs(specs: string[]): string[];
 export declare function expandPackageVersionSpecs(specs: string[]): Set<string>;

package/lib/index.js

@@ -40,6 +40,34 @@ export function getPublishedByPolicy(opts) {
             : undefined,
     };
 }
+/**
+ * Merges a list of package version policy specs (e.g. `minimumReleaseAgeExclude`
+ * entries) into one canonical entry per package. Specs for the same package are
+ * combined: a bare name/pattern (no version) excludes every version and absorbs
+ * any version-specific specs for that package, otherwise the exact versions are
+ * deduplicated, sorted by semver, and joined into a single `name@v1 || v2` entry.
+ * Packages keep their first-seen order so the output is stable.
+ */
+export function mergePackageVersionSpecs(specs) {
+    const byPackage = new Map();
+    for (const spec of specs) {
+        const { packageName, exactVersions } = parseVersionPolicyRule(spec);
+        const existing = byPackage.get(packageName);
+        if (existing === undefined) {
+            byPackage.set(packageName, exactVersions.length === 0 ? null : new Set(exactVersions));
+        }
+        else if (existing === null || exactVersions.length === 0) {
+            byPackage.set(packageName, null);
+        }
+        else {
+            for (const version of exactVersions)
+                existing.add(version);
+        }
+    }
+    return Array.from(byPackage.entries()).map(([packageName, versions]) => versions == null
+        ? packageName
+        : `${packageName}@${Array.from(versions).sort(semver.compare).join(' || ')}`);
+}
 export function expandPackageVersionSpecs(specs) {
     const expandedSpecs = new Set();
     for (const spec of specs) {
@@ -56,16 +84,27 @@ export function expandPackageVersionSpecs(specs) {
     return expandedSpecs;
 }
 function evaluateVersionPolicy(rules, pkgName) {
+    let matchedVersions;
+    let seen;
     for (const { nameMatcher, exactVersions } of rules) {
         if (!nameMatcher(pkgName)) {
             continue;
         }
         if (exactVersions.length === 0) {
-            return true;
+            return matchedVersions ?? true;
+        }
+        if (matchedVersions == null) {
+            matchedVersions = [];
+            seen = new Set();
+        }
+        for (const version of exactVersions) {
+            if (!seen.has(version)) {
+                seen.add(version);
+                matchedVersions.push(version);
+            }
         }
-        return exactVersions;
     }
-    return false;
+    return matchedVersions ?? false;
 }
 function parseVersionPolicyRule(pattern) {
     const isScoped = pattern.startsWith('@');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/config.version-policy",
-  "version": "1100.1.4",
+  "version": "1100.1.6",
   "description": "Parses and evaluates package version policy specs and produces package-version matchers",
   "keywords": [
     "pnpm",
@@ -10,9 +10,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/config/version-policy"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/config/version-policy"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/config/version-policy#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/config/version-policy#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -27,15 +27,15 @@
     "!*.map"
   ],
   "dependencies": {
-    "semver": "^7.8.1",
+    "semver": "^7.8.4",
+    "@pnpm/error": "1100.0.1",
     "@pnpm/config.matcher": "1100.0.1",
-    "@pnpm/types": "1101.3.1",
-    "@pnpm/error": "1100.0.0"
+    "@pnpm/types": "1101.3.2"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "@types/semver": "7.7.1",
-    "@pnpm/config.version-policy": "1100.1.4"
+    "@pnpm/config.version-policy": "1100.1.6"
   },
   "engines": {
     "node": ">=22.13"