repl: fix declaring a variable with the name util

The REPL no longer relies on `util` being a reference to the `util` core module. It still relies on `globalThis` refering to the global object, but no longer emits warnings when it's overwritten by the user. PR-URL: nodejs#38141 Fixes: nodejs#38139 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
aduh95 · Apr 18, 2021 · d666964 · d666964
1 parent b87f1be
commit d666964
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/lib/internal/repl/utils.js b/lib/internal/repl/utils.js
@@ -351,7 +351,11 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
             breakLength: Infinity
           }, previewOptions);
           session.post('Runtime.callFunctionOn', {
-            functionDeclaration: `(v) => util.inspect(v, ${inspectOptions})`,
+            functionDeclaration:
+              `(v) =>
+                    Reflect
+                    .getOwnPropertyDescriptor(globalThis, 'util')
+                    .get().inspect(v, ${inspectOptions})`,
             objectId: result.objectId,
             arguments: [result]
           }, (error, preview) => {
@@ -394,7 +398,7 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
     }
 
     const inputPreviewCallback = (error, inspected) => {
-      if (inspected === null) {
+      if (inspected == null) {
         return;
       }
 

diff --git a/test/parallel/test-repl-history-navigation.js b/test/parallel/test-repl-history-navigation.js
@@ -16,6 +16,7 @@ const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 
 process.throwDeprecation = true;
+process.on('warning', common.mustNotCall());
 
 const defaultHistoryPath = path.join(tmpdir.path, '.node_repl_history');
 
@@ -554,6 +555,42 @@ const tests = [
     expected: [],
     clean: false
   },
+  {
+    env: { NODE_REPL_HISTORY: defaultHistoryPath },
+    test: ['const util = {}', ENTER,
+           'ut', RIGHT, ENTER],
+    expected: common.hasIntl && common.hasCrypto ? [
+      prompt, ...'const util = {}',
+      'undefined\n',
+      prompt, ...'ut', ' // il', '\n// {}',
+      'il', '\n// {}',
+      '{}\n',
+      prompt,
+    ] : [],
+    clean: false
+  },
+  {
+    env: { NODE_REPL_HISTORY: defaultHistoryPath },
+    test: [
+      'const utilDesc = Reflect.getOwnPropertyDescriptor(globalThis, "util")',
+      ENTER,
+      'globalThis.util = {}', ENTER,
+      'ut', RIGHT, ENTER,
+      'Reflect.defineProperty(globalThis, "util", utilDesc)', ENTER],
+    expected: common.hasIntl && common.hasCrypto ? [
+      prompt, ...'const utilDesc = ' +
+      'Reflect.getOwnPropertyDescriptor(globalThis, "util")',
+      'undefined\n',
+      prompt, ...'globalThis.util = {}',
+      '{}\n',
+      prompt, ...'ut', ' // il', 'il',
+      '{}\n',
+      prompt, ...'Reflect.defineProperty(globalThis, "util", utilDesc)',
+      'true\n',
+      prompt,
+    ] : [],
+    clean: false
+  },
 ];
 const numtests = tests.length;