[Pkg-javascript-commits] [node-detective] 43/119: use the latest esprima, remove support for (require)

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-detective.

commit 545eb29c05ef947b624dc7451377c0cdf480aab8
Author: James Halliday <mail at substack.net>
Date:   Sat Feb 2 15:40:58 2013 -0800

    use the latest esprima, remove support for (require)
---
 example/strings.js | 2 +-
 index.js           | 7 +++++--
 package.json       | 4 ++--
 test/files/skip.js | 7 -------
 test/skip.js       | 9 ---------
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/example/strings.js b/example/strings.js
index c176e7f..b9cc58f 100644
--- a/example/strings.js
+++ b/example/strings.js
@@ -1,4 +1,4 @@
-var detective = require('detective');
+var detective = require('../');
 var fs = require('fs');
 
 var src = fs.readFileSync(__dirname + '/strings_src.js');
diff --git a/index.js b/index.js
index cbd8c8a..cb1991f 100644
--- a/index.js
+++ b/index.js
@@ -3,6 +3,7 @@ var esprima = require('esprima');
 var traverse = function (node, cb) {
     if (Array.isArray(node)) {
         node.forEach(function (x) {
+            x.parent = node;
             traverse(x, cb);
         });
     }
@@ -10,6 +11,8 @@ var traverse = function (node, cb) {
         cb(node);
         
         Object.keys(node).forEach(function (key) {
+            if (key === 'parent' || !node[key]) return;
+            node[key].parent = node;
             traverse(node[key], cb);
         });
     }
@@ -35,7 +38,7 @@ exports.find = function (src, opts) {
             && node.type === 'CallExpression'
             && c.type === 'Identifier'
             && c.name === word
-            && src.slice(c.range[0], c.range[1] + 1) === word
+            && src.slice(c.range[0], c.range[1]) === word
         ;
     }
     
@@ -51,7 +54,7 @@ exports.find = function (src, opts) {
         }
         else {
             var r = node.arguments[0].range;
-            var s = src.slice(r[0], r[1] + 1);
+            var s = src.slice(r[0], r[1]);
             modules.expressions.push(s);
         }
     });
diff --git a/package.json b/package.json
index af79e06..32dfa8e 100644
--- a/package.json
+++ b/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" : "0.2.1",
+    "version" : "1.0.0",
     "repository" : {
         "type" : "git",
         "url" : "git://github.com/substack/node-detective.git"
@@ -22,7 +22,7 @@
         "test" : "tap test/*.js"
     },
     "dependencies" : {
-        "esprima" : "~0.9.9"
+        "esprima" : "~1.0.2"
     },
     "devDependencies" : {
         "tap" : "~0.2.6"
diff --git a/test/files/skip.js b/test/files/skip.js
deleted file mode 100644
index 89c6c1b..0000000
--- a/test/files/skip.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var a = require('a');
-var x = (require)('x');
-var b = require('b');
-var y = (function () { return (require)('y') })();
-var c = require('c');
-var abc = a.b(c);
-(require)('z').x.y();
diff --git a/test/skip.js b/test/skip.js
deleted file mode 100644
index 58ed0f0..0000000
--- a/test/skip.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var test = require('tap').test;
-var detective = require('../');
-var fs = require('fs');
-var src = fs.readFileSync(__dirname + '/files/skip.js');
-
-test('skip', function (t) {
-    t.deepEqual(detective(src), [ 'a', 'b', 'c' ]);
-    t.end();
-});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-detective.git