From 331734f7eec66b8b581ea48c2521ef2b0d83ab58 Mon Sep 17 00:00:00 2001 From: garronej Date: Tue, 7 Dec 2021 20:29:25 +0100 Subject: [PATCH] Fix version ordering --- dist/index.js | 7 ++++++- src/tools/NpmModuleVersion.ts | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8a99dc4..1603086 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3471,7 +3471,7 @@ var NpmModuleVersion; */ function compare(v1, v2) { const sign = (diff) => diff === 0 ? 0 : (diff < 0 ? -1 : 1); - const noUndefined = (n) => n !== null && n !== void 0 ? n : -1; + const noUndefined = (n) => n !== null && n !== void 0 ? n : Infinity; for (const level of ["major", "minor", "patch", "betaPreRelease"]) { if (noUndefined(v1[level]) !== noUndefined(v2[level])) { return sign(noUndefined(v1[level]) - noUndefined(v2[level])); @@ -3480,6 +3480,11 @@ var NpmModuleVersion; return 0; } NpmModuleVersion.compare = compare; + /* + console.log(compare(parse("3.0.0-beta.3"), parse("3.0.0")) === -1 ) + console.log(compare(parse("3.0.0-beta.3"), parse("3.0.0-beta.4")) === -1 ) + console.log(compare(parse("3.0.0-beta.3"), parse("4.0.0")) === -1 ) + */ function bumpType(params) { const versionAhead = parse(params.versionAheadStr); const versionBehind = parse(params.versionBehindStr); diff --git a/src/tools/NpmModuleVersion.ts b/src/tools/NpmModuleVersion.ts index 31008c4..54ff32f 100644 --- a/src/tools/NpmModuleVersion.ts +++ b/src/tools/NpmModuleVersion.ts @@ -47,7 +47,7 @@ export namespace NpmModuleVersion { export function compare(v1: NpmModuleVersion, v2: NpmModuleVersion): -1 | 0 | 1 { const sign = (diff: number): -1 | 0 | 1 => diff === 0 ? 0 : (diff < 0 ? -1 : 1); - const noUndefined= (n: number | undefined)=> n ?? -1; + const noUndefined= (n: number | undefined)=> n ?? Infinity; for (const level of ["major", "minor", "patch", "betaPreRelease"] as const) { if (noUndefined(v1[level]) !== noUndefined(v2[level])) { @@ -59,6 +59,12 @@ export namespace NpmModuleVersion { } + /* + console.log(compare(parse("3.0.0-beta.3"), parse("3.0.0")) === -1 ) + console.log(compare(parse("3.0.0-beta.3"), parse("3.0.0-beta.4")) === -1 ) + console.log(compare(parse("3.0.0-beta.3"), parse("4.0.0")) === -1 ) + */ + export function bumpType( params: { versionBehindStr: string;