From 307992ac9597400e23c3983e51b33c082f6bdf25 Mon Sep 17 00:00:00 2001 From: sanex3339 Date: Mon, 23 May 2016 08:22:32 +0300 Subject: [PATCH] dev --- src/Obfuscator.js | 4 ++-- typings.json | 3 ++- typings/browser.d.ts | 1 - typings/browser/ambient/estraverse/index.d.ts | 22 ------------------- typings/main.d.ts | 1 - typings/main/ambient/estraverse/index.d.ts | 22 ------------------- 6 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 typings/browser/ambient/estraverse/index.d.ts delete mode 100644 typings/main/ambient/estraverse/index.d.ts diff --git a/src/Obfuscator.js b/src/Obfuscator.js index 7d81a90a..fa3d3655 100644 --- a/src/Obfuscator.js +++ b/src/Obfuscator.js @@ -36,7 +36,7 @@ class Obfuscator { this.options = options; } obfuscateNode(node) { - this.insertNewNodes(node); + this.setNewNodes(node); this.beforeObfuscation(node); estraverse.replace(node, { enter: (node, parent) => this.nodeControllerFirstPass(node, parent) @@ -70,7 +70,7 @@ class Obfuscator { }); } ; - insertNewNodes(astTree) { + setNewNodes(astTree) { if (this.options['disableConsoleOutput']) { this.setNode('consoleOutputDisableExpressionNode', new ConsoleOutputDisableExpressionNode_1.ConsoleOutputDisableExpressionNode(astTree)); } diff --git a/typings.json b/typings.json index bc95f79f..fe51b9e8 100644 --- a/typings.json +++ b/typings.json @@ -5,6 +5,7 @@ "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#6834f97fb33561a3ad40695084da2b660efaee29", "estree": "github:DefinitelyTyped/DefinitelyTyped/estree/estree.d.ts", "esprima": "github:DefinitelyTyped/DefinitelyTyped/esprima/esprima.d.ts", - "escodegen": "github:DefinitelyTyped/DefinitelyTyped/escodegen/escodegen.d.ts" + "escodegen": "github:DefinitelyTyped/DefinitelyTyped/escodegen/escodegen.d.ts", + "estraverse": "github:DefinitelyTyped/DefinitelyTyped/escodegen/estraverse.d.ts" } } diff --git a/typings/browser.d.ts b/typings/browser.d.ts index c2cb8d0f..e89af714 100644 --- a/typings/browser.d.ts +++ b/typings/browser.d.ts @@ -1,5 +1,4 @@ /// -/// /// /// /// diff --git a/typings/browser/ambient/estraverse/index.d.ts b/typings/browser/ambient/estraverse/index.d.ts deleted file mode 100644 index 69b4d5d3..00000000 --- a/typings/browser/ambient/estraverse/index.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Type definitions for estraverse -// Project: https://github.com/estools/estraverse -// Definitions by: Sanex3339 -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare module 'estraverse' { - export interface Visitor { - enter?: (node: any, parentNode: any) => any; - leave?: (node: any, parentNode: any) => any; - - fallback?: string; - - keys?: {}; - } - - export enum VisitorOption { - Skip, Break, Remove - } - - export function traverse (ast: any, visitor: Visitor): any; - export function replace (ast: any, visitor: Visitor): any; -} \ No newline at end of file diff --git a/typings/main.d.ts b/typings/main.d.ts index c2cb8d0f..e89af714 100644 --- a/typings/main.d.ts +++ b/typings/main.d.ts @@ -1,5 +1,4 @@ /// -/// /// /// /// diff --git a/typings/main/ambient/estraverse/index.d.ts b/typings/main/ambient/estraverse/index.d.ts deleted file mode 100644 index 69b4d5d3..00000000 --- a/typings/main/ambient/estraverse/index.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Type definitions for estraverse -// Project: https://github.com/estools/estraverse -// Definitions by: Sanex3339 -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare module 'estraverse' { - export interface Visitor { - enter?: (node: any, parentNode: any) => any; - leave?: (node: any, parentNode: any) => any; - - fallback?: string; - - keys?: {}; - } - - export enum VisitorOption { - Skip, Break, Remove - } - - export function traverse (ast: any, visitor: Visitor): any; - export function replace (ast: any, visitor: Visitor): any; -} \ No newline at end of file