diff --git a/dist/src/JavaScriptObfuscator.js b/dist/src/JavaScriptObfuscator.js index 9c13c8ed..e25923e8 100644 --- a/dist/src/JavaScriptObfuscator.js +++ b/dist/src/JavaScriptObfuscator.js @@ -13,8 +13,9 @@ class JavaScriptObfuscator { static generateCode(astTree, options) { let escodegenParams = Object.assign({}, JavaScriptObfuscator.escodegenParams); if (options.hasOwnProperty('compact')) { - escodegenParams.format = {}; - escodegenParams.format.compact = options.compact; + escodegenParams.format = { + compact: options.compact + }; } return escodegen.generate(astTree, escodegenParams); } diff --git a/dist/src/Obfuscator.js b/dist/src/Obfuscator.js index 289a02fe..59613e69 100644 --- a/dist/src/Obfuscator.js +++ b/dist/src/Obfuscator.js @@ -88,7 +88,9 @@ class Obfuscator { if (this.options['debugProtection']) { this.setNodesGroup(new DebugProtectionNodesGroup_1.DebugProtectionNodesGroup(this.options)); } - this.setNodesGroup(new UnicodeArrayNodesGroup_1.UnicodeArrayNodesGroup(this.options)); + if (this.options['unicodeArray']) { + this.setNodesGroup(new UnicodeArrayNodesGroup_1.UnicodeArrayNodesGroup(this.options)); + } } } exports.Obfuscator = Obfuscator; diff --git a/dist/src/node-groups/UnicodeArrayNodesGroup.js b/dist/src/node-groups/UnicodeArrayNodesGroup.js index 7ed8ef93..b5eccd50 100644 --- a/dist/src/node-groups/UnicodeArrayNodesGroup.js +++ b/dist/src/node-groups/UnicodeArrayNodesGroup.js @@ -12,9 +12,6 @@ class UnicodeArrayNodesGroup extends NodesGroup_1.NodesGroup { this.unicodeArrayTranslatorName = Utils_1.Utils.getRandomVariableName(UnicodeArrayNode_1.UnicodeArrayNode.UNICODE_ARRAY_RANDOM_LENGTH); this.unicodeArrayRotateValue = this.options['rotateUnicodeArray'] ? Utils_1.Utils.getRandomInteger(100, 500) : 0; let unicodeArrayNode = new UnicodeArrayNode_1.UnicodeArrayNode(this.unicodeArrayName, this.unicodeArrayRotateValue), unicodeArray = unicodeArrayNode.getNodeData(); - if (!this.options['unicodeArray']) { - return; - } this.nodes.set('unicodeArrayNode', unicodeArrayNode); if (this.options['wrapUnicodeArrayCalls']) { this.nodes.set('unicodeArrayCallsWrapper', new UnicodeArrayCallsWrapper_1.UnicodeArrayCallsWrapper(this.unicodeArrayTranslatorName, this.unicodeArrayName, unicodeArray)); diff --git a/src/JavaScriptObfuscator.ts b/src/JavaScriptObfuscator.ts index bb29b8d7..b881d616 100644 --- a/src/JavaScriptObfuscator.ts +++ b/src/JavaScriptObfuscator.ts @@ -41,8 +41,9 @@ export class JavaScriptObfuscator { let escodegenParams: escodegen.GenerateOptions = Object.assign({}, JavaScriptObfuscator.escodegenParams); if (options.hasOwnProperty('compact')) { - escodegenParams.format = {}; - escodegenParams.format.compact = options.compact; + escodegenParams.format = { + compact: options.compact + }; } return escodegen.generate(astTree, escodegenParams); diff --git a/src/Obfuscator.ts b/src/Obfuscator.ts index 473f1a9b..c40ebfcd 100644 --- a/src/Obfuscator.ts +++ b/src/Obfuscator.ts @@ -155,9 +155,11 @@ export class Obfuscator { this.setNodesGroup(new DebugProtectionNodesGroup(this.options)); } - /** - * Important to set this nodes latest to prevent runtime errors cause by `rotateUnicodeArray` option - */ - this.setNodesGroup(new UnicodeArrayNodesGroup(this.options)); + if (this.options['unicodeArray']) { + /** + * Important to set this nodes latest to prevent runtime errors cause by `rotateUnicodeArray` option + */ + this.setNodesGroup(new UnicodeArrayNodesGroup(this.options)); + } } } diff --git a/src/node-groups/UnicodeArrayNodesGroup.ts b/src/node-groups/UnicodeArrayNodesGroup.ts index 56934f96..1c35870d 100644 --- a/src/node-groups/UnicodeArrayNodesGroup.ts +++ b/src/node-groups/UnicodeArrayNodesGroup.ts @@ -37,10 +37,6 @@ export class UnicodeArrayNodesGroup extends NodesGroup { ), unicodeArray: string [] = unicodeArrayNode.getNodeData(); - if (!this.options['unicodeArray']) { - return; - } - this.nodes.set( 'unicodeArrayNode', unicodeArrayNode