actions/mc-publish
1
0
Fork 0
mirror of https://github.com/Kir-Antipov/mc-publish.git synced 2024-11-25 01:41:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed wildcard range parsing

Browse source 
Fixes #91
This commit is contained in:
Kir_Antipov 2024-01-03 22:00:13 +03:00
parent 0a3874adee
commit 6e1bcb10b6
2 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/utils/versioning/version-range.ts
View file

@ -122,7 +122,7 @@ function intervalToSemver(range: string): string {
/**
* Regular expression for matching semver-like tags in version strings with optional patch version.
*/
const SEMVER_OPTIONAL_PATCH_REGEX = /(\d+\.\d+)(\.\d+|\.[Xx])?([\w\-.+]*)/g;
const SEMVER_OPTIONAL_PATCH_REGEX = /((?:\d+|[Xx*])(?:\.\d+|\.[Xx*]))(\.\d+|\.[Xx*])?([\w\-.+]*)/g;
/**
* Ensures that a semver string has a patch version, adding ".0" if it is missing.

68
tests/unit/utils/versioning/version-range.spec.ts
View file

@ -20,6 +20,40 @@ describe("parseVersionRange", () => {
expect(versionRange.includes("2.0.1")).toBe(false);
});
test("parses a semver string with X-ranges correctly", () => {
const versionRange = parseVersionRange(">=1.2.x <2.0.X");
expect(versionRange).toBeDefined();
expect(versionRange.toString()).toBe(">=1.2.x <2.0.X");
expect(versionRange.includes("1.2.0")).toBe(true);
expect(versionRange.includes("1.2.1")).toBe(true);
expect(versionRange.includes("1.2.2")).toBe(true);
expect(versionRange.includes("1.2.3")).toBe(true);
expect(versionRange.includes("1.2.4")).toBe(true);
expect(versionRange.includes("1.9999.9999")).toBe(true);
expect(versionRange.includes("2.0.0")).toBe(false);
expect(versionRange.includes("1.0.0")).toBe(false);
expect(versionRange.includes("2.0.1")).toBe(false);
});
test("parses a semver string with *-ranges correctly", () => {
const versionRange = parseVersionRange(">=1.2.* <2.0.*");
expect(versionRange).toBeDefined();
expect(versionRange.toString()).toBe(">=1.2.* <2.0.*");
expect(versionRange.includes("1.2.0")).toBe(true);
expect(versionRange.includes("1.2.1")).toBe(true);
expect(versionRange.includes("1.2.2")).toBe(true);
expect(versionRange.includes("1.2.3")).toBe(true);
expect(versionRange.includes("1.2.4")).toBe(true);
expect(versionRange.includes("1.9999.9999")).toBe(true);
expect(versionRange.includes("2.0.0")).toBe(false);
expect(versionRange.includes("1.0.0")).toBe(false);
expect(versionRange.includes("2.0.1")).toBe(false);
});
test("parses an interval notation string correctly", () => {
const versionRange = parseVersionRange("[1.2.3,2.0.0)");
@ -35,6 +69,40 @@ describe("parseVersionRange", () => {
expect(versionRange.includes("2.0.1")).toBe(false);
});
test("parses an interval notation string with X-ranges correctly", () => {
const versionRange = parseVersionRange("[1.2.x,2.0.X)");
expect(versionRange).toBeDefined();
expect(versionRange.toString()).toBe("[1.2.x,2.0.X)");
expect(versionRange.includes("1.2.0")).toBe(true);
expect(versionRange.includes("1.2.1")).toBe(true);
expect(versionRange.includes("1.2.2")).toBe(true);
expect(versionRange.includes("1.2.3")).toBe(true);
expect(versionRange.includes("1.2.4")).toBe(true);
expect(versionRange.includes("1.9999.9999")).toBe(true);
expect(versionRange.includes("2.0.0")).toBe(false);
expect(versionRange.includes("1.0.0")).toBe(false);
expect(versionRange.includes("2.0.1")).toBe(false);
});
test("parses an interval notation string with *-ranges correctly", () => {
const versionRange = parseVersionRange("[1.2.*,2.0.*)");
expect(versionRange).toBeDefined();
expect(versionRange.toString()).toBe("[1.2.*,2.0.*)");
expect(versionRange.includes("1.2.0")).toBe(true);
expect(versionRange.includes("1.2.1")).toBe(true);
expect(versionRange.includes("1.2.2")).toBe(true);
expect(versionRange.includes("1.2.3")).toBe(true);
expect(versionRange.includes("1.2.4")).toBe(true);
expect(versionRange.includes("1.9999.9999")).toBe(true);
expect(versionRange.includes("2.0.0")).toBe(false);
expect(versionRange.includes("1.0.0")).toBe(false);
expect(versionRange.includes("2.0.1")).toBe(false);
});
test("parses a string that mixes semver and interval notation correctly", () => {
const versionRange = parseVersionRange(">=1.2.3 <2.0.0 || [2.0.0,3.0.0)");