Skip to content
TypeScript

fix(shared): preserve omitted components in zero-major caret ranges (#29335)

Johan Vaz1b6336d237d7
diff --git a/packages/shared/src/semver.test.ts b/packages/shared/src/semver.test.ts
index a66e5b07d8b..57766584a04 100644
--- a/packages/shared/src/semver.test.ts
+++ b/packages/shared/src/semver.test.ts
@@ -59,12 +59,18 @@ describe("semver helpers", () => {
});
it("honors caret range upper bounds for zero-major versions", () => {
+ expect(satisfiesSemverRange("0.5.0", "^0")).toBe(true);
+ expect(satisfiesSemverRange("0.0.4", "^0.0")).toBe(true);
+ expect(satisfiesSemverRange("1.0.0", "^0")).toBe(false);
+ expect(satisfiesSemverRange("0.1.0", "^0.0")).toBe(false);
expect(satisfiesSemverRange("0.2.3", "^0.2.3")).toBe(true);
expect(satisfiesSemverRange("0.2.9", "^0.2.3")).toBe(true);
expect(satisfiesSemverRange("0.3.0", "^0.2.3")).toBe(false);
expect(satisfiesSemverRange("0.5.0", "^0.2.3")).toBe(false);
expect(satisfiesSemverRange("0.0.3", "^0.0.3")).toBe(true);
expect(satisfiesSemverRange("0.0.4", "^0.0.3")).toBe(false);
+ expect(satisfiesSemverRange("0.0.0", "^0.0.0")).toBe(true);
+ expect(satisfiesSemverRange("0.0.1", "^0.0.0")).toBe(false);
});
it("keeps the range checker stringifiable and executable as plain JavaScript", () => {
@@ -74,6 +80,8 @@ describe("semver helpers", () => {
expect(source).toContain("function satisfiesSemverRange");
expect(source).not.toContain(": string");
expect(source).not.toContain(": boolean");
+ expect(recreated("0.5.0", "^0")).toBe(true);
+ expect(recreated("0.0.4", "^0.0")).toBe(true);
expect(recreated("24.10.0", ">=24.10")).toBe(true);
expect(recreated("24.9.9", ">=24.10")).toBe(false);
});
diff --git a/packages/shared/src/semver.ts b/packages/shared/src/semver.ts
index 8d1a354f008..dc0e34f102d 100644
--- a/packages/shared/src/semver.ts
+++ b/packages/shared/src/semver.ts
@@ -198,10 +198,10 @@ export const satisfiesSemverRange: (rawVersion: string, range: string) => boolea
if (compared < 0) {
return false;
}
- if (target.major > 0) {
+ if (target.major > 0 || targetMatch[2] === undefined) {
return version.major === target.major;
}
- if (target.minor > 0) {
+ if (target.minor > 0 || targetMatch[3] === undefined) {
return version.major === 0 && version.minor === target.minor;
}
return version.major === 0 && version.minor === 0 && version.patch === target.patch;