Improve the regex, require Node.js 8 (#15)

sindresorhus · Apr 19, 2019 · 3fe447d · 3fe447d
1 parent bea513f
commit 3fe447d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
 language: node_js
 node_js:
  - '8'
- - '6'
diff --git a/index.js b/index.js
@@ -1,2 +1,3 @@
 'use strict';
-module.exports = () => /\bv?(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\da-z-]+(?:\.[\da-z-]+)*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?\b/ig;
+module.exports = () => /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/ig;
+
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
  "url": "sindresorhus.com"
  },
  "engines": {
- "node": ">=6"
+ "node": ">=8"
  },
  "scripts": {
  "test": "xo && ava"

diff --git a/test.js b/test.js
@@ -10,8 +10,8 @@ const fixture = [
  '2.7.2+asdf',
  '1.2.3-a.b.c.10.d.5',
  '2.7.2-foo+bar',
- '1.2.3-alpha.10.beta.0',
- '1.2.3-alpha.10.beta.0+build.unicorn.rainbow',
+ '1.2.3-alpha.10.beta',
+ '1.2.3-alpha.10.beta+build.unicorn.rainbow',
  'foo 0.0.0 bar 0.0.0'
 ];
 
@@ -31,7 +31,55 @@ test('returns semver on match', t => {
  t.deepEqual('foo 0.0.0 bar 0.1.1'.match(m()), ['0.0.0', '0.1.1']);
 });
 
-// See #7
-test.failing('does not return tag prefix', t => {
+test('#7, does not return tag prefix', t => {
  t.deepEqual('v0.0.0'.match(m()), ['0.0.0']);
 });
+
+test('#14, does not match substrings of longer semver-similar strings, respect semver2.0.0 clause 9', t => {
+ const invalidStrings = [
+ '1',
+ '1.2',
+ '1.2.3-0123',
+ '1.2.3-0123.0123',
+ '1.1.2+.123',
+ '+invalid',
+ '-invalid',
+ '-invalid+invalid',
+ '-invalid.01',
+ 'alpha',
+ 'alpha.beta',
+ 'alpha.beta.1',
+ 'alpha.1',
+ 'alpha+beta',
+ 'alpha_beta',
+ 'alpha.',
+ 'alpha..',
+ 'beta',
+ '1.0.0-alpha_beta',
+ '-alpha.',
+ '1.0.0-alpha..',
+ '1.0.0-alpha..1',
+ '1.0.0-alpha...1',
+ '1.0.0-alpha....1',
+ '1.0.0-alpha.....1',
+ '1.0.0-alpha......1',
+ '1.0.0-alpha.......1',
+ '01.1.1',
+ '1.01.1',
+ '1.1.01',
+ '1.2',
+ '1.2.3.DEV',
+ '1.2-SNAPSHOT',
+ '1.2.31.2.3----RC-SNAPSHOT.12.09.1--..12+788',
+ '1.2-RC-SNAPSHOT',
+ '-1.0.3-gamma+b7718',
+ '+justmeta',
+ '9.8.7+meta+meta',
+ '9.8.7-whatever+meta+meta',
+ '99999999999999999999999.999999999999999999.99999999999999999----RC-SNAPSHOT.12.09.1--------------------------------..12'
+ ];
+
+ for (const string of invalidStrings) {
+ t.notRegex(string, m());
+ }
+});