modernize, fix conflicts

.gitignore

@@ -0,0 +1 @@
+node_modules

index.js

@@ -1,4 +1,5 @@
 var esprima = require('esprima');
+var escodegen = require('escodegen');
 
 var traverse = function (node, cb) {
     if (Array.isArray(node)) {
@@ -19,7 +20,7 @@ var traverse = function (node, cb) {
 };
 
 var walk = function (src, cb) {
-    var ast = esprima.parse(src, { range : true });
+    var ast = esprima.parse(src);
     traverse(ast, cb);
 };
 
@@ -39,7 +40,6 @@ exports.find = function (src, opts) {
             && node.type === 'CallExpression'
             && c.type === 'Identifier'
             && c.name === word
-            && src.slice(c.range[0], c.range[1]) === word
         ;
     }
 
@@ -54,9 +54,7 @@ exports.find = function (src, opts) {
             modules.strings.push(node.arguments[0].value);
         }
         else {
-            var r = node.arguments[0].range;
-            var s = src.slice(r[0], r[1]);
-            modules.expressions.push(s);
+            modules.expressions.push(escodegen.generate(node.arguments[0]));
         }
     });
 

package.json

@@ -1,7 +1,7 @@
 {
     "name" : "detective",
     "description" : "Find all calls to require() no matter how crazily nested using a proper walk of the AST",
-    "version" : "1.1.0",
+    "version" : "2.0.0",
     "repository" : {
         "type" : "git",
         "url" : "git://github.com/substack/node-detective.git"
@@ -13,22 +13,15 @@
         "analyze",
         "ast"
     ],
-    "directories" : {
-        "lib" : ".",
-        "example" : "example",
-        "test" : "test"
-    },
     "scripts" : {
         "test" : "tap test/*.js"
     },
     "dependencies" : {
-        "esprima" : "~1.0.2"
+        "esprima" : "1.0.2",
+        "escodegen": "0.0.15"
     },
     "devDependencies" : {
-        "tap" : "~0.2.6"
-    },
-    "engines" : {
-        "node" : ">=0.6.0"
+        "tap" : "~0.4.0"
     },
     "license" : "MIT",
     "author" : {

test/both.js

@@ -6,6 +6,6 @@ var src = fs.readFileSync(__dirname + '/files/both.js');
 test('both', function (t) {
     var modules = detective.find(src);
     t.deepEqual(modules.strings, [ 'a', 'b' ]);
-    t.deepEqual(modules.expressions, [ "'c'+x", "'d'+y" ]);
+    t.deepEqual(modules.expressions, [ "'c' + x", "'d' + y" ]);
     t.end();
 });