@adecore/shell 0.49.0 → 0.49.1

package/dist/bridge/versions.js

@@ -2,10 +2,30 @@
  * The order the shell sorts the release list in has to be the order the page reads it in, or the
  * notes of a version land under the wrong heading. One comparison, so the two cannot disagree.
  */
-const SEMVER = /^(\d+)\.(\d+)\.(\d+)$/;
-/* A plain `1.2.3`. A git tag carries a `v` in front of it, which is the tag's and not the version's. */
+const SEMVER = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/;
+const NUMERIC = /^\d+$/;
+/* A `1.2.3` or `1.2.3-beta.1`. A git tag carries a `v` in front of it, which is the tag's and not the version's. */
 export const isVersion = (version) => SEMVER.test(version);
-/* Negative when `a` is older than `b`. A version that is not semver sorts below every one that is. */
+/* Semver's order: part by part, numbers by value and below words, and a shorter list below a longer one it starts. */
+const comparePrereleases = (a, b) => {
+    const left = a.split('.');
+    const right = b.split('.');
+    for (let i = 0; i < Math.min(left.length, right.length); i++) {
+        const leftPart = left[i];
+        const rightPart = right[i];
+        const leftNumeric = NUMERIC.test(leftPart);
+        const rightNumeric = NUMERIC.test(rightPart);
+        if (leftNumeric !== rightNumeric) {
+            return leftNumeric ? -1 : 1;
+        }
+        const difference = leftNumeric ? Number(leftPart) - Number(rightPart) : leftPart < rightPart ? -1 : leftPart > rightPart ? 1 : 0;
+        if (difference !== 0) {
+            return difference;
+        }
+    }
+    return left.length - right.length;
+};
+/* Negative when `a` is older than `b`, a prerelease coming before its own release. A version that is not semver sorts below every one that is. */
 export const compareVersions = (a, b) => {
     const left = SEMVER.exec(a);
     const right = SEMVER.exec(b);
@@ -18,5 +38,10 @@ export const compareVersions = (a, b) => {
             return difference;
         }
     }
-    return 0;
+    const leftPrerelease = left[4];
+    const rightPrerelease = right[4];
+    if (leftPrerelease === undefined || rightPrerelease === undefined) {
+        return (leftPrerelease === undefined ? 1 : 0) - (rightPrerelease === undefined ? 1 : 0);
+    }
+    return comparePrereleases(leftPrerelease, rightPrerelease);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/shell",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "description": "The main process of an Electron app: its menu, its updater and the guards around its page.",
   "license": "FSL-1.1-MIT",
   "author": "Bas Milius",

package/src/bridge/versions.ts

@@ -3,12 +3,38 @@
  * notes of a version land under the wrong heading. One comparison, so the two cannot disagree.
  */
 
-const SEMVER = /^(\d+)\.(\d+)\.(\d+)$/;
+const SEMVER = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/;
+const NUMERIC = /^\d+$/;
 
-/* A plain `1.2.3`. A git tag carries a `v` in front of it, which is the tag's and not the version's. */
+/* A `1.2.3` or `1.2.3-beta.1`. A git tag carries a `v` in front of it, which is the tag's and not the version's. */
 export const isVersion = (version: string): boolean => SEMVER.test(version);
 
-/* Negative when `a` is older than `b`. A version that is not semver sorts below every one that is. */
+/* Semver's order: part by part, numbers by value and below words, and a shorter list below a longer one it starts. */
+const comparePrereleases = (a: string, b: string): number => {
+    const left = a.split('.');
+    const right = b.split('.');
+
+    for (let i = 0; i < Math.min(left.length, right.length); i++) {
+        const leftPart = left[i]!;
+        const rightPart = right[i]!;
+        const leftNumeric = NUMERIC.test(leftPart);
+        const rightNumeric = NUMERIC.test(rightPart);
+
+        if (leftNumeric !== rightNumeric) {
+            return leftNumeric ? -1 : 1;
+        }
+
+        const difference = leftNumeric ? Number(leftPart) - Number(rightPart) : leftPart < rightPart ? -1 : leftPart > rightPart ? 1 : 0;
+
+        if (difference !== 0) {
+            return difference;
+        }
+    }
+
+    return left.length - right.length;
+};
+
+/* Negative when `a` is older than `b`, a prerelease coming before its own release. A version that is not semver sorts below every one that is. */
 export const compareVersions = (a: string, b: string): number => {
     const left = SEMVER.exec(a);
     const right = SEMVER.exec(b);
@@ -25,5 +51,12 @@ export const compareVersions = (a: string, b: string): number => {
         }
     }
 
-    return 0;
+    const leftPrerelease = left[4];
+    const rightPrerelease = right[4];
+
+    if (leftPrerelease === undefined || rightPrerelease === undefined) {
+        return (leftPrerelease === undefined ? 1 : 0) - (rightPrerelease === undefined ? 1 : 0);
+    }
+
+    return comparePrereleases(leftPrerelease, rightPrerelease);
 };