nodejs
diff --git a/‎lib/internal/errors.js‎
Lines changed: 3 additions & 0 deletions b/‎lib/internal/errors.js‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎lib/internal/modules/esm/loader.js‎
Lines changed: 4 additions & 0 deletions b/‎lib/internal/modules/esm/loader.js‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎lib/internal/modules/esm/module_job.js‎
Lines changed: 14 additions & 2 deletions b/‎lib/internal/modules/esm/module_job.js‎
Lines changed: 14 additions & 2 deletions
diff --git a/‎src/module_wrap.cc‎
Lines changed: 3 additions & 9 deletions b/‎src/module_wrap.cc‎
Lines changed: 3 additions & 9 deletions
diff --git a/‎test/es-module/test-require-module-tla-retry-require.js‎
Lines changed: 16 additions & 0 deletions b/‎test/es-module/test-require-module-tla-retry-require.js‎
Lines changed: 16 additions & 0 deletions
@@ -1692,6 +1692,9 @@ E('ERR_PARSE_ARGS_UNKNOWN_OPTION', (option, allowPositionals) => {
 E('ERR_PERFORMANCE_INVALID_TIMESTAMP',
   '%d is not a valid timestamp', TypeError);
 E('ERR_PERFORMANCE_MEASURE_INVALID_OPTIONS', '%s', TypeError);
+E('ERR_REQUIRE_ASYNC_MODULE', 'require() cannot be used on an ESM ' +
+  'graph with top-level await. Use import() instead. To see where the' +
+  ' top-level await comes from, use --experimental-print-required-tla.', Error);
 E('ERR_REQUIRE_CYCLE_MODULE', '%s', Error);
 E('ERR_REQUIRE_ESM',
   function(filename, hasEsmSyntax, parentPath = null, packageJsonPath = null) {
 
@@ -22,6 +22,7 @@ const { imported_cjs_symbol } = internalBinding('symbols');
 
 const assert = require('internal/assert');
 const {
+  ERR_REQUIRE_ASYNC_MODULE,
   ERR_REQUIRE_CYCLE_MODULE,
   ERR_REQUIRE_ESM,
   ERR_NETWORK_IMPORT_DISALLOWED,
@@ -293,6 +294,9 @@ class ModuleLoader {
     //    evaluated at this point.
     if (job !== undefined) {
       mod[kRequiredModuleSymbol] = job.module;
+      if (job.module.async) {
+        throw new ERR_REQUIRE_ASYNC_MODULE();
+      }
       if (job.module.getStatus() !== kEvaluated) {
         const parentFilename = urlToFilename(parent?.filename);
         let message = `Cannot require() ES Module ${filename} in a cycle.`;
 
@@ -32,8 +32,11 @@ const resolvedPromise = PromiseResolve();
 const {
   setHasStartedUserESMExecution,
 } = require('internal/modules/helpers');
+const { getOptionValue } = require('internal/options');
 const noop = FunctionPrototype;
-
+const {
+  ERR_REQUIRE_ASYNC_MODULE,
+} = require('internal/errors').codes;
 let hasPausedEntry = false;
 
 const CJSGlobalLike = [
@@ -370,7 +373,16 @@ class ModuleJobSync extends ModuleJobBase {
 
   runSync() {
     // TODO(joyeecheung): add the error decoration logic from the async instantiate.
-    this.module.instantiateSync();
+    this.module.async = this.module.instantiateSync();
+    // If --experimental-print-required-tla is true, proceeds to evaluation even
+    // if it's async because we want to search for the TLA and help users locate
+    // them.
+    // TODO(joyeecheung): track the asynchroniticy using v8::Module::HasTopLevelAwait()
+    // and we'll be able to throw right after compilation of the modules, using acron
+    // to find and print the TLA.
+    if (this.module.async && !getOptionValue('--experimental-print-required-tla')) {
+      throw new ERR_REQUIRE_ASYNC_MODULE();
+    }
     setHasStartedUserESMExecution();
     const namespace = this.module.evaluateSync();
     return { __proto__: null, module: this.module, namespace };
 
@@ -31,7 +31,6 @@ using v8::FunctionTemplate;
 using v8::HandleScope;
 using v8::Int32;
 using v8::Integer;
-using v8::IntegrityLevel;
 using v8::Isolate;
 using v8::Local;
 using v8::MaybeLocal;
@@ -290,7 +289,6 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {
 
   obj->contextify_context_ = contextify_context;
 
-  that->SetIntegrityLevel(context, IntegrityLevel::kFrozen);
   args.GetReturnValue().Set(that);
 }
 
@@ -581,13 +579,9 @@ void ModuleWrap::InstantiateSync(const FunctionCallbackInfo<Value>& args) {
     }
   }
 
-  // If --experimental-print-required-tla is true, proceeds to evaluation even
-  // if it's async because we want to search for the TLA and help users locate
-  // them.
-  if (module->IsGraphAsync() && !env->options()->print_required_tla) {
-    THROW_ERR_REQUIRE_ASYNC_MODULE(env);
-    return;
-  }
+  // TODO(joyeecheung): record Module::HasTopLevelAwait() in every ModuleWrap
+  // and infer the asynchronicity from a module's children during linking.
+  args.GetReturnValue().Set(module->IsGraphAsync());
 }
 
 void ModuleWrap::EvaluateSync(const FunctionCallbackInfo<Value>& args) {
 
@@ -0,0 +1,16 @@
+// This tests that after failing to require an ESM that contains TLA,
+// retrying with require() still throws, and produces consistent results.
+'use strict';
+require('../common');
+const assert = require('assert');
+
+assert.throws(() => {
+  require('../fixtures/es-modules/tla/resolved.mjs');
+}, {
+  code: 'ERR_REQUIRE_ASYNC_MODULE'
+});
+assert.throws(() => {
+  require('../fixtures/es-modules/tla/resolved.mjs');
+}, {
+  code: 'ERR_REQUIRE_ASYNC_MODULE'
+});