Fix: Support pre-release and build metadata segments of a node version (fixes #3, closes #2, closes #4)

Author: amblp

README.md

@@ -15,14 +15,20 @@ Turn node's process.version into something useful.
 ```js
 var nodeVersion = require('parse-node-version')(process.version);
 
-console.log(nodeVersion.major, nodeVersion.minor, nodeVersion.patch);
+console.log(
+  nodeVersion.major,
+  nodeVersion.minor,
+  nodeVersion.patch,
+  nodeVersion.pre,
+  nodeVersion.build
+);
 ```
 
 ## API
 
 ### parseVersion(nodeVersionString)
 
-Takes a node version string (usually `process.version`) and returns an object with the `major`, `minor`, and `patch` keys which will all be parsed digits.
+Takes a node version string (usually `process.version`) and returns an object with the `major`/`minor`/`patch` (which will all be numbers) and `pre`/`build` keys (which will always be a string). If the version doesn't contain any pre-release or build information, the properties will be returned as empty string.
 
 ## License
 

index.js

@@ -1,16 +1,20 @@
 'use strict';
 
 function parseNodeVersion(version) {
-  var match = version.match(/^v(\d{1,2})\.(\d{1,2})\.(\d{1,2})$/);
+  var match = version.match(/^v(\d{1,2})\.(\d{1,2})\.(\d{1,2})(?:-([0-9A-Za-z-.]+))?(?:\+([0-9A-Za-z-.]+))?$/); // eslint-disable-line max-len
   if (!match) {
     throw new Error('Unable to parse: ' + version);
   }
 
-  return {
+  var res = {
     major: parseInt(match[1], 10),
     minor: parseInt(match[2], 10),
     patch: parseInt(match[3], 10),
+    pre: match[4] || '',
+    build: match[5] || '',
   };
+
+  return res;
 }
 
 module.exports = parseNodeVersion;

test/index.js

@@ -48,4 +48,44 @@ describe('parseNodeVersion', function() {
     expect(invalid).toThrow('Unable to parse: v8.111.8');
     done();
   });
+
+  it('always returns strings if no pre-release or build metadata', function(done) {
+    var nodeVersion = parseNodeVersion(process.version);
+    expect(nodeVersion.pre).toBeA('string');
+    expect(nodeVersion.pre).toEqual('');
+    expect(nodeVersion.build).toBeA('string');
+    expect(nodeVersion.build).toEqual('');
+    done();
+  });
+
+  it('matches pre-release label with single identifier', function(done) {
+    var nodeVersion = parseNodeVersion('v1.2.3-alpha');
+    expect(nodeVersion.pre).toEqual('alpha');
+    done();
+  });
+
+  it('matches pre-release label with multiple identifiers', function(done) {
+    var nodeVersion = parseNodeVersion('v1.2.3-x.7.z.92');
+    expect(nodeVersion.pre).toEqual('x.7.z.92');
+    done();
+  });
+
+  it('matches pre-release label with dashes', function(done) {
+    var nodeVersion = parseNodeVersion('v1.2.3-x-7-z.92');
+    expect(nodeVersion.pre).toEqual('x-7-z.92');
+    done();
+  });
+
+  it('matches build metadata', function(done) {
+    var nodeVersion = parseNodeVersion('v10.15.0+0-b20181231T20014594');
+    expect(nodeVersion.build).toEqual('0-b20181231T20014594');
+    done();
+  });
+
+  it('matches pre-release label and build metadata', function(done) {
+    var nodeVersion = parseNodeVersion('v1.0.0-beta+exp.sha.5114f85');
+    expect(nodeVersion.pre).toEqual('beta');
+    expect(nodeVersion.build).toEqual('exp.sha.5114f85');
+    done();
+  });
 });