Skip to content

Commit f13e49f

Browse files
committed
refactor(host-kit): split the SemVer comparator so each rule reads alone
The Fallow complexity gate flagged compareVersions at cyclomatic 18; release, prerelease and per-field comparison are now separate functions.
1 parent 537d5b4 commit f13e49f

1 file changed

Lines changed: 27 additions & 14 deletions

File tree

‎packages/host-kit/src/internal/version.ts‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,43 @@ export function isNewerVersion(candidate: string, baseline: string): boolean {
4747
function compareVersions(left: string, right: string): number {
4848
const a = parseVersion(left);
4949
const b = parseVersion(right);
50+
return compareRelease(a.release, b.release) || comparePrerelease(a.prerelease, b.prerelease);
51+
}
52+
53+
function compareRelease(a: number[], b: number[]): number {
5054
for (let i = 0; i < 3; i += 1) {
51-
const x = a.release[i] ?? 0;
52-
const y = b.release[i] ?? 0;
55+
const x = a[i] ?? 0;
56+
const y = b[i] ?? 0;
5357
if (x !== y) return x > y ? 1 : -1;
5458
}
55-
if (a.prerelease.length === 0 || b.prerelease.length === 0) {
56-
return Math.sign(b.prerelease.length - a.prerelease.length);
57-
}
58-
const fields = Math.max(a.prerelease.length, b.prerelease.length);
59+
return 0;
60+
}
61+
62+
/** A release (no prerelease) sorts after every prerelease of the same base. */
63+
function comparePrerelease(a: string[], b: string[]): number {
64+
if (a.length === 0 || b.length === 0) return Math.sign(b.length - a.length);
65+
const fields = Math.max(a.length, b.length);
5966
for (let i = 0; i < fields; i += 1) {
60-
const x = a.prerelease[i];
61-
const y = b.prerelease[i];
67+
const x = a[i];
68+
const y = b[i];
6269
if (x === undefined) return -1;
6370
if (y === undefined) return 1;
64-
if (x === y) continue;
65-
const xNumeric = /^\d+$/.test(x);
66-
const yNumeric = /^\d+$/.test(y);
67-
if (xNumeric && yNumeric) return Number(x) > Number(y) ? 1 : -1;
68-
if (xNumeric !== yNumeric) return xNumeric ? -1 : 1;
69-
return x > y ? 1 : -1;
71+
const order = comparePrereleaseField(x, y);
72+
if (order !== 0) return order;
7073
}
7174
return 0;
7275
}
7376

77+
/** Numeric fields compare as numbers and sort below alphanumeric ones; the rest compare lexically. */
78+
function comparePrereleaseField(x: string, y: string): number {
79+
if (x === y) return 0;
80+
const xNumeric = /^\d+$/.test(x);
81+
const yNumeric = /^\d+$/.test(y);
82+
if (xNumeric && yNumeric) return Number(x) > Number(y) ? 1 : -1;
83+
if (xNumeric !== yNumeric) return xNumeric ? -1 : 1;
84+
return x > y ? 1 : -1;
85+
}
86+
7487
function parseVersion(version: string): { release: number[]; prerelease: string[] } {
7588
const [core = '', prerelease = ''] = version.split('+', 1)[0]!.split(/-(.*)/s, 2);
7689
const release = core.split('.').map((part) => Number.parseInt(part, 10));

0 commit comments

Comments
 (0)