Support hotfix versions

Closes gh-50

Author: rwinch

lib/latest-version-extension.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const TagSemVerRx = /^v?(\d+)\.(\d+)\.(\d+)(?:-(RC|M)(\d+))?$/
+const TagSemVerRx = /^v?(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?(?:-(RC|M)(\d+))?$/
 
 const { name: packageName } = require('#package')
 /**
@@ -21,7 +21,6 @@ module.exports.register = function ({ playbook }) {
       .filter((a) => a.origins[0].tag)
       .sort((a, b) => compareSemVerAscending(componentRefname(a), componentRefname(b)))
       .reverse()
-
     for (const componentVersionBucket of tags) {
       const { name: componentName } = componentVersionBucket
       if (!componentToGenerationMapping.has(componentName)) {
@@ -71,7 +70,7 @@ function compareSemVerAscending (lhs, rhs) {
   for (const [index, leftPart] of lhsParts.entries()) {
     const rightPart = rhsParts[index]
     if (leftPart !== rightPart) {
-      if (index !== 3) {
+      if (index !== lhsParts.length - 2) {
         return Number(leftPart) - Number(rightPart)
       }
       return leftPart < rightPart ? -1 : 1
@@ -80,13 +79,32 @@ function compareSemVerAscending (lhs, rhs) {
   return 0
 }
 
+/**
+ * Returns an array of the parsed version [int major, int minor, int patch, int hotfix, String type, int typeVersion].
+ *
+ * If hotfix is undefined, it is explicitly replaced with -1 to ensure proper sorting.
+ *
+ * The type is either M (milestones), RC (release candidates), or Z (explicitly replaced for releases to ensure proper
+ * sorting of releases).
+ *
+ * The type version is the count of the type. If it is undefined (only releases), then it remains undefined since
+ * this comparison is unnecessary.
+ *
+ * @param version the version in the format of a tag (e.g. v1.0.0-M1 v1.0.0-RC1 v1.0.0 v1.0.1 v1.0.1.1). The v prefix is
+ * optional, so v1.0.0 and 1.0.0 are treated the same.
+ * @returns an array of the parsed version used for comparison.
+ */
 function extractVersionParts (version) {
   const match = version.match(TagSemVerRx)
   if (!match) {
     throw new Error(`Cannot parse version = ${version} with regex ${TagSemVerRx}`)
   }
   const result = Array.from(match)
   result.splice(0, 1)
+  const hotfixIndex = result.length - 3
+  if (result[hotfixIndex] === undefined) {
+    result[hotfixIndex] = -1
+  }
   const milestoneRcIndex = result.length - 2
   if (result[milestoneRcIndex] === undefined) {
     result[milestoneRcIndex] = 'Z'

test/latest-version-extension-test.js

@@ -145,6 +145,12 @@ describe('latest-version-extension', () => {
       expect(refnames).to.eql(['5.6.10'])
     })
 
+    it('handles hotfixes tags', async () => {
+      contentAggregate = [createTag('5.6.8.1'), createTag('5.6.8'), createTag('5.6.8.2')]
+      const refnames = await mapContentAggregateToRefname()
+      expect(refnames).to.eql(['5.6.8.2'])
+    })
+
     it('handles tags prefixed with v', async () => {
       contentAggregate = [createTag('v6.0.1'), createTag('v6.0.0')]
       const refnames = await mapContentAggregateToRefname()
@@ -206,7 +212,7 @@ describe('latest-version-extension', () => {
     it('handles invalid version format with proper message', async () => {
       contentAggregate = [createTag('6.0.0-M3-m')]
       expect(await trapAsyncError(runContentAggregate)).to.throw(
-        'Cannot parse version = 6.0.0-M3-m with regex /^v?(\\d+)\\.(\\d+)\\.(\\d+)(?:-(RC|M)(\\d+))?$/'
+        'Cannot parse version = 6.0.0-M3-m with regex /^v?(\\d+)\\.(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-(RC|M)(\\d+))?$/'
       )
     })
   })