From f30baedc0139c133756c4e4b8135ab8114eeb6a6 Mon Sep 17 00:00:00 2001
From: Myles Borins <mylesborins@github.com>
Date: Wed, 29 Jul 2020 18:52:02 -0400
Subject: [PATCH] module: unflag Top-Level Await

This unflags Top-Level await so it can be used by default in the module
goal. This is accomplished by manually setting the
--harmony-top-level-await flag. We are allowing this as a one of
approval based on circumstances. It is not a precedent that future
harmony features will be manually enabled.

Refs: https://github.com/nodejs/node/issues/34551
---
 doc/api/cli.md                                    | 10 ----------
 doc/api/esm.md                                    |  8 +++-----
 doc/node.1                                        |  3 ---
 src/node.cc                                       |  7 +++++++
 src/node_options.cc                               |  3 ++-
 src/node_options.h                                |  2 +-
 test/es-module/test-esm-tla.mjs                   |  2 --
 test/message/esm_display_syntax_error.mjs         |  2 ++
 test/message/esm_display_syntax_error.out         |  2 +-
 test/message/esm_display_syntax_error_module.out  |  4 ++--
 test/message/esm_loader_syntax_error.out          |  4 ++--
 test/parallel/test-cli-node-options.js            |  2 +-
 test/parallel/test-no-harmony-top-level-await.mjs | 11 +++++++++++
 tools/code_cache/mkcodecache.cc                   |  1 +
 14 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 test/parallel/test-no-harmony-top-level-await.mjs

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 3e4b3e9348334f..899c28f6f76675 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -253,16 +253,6 @@ the ability to import a directory that has an index file.
 
 Please see [customizing ESM specifier resolution][] for example usage.
 
-### `--experimental-top-level-await`
-<!-- YAML
-added: v14.3.0
--->
-
-Enable experimental top-level `await` keyword support, available only in ES
-module scripts.
-
-(See also `--experimental-repl-await`.)
-
 ### `--experimental-vm-modules`
 <!-- YAML
 added: v9.6.0
diff --git a/doc/api/esm.md b/doc/api/esm.md
index e98cae376f6c5b..551eef604eac0e 100644
--- a/doc/api/esm.md
+++ b/doc/api/esm.md
@@ -1146,9 +1146,8 @@ would provide the exports interface for the instantiation of `module.wasm`.
 
 ## Experimental top-level `await`
 
-When the `--experimental-top-level-await` flag is provided, `await` may be used
-in the top level (outside of async functions) within modules. This implements
-the [ECMAScript Top-Level `await` proposal][].
+The `await` keyword may be used in the top level (outside of async functions)
+within modules as per the [ECMAScript Top-Level `await` proposal][].
 
 Assuming an `a.mjs` with
 
@@ -1166,8 +1165,7 @@ console.log(five); // Logs `5`
 ```
 
 ```bash
-node b.mjs # fails
-node --experimental-top-level-await b.mjs # works
+node b.mjs # works
 ```
 
 ## Experimental loaders
diff --git a/doc/node.1 b/doc/node.1
index d9285cb54a36e4..3da44752bd38eb 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -157,9 +157,6 @@ keyword support in REPL.
 .It Fl -experimental-specifier-resolution
 Select extension resolution algorithm for ES Modules; either 'explicit' (default) or 'node'
 .
-.It Fl -experimental-top-level-await
-Enable experimental top-level await support in ES modules.
-.
 .It Fl -experimental-vm-modules
 Enable experimental ES module support in VM module.
 .
diff --git a/src/node.cc b/src/node.cc
index f14ff44be80d74..d68c6d8d148a38 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -773,6 +773,13 @@ int ProcessGlobalArgs(std::vector<std::string>* args,
     return 12;
   }
 
+  // TODO(mylesborins): remove this when the harmony-top-level-await flag
+  // is removed in V8
+  if (std::find(v8_args.begin(), v8_args.end(),
+                "--no-harmony-top-level-await") == v8_args.end()) {
+    v8_args.push_back("--harmony-top-level-await");
+  }
+
   auto env_opts = per_process::cli_options->per_isolate->per_env;
   if (std::find(v8_args.begin(), v8_args.end(),
                 "--abort-on-uncaught-exception") != v8_args.end() ||
diff --git a/src/node_options.cc b/src/node_options.cc
index 93a2268da41363..737c4c147d3bcb 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -615,12 +615,13 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
   Implies("--report-signal", "--report-on-signal");
 
   AddOption("--experimental-top-level-await",
-            "enable experimental support for ECMAScript Top-Level Await",
+            "",
             &PerIsolateOptions::experimental_top_level_await,
             kAllowedInEnvironment);
   AddOption("--harmony-top-level-await", "", V8Option{});
   Implies("--experimental-top-level-await", "--harmony-top-level-await");
   Implies("--harmony-top-level-await", "--experimental-top-level-await");
+  ImpliesNot("--no-harmony-top-level-await", "--experimental-top-level-await");
 
   Insert(eop, &PerIsolateOptions::get_per_env_options);
 }
diff --git a/src/node_options.h b/src/node_options.h
index 7f8c223f755a24..fe20022bb2f357 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -188,7 +188,7 @@ class PerIsolateOptions : public Options {
   bool no_node_snapshot = false;
   bool report_uncaught_exception = false;
   bool report_on_signal = false;
-  bool experimental_top_level_await = false;
+  bool experimental_top_level_await = true;
   std::string report_signal = "SIGUSR2";
   inline EnvironmentOptions* get_per_env_options();
   void CheckOptions(std::vector<std::string>* errors) override;
diff --git a/test/es-module/test-esm-tla.mjs b/test/es-module/test-esm-tla.mjs
index 816f88dd80a74e..68a9d8954c5e2e 100644
--- a/test/es-module/test-esm-tla.mjs
+++ b/test/es-module/test-esm-tla.mjs
@@ -1,5 +1,3 @@
-// Flags: --experimental-top-level-await
-
 import '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'assert';
diff --git a/test/message/esm_display_syntax_error.mjs b/test/message/esm_display_syntax_error.mjs
index bda4a7e6ebe3a3..0b9a30c2d054f7 100644
--- a/test/message/esm_display_syntax_error.mjs
+++ b/test/message/esm_display_syntax_error.mjs
@@ -1,2 +1,4 @@
+// Flags: --no-harmony-top-level-await
+
 'use strict';
 await async () => 0;
diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out
index b7d2008540adf3..775448d4b68afd 100644
--- a/test/message/esm_display_syntax_error.out
+++ b/test/message/esm_display_syntax_error.out
@@ -1,4 +1,4 @@
-file:///*/test/message/esm_display_syntax_error.mjs:2
+file:///*/test/message/esm_display_syntax_error.mjs:4
 await async () => 0;
 ^^^^^
 
diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out
index 708257fcaf5792..c45a5008e691ca 100644
--- a/test/message/esm_display_syntax_error_module.out
+++ b/test/message/esm_display_syntax_error_module.out
@@ -1,6 +1,6 @@
 file:///*/test/fixtures/es-module-loaders/syntax-error.mjs:2
 await async () => 0;
-^^^^^
+^^^^^^^^^^^^^
 
-SyntaxError: Unexpected reserved word
+SyntaxError: Malformed arrow function parameter list
     at Loader.moduleStrategy (internal/modules/esm/translators.js:*:*)
\ No newline at end of file
diff --git a/test/message/esm_loader_syntax_error.out b/test/message/esm_loader_syntax_error.out
index 3aee72d423b1a1..6201de95208ff3 100644
--- a/test/message/esm_loader_syntax_error.out
+++ b/test/message/esm_loader_syntax_error.out
@@ -2,8 +2,8 @@
 (Use `node --trace-warnings ...` to show where the warning was created)
 file://*/test/fixtures/es-module-loaders/syntax-error.mjs:2
 await async () => 0;
-^^^^^
+^^^^^^^^^^^^^
 
-SyntaxError: Unexpected reserved word
+SyntaxError: Malformed arrow function parameter list
     at Loader.moduleStrategy (internal/modules/esm/translators.js:*:*)
     at async link (internal/modules/esm/module_job.js:*:*)
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
index 98acf353c4ee43..8fb15d3ba505c1 100644
--- a/test/parallel/test-cli-node-options.js
+++ b/test/parallel/test-cli-node-options.js
@@ -79,7 +79,7 @@ if (!['arm', 'arm64'].includes(process.arch))
   expect('--interpreted-frames-native-stack', 'B\n');
 
 // Workers can't eval as ES Modules. https://github.com/nodejs/node/issues/30682
-expectNoWorker('--experimental-top-level-await --input-type=module',
+expectNoWorker('--input-type=module',
                'B\n', 'console.log(await "B")');
 
 function expectNoWorker(opt, want, command, wantsError) {
diff --git a/test/parallel/test-no-harmony-top-level-await.mjs b/test/parallel/test-no-harmony-top-level-await.mjs
new file mode 100644
index 00000000000000..d48fbbe7f45246
--- /dev/null
+++ b/test/parallel/test-no-harmony-top-level-await.mjs
@@ -0,0 +1,11 @@
+// Flags: --no-harmony-top-level-await
+
+import {
+  mustCall,
+  disableCrashOnUnhandledRejection
+} from '../common/index.mjs';
+
+disableCrashOnUnhandledRejection();
+
+process.on('unhandledRejection', mustCall());
+Promise.reject(new Error('should not be fatal error'));
diff --git a/tools/code_cache/mkcodecache.cc b/tools/code_cache/mkcodecache.cc
index 2aa140fff73ae8..c314e07fd78b22 100644
--- a/tools/code_cache/mkcodecache.cc
+++ b/tools/code_cache/mkcodecache.cc
@@ -27,6 +27,7 @@ int main(int argc, char* argv[]) {
 #endif  // _WIN32
 
   v8::V8::SetFlagsFromString("--random_seed=42");
+  v8::V8::SetFlagsFromString("--harmony-top-level-await");
 
   if (argc < 2) {
     std::cerr << "Usage: " << argv[0] << " <path/to/output.cc>\n";