Merge pull request #3 from javascript-obfuscator/es2022-class-fields-…

…and-private-properties

Added support for ES2022 class fields and private properties

CHANGELOG.md

@@ -1,3 +1,7 @@
+v2.2.0
+---
+* Added support for ES2022 class fields and private properties
+
 v2.1.1
 ---
 * Removed `bin` section from `package.json`

benchmark/old.js

@@ -61,7 +61,7 @@
         FORMAT_MINIFY,
         FORMAT_DEFAULTS;
 
-    estraverse = require('estraverse');
+    estraverse = require('@javascript-obfuscator/estraverse');
     esutils = require('esutils');
 
     Syntax = {

escodegen.js

@@ -64,7 +64,7 @@
         FORMAT_MINIFY,
         FORMAT_DEFAULTS;
 
-    estraverse = require('estraverse');
+    estraverse = require('@javascript-obfuscator/estraverse');
     esutils = require('esutils');
 
     Syntax = estraverse.Syntax;
@@ -2188,6 +2188,10 @@
             return join(result, fragment);
         },
 
+        PrivateIdentifier: function (expr, precedence, flags) {
+            return '#' + generateIdentifier(expr);
+        },
+
         Property: function (expr, precedence, flags) {
             if (expr.kind === 'get' || expr.kind === 'set') {
                 return [
@@ -2219,6 +2223,27 @@
             ];
         },
 
+        PropertyDefinition: function (expr, precedence, flags) {
+            var result;
+
+            if (expr.static) {
+                result = ['static '];
+            } else {
+                result = [];
+            }
+
+            result.push(this.generatePropertyKey(expr.key, expr.computed));
+
+            if (expr.value) {
+                result.push( space + '=' + space);
+                result.push(this.generateExpression(expr.value, Precedence.Assignment, E_TTT));
+            }
+
+            result.push(this.semicolon(flags));
+
+            return result;
+        },
+
         ObjectExpression: function (expr, precedence, flags) {
             var multiline, result, fragment, that = this;
 

package.json

@@ -10,7 +10,7 @@
         "escodegen.js",
         "package.json"
     ],
-    "version": "2.1.1",
+    "version": "2.2.0",
     "engines": {
         "node": ">=6.0"
     },
@@ -31,7 +31,7 @@
         "url": "http://github.com/estools/escodegen.git"
     },
     "dependencies": {
-        "estraverse": "^5.2.0",
+        "@javascript-obfuscator/estraverse": "^5.3.0",
         "esutils": "^2.0.2",
         "esprima": "^4.0.1",
         "optionator": "^0.8.1"
@@ -40,7 +40,7 @@
         "source-map": "~0.6.1"
     },
     "devDependencies": {
-        "acorn": "^8.0.1",
+        "acorn": "^8.2.2",
         "bluebird": "^3.4.7",
         "bower-registry-client": "^1.0.0",
         "chai": "^4.2.0",

test/compare-acorn-es2022.js

@@ -0,0 +1,95 @@
+/*
+  Copyright (C) 2012-2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+'use strict';
+
+var fs = require('fs'),
+    acorn = require('acorn'),
+    escodegen = require('./loader'),
+    chai = require('chai'),
+    chaiExclude = require('chai-exclude'),
+    expect = chai.expect;
+
+chai.use(chaiExclude);
+
+function test(code, expected) {
+    var tree, actual, actualTree, options;
+
+    options = {
+        ranges: false,
+        locations: false,
+        ecmaVersion: 13
+    };
+
+    tree = acorn.parse(code, options);
+
+    // for UNIX text comment
+    actual = escodegen.generate(tree);
+    actualTree = acorn.parse(actual, options);
+
+    expect(actual).to.be.equal(expected);
+    expect(tree).excludingEvery(['start', 'end']).to.deep.equal(actualTree);
+}
+
+function testMin(code, expected) {
+    var tree, actual, actualTree, options;
+
+    options = {
+        ranges: false,
+        locations: false,
+        ecmaVersion: 13
+    };
+
+    tree = acorn.parse(code, options);
+
+    // for UNIX text comment
+    actual = escodegen.generate(tree, {
+        format: escodegen.FORMAT_MINIFY,
+        raw: false
+    }).replace(/[\n\r]$/, '') + '\n';
+    actualTree = acorn.parse(actual, options);
+
+    expect(actual).to.be.equal(expected);
+    expect(tree).excludingEvery(['start', 'end']).to.deep.equal(actualTree);
+}
+
+describe('compare acorn es2022 test', function () {
+    fs.readdirSync(__dirname + '/compare-acorn-es2022').sort().forEach(function(file) {
+        var code, expected, exp, min;
+        if (/\.js$/.test(file) && !/expected\.js$/.test(file) && !/expected\.min\.js$/.test(file)) {
+            it(file, function () {
+                exp = file.replace(/\.js$/, '.expected.js');
+                min = file.replace(/\.js$/, '.expected.min.js');
+                code = fs.readFileSync(__dirname + '/compare-acorn-es2022/' + file, 'utf-8');
+                expected = fs.readFileSync(__dirname + '/compare-acorn-es2022/' + exp, 'utf-8');
+                test(code, expected);
+                if (fs.existsSync(__dirname + '/compare-acorn-es2022/' + min)) {
+                    expected = fs.readFileSync(__dirname + '/compare-acorn-es2022/' + min, 'utf-8');
+                    testMin(code, expected);
+                }
+            });
+        }
+    });
+});
+/* vim: set sw=4 ts=4 et tw=80 : */

test/compare-acorn-es2022/class-features.expected.js

@@ -0,0 +1,46 @@
+class C1 {
+    aaa;
+}
+class C2 {
+    A;
+}
+class C3 {
+    '0';
+}
+class C4 {
+    100;
+}
+class C5 {
+    [0];
+}
+class C6 {
+    aaa = bbb;
+}
+class C7 {
+    aaa = () => 0;
+}
+class C8 {
+    static aaa;
+}
+class C9 {
+    static aaa = bbb;
+}
+class C10 {
+    static aaa = 1;
+    bbb = 2;
+}
+class C11 {
+    get;
+    set;
+    static;
+    async;
+}
+class C12 {
+    #aaa;
+}
+class C13 {
+    #A;
+}
+class C14 {
+    #𩸽;
+}

test/compare-acorn-es2022/class-features.expected.min.js

@@ -0,0 +1 @@
+class C1{aaa;}class C2{A;}class C3{'0';}class C4{100;}class C5{[0];}class C6{aaa=bbb;}class C7{aaa=()=>0;}class C8{static aaa;}class C9{static aaa=bbb;}class C10{static aaa=1;bbb=2;}class C11{get;set;static;async;}class C12{#aaa;}class C13{#A;}class C14{#𩸽;}

test/compare-acorn-es2022/class-features.js

@@ -0,0 +1,15 @@
+class C1 { aaa; }
+class C2 { \u0041; }
+class C3 { '0'; }
+class C4 { 100; }
+class C5 { [0]; }
+class C6 { aaa = bbb; }
+class C7 { aaa = () => 0; }
+class C8 { static aaa; }
+class C9 { static aaa = bbb; }
+class C10 { static aaa = 1; bbb = 2; }
+class C11 { get; set; static; async }
+
+class C12 { #aaa; }
+class C13 { #\u0041; }
+class C14 { #𩸽; }