nodejs
diff --git a/‎lib/internal/main/print_help.js‎
Lines changed: 5 additions & 2 deletions b/‎lib/internal/main/print_help.js‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎lib/internal/options.js‎
Lines changed: 16 additions & 36 deletions b/‎lib/internal/options.js‎
Lines changed: 16 additions & 36 deletions
diff --git a/‎lib/internal/process/per_thread.js‎
Lines changed: 2 additions & 1 deletion b/‎lib/internal/process/per_thread.js‎
Lines changed: 2 additions & 1 deletion
@@ -24,6 +24,8 @@ const {
   markBootstrapComplete,
 } = require('internal/process/pre_execution');
 
+const { getCLIOptionsInfo, getOptionValue } = require('internal/options');
+
 const typeLookup = [];
 for (const key of ObjectKeys(types))
   typeLookup[types[key]] = key;
@@ -134,9 +136,10 @@ function format(
   );
 
   for (const {
-    0: name, 1: { helpText, type, value, defaultIsTrue },
+    0: name, 1: { helpText, type, defaultIsTrue },
   } of sortedOptions) {
     if (!helpText) continue;
+    const value = getOptionValue(name);
 
     let displayName = name;
 
@@ -198,7 +201,7 @@ function format(
 }
 
 function print(stream) {
-  const { options, aliases } = require('internal/options');
+  const { options, aliases } = getCLIOptionsInfo();
 
   // Use 75 % of the available width, and at least 70 characters.
   const width = MathMax(70, (stream.columns || 0) * 0.75);
 
@@ -1,36 +1,33 @@
 'use strict';
 
 const {
-  StringPrototypeSlice,
-} = primordials;
-
-const {
-  getCLIOptions,
+  getCLIOptionsValues,
+  getCLIOptionsInfo,
   getEmbedderOptions: getEmbedderOptionsFromBinding,
 } = internalBinding('options');
 
 let warnOnAllowUnauthorized = true;
 
-let optionsMap;
-let aliasesMap;
+let optionsDict;
+let cliInfo;
 let embedderOptions;
 
-// getCLIOptions() would serialize the option values from C++ land.
+// getCLIOptionsValues() would serialize the option values from C++ land.
 // It would error if the values are queried before bootstrap is
 // complete so that we don't accidentally include runtime-dependent
 // states into a runtime-independent snapshot.
 function getCLIOptionsFromBinding() {
-  if (!optionsMap) {
-    ({ options: optionsMap } = getCLIOptions());
+  if (!optionsDict) {
+    optionsDict = getCLIOptionsValues();
   }
-  return optionsMap;
+  return optionsDict;
 }
 
-function getAliasesFromBinding() {
-  if (!aliasesMap) {
-    ({ aliases: aliasesMap } = getCLIOptions());
+function getCLIOptionsInfoFromBinding() {
+  if (!cliInfo) {
+    cliInfo = getCLIOptionsInfo();
   }
-  return aliasesMap;
+  return cliInfo;
 }
 
 function getEmbedderOptions() {
@@ -41,24 +38,12 @@ function getEmbedderOptions() {
 }
 
 function refreshOptions() {
-  optionsMap = undefined;
-  aliasesMap = undefined;
+  optionsDict = undefined;
 }
 
 function getOptionValue(optionName) {
-  const options = getCLIOptionsFromBinding();
-  if (
-    optionName.length > 5 &&
-    optionName[0] === '-' &&
-    optionName[1] === '-' &&
-    optionName[2] === 'n' &&
-    optionName[3] === 'o' &&
-    optionName[4] === '-'
-  ) {
-    const option = options.get('--' + StringPrototypeSlice(optionName, 5));
-    return option && !option.value;
-  }
-  return options.get(optionName)?.value;
+  const optionsDict = getCLIOptionsFromBinding();
+  return optionsDict[optionName];
 }
 
 function getAllowUnauthorized() {
@@ -76,12 +61,7 @@ function getAllowUnauthorized() {
 }
 
 module.exports = {
-  get options() {
-    return getCLIOptionsFromBinding();
-  },
-  get aliases() {
-    return getAliasesFromBinding();
-  },
+  getCLIOptionsInfo: getCLIOptionsInfoFromBinding,
   getOptionValue,
   getAllowUnauthorized,
   getEmbedderOptions,
 
@@ -284,7 +284,8 @@ function buildAllowedFlags() {
     envSettings: { kAllowedInEnvvar },
     types: { kBoolean },
   } = internalBinding('options');
-  const { options, aliases } = require('internal/options');
+  const { getCLIOptionsInfo } = require('internal/options');
+  const { options, aliases } = getCLIOptionsInfo();
 
   const allowedNodeEnvironmentFlags = [];
   for (const { 0: name, 1: info } of options) {