Support class field declarations.

Fixes: estools#443

Author: kevincox

escodegen.js

@@ -1126,11 +1126,16 @@
             var result = [ '{', newline], that = this;
 
             withIndent(function (indent) {
-                var i, iz;
+                var bodyFlags, i, iz;
 
+                bodyFlags = E_TTT;
                 for (i = 0, iz = stmt.body.length; i < iz; ++i) {
+                    if (i === iz - 1) {
+                        bodyFlags |= F_SEMICOLON_OPT;
+                    }
+
                     result.push(indent);
-                    result.push(that.generateExpression(stmt.body[i], Precedence.Sequence, E_TTT));
+                    result.push(that.generateExpression(stmt.body[i], Precedence.Sequence, bodyFlags));
                     if (i + 1 < iz) {
                         result.push(newline);
                     }
@@ -2161,6 +2166,10 @@
             return join(result, fragment);
         },
 
+        PrivateIdentifier: function(expr, precedence, flags) {
+            return toSourceNodeWhenNeeded('#' + expr.name, expr);
+        },
+
         Property: function (expr, precedence, flags) {
             if (expr.kind === 'get' || expr.kind === 'set') {
                 return [
@@ -2192,6 +2201,22 @@
             ];
         },
 
+        PropertyDefinition: function(expr, precedence, flags) {
+            var keywords = [];
+            if (expr.static) {
+                keywords.push('static');
+            }
+
+            return join(keywords, [
+                this.generatePropertyKey(expr.key, expr.computed),
+                space,
+                '=',
+                space,
+                this.generateExpression(expr.value, Precedence.Assignment, E_TTT),
+                this.semicolon(flags),
+            ]);
+        },
+
         ObjectExpression: function (expr, precedence, flags) {
             var multiline, result, fragment, that = this;
 
@@ -2513,6 +2538,9 @@
             return generateVerbatim(expr, precedence);
         }
 
+        if (!(type in this)) {
+            throw new Error('Unknown node type: ' + type);
+        }
         result = this[type](expr, precedence, flags);
 
 

package.json

@@ -38,7 +38,7 @@
         "source-map": "~0.6.1"
     },
     "devDependencies": {
-        "acorn": "^8.0.4",
+        "acorn": "^8.2.0",
         "bluebird": "^3.4.7",
         "bower-registry-client": "^1.0.0",
         "chai": "^4.2.0",

test/compare-acorn-es2022.js

@@ -0,0 +1,99 @@
+/*
+  Copyright (C) 2012-2013 Yusuke Suzuki <utatane.tea@gmail.com>
+  Copyright (C) 2020 Apple Inc. All rights reserved.
+
+  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 expectedTree, actual, actualTree, options;
+
+    options = {
+        ranges: false,
+        locations: false,
+        ecmaVersion: 2022,
+    };
+
+    expectedTree = acorn.parse(code, options);
+
+    // for UNIX text comment
+    actual = escodegen.generate(expectedTree) + "\n";
+    actualTree = acorn.parse(actual, options);
+
+    console.dir(expectedTree, { depth: null });
+    console.dir(actualTree, { depth: null });
+
+    expect(actual).to.be.equal(expected);
+    expect(actualTree).excludingEvery(['start', 'end', 'raw']).to.deep.equal(expectedTree);
+}
+
+function testMin(code, expected) {
+    var expectedTree, actual, actualTree, options;
+
+    options = {
+        ranges: false,
+        locations: false,
+        ecmaVersion: 2022,
+    };
+
+    expectedTree = acorn.parse(code, options);
+
+    // for UNIX text comment
+    actual = escodegen.generate(expectedTree, {
+        format: escodegen.FORMAT_MINIFY,
+        raw: false
+    }).replace(/[\n\r]$/, '') + '\n';
+    actualTree = acorn.parse(actual, options);
+
+    expect(actual).to.be.equal(expected);
+    expect(actualTree).excludingEvery(['start', 'end', 'raw']).to.deep.equal(expectedTree);
+}
+
+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-field-declarations.expected.js

@@ -0,0 +1,9 @@
+class FieldDeclarations {
+    member = 1;
+    ['non-identifier'] = 18;
+    [Symbol.iterator] = 10;
+    #privateMember = 2;
+    static #STATIC = 3;
+    static STATIC = 4;
+    static [1 + 2] = 4;
+}

test/compare-acorn-es2022/class-field-declarations.expected.min.js

@@ -0,0 +1 @@
+class FieldDeclarations{member=1;['non-identifier']=18;[Symbol.iterator]=10;#privateMember=2;static#STATIC=3;static STATIC=4;static[1+2]=4}

test/compare-acorn-es2022/class-field-declarations.js

@@ -0,0 +1,12 @@
+class FieldDeclarations{
+    member = 1;
+
+    ["non-identifier"] = 18;
+    [Symbol.iterator] = 10;
+
+    #privateMember = 2
+
+    static #STATIC = 3
+    static STATIC = 4
+    static [1 + 2] = 4
+}