derequire - npm Package Compare versions

Comparing version 0.3.0 to 0.4.0

index.js

@@ -5,18 +5,33 @@ 'use strict';
 var escodegen = require('escodegen');
+var esrefactor = require('esrefactor');
 function rename(code, tokenTo, tokenFrom){
     tokenTo = tokenTo || '__derequire__';
     tokenFrom = tokenFrom || 'require';
-    var ast = esprima.parse('!function(){'+code+'}');
-    estraverse.traverse(ast,{
-        leave:function(node, parent) {
-            var isVariableName = node.type === 'Identifier'&&node.name===tokenFrom;
-            var isArugment = parent && (parent.type === 'FunctionDeclaration' || parent.type === 'FunctionExpression');
-            var isCall = parent && (parent.type === 'CallExpression' && parent.callee.type === 'Identifier' && parent.callee.name === tokenFrom);
-            if (isVariableName && (isArugment||isCall)){
-                node.name = tokenTo;
-            }
-        } 
-    });
-    return escodegen.generate(ast.body[0].expression.argument.body.body[0]);
+    var inCode = '!function(){'+code+'}';
+    var location, ctx, ast;
+    var foundOne = true;
+    while(foundOne){
+        foundOne = false;
+        ast = esprima.parse(inCode,{range:true});
+        estraverse.traverse(ast,{
+            enter:function(node, parent) {
+                var isVariableName = node.type === 'Identifier'&&node.name===tokenFrom;
+                var isArugment = parent && (parent.type === 'FunctionDeclaration' || parent.type === 'FunctionExpression');
+                if(isVariableName&&isArugment){
+                    location = node.range[0];
+                    foundOne = true;
+                    this.break();
+                }
+            } 
+        });
+        if(foundOne){
+            ctx = new esrefactor.Context(inCode);
+            inCode = ctx.rename(ctx.identify(location), tokenTo);
+        }
+    }
+    return escodegen.generate(esprima.parse(inCode).body[0].expression.argument.body.body[0]);
 }
+
+
+
 module.exports = rename;

package.json

 {
   "name": "derequire",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "remove requires",
@@ -22,3 +22,4 @@ "main": "index.js",
     "esprima": "~1.0.4",
-    "escodegen": "~1.0.1"
+    "escodegen": "~1.0.1",
+    "esrefactor": "~0.1.0"
   },
@@ -25,0 +26,0 @@ "devDependencies": {

test/test.js

@@ -13,5 +13,5 @@ var should = require('chai').should();
   it('should handle top level return statments', function(){
-    var exampleText = 'return require("require");';
-    derequire(exampleText).should.equal("return __derequire__('require');");
+    var exampleText = 'return (function(require){return require();}(function(){return "sentinel";}));';
+    derequire(exampleText).should.equal("return function (__derequire__) {\n    return __derequire__();\n}(function () {\n    return 'sentinel';\n});");
   });
 });

No alert changes

Improved metrics

Total package byte prevSize

3846

increased by13.65%

Lines of code

47

increased by34.29%

Worsened metrics

Dependency count

4

increased by33.33%

Dependency changes

• + Addedesrefactor@~0.1.0

• + Addedescope@0.0.16(transitive)

• + Addedesrefactor@0.1.0(transitive)

• + Addedestraverse@0.0.4(transitive)