Handle strict, rc, known or known-ver the same way

1. when obtaining for the list
2. when comparing as input
3. when comparing to input (range)

Author: paulo-ferraz-oliveira

dist/index.js

@@ -26336,6 +26336,15 @@ function parseVersion(v) {
   return semver.coerce(v, { includePrerelease: true, loose: true })
 }
 
+function isStrictRCOrKnown(spec) {
+  return (
+    isStrictVersion() ||
+    isRC(spec) ||
+    isKnownBranch(spec) ||
+    isKnownVerBranch(spec)
+  )
+}
+
 function getVersionFromSpec(spec0, versions0) {
   let latest
   Object.keys(versions0).forEach((v) => {
@@ -26349,17 +26358,8 @@ function getVersionFromSpec(spec0, versions0) {
   const altVersions = {}
   Object.entries(versions0).forEach(([version, altVersion]) => {
     let coerced
-    if (
-      isStrictVersion() ||
-      isRC(version) ||
-      isKnownBranch(spec0) ||
-      isKnownVerBranch(spec0)
-    ) {
-      // If
-      // - `version-type: strict`, or
-      // - version is RC, or
-      // - version is from a known branch,
-      // we just try to remove a potential initial v
+    if (isStrictRCOrKnown(spec)) {
+      // We just try to remove a potential initial v
       coerced = maybeRemoveVPrefix(version)
     } else {
       // Otherwise, we place the version into a version bucket
@@ -26376,18 +26376,9 @@ function getVersionFromSpec(spec0, versions0) {
   const rangeMax = semver.maxSatisfying(versions, rangeForMax)
   let version = null
 
-  if (
-    isStrictVersion() ||
-    isRC(spec0) ||
-    isKnownBranch(spec0) ||
-    isKnownVerBranch(spec0)
-  ) {
+  if (isStrictRCOrKnown(spec)) {
     if (versions0[spec]) {
-      // If
-      // - `version-type: strict`, or
-      // - version is RC, or
-      // - version is from a known branch,
-      // we obtain it directly
+      // We obtain it directly
       version = versions0[spec]
     }
   } else if (spec0 === 'latest') {
@@ -26396,10 +26387,16 @@ function getVersionFromSpec(spec0, versions0) {
     // Otherwise, we compare alt. versions' semver ranges to this version, from highest to lowest
     const thatVersion = spec
     const thatVersionAbc = versionAbc(thatVersion)
-    const thatVersionAbcRange = semver.validRange(thatVersionAbc)
+    const thatVersionAbcRange = thatVersionAbc
+      ? undefined
+      : semver.validRange(thatVersionAbc)
 
     versions = altVersions[rangeMax]
     for (let i = versions.length - 1; i >= 0; i -= 1) {
+      if (isStrictRCOrKnown(spec)) {
+        // We move on, skipping this version for comparison
+        continue
+      }
       const thisVersion = versions[i]
       const thisVersionAbc = versionAbc(thisVersion)
       const thisVersionAbcRange = semver.validRange(thisVersionAbc)

src/setup-beam.js

@@ -461,6 +461,15 @@ function parseVersion(v) {
   return semver.coerce(v, { includePrerelease: true, loose: true })
 }
 
+function isStrictRCOrKnown(spec) {
+  return (
+    isStrictVersion() ||
+    isRC(spec) ||
+    isKnownBranch(spec) ||
+    isKnownVerBranch(spec)
+  )
+}
+
 function getVersionFromSpec(spec0, versions0) {
   let latest
   Object.keys(versions0).forEach((v) => {
@@ -474,17 +483,8 @@ function getVersionFromSpec(spec0, versions0) {
   const altVersions = {}
   Object.entries(versions0).forEach(([version, altVersion]) => {
     let coerced
-    if (
-      isStrictVersion() ||
-      isRC(version) ||
-      isKnownBranch(spec0) ||
-      isKnownVerBranch(spec0)
-    ) {
-      // If
-      // - `version-type: strict`, or
-      // - version is RC, or
-      // - version is from a known branch,
-      // we just try to remove a potential initial v
+    if (isStrictRCOrKnown(spec)) {
+      // We just try to remove a potential initial v
       coerced = maybeRemoveVPrefix(version)
     } else {
       // Otherwise, we place the version into a version bucket
@@ -501,18 +501,9 @@ function getVersionFromSpec(spec0, versions0) {
   const rangeMax = semver.maxSatisfying(versions, rangeForMax)
   let version = null
 
-  if (
-    isStrictVersion() ||
-    isRC(spec0) ||
-    isKnownBranch(spec0) ||
-    isKnownVerBranch(spec0)
-  ) {
+  if (isStrictRCOrKnown(spec)) {
     if (versions0[spec]) {
-      // If
-      // - `version-type: strict`, or
-      // - version is RC, or
-      // - version is from a known branch,
-      // we obtain it directly
+      // We obtain it directly
       version = versions0[spec]
     }
   } else if (spec0 === 'latest') {
@@ -521,10 +512,16 @@ function getVersionFromSpec(spec0, versions0) {
     // Otherwise, we compare alt. versions' semver ranges to this version, from highest to lowest
     const thatVersion = spec
     const thatVersionAbc = versionAbc(thatVersion)
-    const thatVersionAbcRange = semver.validRange(thatVersionAbc)
+    const thatVersionAbcRange = thatVersionAbc
+      ? undefined
+      : semver.validRange(thatVersionAbc)
 
     versions = altVersions[rangeMax]
     for (let i = versions.length - 1; i >= 0; i -= 1) {
+      if (isStrictRCOrKnown(spec)) {
+        // We move on, skipping this version for comparison
+        continue
+      }
       const thisVersion = versions[i]
       const thisVersionAbc = versionAbc(thisVersion)
       const thisVersionAbcRange = semver.validRange(thisVersionAbc)

test/setup-beam.test.js

@@ -885,6 +885,11 @@ describe('.getVersionFromSpec(_)', () => {
     got = setupBeam.getVersionFromSpec(spec, matrix.otp['ubuntu-24.04'])
     assert.deepStrictEqual(got, expected)
 
+    spec = 'maint-27'
+    expected = 'maint-27'
+    got = setupBeam.getVersionFromSpec(spec, matrix.otp['ubuntu-24.04'])
+    assert.deepStrictEqual(got, expected)
+
     // range > 0 excludes -rc...
     spec = '> 0'
     expected = 'OTP-27.0'