[pull] master from javascript-obfuscator:master

CHANGELOG.md

@@ -1,5 +1,9 @@
 Change Log
 
+v2.6.1
+---
+* Fixed missing rename of object pattern properties in some cases. Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/781
+
 v2.6.0
 ---
 * Migration to `webpack@5`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "1.0.1",
-    "@types/chai": "4.2.13",
+    "@types/chai": "4.2.14",
     "@types/chance": "1.1.0",
     "@types/escodegen": "0.0.6",
     "@types/eslint-scope": "3.7.0",
@@ -58,7 +58,7 @@
     "@types/mkdirp": "1.0.1",
     "@types/mocha": "8.0.3",
     "@types/multimatch": "4.0.0",
-    "@types/node": "14.11.8",
+    "@types/node": "14.11.10",
     "@types/rimraf": "3.0.0",
     "@types/sinon": "9.0.8",
     "@types/string-template": "1.0.2",
@@ -71,7 +71,7 @@
     "cross-env": "7.0.2",
     "eslint": "7.11.0",
     "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jsdoc": "30.6.4",
+    "eslint-plugin-jsdoc": "30.6.5",
     "eslint-plugin-no-null": "1.0.2",
     "eslint-plugin-prefer-arrow": "1.2.2",
     "eslint-plugin-unicorn": "22.0.0",
@@ -87,7 +87,7 @@
     "ts-loader": "8.0.5",
     "ts-node": "9.0.0",
     "typescript": "4.1.0-beta",
-    "webpack": "5.1.0",
+    "webpack": "5.1.3",
     "webpack-cli": "4.0.0",
     "webpack-node-externals": "2.5.2"
   },

src/node-transformers/converting-transformers/ObjectPatternPropertiesTransformer.ts

@@ -77,7 +77,7 @@ export class ObjectPatternPropertiesTransformer extends AbstractNodeTransformer
         propertyNode.shorthand = false;
         propertyNode.value = NodeUtils.clone(propertyNode.value);
 
-        NodeUtils.parentizeNode(propertyNode.value, parentNode);
+        NodeUtils.parentizeNode(propertyNode.value, propertyNode);
 
         return propertyNode;
     }

src/node-transformers/rename-identifiers-transformers/ScopeIdentifiersTransformer.ts

@@ -296,6 +296,7 @@ export class ScopeIdentifiersTransformer extends AbstractNodeTransformer {
             && !parentNode.computed
             && NodeGuards.isIdentifierNode(parentNode.key)
             && NodeGuards.isIdentifierNode(node)
+            && parentNode.shorthand
             && parentNode.key.name === node.name;
     }
 

test/dev/dev.ts

@@ -1,24 +1,27 @@
 'use strict';
 
 import { NO_ADDITIONAL_NODES_PRESET } from '../../src/options/presets/NoCustomNodes';
-import { IdentifierNamesGenerator } from '../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
 
 (function () {
     const JavaScriptObfuscator: any = require('../../index');
 
     let obfuscatedCode: string = JavaScriptObfuscator.obfuscate(
         `
-           var test = '\\nreturn \\n//# sourceURL= there can only be \\'^\\' and \\'!\\' markers in a subscription marble diagram.';
-
-           console.log(test);
+            function foo () {
+                const {
+                    qq,
+                    qqq,
+                } = object;
+
+                const foo = {
+                    prop: 1
+                };
+            }
         `,
         {
             ...NO_ADDITIONAL_NODES_PRESET,
             compact: false,
-            identifierNamesGenerator: IdentifierNamesGenerator.MangledIdentifierNamesGenerator,
-            stringArray: true,
-            stringArrayThreshold: 1,
-            unicodeEscapeSequence: false
+            transformObjectKeys: true
         }
     ).getObfuscatedCode();
 

test/functional-tests/node-transformers/converting-transformers/object-pattern-properties-transformer/ObjectPatternPropertiesTransformer.spec.ts

@@ -65,6 +65,37 @@ describe('ObjectPatternPropertiesTransformer', () => {
                 assert.match(obfuscatedCode, regExp);
             });
         });
+
+        describe('Variant #3: issue 781. Wrong parentize of cloned `propertyNode` value', () => {
+            const regExp: RegExp = new RegExp(
+                'const { *' +
+                    'foo: *_0x([a-f0-9]){4,6}, *' +
+                    'bar: *_0x([a-f0-9]){4,6} *' +
+                '} *= *{}; *' +
+                'const _0x([a-f0-9]){4,6} *= *{};' +
+                '_0x([a-f0-9]){4,6}\\[\'prop\'] *= *0x1;' +
+                'const _0x([a-f0-9]){4,6} *= *_0x([a-f0-9]){4,6};'
+            );
+
+            let obfuscatedCode: string;
+
+            before(() => {
+                const code: string = readFileAsString(__dirname + '/fixtures/function-scope-wrong-parentize.js');
+
+                obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                    code,
+                    {
+                        ...NO_ADDITIONAL_NODES_PRESET,
+                        renameGlobals: false,
+                        transformObjectKeys: true
+                    }
+                ).getObfuscatedCode();
+            });
+
+            it('should transform object properties', () => {
+                assert.match(obfuscatedCode, regExp);
+            });
+        });
     });
 
     describe('Variant #2: global scope', () => {

test/functional-tests/node-transformers/converting-transformers/object-pattern-properties-transformer/fixtures/function-scope-wrong-parentize.js

@@ -0,0 +1,6 @@
+(function () {
+    const {foo, bar} = {};
+    const baz = {
+        prop: 1
+    };
+})();