From 93a6b862e6b15baf661f156a68d9cf663dce3acf Mon Sep 17 00:00:00 2001
From: Myles Borins <mylesborins@google.com>
Date: Wed, 27 May 2020 12:05:55 -0400
Subject: [PATCH] repl: improve static import error message in repl

Currently the error is rather ambiguous and does not inform folks that
static import is not supported in the repl. This overrides the default
error message with one that is more informative.

Closes: https://github.com/nodejs/node/issues/33576

PR-URL: https://github.com/nodejs/node/pull/33588
Fixes: https://github.com/nodejs/node/issues/33576
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 lib/repl.js                |  9 +++++++++
 test/parallel/test-repl.js | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/repl.js b/lib/repl.js
index 18f26a1bb975c5..b881a17936b3b0 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -58,6 +58,7 @@ const {
   PromiseRace,
   RegExp,
   Set,
+  StringPrototypeIncludes,
   Symbol,
   WeakSet,
 } = primordials;
@@ -576,6 +577,14 @@ function REPLServer(prompt,
             e.stack = e.stack
               .replace(/^REPL\d+:\d+\r?\n/, '')
               .replace(/^\s+at\s.*\n?/gm, '');
+            const importErrorStr = 'Cannot use import statement outside a ' +
+              'module';
+            if (StringPrototypeIncludes(e.message, importErrorStr)) {
+              e.message = 'Cannot use import statement inside the Node.js ' +
+                'repl, alternatively use dynamic import';
+              e.stack = e.stack.replace(/SyntaxError:.*\n/,
+                                        `SyntaxError: ${e.message}\n`);
+            }
           } else if (self.replMode === module.exports.REPL_MODE_STRICT) {
             e.stack = e.stack.replace(/(\s+at\s+REPL\d+:)(\d+)/,
                                       (_, pre, line) => pre + (line - 1));
diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js
index 71160a20ec86ab..8f98dfd540ace8 100644
--- a/test/parallel/test-repl.js
+++ b/test/parallel/test-repl.js
@@ -805,6 +805,16 @@ const tcpTests = [
   {
     send: `require(${JSON.stringify(moduleFilename)}).number`,
     expect: '42'
+  },
+  {
+    send: 'import comeOn from \'fhqwhgads\'',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      'Uncaught:',
+      /^SyntaxError: .* dynamic import/
+    ]
   }
 ];