diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2019-12-03 20:11:29 +0300 |
---|---|---|
committer | Michaƫl Zasso <targos@protonmail.com> | 2019-12-09 12:23:08 +0300 |
commit | 325128e469229a35f2c805ef18970a2cffb64831 (patch) | |
tree | 0020fec9b1de3fa8a116ccfb56083585cb0429e8 | |
parent | 5067463f3c3235fd25941afc1e6b6510c359da0f (diff) |
lib: delay access to CLI option to pre-execution
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: https://github.com/nodejs/node/pull/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>
-rw-r--r-- | lib/internal/bootstrap/loaders.js | 3 | ||||
-rw-r--r-- | lib/internal/bootstrap/pre_execution.js | 12 | ||||
-rw-r--r-- | lib/internal/main/worker_thread.js | 2 | ||||
-rw-r--r-- | src/node_config.cc | 8 |
4 files changed, 17 insertions, 8 deletions
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js index 044bea3114b..cfefc56bd81 100644 --- 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 index b3738015922..0529bd65852 100644 --- 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 index 97b55ac769f..3b7a2ef873f 100644 --- 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 index 16050bdd5b9..6ee3164a134 100644 --- 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 |