Merge pull request #40 from elrrrrrrr/fix/fixUnderscore

Fix/fix underscore
spmjs · Dec 14, 2015 · aa12ad0 · aa12ad0
2 parents 2cdf11b + a842ed6
commit aa12ad0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -2,8 +2,8 @@
 
 var debug = require('debug')('spm-client:util');
 
-var ID_REGEX = /^([a-z][a-z0-9\-\.]*)(?:@(.+))?$/;
-var NAME_REGEX = /^[a-z][a-z0-9\-\.]*$/;
+var ID_REGEX = /^([a-z][a-z0-9\-\._]*)(?:@(.+))?$/;
+var NAME_REGEX = /^[a-z][a-z0-9\-\._]*$/;
 
 exports.errorHandle = errorHandle;
 exports.resolveid = resolveid;

diff --git a/test/publish.test.js b/test/publish.test.js
@@ -104,7 +104,7 @@ describe('/lib/publish.js', function() {
     } catch(e) {
       err = e;
     }
-    err.message.should.eql('name is invalid, should match /^[a-z][a-z0-9\\-\\.]*$/');
+    err.message.should.eql('name is invalid, should match /^[a-z][a-z0-9\\-\\._]*$/');
 
     try {
       err = undefined;

diff --git a/test/util.test.js b/test/util.test.js
@@ -17,4 +17,11 @@ describe('/lib/util.js', function() {
     (util.resolveid('@1.0.0') === null).should.be.true;
     (util.resolveid('_@1.0.0') === null).should.be.true;
   });
+
+  it('should resolve id contains underscore', function* () {
+    util.resolveid('lodash._getnative@1.0').should.eql({
+      name: 'lodash._getnative',
+      version: '1.0'
+    });
+  });
 });