fix: prerelease identifier starting with digits (#781)

Closes #775

The regex for the prerelease identifier was not precise
enough. Changing the order of numeric and non-numeric parts fixes the
issue. I reverted the change to `inc` function in `semver.js`. The tests
still pass 😃

I added tests that check the exact result of parsing valid versions in
particular the pre-release and build parts which was somehow missing. We
might want to add edge cases here.

Related: #764 (comment)

Author: mbtools

classes/semver.js

@@ -1,6 +1,6 @@
 const debug = require('../internal/debug')
 const { MAX_LENGTH, MAX_SAFE_INTEGER } = require('../internal/constants')
-const { safeRe: re, safeSrc: src, t } = require('../internal/re')
+const { safeRe: re, t } = require('../internal/re')
 
 const parseOptions = require('../internal/parse-options')
 const { compareIdentifiers } = require('../internal/identifiers')
@@ -182,8 +182,7 @@ class SemVer {
       }
       // Avoid an invalid semver results
       if (identifier) {
-        const r = new RegExp(`^${this.options.loose ? src[t.PRERELEASELOOSE] : src[t.PRERELEASE]}$`)
-        const match = `-${identifier}`.match(r)
+        const match = `-${identifier}`.match(this.options.loose ? re[t.PRERELEASELOOSE] : re[t.PRERELEASE])
         if (!match || match[1] !== identifier) {
           throw new Error(`invalid identifier: ${identifier}`)
         }

internal/re.js

@@ -76,12 +76,14 @@ createToken('MAINVERSIONLOOSE', `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` +
 
 // ## Pre-release Version Identifier
 // A numeric identifier, or a non-numeric identifier.
+// Non-numberic identifiers include numberic identifiers but can be longer.
+// Therefore non-numberic identifiers must go first.
 
-createToken('PRERELEASEIDENTIFIER', `(?:${src[t.NUMERICIDENTIFIER]
-}|${src[t.NONNUMERICIDENTIFIER]})`)
+createToken('PRERELEASEIDENTIFIER', `(?:${src[t.NONNUMERICIDENTIFIER]
+}|${src[t.NUMERICIDENTIFIER]})`)
 
-createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NUMERICIDENTIFIERLOOSE]
-}|${src[t.NONNUMERICIDENTIFIER]})`)
+createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NONNUMERICIDENTIFIER]
+}|${src[t.NUMERICIDENTIFIERLOOSE]})`)
 
 // ## Pre-release Version
 // Hyphen, followed by one or more dot-separated pre-release version

test/classes/semver.js

@@ -3,7 +3,22 @@ const SemVer = require('../../classes/semver')
 const increments = require('../fixtures/increments.js')
 const comparisons = require('../fixtures/comparisons.js')
 const equality = require('../fixtures/equality.js')
-const invalidVersions = require('../fixtures/invalid-versions')
+const invalidVersions = require('../fixtures/invalid-versions.js')
+const validVersions = require('../fixtures/valid-versions.js')
+
+test('valid versions', t => {
+  t.plan(validVersions.length)
+  validVersions.forEach(([v, major, minor, patch, prerelease, build]) => t.test(v, t => {
+    const s = new SemVer(v)
+    t.strictSame(s.major, major)
+    t.strictSame(s.minor, minor)
+    t.strictSame(s.patch, patch)
+    t.strictSame(s.prerelease, prerelease)
+    t.strictSame(s.build, build)
+    t.strictSame(s.raw, v)
+    t.end()
+  }))
+})
 
 test('comparisons', t => {
   t.plan(comparisons.length)

test/fixtures/valid-versions.js

@@ -0,0 +1,31 @@
+// [version, major, minor, patch, prerelease[], build[]]
+module.exports = [
+  ['1.0.0', 1, 0, 0, [], []],
+  ['2.1.0', 2, 1, 0, [], []],
+  ['3.2.1', 3, 2, 1, [], []],
+  ['v1.2.3', 1, 2, 3, [], []],
+
+  // prerelease
+  ['1.2.3-0', 1, 2, 3, [0], []],
+  ['1.2.3-123', 1, 2, 3, [123], []],
+  ['1.2.3-1.2.3', 1, 2, 3, [1, 2, 3], []],
+  ['1.2.3-1a', 1, 2, 3, ['1a'], []],
+  ['1.2.3-a1', 1, 2, 3, ['a1'], []],
+  ['1.2.3-alpha', 1, 2, 3, ['alpha'], []],
+  ['1.2.3-alpha.1', 1, 2, 3, ['alpha', 1], []],
+  ['1.2.3-alpha-1', 1, 2, 3, ['alpha-1'], []],
+  ['1.2.3-alpha-.-beta', 1, 2, 3, ['alpha-', '-beta'], []],
+
+  // build
+  ['1.2.3+456', 1, 2, 3, [], ['456']],
+  ['1.2.3+build', 1, 2, 3, [], ['build']],
+  ['1.2.3+new-build', 1, 2, 3, [], ['new-build']],
+  ['1.2.3+build.1', 1, 2, 3, [], ['build', '1']],
+  ['1.2.3+build.1a', 1, 2, 3, [], ['build', '1a']],
+  ['1.2.3+build.a1', 1, 2, 3, [], ['build', 'a1']],
+  ['1.2.3+build.alpha', 1, 2, 3, [], ['build', 'alpha']],
+  ['1.2.3+build.alpha.beta', 1, 2, 3, [], ['build', 'alpha', 'beta']],
+
+  // mixed
+  ['1.2.3-alpha+build', 1, 2, 3, ['alpha'], ['build']],
+]

test/functions/coerce.js

@@ -118,6 +118,13 @@ test('coerce tests', (t) => {
     ['1.2.3.4-rc.5', '1.2.3', { includePrerelease: true }],
     ['1.2.3.4+rev.6', '1.2.3', { includePrerelease: true }],
 
+    ['1.0.0-1a', '1.0.0-1a', { includePrerelease: true }],
+    ['1.0.0-alpha.12ab', '1.0.0-alpha.12ab', { includePrerelease: true }],
+    ['1.0.0-alpha.1234.23cd', '1.0.0-alpha.1234.23cd', { includePrerelease: true }],
+    ['1.0.0-nightly.abc123', '1.0.0-nightly.abc123', { includePrerelease: true }],
+    ['1.0.0-nightly.abcdef', '1.0.0-nightly.abcdef', { includePrerelease: true }],
+    ['1.0.0-nightly.123456', '1.0.0-nightly.123456', { includePrerelease: true }],
+
     ['1+rev.6', '1.0.0+rev.6', { includePrerelease: true }],
     ['1.2+rev.6', '1.2.0+rev.6', { includePrerelease: true }],
     ['1.2.3+rev.6', '1.2.3+rev.6', { includePrerelease: true }],