@antora/content-classifier - npm Package Compare versions

Comparing version 2.1.2 to 2.2.0

lib/util/version-compare-desc.js

 'use strict'
 
+const NUMBERS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0']
+
 /**
- * A modified semantic version comparison function.
+ * An augmented semantic version comparison function.
  *
- * Based on a semantic version comparison algorithm with the following enhancements:
+ * Augments the semantic version comparison algorithm with the following enhancements:
  *
- * * Drops the leading "v" character from a semantic version, if present.
- * * Compares semantic versions in descending order (e.g., 2.0.0 comes before 1.0.0).
- * * Bubbles non-semantic versions to the top (e.g., dev, master).
- * * Compares non-semantic versions as strings.
+ * * Discard the leading "v" character, if present and the version string is a semantic version.
+ * * Compare non-semantic versions as strings in reverse alphabetical order (e.g., xenial comes before trusty).
+ * * Compare semantic versions in descending order (e.g., 2.0.0 comes before 1.0.0).
  *
- * This function assumes the string is a semantic version if it contains a "." character.
+ * This function assumes that the string is a semantic version if it begins with a number (or a "v"
+ * followed by a number) and contains a "." character or it's a parsable number.
  *
@@ -21,11 +23,22 @@ * @param {String} a - The left version string.
   if (a === b) return 0
-  const semverA = a.charAt() === 'v' ? a.substr(1) : a
-  const semverB = b.charAt() === 'v' ? b.substr(1) : b
-  if (~a.indexOf('.') || isNumber(semverA)) {
-    return ~b.indexOf('.') || isNumber(semverB) ? -1 * semverCompare(semverA, semverB) : 1
+  const semverA = resolveSemver(a)
+  const semverB = resolveSemver(b)
+  if (semverA) {
+    return semverB ? -1 * semverCompare(semverA, semverB) : 1
   } else {
-    return ~b.indexOf('.') || isNumber(semverB) ? -1 : -1 * a.localeCompare(b, 'en', { numeric: true })
+    return semverB ? -1 : -1 * a.localeCompare(b, 'en', { numeric: true })
   }
 }
 
+function resolveSemver (str) {
+  const char0 = str.charAt()
+  if (char0 === 'v') {
+    if (NUMBERS.includes(str.charAt(1)) && (str = str.substr(1)) && (~str.indexOf('.') || isNumber(str.charAt()))) {
+      return str
+    }
+  } else if (NUMBERS.includes(char0) && (~str.indexOf('.') || isNumber(str))) {
+    return str
+  }
+}
+
 function isNumber (str) {
@@ -51,4 +64,4 @@ return !isNaN(Number(str))
   for (let i = 0; i < 3; i++) {
-    const numA = numsA[i] ? Number(numsA[i]) : 0
-    const numB = numsB[i] ? Number(numsB[i]) : 0
+    const numA = Number(numsA[i] || 0)
+    const numB = Number(numsB[i] || 0)
     if (numA > numB) {
@@ -55,0 +68,0 @@ return 1

package.json

 {
   "name": "@antora/content-classifier",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Organizes aggregated content into a virtual file catalog for use in an Antora documentation pipeline.",
@@ -23,3 +23,3 @@ "license": "MPL-2.0",
   "devDependencies": {
-    "@antora/content-aggregator": "2.1.2"
+    "@antora/content-aggregator": "2.2.0"
   },
@@ -26,0 +26,0 @@ "engines": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

25922

increased by1.41%

Lines of code

604

increased by1.85%

No dependency changes