fixup! src: use option parser for expose_internals

lib/internal/bootstrap_node.js

@@ -508,10 +508,9 @@
     return NativeModule._source.hasOwnProperty(id);
   };
 
-  const EXPOSE_INTERNALS = process._exposeInternals;
+  const config = process.binding('config');
 
-  if (EXPOSE_INTERNALS) {
-    delete process._exposeInternals;
+  if (config.exposeInternals) {
     NativeModule.nonInternalExists = NativeModule.exists;
 
     NativeModule.isInternal = function(id) {

src/node.cc

@@ -163,7 +163,6 @@ static bool trace_sync_io = false;
 static bool track_heap_objects = false;
 static const char* eval_string = nullptr;
 static std::vector<std::string> preload_modules;
-static bool expose_internals = false;
 static const int v8_default_thread_pool_size = 4;
 static int v8_thread_pool_size = v8_default_thread_pool_size;
 static bool prof_process = false;
@@ -216,6 +215,12 @@ bool config_preserve_symlinks = false;
 // Set in node.cc by ParseArgs when --redirect-warnings= is used.
 std::string config_warning_file;  // NOLINT(runtime/string)
 
+// Set in node.cc by ParseArgs when --expose-internals or --expose_internals is
+// used.
+// Used in node_config.cc to set a constant on process.binding('config')
+// that is used by lib/internal/bootstrap_node.js
+bool config_expose_internals = false;
+
 bool v8_initialized = false;
 
 // process-relative uptime base, initialized at start-up
@@ -3334,13 +3339,6 @@ void SetupProcessObject(Environment* env,
     READONLY_PROPERTY(process, "_debugWaitConnect", True(env->isolate()));
   }
 
-  // --expose_internals, --expose-internals
-  // Note that this is not exposed as a process property, it is deleted when
-  // node's javascript bootstrap code runs.
-  if (expose_internals) {
-    READONLY_PROPERTY(process, "_exposeInternals", True(env->isolate()));
-  }
-
   // --security-revert flags
 #define V(code, _, __)                                                        \
   do {                                                                        \
@@ -3794,7 +3792,7 @@ static void ParseArgs(int* argc,
 #endif
     } else if (strcmp(arg, "--expose-internals") == 0 ||
                strcmp(arg, "--expose_internals") == 0) {
-      expose_internals = true;
+      config_expose_internals = true;
     } else if (strcmp(arg, "--") == 0) {
       index += 1;
       break;

src/node_config.cc

@@ -58,6 +58,9 @@ void InitConfig(Local<Object> target,
                                                 .ToLocalChecked();
     target->DefineOwnProperty(env->context(), name, value).FromJust();
   }
+
+  if (config_expose_internals)
+    READONLY_BOOLEAN_PROPERTY("exposeInternals");
 }  // InitConfig
 
 }  // namespace node

src/node_internals.h

@@ -65,6 +65,12 @@ extern std::string openssl_config;
 // that is used by lib/module.js
 extern bool config_preserve_symlinks;
 
+// Set in node.cc by ParseArgs when --expose-internals or --expose_internals is
+// used.
+// Used in node_config.cc to set a constant on process.binding('config')
+// that is used by lib/internal/bootstrap_node.js
+extern bool config_expose_internals;
+
 // Set in node.cc by ParseArgs when --redirect-warnings= is used.
 // Used to redirect warning output to a file rather than sending
 // it to stderr.

test/parallel/test-internal-modules-expose.js

@@ -3,6 +3,9 @@
 
 require('../common');
 const assert = require('assert');
+const config = process.binding('config');
+
+console.log(config, process.argv);
 
 assert.strictEqual(typeof require('internal/freelist').FreeList, 'function');
-assert(!('_exposeInternals' in process), 'no process property is leaked');
+assert.strictEqual(config.exposeInternals, true);