Revert "Allow inline members in JS classes. NFC (emscripten-core#22808)"

This reverts commit eea2a44.

Author: walkingeyerobot

src/library.js

@@ -2282,8 +2282,12 @@ addToLibrary({
   },
 
   $HandleAllocator: class {
-    allocated = [undefined];
-    freelist = [];
+    constructor() {
+      // TODO(https://github.com/emscripten-core/emscripten/issues/21414):
+      // Use inline field declarations.
+      this.allocated = [undefined];
+      this.freelist = [];
+    }
     get(id) {
 #if ASSERTIONS
       assert(this.allocated[id] !== undefined, `invalid handle: ${id}`);

src/library_fs.js

@@ -73,7 +73,6 @@ FS.staticInit();
 #else
     ErrnoError: class {
 #endif
-      name = 'ErrnoError';
       // We set the `name` property to be able to identify `FS.ErrnoError`
       // - the `name` is a standard ECMA-262 property of error objects. Kind of good to have it anyway.
       // - when using PROXYFS, an error can come from an underlying FS
@@ -84,6 +83,9 @@ FS.staticInit();
 #if ASSERTIONS
         super(runtimeInitialized ? strError(errno) : '');
 #endif
+        // TODO(sbc): Use the inline member declaration syntax once we
+        // support it in acorn and closure.
+        this.name = 'ErrnoError';
         this.errno = errno;
 #if ASSERTIONS
         for (var key in ERRNO_CODES) {
@@ -97,11 +99,16 @@ FS.staticInit();
     },
 
     FSStream: class {
-      shared = {};
+      constructor() {
+        // TODO(https://github.com/emscripten-core/emscripten/issues/21414):
+        // Use inline field declarations.
+        this.shared = {};
 #if USE_CLOSURE_COMPILER
-      // Closure compiler requires us to declare all properties ahead of time
-      node = null;
+        // Closure compiler requires us to declare all properties in the
+        // constructor.
+        this.node = null;
 #endif
+      }
       get object() {
         return this.node;
       }
@@ -131,22 +138,22 @@ FS.staticInit();
       }
     },
     FSNode: class {
-      node_ops = {};
-      stream_ops = {};
-      readMode = {{{ cDefs.S_IRUGO }}} | {{{ cDefs.S_IXUGO }}};
-      writeMode = {{{ cDefs.S_IWUGO }}};
-      mounted = null;
       constructor(parent, name, mode, rdev) {
         if (!parent) {
           parent = this;  // root node sets parent to itself
         }
         this.parent = parent;
         this.mount = parent.mount;
+        this.mounted = null;
         this.id = FS.nextInode++;
         this.name = name;
         this.mode = mode;
+        this.node_ops = {};
+        this.stream_ops = {};
         this.rdev = rdev;
         this.atime = this.mtime = this.ctime = Date.now();
+        this.readMode = {{{ cDefs.S_IRUGO }}} | {{{ cDefs.S_IXUGO }}};
+        this.writeMode = {{{ cDefs.S_IWUGO }}};
       }
       get read() {
         return (this.mode & this.readMode) === this.readMode;
@@ -1674,14 +1681,17 @@ FS.staticInit();
       // Lazy chunked Uint8Array (implements get and length from Uint8Array).
       // Actual getting is abstracted away for eventual reuse.
       class LazyUint8Array {
-        lengthKnown = false;
-        chunks = []; // Loaded chunks. Index is the chunk number
+        constructor() {
+          this.lengthKnown = false;
+          this.chunks = []; // Loaded chunks. Index is the chunk number
 #if USE_CLOSURE_COMPILER
-        // Closure compiler requires us to declare all properties ahead of time.
-        getter = undefined;
-        _length = 0;
-        _chunkSize = 0;
+          // Closure compiler requires us to declare all properties in the
+          // constructor.
+          this.getter = undefined;
+          this._length = 0;
+          this._chunkSize = 0;
 #endif
+        }
         get(idx) {
           if (idx > this.length-1 || idx < 0) {
             return undefined;

src/library_wasi.js

@@ -6,12 +6,11 @@
 
 var WasiLibrary = {
 #if !MINIMAL_RUNTIME
-  $ExitStatus: class {
-    name = 'ExitStatus';
-    constructor(status) {
-      this.message = `Program terminated with exit(${status})`;
-      this.status = status;
-    }
+  $ExitStatus__docs: '/** @constructor */',
+  $ExitStatus: function(status) {
+    this.name = 'ExitStatus';
+    this.message = `Program terminated with exit(${status})`;
+    this.status = status;
   },
   proc_exit__deps: ['$ExitStatus', '$keepRuntimeAlive'],
 #endif

tools/acorn-optimizer.mjs

@@ -2037,7 +2037,8 @@ if (extraInfoStart > 0) {
 // outputted code if --closureFriendly was requested.
 const sourceComments = {};
 const params = {
-  ecmaVersion: 'latest',
+  // Keep in sync with --language_in that we pass to closure in building.py
+  ecmaVersion: 2021,
   sourceType: exportES6 ? 'module' : 'script',
   allowAwaitOutsideFunction: true,
 };

tools/building.py

@@ -598,7 +598,8 @@ def closure_compiler(filename, advanced=True, extra_closure_args=None):
     CLOSURE_EXTERNS += [path_from_root('src/closure-externs/dyncall-externs.js')]
 
   args = ['--compilation_level', 'ADVANCED_OPTIMIZATIONS' if advanced else 'SIMPLE_OPTIMIZATIONS']
-  args += ['--language_in', 'UNSTABLE']
+  # Keep in sync with ecmaVersion in tools/acorn-optimizer.mjs
+  args += ['--language_in', 'ECMASCRIPT_2021']
   # We do transpilation using babel
   args += ['--language_out', 'NO_TRANSPILE']
   # Tell closure never to inject the 'use strict' directive.