lib: delay access to CLI option to pre-execution

joyeecheung · targos · commit 325128e46922 · 2019-12-09T10:23:08.000+01:00
CLI options should not be added through the config binding, instead they are already available in the JS land via `require('internal/options')`. Also CLI options in principle should be processed in pre-execution instead of bootstrap scripts. PR-URL: #30778 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -157,9 +157,6 @@ function NativeModule(id) {
   this.loaded = false;
   this.loading = false;
   this.canBeRequiredByUsers = !id.startsWith('internal/');
-
-  if (id === 'wasi')
-    this.canBeRequiredByUsers = !!internalBinding('config').experimentalWasi;
 }
 
 // To be called during pre-execution when --expose-internals is on.
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -61,6 +61,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
   initializeClusterIPC();
 
   initializeDeprecations();
+  initializeWASI();
   initializeCJSLoader();
   initializeESMLoader();
 
@@ -399,6 +400,14 @@ function initializePolicy() {
   }
 }
 
+function initializeWASI() {
+  if (getOptionValue('--experimental-wasi-unstable-preview0')) {
+    const { NativeModule } = require('internal/bootstrap/loaders');
+    const mod = NativeModule.map.get('wasi');
+    mod.canBeRequiredByUsers = true;
+  }
+}
+
 function initializeCJSLoader() {
   const CJSLoader = require('internal/modules/cjs/loader');
   CJSLoader.Module._initPaths();
@@ -456,5 +465,6 @@ module.exports = {
   setupTraceCategoryState,
   setupInspectorHooks,
   initializeReport,
-  initializeCJSLoader
+  initializeCJSLoader,
+  initializeWASI
 };
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
@@ -14,6 +14,7 @@ const {
   setupWarningHandler,
   setupDebugEnv,
   initializeDeprecations,
+  initializeWASI,
   initializeCJSLoader,
   initializeESMLoader,
   initializeFrozenIntrinsics,
@@ -109,6 +110,7 @@ port.on('message', (message) => {
       require('internal/process/policy').setup(manifestSrc, manifestURL);
     }
     initializeDeprecations();
+    initializeWASI();
     initializeCJSLoader();
     initializeESMLoader();
 
diff --git a/src/node_config.cc b/src/node_config.cc
@@ -15,11 +15,14 @@ using v8::Number;
 using v8::Object;
 using v8::Value;
 
-// The config binding is used to provide an internal view of compile or runtime
+// The config binding is used to provide an internal view of compile time
 // config options that are required internally by lib/*.js code. This is an
 // alternative to dropping additional properties onto the process object as
 // has been the practice previously in node.cc.
 
+// Command line arguments are already accessible in the JS land via
+// require('internal/options').getOptionValue('--some-option'). Do not add them
+// here.
 static void Initialize(Local<Object> target,
                        Local<Value> unused,
                        Local<Context> context,
@@ -84,9 +87,6 @@ static void Initialize(Local<Object> target,
 
   READONLY_PROPERTY(target, "hasCachedBuiltins",
      v8::Boolean::New(isolate, native_module::has_code_cache));
-
-  if (env->options()->experimental_wasi)
-    READONLY_TRUE_PROPERTY(target, "experimentalWasi");
 }  // InitConfig
 
 }  // namespace node

Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,6 @@ function NativeModule(id) {`
`157`	`157`	`this.loaded = false;`
`158`	`158`	`this.loading = false;`
`159`	`159`	`this.canBeRequiredByUsers = !id.startsWith('internal/');`
`160`		`-`
`161`		`- if (id === 'wasi')`
`162`		`- this.canBeRequiredByUsers = !!internalBinding('config').experimentalWasi;`
`163`	`160`	`}`
`164`	`161`
`165`	`162`	`// To be called during pre-execution when --expose-internals is on.`