ソースを参照

replace all `by` matches with `with` in method names

sanex3339 9 年 前
コミット
251db19cd8

+ 139 - 139
dist/index.js

@@ -215,7 +215,7 @@ module.exports =
 	
 	var estraverse = __webpack_require__(3);
 	var NodeType_1 = __webpack_require__(2);
-	var Nodes_1 = __webpack_require__(4);
+	var Nodes_1 = __webpack_require__(8);
 	var Utils_1 = __webpack_require__(0);
 	
 	var NodeUtils = function () {
@@ -377,80 +377,7 @@ module.exports =
 	
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 	
-	var NodeType_1 = __webpack_require__(2);
-	
-	var Nodes = function () {
-	    function Nodes() {
-	        _classCallCheck(this, Nodes);
-	    }
-	
-	    _createClass(Nodes, null, [{
-	        key: "getProgramNode",
-	        value: function getProgramNode(bodyNode) {
-	            return {
-	                'type': NodeType_1.NodeType.Program,
-	                'body': bodyNode
-	            };
-	        }
-	    }, {
-	        key: "isBlockStatementNode",
-	        value: function isBlockStatementNode(node) {
-	            return node.type === NodeType_1.NodeType.BlockStatement;
-	        }
-	    }, {
-	        key: "isIdentifierNode",
-	        value: function isIdentifierNode(node) {
-	            return node.type === NodeType_1.NodeType.Identifier;
-	        }
-	    }, {
-	        key: "isLiteralNode",
-	        value: function isLiteralNode(node) {
-	            return node.type === NodeType_1.NodeType.Literal;
-	        }
-	    }, {
-	        key: "isMemberExpressionNode",
-	        value: function isMemberExpressionNode(node) {
-	            return node.type === NodeType_1.NodeType.MemberExpression;
-	        }
-	    }, {
-	        key: "isProgramNode",
-	        value: function isProgramNode(node) {
-	            return node.type === NodeType_1.NodeType.Program;
-	        }
-	    }, {
-	        key: "isPropertyNode",
-	        value: function isPropertyNode(node) {
-	            return node.type === NodeType_1.NodeType.Property;
-	        }
-	    }, {
-	        key: "isVariableDeclaratorNode",
-	        value: function isVariableDeclaratorNode(node) {
-	            return node.type === NodeType_1.NodeType.VariableDeclarator;
-	        }
-	    }, {
-	        key: "isNodeHasBlockStatement",
-	        value: function isNodeHasBlockStatement(node) {
-	            return node.hasOwnProperty('body') && Array.isArray(node.body);
-	        }
-	    }]);
-	
-	    return Nodes;
-	}();
-	
-	exports.Nodes = Nodes;
-
-/***/ },
-/* 5 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	"use strict";
-	
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-	
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-	
-	var AppendState_1 = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
 	var NodeUtils_1 = __webpack_require__(1);
 	
 	var Node = function () {
@@ -490,7 +417,7 @@ module.exports =
 	exports.Node = Node;
 
 /***/ },
-/* 6 */
+/* 5 */
 /***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
@@ -502,7 +429,7 @@ module.exports =
 	
 	var estraverse = __webpack_require__(3);
 	var JSFuck_1 = __webpack_require__(9);
-	var Nodes_1 = __webpack_require__(4);
+	var Nodes_1 = __webpack_require__(8);
 	var Utils_1 = __webpack_require__(0);
 	
 	var NodeObfuscator = function () {
@@ -531,8 +458,8 @@ module.exports =
 	            return estraverse.VisitorOption.Skip;
 	        }
 	    }, {
-	        key: "replaceNodeIdentifierByNewValue",
-	        value: function replaceNodeIdentifierByNewValue(node, parentNode, namesMap) {
+	        key: "replaceNodeIdentifierWithNewValue",
+	        value: function replaceNodeIdentifierWithNewValue(node, parentNode, namesMap) {
 	            if (Nodes_1.Nodes.isIdentifierNode(node) && namesMap.has(node.name)) {
 	                var parentNodeIsPropertyNode = Nodes_1.Nodes.isPropertyNode(parentNode) && parentNode.key === node,
 	                    parentNodeIsMemberExpressionNode = Nodes_1.Nodes.isMemberExpressionNode(parentNode) && parentNode.computed === false && parentNode.property === node;
@@ -543,13 +470,13 @@ module.exports =
 	            }
 	        }
 	    }, {
-	        key: "replaceLiteralBooleanByJSFuck",
-	        value: function replaceLiteralBooleanByJSFuck(nodeValue) {
+	        key: "replaceLiteralBooleanWithJSFuck",
+	        value: function replaceLiteralBooleanWithJSFuck(nodeValue) {
 	            return nodeValue ? JSFuck_1.JSFuck.True : JSFuck_1.JSFuck.False;
 	        }
 	    }, {
-	        key: "replaceLiteralNumberByHexadecimalValue",
-	        value: function replaceLiteralNumberByHexadecimalValue(nodeValue) {
+	        key: "replaceLiteralNumberWithHexadecimalValue",
+	        value: function replaceLiteralNumberWithHexadecimalValue(nodeValue) {
 	            var prefix = '0x';
 	            if (!Utils_1.Utils.isInteger(nodeValue)) {
 	                return String(nodeValue);
@@ -557,22 +484,22 @@ module.exports =
 	            return "" + prefix + Utils_1.Utils.decToHex(nodeValue);
 	        }
 	    }, {
-	        key: "replaceLiteralValueByUnicodeValue",
-	        value: function replaceLiteralValueByUnicodeValue(nodeValue) {
+	        key: "replaceLiteralValueWithUnicodeValue",
+	        value: function replaceLiteralValueWithUnicodeValue(nodeValue) {
 	            var value = nodeValue,
-	                replaceByUnicodeArrayFlag = Math.random() <= this.options.get('unicodeArrayThreshold');
-	            if (this.options.get('encodeUnicodeLiterals') && replaceByUnicodeArrayFlag) {
+	                replaceWithUnicodeArrayFlag = Math.random() <= this.options.get('unicodeArrayThreshold');
+	            if (this.options.get('encodeUnicodeLiterals') && replaceWithUnicodeArrayFlag) {
 	                value = Utils_1.Utils.btoa(value);
 	            }
 	            value = Utils_1.Utils.stringToUnicode(value);
-	            if (!this.options.get('unicodeArray') || !replaceByUnicodeArrayFlag) {
+	            if (!this.options.get('unicodeArray') || !replaceWithUnicodeArrayFlag) {
 	                return value;
 	            }
-	            return this.replaceLiteralValueByUnicodeArrayCall(value);
+	            return this.replaceLiteralValueWithUnicodeArrayCall(value);
 	        }
 	    }, {
-	        key: "replaceLiteralValueByUnicodeArrayCall",
-	        value: function replaceLiteralValueByUnicodeArrayCall(value) {
+	        key: "replaceLiteralValueWithUnicodeArrayCall",
+	        value: function replaceLiteralValueWithUnicodeArrayCall(value) {
 	            var unicodeArrayNode = this.nodes.get('unicodeArrayNode'),
 	                unicodeArray = unicodeArrayNode.getNodeData(),
 	                sameIndex = unicodeArray.indexOf(value),
@@ -584,7 +511,7 @@ module.exports =
 	                index = unicodeArray.length;
 	                unicodeArrayNode.updateNodeData(value);
 	            }
-	            hexadecimalIndex = this.replaceLiteralNumberByHexadecimalValue(index);
+	            hexadecimalIndex = this.replaceLiteralNumberWithHexadecimalValue(index);
 	            if (this.options.get('wrapUnicodeArrayCalls')) {
 	                return this.nodes.get('unicodeArrayCallsWrapper').getNodeIdentifier() + "('" + hexadecimalIndex + "')";
 	            }
@@ -598,7 +525,7 @@ module.exports =
 	exports.NodeObfuscator = NodeObfuscator;
 
 /***/ },
-/* 7 */
+/* 6 */
 /***/ function(module, exports) {
 
 	"use strict";
@@ -611,11 +538,84 @@ module.exports =
 	var AppendState = exports.AppendState;
 
 /***/ },
-/* 8 */
+/* 7 */
 /***/ function(module, exports) {
 
 	module.exports = require("esprima");
 
+/***/ },
+/* 8 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	"use strict";
+	
+	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+	
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+	
+	var NodeType_1 = __webpack_require__(2);
+	
+	var Nodes = function () {
+	    function Nodes() {
+	        _classCallCheck(this, Nodes);
+	    }
+	
+	    _createClass(Nodes, null, [{
+	        key: "getProgramNode",
+	        value: function getProgramNode(bodyNode) {
+	            return {
+	                'type': NodeType_1.NodeType.Program,
+	                'body': bodyNode
+	            };
+	        }
+	    }, {
+	        key: "isBlockStatementNode",
+	        value: function isBlockStatementNode(node) {
+	            return node.type === NodeType_1.NodeType.BlockStatement;
+	        }
+	    }, {
+	        key: "isIdentifierNode",
+	        value: function isIdentifierNode(node) {
+	            return node.type === NodeType_1.NodeType.Identifier;
+	        }
+	    }, {
+	        key: "isLiteralNode",
+	        value: function isLiteralNode(node) {
+	            return node.type === NodeType_1.NodeType.Literal;
+	        }
+	    }, {
+	        key: "isMemberExpressionNode",
+	        value: function isMemberExpressionNode(node) {
+	            return node.type === NodeType_1.NodeType.MemberExpression;
+	        }
+	    }, {
+	        key: "isProgramNode",
+	        value: function isProgramNode(node) {
+	            return node.type === NodeType_1.NodeType.Program;
+	        }
+	    }, {
+	        key: "isPropertyNode",
+	        value: function isPropertyNode(node) {
+	            return node.type === NodeType_1.NodeType.Property;
+	        }
+	    }, {
+	        key: "isVariableDeclaratorNode",
+	        value: function isVariableDeclaratorNode(node) {
+	            return node.type === NodeType_1.NodeType.VariableDeclarator;
+	        }
+	    }, {
+	        key: "isNodeHasBlockStatement",
+	        value: function isNodeHasBlockStatement(node) {
+	            return node.hasOwnProperty('body') && Array.isArray(node.body);
+	        }
+	    }]);
+	
+	    return Nodes;
+	}();
+	
+	exports.Nodes = Nodes;
+
 /***/ },
 /* 9 */
 /***/ function(module, exports) {
@@ -698,7 +698,7 @@ module.exports =
 	
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 	
-	var esprima = __webpack_require__(8);
+	var esprima = __webpack_require__(7);
 	var escodegen = __webpack_require__(10);
 	var Obfuscator_1 = __webpack_require__(16);
 	var Options_1 = __webpack_require__(17);
@@ -819,7 +819,7 @@ module.exports =
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 	
 	var estraverse = __webpack_require__(3);
-	var AppendState_1 = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
 	var NodeType_1 = __webpack_require__(2);
 	var CatchClauseObfuscator_1 = __webpack_require__(31);
 	var ConsoleOutputDisableExpressionNode_1 = __webpack_require__(19);
@@ -1048,8 +1048,8 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var esprima = __webpack_require__(8);
-	var Node_1 = __webpack_require__(5);
+	var esprima = __webpack_require__(7);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	
 	var ConsoleOutputDisableExpressionNode = function (_Node_1$Node) {
@@ -1097,7 +1097,7 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var NodeType_1 = __webpack_require__(2);
-	var Node_1 = __webpack_require__(5);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	
 	var DebugProtectionFunctionCallNode = function (_Node_1$Node) {
@@ -1156,7 +1156,7 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var NodeType_1 = __webpack_require__(2);
-	var Node_1 = __webpack_require__(5);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	
 	var DebugProtectionFunctionIntervalNode = function (_Node_1$Node) {
@@ -1239,8 +1239,8 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var esprima = __webpack_require__(8);
-	var Node_1 = __webpack_require__(5);
+	var esprima = __webpack_require__(7);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -1299,12 +1299,12 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var esprima = __webpack_require__(8);
-	var AppendState_1 = __webpack_require__(7);
+	var esprima = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
 	var JSFuck_1 = __webpack_require__(9);
 	var NoCustomNodesPreset_1 = __webpack_require__(13);
 	var JavaScriptObfuscator_1 = __webpack_require__(11);
-	var Node_1 = __webpack_require__(5);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -1365,9 +1365,9 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var esprima = __webpack_require__(8);
-	var AppendState_1 = __webpack_require__(7);
-	var Node_1 = __webpack_require__(5);
+	var esprima = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -1439,12 +1439,12 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var esprima = __webpack_require__(8);
+	var esprima = __webpack_require__(7);
 	var JavaScriptObfuscator_1 = __webpack_require__(11);
-	var AppendState_1 = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
 	var JSFuck_1 = __webpack_require__(9);
 	var NoCustomNodesPreset_1 = __webpack_require__(13);
-	var Node_1 = __webpack_require__(5);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -1520,9 +1520,9 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var escodegen = __webpack_require__(10);
-	var AppendState_1 = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
 	var NodeType_1 = __webpack_require__(2);
-	var Node_1 = __webpack_require__(5);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -1629,12 +1629,12 @@ module.exports =
 	
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
-	var esprima = __webpack_require__(8);
-	var AppendState_1 = __webpack_require__(7);
+	var esprima = __webpack_require__(7);
+	var AppendState_1 = __webpack_require__(6);
 	var JSFuck_1 = __webpack_require__(9);
 	var NoCustomNodesPreset_1 = __webpack_require__(13);
 	var JavaScriptObfuscator_1 = __webpack_require__(11);
-	var Node_1 = __webpack_require__(5);
+	var Node_1 = __webpack_require__(4);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -1840,7 +1840,7 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var estraverse = __webpack_require__(3);
-	var NodeObfuscator_1 = __webpack_require__(6);
+	var NodeObfuscator_1 = __webpack_require__(5);
 	
 	var CatchClauseObfuscator = function (_NodeObfuscator_1$Nod) {
 	    _inherits(CatchClauseObfuscator, _NodeObfuscator_1$Nod);
@@ -1884,7 +1884,7 @@ module.exports =
 	
 	            estraverse.replace(catchClauseNode.body, {
 	                leave: function leave(node, parentNode) {
-	                    _this3.replaceNodeIdentifierByNewValue(node, parentNode, _this3.catchClauseParam);
+	                    _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.catchClauseParam);
 	                }
 	            });
 	        }
@@ -1912,7 +1912,7 @@ module.exports =
 	
 	var estraverse = __webpack_require__(3);
 	var NodeType_1 = __webpack_require__(2);
-	var NodeObfuscator_1 = __webpack_require__(6);
+	var NodeObfuscator_1 = __webpack_require__(5);
 	var NodeUtils_1 = __webpack_require__(1);
 	
 	var FunctionDeclarationObfuscator = function (_NodeObfuscator_1$Nod) {
@@ -1961,7 +1961,7 @@ module.exports =
 	            var scopeNode = NodeUtils_1.NodeUtils.getBlockScopeOfNode(functionDeclarationNode);
 	            estraverse.replace(scopeNode, {
 	                enter: function enter(node, parentNode) {
-	                    _this3.replaceNodeIdentifierByNewValue(node, parentNode, _this3.functionName);
+	                    _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.functionName);
 	                }
 	            });
 	        }
@@ -1988,7 +1988,7 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var estraverse = __webpack_require__(3);
-	var NodeObfuscator_1 = __webpack_require__(6);
+	var NodeObfuscator_1 = __webpack_require__(5);
 	
 	var FunctionObfuscator = function (_NodeObfuscator_1$Nod) {
 	    _inherits(FunctionObfuscator, _NodeObfuscator_1$Nod);
@@ -2034,7 +2034,7 @@ module.exports =
 	
 	            estraverse.replace(functionNode.body, {
 	                leave: function leave(node, parentNode) {
-	                    _this3.replaceNodeIdentifierByNewValue(node, parentNode, _this3.functionParams);
+	                    _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.functionParams);
 	                }
 	            });
 	        }
@@ -2063,8 +2063,8 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var escodegen = __webpack_require__(10);
-	var NodeObfuscator_1 = __webpack_require__(6);
-	var Nodes_1 = __webpack_require__(4);
+	var NodeObfuscator_1 = __webpack_require__(5);
+	var Nodes_1 = __webpack_require__(8);
 	
 	var LiteralObfuscator = function (_NodeObfuscator_1$Nod) {
 	    _inherits(LiteralObfuscator, _NodeObfuscator_1$Nod);
@@ -2087,13 +2087,13 @@ module.exports =
 	            var content = void 0;
 	            switch (_typeof(literalNode.value)) {
 	                case 'boolean':
-	                    content = this.replaceLiteralBooleanByJSFuck(literalNode.value);
+	                    content = this.replaceLiteralBooleanWithJSFuck(literalNode.value);
 	                    break;
 	                case 'number':
-	                    content = this.replaceLiteralNumberByHexadecimalValue(literalNode.value);
+	                    content = this.replaceLiteralNumberWithHexadecimalValue(literalNode.value);
 	                    break;
 	                case 'string':
-	                    content = this.replaceLiteralValueByUnicodeValue(literalNode.value);
+	                    content = this.replaceLiteralValueWithUnicodeValue(literalNode.value);
 	                    break;
 	                default:
 	                    return;
@@ -2130,8 +2130,8 @@ module.exports =
 	var escodegen = __webpack_require__(10);
 	var estraverse = __webpack_require__(3);
 	var NodeType_1 = __webpack_require__(2);
-	var NodeObfuscator_1 = __webpack_require__(6);
-	var Nodes_1 = __webpack_require__(4);
+	var NodeObfuscator_1 = __webpack_require__(5);
+	var Nodes_1 = __webpack_require__(8);
 	
 	var MemberExpressionObfuscator = function (_NodeObfuscator_1$Nod) {
 	    _inherits(MemberExpressionObfuscator, _NodeObfuscator_1$Nod);
@@ -2170,7 +2170,7 @@ module.exports =
 	                literalNode = {
 	                raw: '\'' + nodeValue + '\'',
 	                'x-verbatim-property': {
-	                    content: this.replaceLiteralValueByUnicodeValue(nodeValue),
+	                    content: this.replaceLiteralValueWithUnicodeValue(nodeValue),
 	                    precedence: escodegen.Precedence.Primary
 	                },
 	                type: NodeType_1.NodeType.Literal,
@@ -2188,7 +2188,7 @@ module.exports =
 	                        break;
 	                    }
 	                    node['x-verbatim-property'] = {
-	                        content: this.replaceLiteralValueByUnicodeValue(node.value),
+	                        content: this.replaceLiteralValueWithUnicodeValue(node.value),
 	                        precedence: escodegen.Precedence.Primary
 	                    };
 	                    break;
@@ -2219,8 +2219,8 @@ module.exports =
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 	
 	var estraverse = __webpack_require__(3);
-	var NodeObfuscator_1 = __webpack_require__(6);
-	var Nodes_1 = __webpack_require__(4);
+	var NodeObfuscator_1 = __webpack_require__(5);
+	var Nodes_1 = __webpack_require__(8);
 	var Utils_1 = __webpack_require__(0);
 	
 	var MethodDefinitionObfuscator = function (_NodeObfuscator_1$Nod) {
@@ -2255,7 +2255,7 @@ module.exports =
 	                leave: function leave(node) {
 	                    if (Nodes_1.Nodes.isIdentifierNode(node) && !Utils_1.Utils.arrayContains(_this2.ignoredNames, node.name) && methodDefinitionNode.computed === false) {
 	                        methodDefinitionNode.computed = true;
-	                        node.name = _this2.replaceLiteralValueByUnicodeValue(node.name);
+	                        node.name = _this2.replaceLiteralValueWithUnicodeValue(node.name);
 	                        return;
 	                    }
 	                    return estraverse.VisitorOption.Skip;
@@ -2289,8 +2289,8 @@ module.exports =
 	var escodegen = __webpack_require__(10);
 	var estraverse = __webpack_require__(3);
 	var NodeType_1 = __webpack_require__(2);
-	var NodeObfuscator_1 = __webpack_require__(6);
-	var Nodes_1 = __webpack_require__(4);
+	var NodeObfuscator_1 = __webpack_require__(5);
+	var Nodes_1 = __webpack_require__(8);
 	var Utils_1 = __webpack_require__(0);
 	
 	var ObjectExpressionObfuscator = function (_NodeObfuscator_1$Nod) {
@@ -2378,7 +2378,7 @@ module.exports =
 	
 	var estraverse = __webpack_require__(3);
 	var NodeType_1 = __webpack_require__(2);
-	var NodeObfuscator_1 = __webpack_require__(6);
+	var NodeObfuscator_1 = __webpack_require__(5);
 	var NodeUtils_1 = __webpack_require__(1);
 	var Utils_1 = __webpack_require__(0);
 	
@@ -2435,7 +2435,7 @@ module.exports =
 	                    if (Utils_1.Utils.arrayContains(functionNodes, node.type)) {
 	                        estraverse.replace(node, {
 	                            enter: function enter(node, parentNode) {
-	                                _this3.replaceNodeIdentifierByNewValue(node, parentNode, _this3.variableNames);
+	                                _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.variableNames);
 	                            }
 	                        });
 	                    }
@@ -2443,7 +2443,7 @@ module.exports =
 	                        isNodeAfterVariableDeclaratorFlag = true;
 	                    }
 	                    if (isNodeAfterVariableDeclaratorFlag) {
-	                        _this3.replaceNodeIdentifierByNewValue(node, parentNode, _this3.variableNames);
+	                        _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.variableNames);
 	                    }
 	                }
 	            });

+ 1 - 1
src/node-obfuscators/CatchClauseObfuscator.ts

@@ -45,7 +45,7 @@ export class CatchClauseObfuscator extends NodeObfuscator {
     private replaceCatchClauseParamInBlockStatement (catchClauseNode: ICatchClauseNode): void {
         estraverse.replace(catchClauseNode.body, {
             leave: (node: INode, parentNode: INode): any => {
-                this.replaceNodeIdentifierByNewValue(node, parentNode, this.catchClauseParam);
+                this.replaceNodeIdentifierWithNewValue(node, parentNode, this.catchClauseParam);
             }
         });
     }

+ 1 - 1
src/node-obfuscators/FunctionDeclarationObfuscator.ts

@@ -55,7 +55,7 @@ export class FunctionDeclarationObfuscator extends NodeObfuscator {
 
         estraverse.replace(scopeNode, {
             enter: (node: INode, parentNode: INode): any => {
-                this.replaceNodeIdentifierByNewValue(node, parentNode, this.functionName);
+                this.replaceNodeIdentifierWithNewValue(node, parentNode, this.functionName);
             }
         });
     }

+ 1 - 1
src/node-obfuscators/FunctionObfuscator.ts

@@ -47,7 +47,7 @@ export class FunctionObfuscator extends NodeObfuscator {
     private replaceFunctionParamsInBlockStatement (functionNode: IFunctionNode): void {
         estraverse.replace(functionNode.body, {
             leave: (node: INode, parentNode: INode): any => {
-                this.replaceNodeIdentifierByNewValue(node, parentNode, this.functionParams);
+                this.replaceNodeIdentifierWithNewValue(node, parentNode, this.functionParams);
             }
         });
     }

+ 3 - 3
src/node-obfuscators/LiteralObfuscator.ts

@@ -24,18 +24,18 @@ export class LiteralObfuscator extends NodeObfuscator {
 
         switch (typeof literalNode.value) {
             case 'boolean':
-                content = this.replaceLiteralBooleanByJSFuck(<boolean>literalNode.value);
+                content = this.replaceLiteralBooleanWithJSFuck(<boolean>literalNode.value);
 
                 break;
 
             case 'number':
-                content = this.replaceLiteralNumberByHexadecimalValue(<number>literalNode.value);
+                content = this.replaceLiteralNumberWithHexadecimalValue(<number>literalNode.value);
 
                 break;
 
 
             case 'string':
-                content = this.replaceLiteralValueByUnicodeValue(<string>literalNode.value);
+                content = this.replaceLiteralValueWithUnicodeValue(<string>literalNode.value);
 
                 break;
 

+ 2 - 2
src/node-obfuscators/MemberExpressionObfuscator.ts

@@ -53,7 +53,7 @@ export class MemberExpressionObfuscator extends NodeObfuscator {
             literalNode: ILiteralNode = {
                 raw: `'${nodeValue}'`,
                 'x-verbatim-property': {
-                    content : this.replaceLiteralValueByUnicodeValue(nodeValue),
+                    content : this.replaceLiteralValueWithUnicodeValue(nodeValue),
                     precedence: escodegen.Precedence.Primary
                 },
                 type: NodeType.Literal,
@@ -82,7 +82,7 @@ export class MemberExpressionObfuscator extends NodeObfuscator {
                 }
 
                 node['x-verbatim-property'] = {
-                    content : this.replaceLiteralValueByUnicodeValue(<string>node.value),
+                    content : this.replaceLiteralValueWithUnicodeValue(<string>node.value),
                     precedence: escodegen.Precedence.Primary
                 };
 

+ 1 - 1
src/node-obfuscators/MethodDefinitionObfuscator.ts

@@ -42,7 +42,7 @@ export class MethodDefinitionObfuscator extends NodeObfuscator {
                     methodDefinitionNode.computed === false
                 ) {
                     methodDefinitionNode.computed = true;
-                    node.name = this.replaceLiteralValueByUnicodeValue(node.name);
+                    node.name = this.replaceLiteralValueWithUnicodeValue(node.name);
 
                     return;
                 }

+ 10 - 10
src/node-obfuscators/NodeObfuscator.ts

@@ -72,7 +72,7 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      * @param parentNode
      * @param namesMap
      */
-    protected replaceNodeIdentifierByNewValue (node: INode, parentNode: INode, namesMap: Map <string, string>): void {
+    protected replaceNodeIdentifierWithNewValue (node: INode, parentNode: INode, namesMap: Map <string, string>): void {
         if (Nodes.isIdentifierNode(node) && namesMap.has(node.name)) {
             const parentNodeIsPropertyNode: boolean = (
                     Nodes.isPropertyNode(parentNode) &&
@@ -96,7 +96,7 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      * @param nodeValue
      * @returns {string}
      */
-    protected replaceLiteralBooleanByJSFuck (nodeValue: boolean): string {
+    protected replaceLiteralBooleanWithJSFuck (nodeValue: boolean): string {
         return nodeValue ? JSFuck.True : JSFuck.False;
     }
 
@@ -104,7 +104,7 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      * @param nodeValue
      * @returns {string}
      */
-    protected replaceLiteralNumberByHexadecimalValue (nodeValue: number): string {
+    protected replaceLiteralNumberWithHexadecimalValue (nodeValue: number): string {
         const prefix: string = '0x';
 
         if (!Utils.isInteger(nodeValue)) {
@@ -118,28 +118,28 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      * @param nodeValue
      * @returns {string}
      */
-    protected replaceLiteralValueByUnicodeValue (nodeValue: string): string {
+    protected replaceLiteralValueWithUnicodeValue (nodeValue: string): string {
         let value: string = nodeValue,
-            replaceByUnicodeArrayFlag: boolean = Math.random() <= this.options.get('unicodeArrayThreshold');
+            replaceWithUnicodeArrayFlag: boolean = Math.random() <= this.options.get('unicodeArrayThreshold');
 
-        if (this.options.get('encodeUnicodeLiterals') && replaceByUnicodeArrayFlag) {
+        if (this.options.get('encodeUnicodeLiterals') && replaceWithUnicodeArrayFlag) {
             value = Utils.btoa(value);
         }
 
         value = Utils.stringToUnicode(value);
 
-        if (!this.options.get('unicodeArray') || !replaceByUnicodeArrayFlag) {
+        if (!this.options.get('unicodeArray') || !replaceWithUnicodeArrayFlag) {
             return value;
         }
 
-        return this.replaceLiteralValueByUnicodeArrayCall(value);
+        return this.replaceLiteralValueWithUnicodeArrayCall(value);
     }
 
     /**
      * @param value
      * @returns {string}
      */
-    protected replaceLiteralValueByUnicodeArrayCall (value: string): string {
+    protected replaceLiteralValueWithUnicodeArrayCall (value: string): string {
         let unicodeArrayNode: UnicodeArrayNode = <UnicodeArrayNode> this.nodes.get('unicodeArrayNode'),
             unicodeArray: string[] = unicodeArrayNode.getNodeData(),
             sameIndex: number = unicodeArray.indexOf(value),
@@ -153,7 +153,7 @@ export abstract class NodeObfuscator implements INodeObfuscator {
             unicodeArrayNode.updateNodeData(value);
         }
 
-        hexadecimalIndex = this.replaceLiteralNumberByHexadecimalValue(index);
+        hexadecimalIndex = this.replaceLiteralNumberWithHexadecimalValue(index);
 
         if (this.options.get('wrapUnicodeArrayCalls')) {
             return `${this.nodes.get('unicodeArrayCallsWrapper').getNodeIdentifier()}('${hexadecimalIndex}')`;

+ 2 - 2
src/node-obfuscators/VariableDeclarationObfuscator.ts

@@ -72,7 +72,7 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
                 if (Utils.arrayContains(functionNodes, node.type)) {
                     estraverse.replace(node, {
                         enter: (node: INode, parentNode: INode): any => {
-                            this.replaceNodeIdentifierByNewValue(node, parentNode, this.variableNames);
+                            this.replaceNodeIdentifierWithNewValue(node, parentNode, this.variableNames);
                         }
                     });
                 }
@@ -82,7 +82,7 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
                 }
 
                 if (isNodeAfterVariableDeclaratorFlag) {
-                    this.replaceNodeIdentifierByNewValue(node, parentNode, this.variableNames);
+                    this.replaceNodeIdentifierWithNewValue(node, parentNode, this.variableNames);
                 }
             }
         });