From 4e914abeefbe80976cf93399a1a92574b01bbb1a Mon Sep 17 00:00:00 2001 From: Helmi Pradita Date: Sun, 8 Nov 2026 20:36:09 +0700 Subject: [PATCH] fix(semver): handle major wildcards in <= and bounded wildcards in greater/lessThanRange Refs #7385 --- semver/greater_than_range.ts | 8 +++++--- semver/greater_than_range_test.ts | 1 + semver/less_than_range.ts | 10 +++++----- semver/less_than_range_test.ts | 1 + semver/parse_range.ts | 2 ++ semver/parse_range_test.ts | 30 ++++++++++++++++++++++++++++++ 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/semver/greater_than_range.ts b/semver/greater_than_range.ts index f6870b911dff..93d071c2a47a 100644 --- a/semver/greater_than_range.ts +++ b/semver/greater_than_range.ts @@ -36,13 +36,15 @@ function greaterThanComparatorSet( version: SemVer, comparatorSet: Comparator[], ): boolean { - // If the comparator set contains wildcard, then the semver is not greater than the range. - if (comparatorSet.some(isWildcardComparator)) return false; + const bounded = comparatorSet.filter( + (comparator) => !isWildcardComparator(comparator), + ); + if (bounded.length === 0) return false; // If the semver satisfies the comparator set, then it's not greater than the range. if (testComparatorSet(version, comparatorSet)) return false; // If the semver is less than any of the comparator set, then it's not greater than the range. if ( - comparatorSet.some((comparator) => lessThanComparator(version, comparator)) + bounded.some((comparator) => lessThanComparator(version, comparator)) ) return false; return true; } diff --git a/semver/greater_than_range_test.ts b/semver/greater_than_range_test.ts index a5dd2d2cf9cd..4b128e64153c 100644 --- a/semver/greater_than_range_test.ts +++ b/semver/greater_than_range_test.ts @@ -66,6 +66,7 @@ Deno.test("greaterThanRange() checks if the semver is greater than the range", a ["=0.7.x", "0.8.2"], ["<0.7.x", "0.7.2"], ["=0.1.0", "1.0.0"], + ["* <1.2.1", "2.0.3"], ] as const; for (const [range, version] of versionGtRange) { diff --git a/semver/less_than_range.ts b/semver/less_than_range.ts index 27b4cdb64dd4..50df1cb45f8a 100644 --- a/semver/less_than_range.ts +++ b/semver/less_than_range.ts @@ -33,15 +33,15 @@ export function lessThanRange(version: SemVer, range: Range): boolean { } function lessThanComparatorSet(version: SemVer, comparatorSet: Comparator[]) { - // If the comparator set contains wildcard, then the semver is not greater than the range. - if (comparatorSet.some(isWildcardComparator)) return false; + const bounded = comparatorSet.filter( + (comparator) => !isWildcardComparator(comparator), + ); + if (bounded.length === 0) return false; // If the SemVer satisfies the comparator set, then it's not less than the range. if (testComparatorSet(version, comparatorSet)) return false; // If the SemVer is greater than any of the comparator set, then it's not less than the range. if ( - comparatorSet.some((comparator) => - greaterThanComparator(version, comparator) - ) + bounded.some((comparator) => greaterThanComparator(version, comparator)) ) return false; return true; } diff --git a/semver/less_than_range_test.ts b/semver/less_than_range_test.ts index 55baeeac8394..eb22d5728beb 100644 --- a/semver/less_than_range_test.ts +++ b/semver/less_than_range_test.ts @@ -66,6 +66,7 @@ Deno.test("lessThanRange() checks if the SemVer is less than the range", async ( [">=0.7.x", "0.7.0-asdf"], [">=0.7.x", "0.6.2"], [">1.2.3", "1.3.0-alpha"], + ["* >2.1.0", "0.2.1"], ] as const; for (const [range, version] of versionLtRange) { diff --git a/semver/parse_range.ts b/semver/parse_range.ts index b9bef6039251..ede4d0a19dfe 100644 --- a/semver/parse_range.ts +++ b/semver/parse_range.ts @@ -240,6 +240,7 @@ function handleLessThanOperator(groups: RangeRegExpGroups): Comparator[] { function handleLessThanOrEqualOperator( groups: RangeRegExpGroups, ): Comparator[] { + const majorIsWildcard = isWildcard(groups.major); const minorIsWildcard = isWildcard(groups.minor); const patchIsWildcard = isWildcard(groups.patch); @@ -247,6 +248,7 @@ function handleLessThanOrEqualOperator( const minor = +groups.minor; const patch = +groups.patch; + if (majorIsWildcard) return [ALL]; if (minorIsWildcard) { return [{ operator: "<", major: major + 1, minor: 0, patch: 0 }]; } diff --git a/semver/parse_range_test.ts b/semver/parse_range_test.ts index 845d372f30b2..0754e5299e35 100644 --- a/semver/parse_range_test.ts +++ b/semver/parse_range_test.ts @@ -686,6 +686,36 @@ Deno.test("parseRange() handles wildcards", () => { assertEquals(parseRange("<=1.*.2"), [ [{ operator: "<", major: 2, minor: 0, patch: 0 }], ]); + assertEquals(parseRange("<=*"), [ + [{ + operator: undefined, + major: NaN, + minor: NaN, + patch: NaN, + prerelease: [], + build: [], + }], + ]); + assertEquals(parseRange("<=x"), [ + [{ + operator: undefined, + major: NaN, + minor: NaN, + patch: NaN, + prerelease: [], + build: [], + }], + ]); + assertEquals(parseRange("<=X"), [ + [{ + operator: undefined, + major: NaN, + minor: NaN, + patch: NaN, + prerelease: [], + build: [], + }], + ]); assertEquals(parseRange(">=1.*.0"), [ [{ operator: ">=", major: 1, minor: 0, patch: 0 }], ]);