javascript-obfuscator · sanex3339 · Mar 22, 2020 · Mar 22, 2020
diff --git a/dist/index.browser.js b/dist/index.browser.js
diff --git a/dist/index.cli.js b/dist/index.cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/package.json b/package.json
@@ -50,13 +50,13 @@
     "@types/escodegen": "0.0.6",
     "@types/eslint-scope": "3.7.0",
     "@types/estraverse": "0.0.6",
-    "@types/estree": "0.0.42",
+    "@types/estree": "0.0.44",
     "@types/md5": "2.1.33",
     "@types/mkdirp": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/multimatch": "4.0.0",
-    "@types/node": "13.9.2",
-    "@types/rimraf": "2.0.3",
+    "@types/node": "13.9.3",
+    "@types/rimraf": "3.0.0",
     "@types/sinon": "7.5.2",
     "@types/string-template": "1.0.2",
     "@types/webpack-env": "1.15.1",
@@ -79,7 +79,7 @@
     "rimraf": "3.0.2",
     "sinon": "9.0.1",
     "threads": "1.3.1",
-    "ts-loader": "6.2.1",
+    "ts-loader": "6.2.2",
     "ts-node": "6.1.0",
     "typescript": "3.8.3",
     "webpack": "4.42.0",

diff --git a/...lyzers/calls-graph-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts b/...lyzers/calls-graph-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts
@@ -145,7 +145,7 @@ export class ObjectExpressionCalleeDataExtractor extends AbstractCalleeDataExtra
      * @returns {BlockStatement}
      */
     private findCalleeBlockStatement (
-        objectExpressionProperties: ESTree.Property[],
+        objectExpressionProperties: (ESTree.Property | ESTree.SpreadElement)[],
         objectMembersCallsChain: TObjectMembersCallsChain
     ): ESTree.BlockStatement | null {
         const nextItemInCallsChain: string | number | undefined = objectMembersCallsChain.shift();
@@ -155,6 +155,10 @@ export class ObjectExpressionCalleeDataExtractor extends AbstractCalleeDataExtra
         }
 
         for (const propertyNode of objectExpressionProperties) {
+            if (!NodeGuards.isPropertyNode(propertyNode)) {
+                continue;
+            }
+
             if (!ObjectExpressionCalleeDataExtractor.isValidTargetPropertyNode(propertyNode, nextItemInCallsChain)) {
                 continue;
             }

diff --git a/...s/object-expression-keys-transformer-nodes/ObjectExpressionVariableDeclarationHostNode.ts b/...s/object-expression-keys-transformer-nodes/ObjectExpressionVariableDeclarationHostNode.ts
@@ -22,9 +22,9 @@ export class ObjectExpressionVariableDeclarationHostNode extends AbstractCustomN
      */
     private lexicalScopeNode!: TNodeWithLexicalScope;
     /**
-     * @ type {Property}
+     * @ type {(Property | SpreadElement)[]}
      */
-    private properties!: ESTree.Property[];
+    private properties!: (ESTree.Property | ESTree.SpreadElement)[];
 
     /**
      * @param {TIdentifierNamesGeneratorFactory} identifierNamesGeneratorFactory
@@ -47,7 +47,11 @@ export class ObjectExpressionVariableDeclarationHostNode extends AbstractCustomN
         );
     }
 
-    public initialize (lexicalScopeNode: TNodeWithLexicalScope, properties: ESTree.Property[]): void {
+    /**
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
+     * @param {(ESTree.Property | ESTree.SpreadElement)[]} properties
+     */
+    public initialize (lexicalScopeNode: TNodeWithLexicalScope, properties: (ESTree.Property | ESTree.SpreadElement)[]): void {
         this.lexicalScopeNode = lexicalScopeNode;
         this.properties = properties;
     }

diff --git a/src/node-transformers/converting-transformers/ObjectExpressionTransformer.ts b/src/node-transformers/converting-transformers/ObjectExpressionTransformer.ts
@@ -60,7 +60,11 @@ export class ObjectExpressionTransformer extends AbstractNodeTransformer {
      */
     public transformNode (objectExpressionNode: ESTree.ObjectExpression, parentNode: ESTree.Node): ESTree.Node {
         objectExpressionNode.properties
-            .forEach((property: ESTree.Property) => {
+            .forEach((property: ESTree.Property | ESTree.SpreadElement) => {
+                if (!NodeGuards.isPropertyNode(property)) {
+                    return;
+                }
+
                 if (!property.key) {
                     return;
                 }

diff --git a/...nsformers/converting-transformers/object-expression-extractors/BasePropertiesExtractor.ts b/...nsformers/converting-transformers/object-expression-extractors/BasePropertiesExtractor.ts
@@ -99,7 +99,7 @@ export class BasePropertiesExtractor implements IObjectExpressionExtractor {
         hostStatement: ESTree.Statement,
         memberExpressionHostNode: ESTree.Expression
     ): IObjectExpressionExtractorResult {
-        const properties: ESTree.Property[] = objectExpressionNode.properties;
+        const properties: (ESTree.Property | ESTree.SpreadElement)[] = objectExpressionNode.properties;
         const [expressionStatements, removablePropertyIds]: [ESTree.ExpressionStatement[], number[]] = this
             .extractPropertiesToExpressionStatements(
                 properties,
@@ -121,13 +121,13 @@ export class BasePropertiesExtractor implements IObjectExpressionExtractor {
     }
 
     /**
-     * @param {Property[]} properties
+     * @param {(Property | SpreadElement)[]} properties
      * @param {Statement} hostStatement
      * @param {Expression} memberExpressionHostNode
      * @returns {[ExpressionStatement[], number[]]}
      */
     private extractPropertiesToExpressionStatements (
-        properties: ESTree.Property[],
+        properties: (ESTree.Property | ESTree.SpreadElement)[],
         hostStatement: ESTree.Statement,
         memberExpressionHostNode: ESTree.Expression
     ): [ESTree.ExpressionStatement[], number[]] {
@@ -136,7 +136,12 @@ export class BasePropertiesExtractor implements IObjectExpressionExtractor {
         const removablePropertyIds: number[] = [];
 
         for (let i: number = 0; i < propertiesLength; i++) {
-            const property: ESTree.Property = properties[i];
+            const property: (ESTree.Property | ESTree.SpreadElement) = properties[i];
+
+            if (!NodeGuards.isPropertyNode(property)) {
+                continue;
+            }
+
             const propertyValue: ESTree.Expression | ESTree.Pattern = property.value;
 
             // invalid property nodes
@@ -193,6 +198,8 @@ export class BasePropertiesExtractor implements IObjectExpressionExtractor {
         removablePropertyIds: number[]
     ): void {
         objectExpressionNode.properties = objectExpressionNode.properties
-            .filter((property: ESTree.Property, index: number) => !removablePropertyIds.includes(index));
+            .filter((property: ESTree.Property | ESTree.SpreadElement, index: number) =>
+                !removablePropertyIds.includes(index)
+            );
     }
 }
diff --git a/...ansformers/object-expression-extractors/ObjectExpressionToVariableDeclarationExtractor.ts b/...ansformers/object-expression-extractors/ObjectExpressionToVariableDeclarationExtractor.ts
@@ -85,7 +85,7 @@ export class ObjectExpressionToVariableDeclarationExtractor implements IObjectEx
             throw new Error('Cannot find lexical scope node for the host statement node');
         }
 
-        const properties: ESTree.Property[] = objectExpressionNode.properties;
+        const properties: (ESTree.Property | ESTree.SpreadElement)[] = objectExpressionNode.properties;
 
         const newObjectExpressionHostStatement: ESTree.VariableDeclaration = this.getObjectExpressionHostNode(
             lexicalScopeNode,
@@ -109,12 +109,12 @@ export class ObjectExpressionToVariableDeclarationExtractor implements IObjectEx
 
     /**
      * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {Property[]} properties
+     * @param {(Property | SpreadElement)[]} properties
      * @returns {VariableDeclaration}
      */
     private getObjectExpressionHostNode (
         lexicalScopeNode: TNodeWithLexicalScope,
-        properties: ESTree.Property[]
+        properties: (ESTree.Property | ESTree.SpreadElement)[]
     ): ESTree.VariableDeclaration {
         const variableDeclarationHostNodeCustomNode: ICustomNode<TInitialData<ObjectExpressionVariableDeclarationHostNode>> =
             this.objectExpressionKeysTransformerCustomNodeFactory(

diff --git a/src/node-transformers/obfuscating-transformers/ScopeIdentifiersTransformer.ts b/src/node-transformers/obfuscating-transformers/ScopeIdentifiersTransformer.ts
@@ -346,9 +346,13 @@ export class ScopeIdentifiersTransformer extends AbstractNodeTransformer {
                 ) {
                     isLexicalScopeHasObjectPatternWithoutDeclaration = true;
 
-                    const properties: ESTree.Property[] = node.properties;
+                    const properties: (ESTree.Property | ESTree.RestElement)[] = node.properties;
 
                     for (const property of properties) {
+                        if (!NodeGuards.isPropertyNode(property)) {
+                            continue;
+                        }
+
                         if (property.computed || !property.shorthand) {
                             continue;
                         }

diff --git a/src/node/NodeFactory.ts b/src/node/NodeFactory.ts
@@ -304,10 +304,10 @@ export class NodeFactory {
     }
 
     /**
-     * @param {Property[]} properties
-     * @returns {ObjectExpression}
+     * @param {(ESTree.Property | ESTree.SpreadElement)[]} properties
+     * @returns {ESTree.ObjectExpression}
      */
-    public static objectExpressionNode (properties: ESTree.Property[]): ESTree.ObjectExpression {
+    public static objectExpressionNode (properties: (ESTree.Property | ESTree.SpreadElement)[]): ESTree.ObjectExpression {
         return {
             type: NodeType.ObjectExpression,
             properties,

diff --git a/test/dev/dev.ts b/test/dev/dev.ts
@@ -7,19 +7,13 @@ import { NO_ADDITIONAL_NODES_PRESET } from '../../src/options/presets/NoCustomNo
 
     let obfuscatedCode: string = JavaScriptObfuscator.obfuscate(
         `
-            #!/usr/bin/env node
-
-            /**
-             * @license
-             */
-            var foo = 'abc';
-            //bar
+            var a, b;
+            ({a, ...b} = {a: 1, b: 2, c: 3});
         `,
         {
             ...NO_ADDITIONAL_NODES_PRESET,
-            stringArray: true,
-            stringArrayThreshold: 1,
-            compact: false
+            compact: false,
+            renameGlobals: true
         }
     ).getObfuscatedCode();
 

diff --git a/...ansformers/scope-identifiers-transformer/variable-declaration/VariableDeclaration.spec.ts b/...ansformers/scope-identifiers-transformer/variable-declaration/VariableDeclaration.spec.ts
@@ -617,7 +617,7 @@ describe('ScopeIdentifiersTransformer VariableDeclaration identifiers', () => {
         let obfuscatedCode: string;
 
         before(() => {
-            const code: string = readFileAsString(__dirname + '/fixtures/object-rest.js');
+            const code: string = readFileAsString(__dirname + '/fixtures/object-rest-1.js');
 
             obfuscatedCode = JavaScriptObfuscator.obfuscate(
                 code,
@@ -707,4 +707,35 @@ describe('ScopeIdentifiersTransformer VariableDeclaration identifiers', () => {
             assert.match(obfuscatedCode, variablesUsageRegExp);
         });
     });
+
+    describe('Variant #20: destructing assignment without declaration #3', () => {
+        const variablesDeclaration: RegExp = /var a, *_0x[a-f0-9]{4,6};/;
+        const destructingAssignmentRegExp: RegExp = /\({ *a, *\.\.\._0x[a-f0-9]{4,6} *} *= *{ *'a' *: *0x1, *'b' *: *0x2 *}\);/;
+        const variablesUsageRegExp: RegExp = /console\['log']\(a, *_0x[a-f0-9]{4,6}\);/;
+
+        let obfuscatedCode: string;
+
+        before(() => {
+            const code: string = readFileAsString(__dirname + '/fixtures/destructing-assignment-without-declaration-3.js');
+
+            obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                code,
+                {
+                    ...NO_ADDITIONAL_NODES_PRESET
+                }
+            ).getObfuscatedCode();
+        });
+
+        it('match #1: should transform variables declaration', () => {
+            assert.match(obfuscatedCode, variablesDeclaration);
+        });
+
+        it('match #2: should transform destructing assignment without declaration', () => {
+            assert.match(obfuscatedCode, destructingAssignmentRegExp);
+        });
+
+        it('match #3: should transform variables usage', () => {
+            assert.match(obfuscatedCode, variablesUsageRegExp);
+        });
+    });
 });
diff --git a/...transformer/variable-declaration/fixtures/destructing-assignment-without-declaration-3.js b/...transformer/variable-declaration/fixtures/destructing-assignment-without-declaration-3.js
@@ -0,0 +1,6 @@
+(function () {
+    var a, b;
+    ({a, ...b} = {a: 1, b: 2});
+
+    console.log(a, b);
+})();
diff --git a/...iable-declaration/fixtures/object-rest.js → ...ble-declaration/fixtures/object-rest-1.js b/...iable-declaration/fixtures/object-rest.js → ...ble-declaration/fixtures/object-rest-1.js