bootstrapper: move internalBinding to NativeModule wrapper

devsnek · devsnek · commit 062f1de6dcee · 2018-10-03T22:46:40.000-05:00
internalBinding is used so often that it should just automatically be available for usage in internals. Refs: 2a9eb31
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
@@ -44,3 +44,4 @@ globals:
   DCHECK_LE: false
   DCHECK_LT: false
   DCHECK_NE: false
+  internalBinding: false
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -24,7 +24,6 @@
 const util = require('util');
 const net = require('net');
 const url = require('url');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { HTTPParser } = internalBinding('http_parser');
 const assert = require('assert').ok;
 const {
diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -21,7 +21,6 @@
 
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { methods, HTTPParser } = internalBinding('http_parser');
 
 const FreeList = require('internal/freelist');
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -23,7 +23,6 @@
 
 const util = require('util');
 const net = require('net');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { HTTPParser } = internalBinding('http_parser');
 const assert = require('assert').ok;
 const {
diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -34,7 +34,6 @@ const { SSL_OP_CIPHER_SERVER_PREFERENCE } = process.binding('constants').crypto;
 // Lazily loaded from internal/crypto/util.
 let toBuf = null;
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { SecureContext: NativeSecureContext } = internalBinding('crypto');
 function SecureContext(secureProtocol, secureOptions, context) {
   if (!(this instanceof SecureContext)) {
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -32,7 +32,6 @@ const common = require('_tls_common');
 const { StreamWrap } = require('_stream_wrap');
 const { Buffer } = require('buffer');
 const debug = util.debuglog('tls');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
 const tls_wrap = internalBinding('tls_wrap');
 const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -41,7 +41,6 @@ const {
 // that test/parallel/test-buffer-bindingobj-no-zerofill.js is written.
 let isAnyArrayBuffer;
 try {
-  const { internalBinding } = require('internal/bootstrap/loaders');
   isAnyArrayBuffer = internalBinding('types').isAnyArrayBuffer;
 } catch (e) {
   isAnyArrayBuffer = require('util').types.isAnyArrayBuffer;
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -28,7 +28,6 @@ const {
 const { isArrayBufferView } = require('internal/util/types');
 const debug = util.debuglog('child_process');
 const { Buffer } = require('buffer');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
 const {
   ERR_INVALID_ARG_VALUE,
diff --git a/lib/console.js b/lib/console.js
@@ -29,7 +29,6 @@ const {
     ERR_INVALID_ARG_VALUE,
   },
 } = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { previewEntries } = internalBinding('util');
 const { Buffer: { isBuffer } } = require('buffer');
 const util = require('util');
diff --git a/lib/crypto.js b/lib/crypto.js
@@ -30,7 +30,6 @@ const {
 } = require('internal/util');
 assertCrypto();
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   ERR_CRYPTO_FIPS_FORCED,
   ERR_CRYPTO_FIPS_UNAVAILABLE
diff --git a/lib/dgram.js b/lib/dgram.js
@@ -52,7 +52,6 @@ const {
   defaultTriggerAsyncIdScope,
   symbols: { async_id_symbol, owner_symbol }
 } = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { UV_UDP_REUSEADDR } = process.binding('constants').os;
 
 const { UDP, SendWrap } = internalBinding('udp_wrap');
diff --git a/lib/dns.js b/lib/dns.js
@@ -21,7 +21,6 @@
 
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const cares = internalBinding('cares_wrap');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');
 const { customPromisifyArgs } = require('internal/util');
diff --git a/lib/domain.js b/lib/domain.js
@@ -34,7 +34,6 @@ const {
   ERR_UNHANDLED_ERROR
 } = require('internal/errors').codes;
 const { createHook } = require('async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
 
 // overwrite process.domain with a getter/setter that will allow for more
 // effective optimizations
diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -4,7 +4,6 @@ const {
   ERR_ASYNC_TYPE,
   ERR_INVALID_ASYNC_ID
 } = require('internal/errors').codes;
-const { internalBinding } = require('internal/bootstrap/loaders');
 const async_wrap = internalBinding('async_wrap');
 /* async_hook_fields is a Uint32Array wrapping the uint32_t array of
  * Environment::AsyncHooks::fields_[]. Each index tracks the number of active
diff --git a/lib/internal/bash_completion.js b/lib/internal/bash_completion.js
@@ -1,5 +1,4 @@
 'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { getOptions } = internalBinding('options');
 
 function print(stream) {
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -223,7 +223,7 @@
   };
 
   NativeModule.wrapper = [
-    '(function (exports, require, module, process) {',
+    '(function (exports, require, module, process, internalBinding) {',
     '\n});'
   ];
 
@@ -294,7 +294,7 @@
       const requireFn = this.id.startsWith('internal/deps/') ?
         NativeModule.requireForDeps :
         NativeModule.require;
-      fn(this.exports, requireFn, this, process);
+      fn(this.exports, requireFn, this, process, internalBinding);
 
       if (config.experimentalModules && !NativeModule.isInternal(this.id)) {
         this.exportKeys = ObjectKeys(this.exports);
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
@@ -21,7 +21,6 @@ const dgram = require('dgram');
 const util = require('util');
 const assert = require('assert');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { Process } = internalBinding('process_wrap');
 const { WriteWrap } = internalBinding('stream_wrap');
 const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
@@ -2,7 +2,6 @@
 const assert = require('assert');
 const net = require('net');
 const { sendHelper } = require('internal/cluster/utils');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const uv = internalBinding('uv');
 
 module.exports = RoundRobinHandle;
diff --git a/lib/internal/crypto/certificate.js b/lib/internal/crypto/certificate.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   certExportChallenge,
   certExportPublicKey,
diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
@@ -21,7 +21,6 @@ const {
 
 const { isArrayBufferView } = require('internal/util/types');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   CipherBase,
   privateDecrypt: _privateDecrypt,
diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const {
   generateKeyPairRSA,
diff --git a/lib/internal/crypto/pbkdf2.js b/lib/internal/crypto/pbkdf2.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const { Buffer } = require('buffer');
 const { pbkdf2: _pbkdf2 } = internalBinding('crypto');
diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const { Buffer, kMaxLength } = require('buffer');
 const { randomBytes: _randomBytes } = internalBinding('crypto');
diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { AsyncWrap, Providers } = internalBinding('async_wrap');
 const { Buffer } = require('buffer');
 const { scrypt: _scrypt } = internalBinding('crypto');
diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js
@@ -5,7 +5,6 @@ const {
   ERR_INVALID_OPT_VALUE
 } = require('internal/errors').codes;
 const { validateString } = require('internal/validators');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { Sign: _Sign, Verify: _Verify } = internalBinding('crypto');
 const {
   RSA_PSS_SALTLEN_AUTO,
diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   getCiphers: _getCiphers,
   getCurves: _getCurves,
diff --git a/lib/internal/dgram.js b/lib/internal/dgram.js
@@ -1,6 +1,5 @@
 'use strict';
 const { codes } = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { UDP } = internalBinding('udp_wrap');
 const { isInt32 } = require('internal/validators');
 const TTYWrap = internalBinding('tty_wrap');
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
@@ -6,7 +6,6 @@ const {
 } = require('internal/dns/utils');
 const { codes, dnsException } = require('internal/errors');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   getaddrinfo,
   getnameinfo,
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
@@ -1,7 +1,6 @@
 'use strict';
 const errors = require('internal/errors');
 const { isIP } = require('internal/net');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   ChannelWrap,
   strerror,
diff --git a/lib/internal/domexception.js b/lib/internal/domexception.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { registerDOMException } = internalBinding('messaging');
 const { ERR_INVALID_THIS } = require('internal/errors').codes;
 
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -23,7 +23,6 @@ const {
 
 const { isArrayBufferView } = require('internal/util/types');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   isArrayBuffer
 } = internalBinding('types');
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -15,7 +15,6 @@ const kInfo = Symbol('info');
 const messages = new Map();
 const codes = {};
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   errmap,
   UV_EAI_NODATA,
diff --git a/lib/internal/fs/watchers.js b/lib/internal/fs/watchers.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const errors = require('internal/errors');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   kFsStatsFieldsLength,
   StatWatcher: _StatWatcher
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const Stream = require('stream');
 const Readable = Stream.Readable;
 const binding = internalBinding('http2');
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -10,7 +10,6 @@ const {
 
 assertCrypto();
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const assert = require('assert');
 const EventEmitter = require('events');
 const fs = require('fs');
diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const binding = internalBinding('http2');
 const {
   ERR_HTTP2_HEADER_SINGLE_VALUE,
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { internalBinding, NativeModule } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const util = require('util');
 const { pathToFileURL } = require('internal/url');
 const vm = require('vm');
diff --git a/lib/internal/modules/esm/create_dynamic_module.js b/lib/internal/modules/esm/create_dynamic_module.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const debug = require('util').debuglog('esm');
 const ArrayJoin = Function.call.bind(Array.prototype.join);
diff --git a/lib/internal/modules/esm/default_resolve.js b/lib/internal/modules/esm/default_resolve.js
@@ -3,7 +3,7 @@
 const { URL } = require('url');
 const CJSmodule = require('internal/modules/cjs/loader');
 const internalFS = require('internal/fs/utils');
-const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const { extname } = require('path');
 const { realpathSync } = require('fs');
 const preserveSymlinks = !!process.binding('config').preserveSymlinks;
diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const { SafeSet, SafePromise } = require('internal/safe_globals');
 const { decorateErrorStack } = require('internal/util');
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const {
   stripShebang,
diff --git a/lib/internal/print_help.js b/lib/internal/print_help.js
@@ -1,5 +1,4 @@
 'use strict';
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { getOptions, types } = internalBinding('options');
 
 const typeLookup = [];
diff --git a/lib/internal/process/esm_loader.js b/lib/internal/process/esm_loader.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   setImportModuleDynamicallyCallback,
   setInitializeImportMetaObjectCallback
diff --git a/lib/internal/process/promises.js b/lib/internal/process/promises.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { safeToString } = internalBinding('util');
 
 const maybeUnhandledPromises = new WeakMap();
diff --git a/lib/internal/process/stdio.js b/lib/internal/process/stdio.js
@@ -47,7 +47,6 @@ function getMainThreadStdio() {
 
   function getStdin() {
     if (stdin) return stdin;
-    const { internalBinding } = require('internal/bootstrap/loaders');
     const tty_wrap = internalBinding('tty_wrap');
     const fd = 0;
 
@@ -164,7 +163,6 @@ function setupProcessStdio({ getStdout, getStdin, getStderr }) {
 
 function createWritableStdioStream(fd) {
   var stream;
-  const { internalBinding } = require('internal/bootstrap/loaders');
   const tty_wrap = internalBinding('tty_wrap');
 
   // Note stream._type is used for test-module-load-list.js
diff --git a/lib/internal/queue_microtask.js b/lib/internal/queue_microtask.js
@@ -3,7 +3,6 @@
 const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
 const { AsyncResource } = require('async_hooks');
 const { getDefaultTriggerAsyncId } = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { enqueueMicrotask } = internalBinding('util');
 
 // declared separately for name, arrow function to prevent construction
diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const { Buffer } = require('buffer');
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { WriteWrap } = internalBinding('stream_wrap');
 const { UV_EOF } = internalBinding('uv');
 const { errnoException } = require('internal/errors');
diff --git a/lib/internal/test/binding.js b/lib/internal/test/binding.js
@@ -5,5 +5,4 @@ process.emitWarning(
   'tracked by any versioning system or deprecation process.',
   'internal/test/binding');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 module.exports = { internalBinding };
diff --git a/lib/internal/test/heap.js b/lib/internal/test/heap.js
@@ -5,7 +5,6 @@ process.emitWarning(
   'tracked by any versioning system or deprecation process.',
   'internal/test/heap');
 
-const { internalBinding } = require('internal/bootstrap/loaders');
 const { createHeapDump, buildEmbedderGraph } = internalBinding('heap_utils');
 const assert = require('assert');
 
diff --git a/lib/internal/timers.js b/lib/internal/timers.js
@@ -6,7 +6,6 @@ const {
   initHooksExist,
   emitInit
 } = require('internal/async_hooks');
-const { internalBinding } = require('internal/bootstrap/loaders');
 // Symbols for storing async id state.
 const async_id_symbol = Symbol('asyncId');
 const trigger_async_id_symbol = Symbol('triggerId');
diff --git a/lib/internal/trace_events_async_hooks.js b/lib/internal/trace_events_async_hooks.js
diff --git a/lib/internal/url.js b/lib/internal/url.js
diff --git a/lib/internal/util.js b/lib/internal/util.js
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
diff --git a/lib/internal/vm/source_text_module.js b/lib/internal/vm/source_text_module.js
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
diff --git a/lib/internal/wrap_js_stream.js b/lib/internal/wrap_js_stream.js
diff --git a/lib/net.js b/lib/net.js
diff --git a/lib/os.js b/lib/os.js
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
diff --git a/lib/repl.js b/lib/repl.js
diff --git a/lib/stream.js b/lib/stream.js
diff --git a/lib/string_decoder.js b/lib/string_decoder.js
diff --git a/lib/timers.js b/lib/timers.js
diff --git a/lib/tls.js b/lib/tls.js
diff --git a/lib/trace_events.js b/lib/trace_events.js
diff --git a/lib/tty.js b/lib/tty.js
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/v8.js b/lib/v8.js
diff --git a/lib/vm.js b/lib/vm.js
