module: print better message on esm import error

lib/internal/loader/ModuleJob.js

@@ -2,6 +2,7 @@
 
 const { ModuleWrap } = internalBinding('module_wrap');
 const { SafeSet, SafePromise } = require('internal/safe_globals');
+const { decorateErrorStack } = require('internal/util');
 const assert = require('assert');
 const resolvedPromise = SafePromise.resolve();
 
@@ -81,7 +82,12 @@ class ModuleJob {
       }
       throw e;
     }
-    this.module.instantiate();
+    try {
+      this.module.instantiate();
+    } catch (e) {
+      decorateErrorStack(e);
+      throw e;
+    }
     for (const dependencyJob of jobsInGraph) {
       // Calling `this.module.instantiate()` instantiates not only the
       // ModuleWrap in this module, but all modules in the graph.

src/module_wrap.cc

@@ -179,13 +179,15 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
 }
 
 void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
   Isolate* isolate = args.GetIsolate();
   Local<Object> that = args.This();
   Local<Context> context = that->CreationContext();
 
   ModuleWrap* obj = Unwrap<ModuleWrap>(that);
   CHECK_NE(obj, nullptr);
   Local<Module> module = obj->module_.Get(isolate);
+  TryCatch try_catch(isolate);
   Maybe<bool> ok =
       module->InstantiateModule(context, ModuleWrap::ResolveCallback);
 
@@ -195,6 +197,12 @@ void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) {
   obj->resolve_cache_.clear();
 
   if (!ok.FromMaybe(false)) {
+    CHECK(try_catch.HasCaught());
+    CHECK(!try_catch.Message().IsEmpty());
+    CHECK(!try_catch.Exception().IsEmpty());
+    AppendExceptionLine(env, try_catch.Exception(), try_catch.Message(),
+                        ErrorHandlingMode::MODULE_ERROR);
+    try_catch.ReThrow();
     return;
   }
 }

test/fixtures/es-module-loaders/module-named-exports.mjs

@@ -0,0 +1,2 @@
+export const foo = 'foo';
+export const bar = 'bar';

test/fixtures/es-module-loaders/syntax-error-import.mjs

@@ -0,0 +1 @@
+import { foo, notfound } from './module-named-exports';

test/message/esm_display_syntax_error_import.mjs

@@ -0,0 +1,7 @@
+// Flags:  --experimental-modules
+/* eslint-disable no-unused-vars */
+import '../common';
+import {
+  foo,
+  notfound
+} from '../fixtures/es-module-loaders/module-named-exports';

test/message/esm_display_syntax_error_import.out

@@ -0,0 +1,7 @@
+(node:*) ExperimentalWarning: The ESM module loader is experimental.
+file:///*/test/message/esm_display_syntax_error_import.mjs:6
+  notfound
+  ^^^^^^^^
+SyntaxError: The requested module does not provide an export named 'notfound'
+    at ModuleJob._instantiate (internal/loader/ModuleJob.js:*:*)
+    at <anonymous>

test/message/esm_display_syntax_error_import_module.mjs

@@ -0,0 +1,3 @@
+// Flags:  --experimental-modules
+import '../common';
+import '../fixtures/es-module-loaders/syntax-error-import';

test/message/esm_display_syntax_error_import_module.out

@@ -0,0 +1,7 @@
+(node:*) ExperimentalWarning: The ESM module loader is experimental.
+file:///*/test/fixtures/es-module-loaders/syntax-error-import.mjs:1
+import { foo, notfound } from './module-named-exports';
+              ^^^^^^^^
+SyntaxError: The requested module does not provide an export named 'notfound'
+    at ModuleJob._instantiate (internal/loader/ModuleJob.js:*:*)
+    at <anonymous>