Revert "src,lib: make process.binding('config') internal"

joyeecheung · addaleax · commit 577da835d298 · 2019-01-14T13:58:07.000+01:00
This reverts commit 88a5449. PR-URL: #25446 Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -57,7 +57,7 @@ const {
 } = require('internal/util/types');
 const {
 pendingDeprecation
-} = internalBinding('config');
+} = process.binding('config');
 const {
 formatProperty,
 kObjectType
@@ -1083,7 +1083,7 @@ Buffer.prototype.swap64 = function swap64() {
 Buffer.prototype.toLocaleString = Buffer.prototype.toString;
 
 let transcode;
-if (internalBinding('config').hasIntl) {
+if (process.binding('config').hasIntl) {
 const {
 icuErrName,
 transcode: _transcode
diff --git a/lib/crypto.js b/lib/crypto.js
@@ -40,7 +40,7 @@ const pendingDeprecation = getOptionValue('--pending-deprecation');
 const {
 fipsMode,
 fipsForced
-} = internalBinding('config');
+} = process.binding('config');
 const { getFipsCrypto, setFipsCrypto } = internalBinding('crypto');
 const {
 randomBytes,
diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -107,7 +107,7 @@ function fatalError(e) {
 Error.captureStackTrace(o, fatalError);
 process._rawDebug(o.stack);
 }
- if (internalBinding('config').shouldAbortOnUncaughtException) {
+ if (process.binding('config').shouldAbortOnUncaughtException) {
 process.abort();
 }
 process.exit(1);
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -79,7 +79,6 @@
 'buffer',
 'cares_wrap',
 'constants',
- 'config',
 'contextify',
 'crypto',
 'fs_event_wrap',
@@ -165,7 +164,7 @@
 NativeModule._source = getInternalBinding('natives');
 NativeModule._cache = {};
 
- const config = getInternalBinding('config');
+ const config = getBinding('config');
 
 // Think of this as module.exports in this file even though it is not
 // written in CommonJS style.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -175,7 +175,7 @@
 {
 // Install legacy getters on the `util` binding for typechecking.
 // TODO(addaleax): Turn into a full runtime deprecation.
- const { pendingDeprecation } = internalBinding('config');
+ const { pendingDeprecation } = process.binding('config');
 const utilBinding = internalBinding('util');
 const types = internalBinding('types');
 for (const name of [
@@ -637,7 +637,7 @@
 }
 
 function setupProcessICUVersions() {
- const icu = internalBinding('config').hasIntl ?
+ const icu = process.binding('config').hasIntl ?
 internalBinding('icu') : undefined;
 if (!icu) return; // no Intl/ICU: nothing to add here.
 // With no argument, getVersion() returns a comma separated list
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -342,7 +342,7 @@ Object.defineProperties(
 } });
 
 const TextDecoder =
- internalBinding('config').hasIntl ?
+ process.binding('config').hasIntl ?
 makeTextDecoderICU() :
 makeTextDecoderJS();
 
diff --git a/lib/internal/inspector_async_hook.js b/lib/internal/inspector_async_hook.js
@@ -12,7 +12,7 @@ let config;
 
 function lazyHookCreation() {
 const { createHook } = require('async_hooks');
- config = internalBinding('config');
+ config = process.binding('config');
 
 hook = createHook({
 init(asyncId, type, triggerAsyncId, resource) {
diff --git a/lib/internal/print_help.js b/lib/internal/print_help.js
@@ -9,7 +9,7 @@ for (const key of Object.keys(types))
 
 // Environment variables are parsed ad-hoc throughout the code base,
 // so we gather the documentation here.
-const { hasIntl, hasSmallICU, hasNodeOptions } = internalBinding('config');
+const { hasIntl, hasSmallICU, hasNodeOptions } = process.binding('config');
 const envVars = new Map([
 ['NODE_DEBUG', { helpText: "','-separated list of core modules that " +
 'should print debug information' }],
diff --git a/lib/internal/readline.js b/lib/internal/readline.js
@@ -30,7 +30,7 @@ CSI.kClearToEnd = CSI`0K`;
 CSI.kClearLine = CSI`2K`;
 CSI.kClearScreenDown = CSI`0J`;
 
-if (internalBinding('config').hasIntl) {
+if (process.binding('config').hasIntl) {
 const icu = internalBinding('icu');
 getStringWidth = function getStringWidth(str, options) {
 options = options || {};
diff --git a/lib/trace_events.js b/lib/trace_events.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { hasTracing } = internalBinding('config');
+const { hasTracing } = process.binding('config');
 const kHandle = Symbol('handle');
 const kEnabled = Symbol('enabled');
 const kCategories = Symbol('categories');
diff --git a/lib/url.js b/lib/url.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { toASCII } = internalBinding('config').hasIntl ?
+const { toASCII } = process.binding('config').hasIntl ?
 internalBinding('icu') : require('punycode');
 
 const { hexTable } = require('internal/querystring');
diff --git a/src/node_config.cc b/src/node_config.cc
@@ -106,4 +106,4 @@ static void Initialize(Local<Object> target,
 
 } // namespace node
 
-NODE_MODULE_CONTEXT_AWARE_INTERNAL(config, node::Initialize)
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(config, node::Initialize)
diff --git a/test/parallel/test-icu-data-dir.js b/test/parallel/test-icu-data-dir.js
@@ -1,10 +1,8 @@
-// Flags: --expose-internals
 'use strict';
-const { internalBinding } = require('internal/test/binding');
 const common = require('../common');
 const os = require('os');
 
-const { hasSmallICU } = internalBinding('config');
+const { hasSmallICU } = process.binding('config');
 if (!(common.hasIntl && hasSmallICU))
 common.skip('missing Intl');
 
diff --git a/test/parallel/test-internal-modules-expose.js b/test/parallel/test-internal-modules-expose.js
@@ -3,8 +3,7 @@
 
 require('../common');
 const assert = require('assert');
-const { internalBinding } = require('internal/test/binding');
-const config = internalBinding('config');
+const config = process.binding('config');
 
 console.log(config, process.argv);
 
diff --git a/test/parallel/test-readline-position.js b/test/parallel/test-readline-position.js
@@ -1,6 +1,4 @@
-// Flags: --expose-internals
 'use strict';
-const { internalBinding } = require('internal/test/binding');
 require('../common');
 const { PassThrough } = require('stream');
 const readline = require('readline');
@@ -25,7 +23,7 @@ const ctrlU = { ctrl: true, name: 'u' };
 // The non-ICU JS implementation of character width calculation is only aware
 // of the wide/narrow distinction. Only test these more advanced cases when
 // ICU is available.
- if (internalBinding('config').hasIntl) {
+ if (process.binding('config').hasIntl) {
 tests.push(
 [0, '\u0301'], // COMBINING ACUTE ACCENT
 [1, 'a\u0301'], // á

-Original file line number
+Diff line change
 }=require('internal/util/types');
 const{
  pendingDeprecation
 -}=internalBinding('config');
 +}=process.binding('config');
 const{
  formatProperty,
  kObjectType
 Buffer.prototype.toLocaleString=Buffer.prototype.toString;
 lettranscode;
 -if(internalBinding('config').hasIntl){
 +if(process.binding('config').hasIntl){
 const{
  icuErrName,
 transcode: _transcode
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ function fatalError(e) {`
`107`	`107`	`Error.captureStackTrace(o,fatalError);`
`108`	`108`	`process._rawDebug(o.stack);`
`109`	`109`	`}`
`110`		`-if(internalBinding('config').shouldAbortOnUncaughtException){`
	`110`	`+if(process.binding('config').shouldAbortOnUncaughtException){`
`111`	`111`	`process.abort();`
`112`	`112`	`}`
`113`	`113`	`process.exit(1);`
-Original file line number
+Diff line change
+{
 // Install legacy getters on the `util` binding for typechecking.
 // TODO(addaleax): Turn into a full runtime deprecation.
 -const{ pendingDeprecation }=internalBinding('config');
 +const{ pendingDeprecation }=process.binding('config');
 constutilBinding=internalBinding('util');
 consttypes=internalBinding('types');
 for(constnameof[
+}
 functionsetupProcessICUVersions(){
 -consticu=internalBinding('config').hasIntl ?
 +consticu=process.binding('config').hasIntl ?
 internalBinding('icu') : undefined;
 if(!icu)return;// no Intl/ICU: nothing to add here.
 // With no argument, getVersion() returns a comma separated list
-Original file line number
+Diff line change
 functionlazyHookCreation(){
 const{ createHook }=require('async_hooks');
 -config=internalBinding('config');
 +config=process.binding('config');
 hook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
-Original file line number
+Diff line change
 // Environment variables are parsed ad-hoc throughout the code base,
 // so we gather the documentation here.
 -const{ hasIntl, hasSmallICU, hasNodeOptions }=internalBinding('config');
 +const{ hasIntl, hasSmallICU, hasNodeOptions }=process.binding('config');
 constenvVars=newMap([
 ['NODE_DEBUG',{helpText: "','-separated list of core modules that "+
 'should print debug information'}],
-Original file line number
+Diff line change
 CSI.kClearLine=CSI`2K`;
 CSI.kClearScreenDown=CSI`0J`;
 -if(internalBinding('config').hasIntl){
 +if(process.binding('config').hasIntl){
 consticu=internalBinding('icu');
 getStringWidth=functiongetStringWidth(str,options){
 options=options||{};
-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 'use strict';
 -const{ hasTracing }=internalBinding('config');
 +const{ hasTracing }=process.binding('config');
 constkHandle=Symbol('handle');
 constkEnabled=Symbol('enabled');
 constkCategories=Symbol('categories');