Merge pull request #1 from Cff01/npmGH-164

Let '.' start non-numeric prerelease in loose mode
Cff01 · Dec 10, 2021 · ef9e768 · ef9e768
2 parents cb1ca1d + 174477e
commit ef9e768
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/internal/re.js b/internal/re.js
@@ -58,8 +58,13 @@ createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NUMERICIDENTIFIERLOOSE]
 createToken('PRERELEASE', `(?:-(${src[t.PRERELEASEIDENTIFIER]
 }(?:\\.${src[t.PRERELEASEIDENTIFIER]})*))`)
 
-createToken('PRERELEASELOOSE', `(?:-?(${src[t.PRERELEASEIDENTIFIERLOOSE]
-}(?:\\.${src[t.PRERELEASEIDENTIFIERLOOSE]})*))`)
+// loose mode prereleases can start with a dot, but only if they're not numeric
+// 1.2.3.foo is allowed, 1.2.3.4 is not.
+createToken('PRERELEASELOOSE', `(?:(?:-|\\.*(?=[a-zA-Z-]))(${
+  src[t.PRERELEASEIDENTIFIERLOOSE]
+}(?:\\.${
+  src[t.PRERELEASEIDENTIFIERLOOSE]
+})*))`)
 
 // ## Build Metadata Identifier
 // Any combination of digits, letters, or hyphens.

diff --git a/test/fixtures/invalid-versions.js b/test/fixtures/invalid-versions.js
@@ -12,4 +12,7 @@ module.exports = [
   [ /a regexp/, 'regexp is not a string'],
   [ /1.2.3/, 'semver-ish regexp is not a string'],
   [ {toString: () => '1.2.3'}, 'obj with a tostring is not a string'],
+  [ '1.2.3.foo', 'no dot-led prerelease tag, strict'],
+  [ '1.2.3.4', 'no dot-led numeric prerelease tag, strict'],
+  [ '1.2.3.4', 'no dot-led numeric prerelease tag, loose', { loose: true }],
 ]
diff --git a/test/functions/valid.js b/test/functions/valid.js
@@ -15,5 +15,9 @@ t.test('validate a version into a SemVer object', t => {
   t.equal(valid(s), '4.5.6', 'return the version if a SemVer obj')
   t.equal(valid('4.2.0foo', true), '4.2.0-foo', 'looseness as a boolean')
   t.equal(valid('4.2.0foo', { loose: true }), '4.2.0-foo', 'looseness as an option')
+  t.equal(valid('4.2.0.foo', { loose: true }), '4.2.0-foo', 'dot-led prerelease allowed in loose mode')
+  t.equal(valid('4.2.0.-foo', { loose: true }), '4.2.0--foo', 'dot-and-dash-led prerelease allowed in loose mode')
+  t.equal(valid('4.2.0--foo', { loose: true }), '4.2.0--foo', 'double-dash, loose')
+  t.equal(valid('4.2.0--foo'), '4.2.0--foo', 'double-dash, strict')
   t.end()
 })