From 658ebb0be535f10109cff31067f39bc87d4c7c2a Mon Sep 17 00:00:00 2001
From: sanex3339 <sanex3339@yandex.ru>
Date: Tue, 17 Jan 2017 16:25:00 +0300
Subject: [PATCH] transformers as visitor: removed `any` type

---
 dist/index.js     | 23 ++++++++++++-----------
 src/Obfuscator.ts | 24 +++++++++++-------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 2f93c692..bdcaced9 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -90,7 +90,7 @@ module.exports =
 /******/ 	__webpack_require__.p = "";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 149);
+/******/ 	return __webpack_require__(__webpack_require__.s = 150);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -2541,15 +2541,13 @@ var Obfuscator = Obfuscator_1 = function () {
             var visitors = nodeTransformers.map(function (nodeTransformer) {
                 return _this2.nodeTransformersFactory(nodeTransformer).getVisitor();
             });
-            var enterVisitor = this.mergeVisitorsForDirection(visitors.filter(function (visitor) {
-                return visitor.enter !== undefined;
-            }), VisitorDirection_1.VisitorDirection.enter);
-            var leaveVisitor = this.mergeVisitorsForDirection(visitors.filter(function (visitor) {
-                return visitor.leave !== undefined;
-            }), VisitorDirection_1.VisitorDirection.leave);
             estraverse.replace(astTree, {
-                enter: enterVisitor,
-                leave: leaveVisitor
+                enter: this.mergeVisitorsForDirection(visitors.filter(function (visitor) {
+                    return visitor.enter !== undefined;
+                }), VisitorDirection_1.VisitorDirection.enter),
+                leave: this.mergeVisitorsForDirection(visitors.filter(function (visitor) {
+                    return visitor.leave !== undefined;
+                }), VisitorDirection_1.VisitorDirection.leave)
             });
             return astTree;
         }
@@ -2557,7 +2555,9 @@ var Obfuscator = Obfuscator_1 = function () {
         key: "mergeVisitorsForDirection",
         value: function mergeVisitorsForDirection(visitors, direction) {
             if (!visitors.length) {
-                return null;
+                return function (node, parentNode) {
+                    return node;
+                };
             }
             return function (node, parentNode) {
                 var _iteratorNormalCompletion = true;
@@ -8361,7 +8361,8 @@ module.exports = require("mkdirp");
 module.exports = require("reflect-metadata");
 
 /***/ }),
-/* 149 */
+/* 149 */,
+/* 150 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
diff --git a/src/Obfuscator.ts b/src/Obfuscator.ts
index 30c7c303..bb10194e 100644
--- a/src/Obfuscator.ts
+++ b/src/Obfuscator.ts
@@ -162,18 +162,16 @@ export class Obfuscator implements IObfuscator {
             .map((nodeTransformer: NodeTransformers): estraverse.Visitor => {
                 return this.nodeTransformersFactory(nodeTransformer).getVisitor();
             });
-        const enterVisitor: any = this.mergeVisitorsForDirection(
-            visitors.filter((visitor: estraverse.Visitor) => visitor.enter !== undefined),
-            VisitorDirection.enter
-        );
-        const leaveVisitor: any = this.mergeVisitorsForDirection(
-            visitors.filter((visitor: estraverse.Visitor) => visitor.leave !== undefined),
-            VisitorDirection.leave
-        );
 
         estraverse.replace(astTree, {
-            enter: enterVisitor,
-            leave: leaveVisitor
+            enter: this.mergeVisitorsForDirection(
+                visitors.filter((visitor: estraverse.Visitor) => visitor.enter !== undefined),
+                VisitorDirection.enter
+            ),
+            leave: this.mergeVisitorsForDirection(
+                visitors.filter((visitor: estraverse.Visitor) => visitor.leave !== undefined),
+                VisitorDirection.leave
+            )
         });
 
         return astTree;
@@ -182,11 +180,11 @@ export class Obfuscator implements IObfuscator {
     /**
      * @param visitors
      * @param direction
-     * @return {estraverse.Visitor | null}
+     * @return {TVisitorDirection}
      */
-    private mergeVisitorsForDirection (visitors: estraverse.Visitor[], direction: TVisitorDirection): TVisitorFunction | null {
+    private mergeVisitorsForDirection (visitors: estraverse.Visitor[], direction: TVisitorDirection): TVisitorFunction {
         if (!visitors.length) {
-            return null;
+            return (node: ESTree.Node, parentNode: ESTree.Node) => node;
         }
 
         return (node: ESTree.Node, parentNode: ESTree.Node) => {