tsd to typings update

src/NodeUtils.js

@@ -1,5 +1,4 @@
 "use strict";
-let estraverse = require('estraverse');
 class NodeUtils {
     static getNodeScope(node, deep = 0) {
         let scopeNodes = [

src/NodeUtils.ts

@@ -1,5 +1,3 @@
-let estraverse = require('estraverse');
-
 export class NodeUtils {
     /**
      * @param node

src/node-obfuscators/CatchClauseObfuscator.js

@@ -1,7 +1,7 @@
 "use strict";
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
 const Utils_1 = require('../Utils');
-let estraverse = require('estraverse');
 class CatchClauseObfuscator extends NodeObfuscator_1.NodeObfuscator {
     constructor(...args) {
         super(...args);

src/node-obfuscators/CatchClauseObfuscator.ts

@@ -1,8 +1,8 @@
+import * as estraverse from 'estraverse';
+
 import { NodeObfuscator } from './NodeObfuscator';
 import { Utils } from '../Utils';
 
-let estraverse = require('estraverse');
-
 /**
  * replaces:
  *     try {} catch (e) { console.log(e); };

src/node-obfuscators/FunctionDeclarationObfuscator.js

@@ -1,8 +1,8 @@
 "use strict";
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
 const NodeUtils_1 = require("../NodeUtils");
 const Utils_1 = require('../Utils');
-let estraverse = require('estraverse');
 class FunctionDeclarationObfuscator extends NodeObfuscator_1.NodeObfuscator {
     constructor(...args) {
         super(...args);

src/node-obfuscators/FunctionDeclarationObfuscator.ts

@@ -1,9 +1,9 @@
+import * as estraverse from 'estraverse';
+
 import { NodeObfuscator } from './NodeObfuscator';
 import { NodeUtils } from "../NodeUtils";
 import { Utils } from '../Utils';
 
-let estraverse = require('estraverse');
-
 /**
  * replaces:
  *     function foo () { //... };

src/node-obfuscators/FunctionObfuscator.js

@@ -1,7 +1,7 @@
 "use strict";
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
 const Utils_1 = require('../Utils');
-let estraverse = require('estraverse');
 class FunctionObfuscator extends NodeObfuscator_1.NodeObfuscator {
     constructor(...args) {
         super(...args);

src/node-obfuscators/FunctionObfuscator.ts

@@ -1,8 +1,8 @@
+import * as estraverse from 'estraverse';
+
 import { NodeObfuscator } from './NodeObfuscator';
 import { Utils } from '../Utils';
 
-let estraverse = require('estraverse');
-
 /**
  * replaces:
  *     function foo (argument1) { return argument1; };

src/node-obfuscators/LiteralObfuscator.js

@@ -1,6 +1,6 @@
 "use strict";
+const escodegen = require('escodegen');
 const NodeObfuscator_1 = require('./NodeObfuscator');
-let escodegen = require('escodegen'), estraverse = require('estraverse');
 class LiteralObfuscator extends NodeObfuscator_1.NodeObfuscator {
     obfuscateNode(literalNode, parentNode) {
         if (parentNode.type === 'Property' && parentNode.key === literalNode) {

src/node-obfuscators/LiteralObfuscator.ts

@@ -1,7 +1,6 @@
-import { NodeObfuscator } from './NodeObfuscator'
+import * as escodegen from 'escodegen';
 
-let escodegen = require('escodegen'),
-    estraverse = require('estraverse');
+import { NodeObfuscator } from './NodeObfuscator';
 
 export class LiteralObfuscator extends NodeObfuscator {
     /**

src/node-obfuscators/MemberExpressionObfuscator.js

@@ -1,6 +1,7 @@
 "use strict";
+const escodegen = require('escodegen');
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
-let escodegen = require('escodegen'), estraverse = require('estraverse');
 class MemberExpressionObfuscator extends NodeObfuscator_1.NodeObfuscator {
     obfuscateNode(memberExpressionNode) {
         estraverse.replace(memberExpressionNode.property, {
@@ -27,7 +28,7 @@ class MemberExpressionObfuscator extends NodeObfuscator_1.NodeObfuscator {
         node['raw'] = `'${nodeValue}'`;
         node['x-verbatim-property'] = {
             content: this.replaceLiteralStringByArrayElement(nodeValue),
-            precedence: escodegen['Precedence']['Primary']
+            precedence: escodegen.Precedence.Primary
         };
         delete node['name'];
     }
@@ -39,7 +40,7 @@ class MemberExpressionObfuscator extends NodeObfuscator_1.NodeObfuscator {
                 }
                 node['x-verbatim-property'] = {
                     content: this.replaceLiteralStringByArrayElement(node.value),
-                    precedence: escodegen['Precedence']['Primary']
+                    precedence: escodegen.Precedence.Primary
                 };
                 break;
         }

src/node-obfuscators/MemberExpressionObfuscator.ts

@@ -1,7 +1,7 @@
-import { NodeObfuscator } from './NodeObfuscator'
+import * as escodegen from 'escodegen';
+import * as estraverse from 'estraverse';
 
-let escodegen = require('escodegen'),
-    estraverse = require('estraverse');
+import { NodeObfuscator } from './NodeObfuscator'
 
 export class MemberExpressionObfuscator extends NodeObfuscator {
     /**
@@ -50,7 +50,7 @@ export class MemberExpressionObfuscator extends NodeObfuscator {
         node['raw'] = `'${nodeValue}'`;
         node['x-verbatim-property'] = {
             content : this.replaceLiteralStringByArrayElement(nodeValue),
-            precedence: escodegen['Precedence']['Primary']
+            precedence: escodegen.Precedence.Primary
         };
 
         delete node['name'];
@@ -74,7 +74,7 @@ export class MemberExpressionObfuscator extends NodeObfuscator {
 
                 node['x-verbatim-property'] = {
                     content : this.replaceLiteralStringByArrayElement(node.value),
-                    precedence: escodegen['Precedence']['Primary']
+                    precedence: escodegen.Precedence.Primary
                 };
 
                 break;

src/node-obfuscators/MethodDefinitionObfuscator.js

@@ -1,6 +1,6 @@
 "use strict";
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
-let estraverse = require('estraverse');
 class MethodDefinitionObfuscator extends NodeObfuscator_1.NodeObfuscator {
     constructor(...args) {
         super(...args);

src/node-obfuscators/MethodDefinitionObfuscator.ts

@@ -1,7 +1,6 @@
-import { NodeObfuscator } from './NodeObfuscator';
-import { Utils } from '../Utils';
+import * as estraverse from 'estraverse';
 
-let estraverse = require('estraverse');
+import { NodeObfuscator } from './NodeObfuscator';
 
 /**
  * replaces:

src/node-obfuscators/NodeObfuscator.ts

@@ -1,7 +1,6 @@
 import { INode } from '../interfaces/INode';
 import { INodeObfuscator } from '../interfaces/INodeObfuscator';
 
-import { UnicodeArrayNode } from '../nodes/UnicodeArrayNode';
 import { Utils } from '../Utils';
 
 export abstract class NodeObfuscator implements INodeObfuscator {

src/node-obfuscators/ObjectExpressionObfuscator.js

@@ -1,7 +1,8 @@
 "use strict";
+const escodegen = require('escodegen');
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
 const Utils_1 = require('../Utils');
-let escodegen = require('escodegen'), estraverse = require('estraverse');
 class ObjectExpressionObfuscator extends NodeObfuscator_1.NodeObfuscator {
     obfuscateNode(objectExpressionNode) {
         objectExpressionNode.properties.forEach((property) => {
@@ -27,7 +28,7 @@ class ObjectExpressionObfuscator extends NodeObfuscator_1.NodeObfuscator {
                 }
                 node['x-verbatim-property'] = {
                     content: Utils_1.Utils.stringToUnicode(node.value),
-                    precedence: escodegen['Precedence']['Primary']
+                    precedence: escodegen.Precedence.Primary
                 };
                 break;
         }

src/node-obfuscators/ObjectExpressionObfuscator.ts

@@ -1,9 +1,9 @@
+import * as escodegen from 'escodegen';
+import * as estraverse from 'estraverse';
+
 import { NodeObfuscator } from './NodeObfuscator'
 import { Utils } from '../Utils';
 
-let escodegen = require('escodegen'),
-    estraverse = require('estraverse');
-
 /**
  * replaces:
  *     var object = { 'PSEUDO': 1 };
@@ -50,7 +50,7 @@ export class ObjectExpressionObfuscator extends NodeObfuscator {
 
                 node['x-verbatim-property'] = {
                     content : Utils.stringToUnicode(node.value),
-                    precedence: escodegen['Precedence']['Primary']
+                    precedence: escodegen.Precedence.Primary
                 };
 
                 break;

src/node-obfuscators/VariableDeclarationObfuscator.js

@@ -1,8 +1,8 @@
 "use strict";
+const estraverse = require('estraverse');
 const NodeObfuscator_1 = require('./NodeObfuscator');
 const NodeUtils_1 = require("../NodeUtils");
 const Utils_1 = require('../Utils');
-let estraverse = require('estraverse');
 class VariableDeclarationObfuscator extends NodeObfuscator_1.NodeObfuscator {
     constructor(...args) {
         super(...args);

src/node-obfuscators/VariableDeclarationObfuscator.ts

@@ -1,9 +1,9 @@
+import * as estraverse from 'estraverse';
+
 import { NodeObfuscator } from './NodeObfuscator';
 import { NodeUtils } from "../NodeUtils";
 import { Utils } from '../Utils';
 
-let estraverse = require('estraverse');
-
 /**
  * replaces:
  *     var variable = 1;

src/nodes/UnicodeArrayNode.js

@@ -1,8 +1,9 @@
 "use strict";
+const escodegen = require('escodegen');
+const estraverse = require('estraverse');
 const Node_1 = require('./Node');
 const Utils_1 = require('../Utils');
 const AppendState_1 = require('../enums/AppendState');
-let escodegen = require('escodegen'), estraverse = require('estraverse');
 class UnicodeArrayNode extends Node_1.Node {
     constructor(astTree, unicodeArrayName, unicodeArrayRotateValue = 0) {
         super();

src/nodes/UnicodeArrayNode.ts

@@ -1,11 +1,11 @@
+import * as escodegen from 'escodegen';
+import * as estraverse from 'estraverse';
+
 import { Node } from './Node';
 import { Utils } from '../Utils';
 
 import { AppendState } from '../enums/AppendState';
 
-let escodegen = require('escodegen'),
-    estraverse = require('estraverse');
-
 export class UnicodeArrayNode extends Node {
     /**
      * @type {number}

src/nodes/UnicodeArrayRotateFunctionCallNode.js

@@ -1,6 +1,6 @@
 "use strict";
+const estraverse = require('estraverse');
 const Node_1 = require('./Node');
-let estraverse = require('estraverse');
 class UnicodeArrayRotateFunctionCallNode extends Node_1.Node {
     constructor(astTree, unicodeArrayRotateFunctionName, unicodeArrayName, unicodeArrayRotateValue) {
         super();

src/nodes/UnicodeArrayRotateFunctionCallNode.ts

@@ -1,6 +1,6 @@
-import { Node } from './Node';
+import * as estraverse from 'estraverse';
 
-let estraverse = require('estraverse');
+import { Node } from './Node';
 
 export class UnicodeArrayRotateFunctionCallNode extends Node {
     /**

src/nodes/UnicodeArrayRotateFunctionNode.js

@@ -1,7 +1,7 @@
 "use strict";
+const estraverse = require('estraverse');
 const Node_1 = require('./Node');
 const Utils_1 = require('../Utils');
-let estraverse = require('estraverse');
 class UnicodeArrayRotateFunctionNode extends Node_1.Node {
     constructor(astTree, unicodeArrayRotateFunctionName, unicodeArrayName) {
         super();

src/nodes/UnicodeArrayRotateFunctionNode.ts

@@ -1,8 +1,8 @@
+import * as estraverse from 'estraverse';
+
 import { Node } from './Node';
 import { Utils } from '../Utils';
 
-let estraverse = require('estraverse');
-
 export class UnicodeArrayRotateFunctionNode extends Node {
     /**
      * @type any

typings/custom/escodegen/escodegen.d.ts

@@ -10,6 +10,10 @@ declare namespace escodegen {
         }
     }
 
+    enum Precedence {
+        Primary
+    }
+
     function generate(ast: any, opts?: GenerateOpts): string;
 }