Fixes to include/exclude behavior

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
 npm-debug.log
-node_modules
+/node_modules
 /npm-alias

package.json

@@ -39,6 +39,7 @@
   ],
   "dependencies": {
     "babylon": "^7.0.0-beta.41",
+    "node-modules-regexp": "^1.0.0",
     "pirates": "^3.0.2",
     "vlq": "^0.2.1"
   }

register.js

@@ -16,6 +16,7 @@ module.exports = function setOptions(newOptions) {
 
 var jsLoader = require.extensions['.js'];
 var exts = [ '.js', '.mjs', '.jsx', '.flow', '.es6' ];
+var nodeModulesRegexp = require('node-modules-regexp');
 
 var revert = pirates.addHook(function hook(code, filename) {
   try {
@@ -25,15 +26,21 @@ var revert = pirates.addHook(function hook(code, filename) {
     e.message = filename + ': ' + e.message;
     throw e;
   }
-}, { exts: exts, matcher: shouldTransform });
+}, { exts: exts, matcher: shouldTransform, ignoreNodeModules: false });
 
 function shouldTransform(filename) {
   var includes = options && regexpPattern(options.includes || options.include);
   var excludes =
     options && 'excludes' in options ? regexpPattern(options.excludes) :
     options && 'exclude' in options ? regexpPattern(options.exclude) :
-    /\/node_modules\//;
-  return (!includes || includes.test(filename)) && !(excludes && excludes.test(filename));
+    nodeModulesRegexp;
+  if (includes && includes.test(filename)) {
+    return true;
+  }
+  if (excludes && excludes.test(filename)) {
+    return false;
+  }
+  return true;
 }
 
 // Given a null | string | RegExp | any, returns null | Regexp or throws a

test.sh

@@ -39,6 +39,16 @@ echo "Test: node require hook"
 RES=$(node -e 'require("./register");require("./test/test-node-module.js")');
 if [ "$RES" != 42 ]; then echo 'Node require hook failed'; exit 1; fi;
 
+# Test node require hook: exclude override
+echo "Test: node require hook with excludes override"
+RES=$(node -e 'require("./register")({excludes: null});require("./test/node_modules/test-node-module.js")');
+if [ "$RES" != 42 ]; then echo 'Node require hook: exclude override failed'; exit 1; fi;
+
+# Test node require hook: include priority
+echo "Test: node require hook with include priority"
+RES=$(node -e 'require("./register")({includes: "test-node-module.js"});require("./test/node_modules/test-node-module.js")');
+if [ "$RES" != 42 ]; then echo 'Node require hook: include priority failed'; exit 1; fi;
+
 # Test flow-node
 echo "Test: flow-node"
 FLOW_NODE=$(./flow-node ./test/test-node-module.js);