Be really strict about the kind of redefinition we expect

Author: goto-bus-stop

index.js

@@ -49,7 +49,7 @@ exports.find = function (src, opts) {
     function visit(node, st, c) {
         var hasRequire = wordRe.test(src.slice(node.start, node.end));
         if (!hasRequire) return;
-        if (redefinesRequire(node)) return;
+        if (isBundledDefinition(node)) return;
         walk.base[node.type](node, st, c);
         if (node.type !== 'CallExpression') return;
         if (isRequire(node)) {
@@ -78,15 +78,17 @@ exports.find = function (src, opts) {
     });
 
     // Detect `require` redefinitions in function parameter lists, like
-    // in `[function(require,module,exports){` generated by browser-pack.
+    // in `{0:[function(require,module,exports){` generated by browser-pack.
     // This is a simple way to address the 99% case without doing full scope analysis
-    function redefinesRequire(node) {
-        if (node.type === 'FunctionExpression') {
-            return node.params.some(function (param) {
-                return param.type === 'Identifier' && param.name === word;
-            });
-        }
-        return false;
+    function isBundledDefinition(node) {
+        if (node.type !== 'ObjectExpression') return false;
+        if (node.properties.length < 1) return false;
+        var arr = node.properties[0].value;
+        if (arr.type !== 'ArrayExpression') return false;
+        if (arr.elements.length < 2) return false;
+        if (arr.elements[0].type !== 'FunctionExpression') return false;
+        var fn = arr.elements[0];
+        return fn.params.length > 0 && fn.params[0].type === 'Identifier' && fn.params[0].name === word;
     }
 
     return modules;

test/files/scope.js

@@ -1,8 +1,12 @@
 (function(modules){
     modules[1](function(i){return modules[i]()})
 })({1:[function (require,module,exports) {
-    require('./y')
+    require('./y') // inside a bundle; should not be detected
 },{'./y':2}],2:function(require,module,exports){
     console.log("abc")
 }})
+
+(function (require) {
+    require('./x'); // not inside a bundle; should be detected
+}(require)); // (because someone might do this)
 require('./z')

test/scope.js

@@ -5,5 +5,5 @@ var src = fs.readFileSync(__dirname + '/files/scope.js');
 
 test('scope', function (t) {
     t.plan(1);
-    t.deepEqual(detective(src), [ './z' ]);
+    t.deepEqual(detective(src), [ './x', './z' ]);
 });