compare-versions - npm Package Compare versions

Comparing version 5.0.2 to 5.0.3

lib/esm/index.js

@@ -88,12 +88,26 @@ /**
     // else range of either "~" or "^" is assumed
-    const [v1, v2, v3] = validateAndParse(version);
-    const [r1, r2, r3] = validateAndParse(range);
-    if (compareStrings(v1, r1) !== 0)
-        return false;
-    if (op === '^') {
-        return compareSegments([v2, v3], [r2, r3]) >= 0;
+    const [v1, v2, v3, , vp] = validateAndParse(version);
+    const [r1, r2, r3, , rp] = validateAndParse(range);
+    const v = [v1, v2, v3];
+    const r = [r1, r2 !== null && r2 !== void 0 ? r2 : 'x', r3 !== null && r3 !== void 0 ? r3 : 'x'];
+    // validate pre-release
+    if (rp) {
+        if (!vp)
+            return false;
+        if (compareSegments(v, r) !== 0)
+            return false;
+        if (compareSegments(vp.split('.'), rp.split('.')) === -1)
+            return false;
     }
-    if (compareStrings(v2, r2) !== 0)
+    // first non-zero number
+    const nonZero = r.findIndex((v) => v !== '0') + 1;
+    // pointer to where segments can be >=
+    const i = op === '~' ? 2 : nonZero > 1 ? nonZero : 1;
+    // before pointer must be equal
+    if (compareSegments(v.slice(0, i), r.slice(0, i)) !== 0)
         return false;
-    return compareStrings(v3, r3) >= 0;
+    // after pointer must be >=
+    if (compareSegments(v.slice(i), r.slice(i)) === -1)
+        return false;
+    return true;
 };
@@ -100,0 +114,0 @@ const semver = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;

lib/umd/index.js

@@ -94,12 +94,26 @@ (function (global, factory) {
         // else range of either "~" or "^" is assumed
-        const [v1, v2, v3] = validateAndParse(version);
-        const [r1, r2, r3] = validateAndParse(range);
-        if (compareStrings(v1, r1) !== 0)
-            return false;
-        if (op === '^') {
-            return compareSegments([v2, v3], [r2, r3]) >= 0;
+        const [v1, v2, v3, , vp] = validateAndParse(version);
+        const [r1, r2, r3, , rp] = validateAndParse(range);
+        const v = [v1, v2, v3];
+        const r = [r1, r2 !== null && r2 !== void 0 ? r2 : 'x', r3 !== null && r3 !== void 0 ? r3 : 'x'];
+        // validate pre-release
+        if (rp) {
+            if (!vp)
+                return false;
+            if (compareSegments(v, r) !== 0)
+                return false;
+            if (compareSegments(vp.split('.'), rp.split('.')) === -1)
+                return false;
         }
-        if (compareStrings(v2, r2) !== 0)
+        // first non-zero number
+        const nonZero = r.findIndex((v) => v !== '0') + 1;
+        // pointer to where segments can be >=
+        const i = op === '~' ? 2 : nonZero > 1 ? nonZero : 1;
+        // before pointer must be equal
+        if (compareSegments(v.slice(0, i), r.slice(0, i)) !== 0)
             return false;
-        return compareStrings(v3, r3) >= 0;
+        // after pointer must be >=
+        if (compareSegments(v.slice(i), r.slice(i)) === -1)
+            return false;
+        return true;
     };
@@ -106,0 +120,0 @@ const semver = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;

package.json

 {
   "name": "compare-versions",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Compare semver version strings to find greater, equal or lesser.",
@@ -5,0 +5,0 @@ "repository": {

No alert changes

Improved metrics

Total package byte prevSize

43711

increased by8.09%

Lines of code

566

increased by5.2%

No dependency changes