From 07c9f981d6de8f88db5b8b34480830c3bab89b8e Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Mon, 18 Apr 2016 13:19:12 +0200
Subject: [PATCH] repl: keep the built-in modules non-enumerable

Make sure that the built-in modules in the repl stay non-enumerable.
Previously, they would pop up as enumerable properties of the global
object after having been accessed for the first time.

PR-URL: https://github.com/nodejs/node/pull/6207
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/internal/module.js | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/lib/internal/module.js b/lib/internal/module.js
index 10ab0bb0c0a979..1742716726478b 100644
--- a/lib/internal/module.js
+++ b/lib/internal/module.js
@@ -57,21 +57,36 @@ exports.builtinLibs = ['assert', 'buffer', 'child_process', 'cluster',
 function addBuiltinLibsToObject(object) {
   // Make built-in modules available directly (loaded lazily).
   exports.builtinLibs.forEach((name) => {
+    // Goals of this mechanism are:
+    // - Lazy loading of built-in modules
+    // - Having all built-in modules available as non-enumerable properties
+    // - Allowing the user to re-assign these variables as if there were no
+    //   pre-existing globals with the same name.
+
+    const setReal = (val) => {
+      // Deleting the property before re-assigning it disables the
+      // getter/setter mechanism.
+      delete object[name];
+      object[name] = val;
+    };
+
     Object.defineProperty(object, name, {
       get: () => {
         const lib = require(name);
-        // This implicitly invokes the setter, so that this getter is only
-        // invoked at most once and does not overwrite anything.
-        object[name] = lib;
-        return lib;
-      },
-      // Allow the creation of other globals with this name.
-      set: (val) => {
-        // Deleting the property before re-assigning it disables the
-        // getter/setter mechanism.
+
+        // Disable the current getter/setter and set up a new
+        // non-enumerable property.
         delete object[name];
-        object[name] = val;
+        Object.defineProperty(object, name, {
+          get: () => lib,
+          set: setReal,
+          configurable: true,
+          enumerable: false
+        });
+
+        return lib;
       },
+      set: setReal,
       configurable: true,
       enumerable: false
     });