bootstrapper: move internalBinding to NativeModule

internalBinding is used so often that it should just automatically be
available for usage in internals.

PR-URL: https://github.com/nodejs/node/pull/23025
Refs: https://github.com/nodejs/node/commit/2a9eb31
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
Gus Caplan 2018-09-22 09:49:52 -05:00 committed by Daniel Bevenius
parent 9800fd7aaa
commit e7f710c1d4
71 changed files with 6 additions and 74 deletions

View File

@ -44,3 +44,4 @@ globals:
DCHECK_LE: false
DCHECK_LT: false
DCHECK_NE: false
internalBinding: false

View File

@ -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 {

View File

@ -21,7 +21,6 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { methods, HTTPParser } = internalBinding('http_parser');
const FreeList = require('internal/freelist');

View File

@ -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 {

View File

@ -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)) {

View File

@ -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');

View File

@ -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;

View File

@ -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,

View File

@ -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');

View File

@ -30,7 +30,6 @@ const {
} = require('internal/util');
assertCrypto();
const { internalBinding } = require('internal/bootstrap/loaders');
const {
ERR_CRYPTO_FIPS_FORCED,
ERR_CRYPTO_FIPS_UNAVAILABLE

View File

@ -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');

View File

@ -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');

View File

@ -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

View File

@ -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

View File

@ -1,5 +1,4 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { getOptions } = internalBinding('options');
function print(stream) {

View File

@ -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);

View File

@ -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');

View File

@ -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;

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
certExportChallenge,
certExportPublicKey,

View File

@ -21,7 +21,6 @@ const {
const { isArrayBufferView } = require('internal/util/types');
const { internalBinding } = require('internal/bootstrap/loaders');
const {
CipherBase,
privateDecrypt: _privateDecrypt,

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { AsyncWrap, Providers } = internalBinding('async_wrap');
const {
generateKeyPairRSA,

View File

@ -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');

View File

@ -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');

View File

@ -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');

View File

@ -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,

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
getCiphers: _getCiphers,
getCurves: _getCurves,

View File

@ -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');

View File

@ -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,

View File

@ -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,

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { registerDOMException } = internalBinding('messaging');
const { ERR_INVALID_THIS } = require('internal/errors').codes;

View File

@ -23,7 +23,6 @@ const {
const { isArrayBufferView } = require('internal/util/types');
const { internalBinding } = require('internal/bootstrap/loaders');
const {
isArrayBuffer
} = internalBinding('types');

View File

@ -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,

View File

@ -1,7 +1,6 @@
'use strict';
const errors = require('internal/errors');
const { internalBinding } = require('internal/bootstrap/loaders');
const {
kFsStatsFieldsLength,
StatWatcher: _StatWatcher

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const Stream = require('stream');
const Readable = Stream.Readable;
const binding = internalBinding('http2');

View File

@ -10,7 +10,6 @@ const {
assertCrypto();
const { internalBinding } = require('internal/bootstrap/loaders');
const assert = require('assert');
const EventEmitter = require('events');
const fs = require('fs');

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const binding = internalBinding('http2');
const {
ERR_HTTP2_HEADER_SINGLE_VALUE,

View File

@ -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');

View File

@ -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);

View File

@ -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;

View File

@ -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');

View File

@ -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,

View File

@ -1,5 +1,4 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { getOptions, types } = internalBinding('options');
const typeLookup = [];

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
setImportModuleDynamicallyCallback,
setInitializeImportMetaObjectCallback

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { safeToString } = internalBinding('util');
const maybeUnhandledPromises = new WeakMap();

View File

@ -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

View File

@ -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

View File

@ -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');

View File

@ -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 };

View File

@ -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');

View File

@ -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');

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { trace } = internalBinding('trace_events');
const async_wrap = internalBinding('async_wrap');
const async_hooks = require('async_hooks');

View File

@ -37,7 +37,6 @@ let querystring;
const { platform } = process;
const isWindows = platform === 'win32';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
domainToASCII: _domainToASCII,
domainToUnicode: _domainToUnicode,

View File

@ -6,7 +6,6 @@ const {
ERR_UNKNOWN_SIGNAL
} = require('internal/errors').codes;
const { signals } = process.binding('constants').os;
const { internalBinding } = require('internal/bootstrap/loaders');
const {
getHiddenValue,
setHiddenValue,

View File

@ -2,7 +2,6 @@
const { compare } = process.binding('buffer');
const { isArrayBufferView } = require('internal/util/types');
const { internalBinding } = require('internal/bootstrap/loaders');
const {
isAnyArrayBuffer,
isDate,

View File

@ -1,7 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
getOwnNonIndexProperties,
getPromiseDetails,

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { URL } = require('internal/url');
const { isContext } = internalBinding('contextify');
const {

View File

@ -12,7 +12,6 @@ const {
ERR_WORKER_UNSUPPORTED_EXTENSION,
} = require('internal/errors').codes;
const { internalBinding } = require('internal/bootstrap/loaders');
const { MessagePort, MessageChannel } = internalBinding('messaging');
const {
handle_onclose: handleOnCloseSymbol,

View File

@ -3,7 +3,6 @@
const assert = require('assert');
const util = require('util');
const { Socket } = require('net');
const { internalBinding } = require('internal/bootstrap/loaders');
const { JSStream } = internalBinding('js_stream');
const uv = internalBinding('uv');
const debug = util.debuglog('stream_wrap');

View File

@ -34,7 +34,6 @@ const {
makeSyncWrite
} = require('internal/net');
const assert = require('assert');
const { internalBinding } = require('internal/bootstrap/loaders');
const {
UV_EADDRINUSE,
UV_EINVAL

View File

@ -21,7 +21,6 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const { pushValToArrayMax, safeGetenv } = internalBinding('util');
const constants = process.binding('constants').os;
const { deprecate } = require('internal/util');

View File

@ -1,6 +1,5 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
PerformanceEntry,
mark: _mark,

View File

@ -53,7 +53,6 @@ const {
} = require('internal/deps/acorn/dist/acorn');
const internalUtil = require('internal/util');
const util = require('util');
const { internalBinding } = require('internal/bootstrap/loaders');
const { inherits } = util;
const Stream = require('stream');
const vm = require('vm');

View File

@ -49,7 +49,6 @@ try {
} else {
// This throws for Node < 4.2.0 because there's no util binding and
// returns undefined for Node < 7.4.0.
const { internalBinding } = require('internal/bootstrap/loaders');
Stream._isUint8Array = internalBinding('util').isUint8Array;
}
} catch (e) {

View File

@ -22,7 +22,6 @@
'use strict';
const { Buffer } = require('buffer');
const { internalBinding } = require('internal/bootstrap/loaders');
const {
kIncompleteCharactersStart,
kIncompleteCharactersEnd,

View File

@ -21,7 +21,6 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
getLibuvNow,
setupTimers,

View File

@ -29,7 +29,6 @@ const { isUint8Array } = require('internal/util/types');
const net = require('net');
const url = require('url');
const { internalBinding } = require('internal/bootstrap/loaders');
const binding = internalBinding('crypto');
const { Buffer } = require('buffer');
const EventEmitter = require('events');

View File

@ -16,7 +16,6 @@ const {
if (!hasTracing)
throw new ERR_TRACE_EVENTS_UNAVAILABLE();
const { internalBinding } = require('internal/bootstrap/loaders');
const { CategorySet, getEnabledCategories } = internalBinding('trace_events');
const { customInspectSymbol } = require('internal/util');
const { format } = require('util');

View File

@ -23,7 +23,6 @@
const { inherits, _extend } = require('util');
const net = require('net');
const { internalBinding } = require('internal/bootstrap/loaders');
const { TTY, isTTY } = internalBinding('tty_wrap');
const errors = require('internal/errors');
const {

View File

@ -32,8 +32,6 @@ const { validateNumber } = require('internal/validators');
const { TextDecoder, TextEncoder } = require('internal/encoding');
const { isBuffer } = require('buffer').Buffer;
const { internalBinding } = require('internal/bootstrap/loaders');
const types = internalBinding('types');
Object.assign(types, require('internal/util/types'));
const {

View File

@ -16,7 +16,6 @@
const { Buffer } = require('buffer');
const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
const { internalBinding } = require('internal/bootstrap/loaders');
const {
Serializer: _Serializer,
Deserializer: _Deserializer

View File

@ -21,7 +21,6 @@
'use strict';
const { internalBinding } = require('internal/bootstrap/loaders');
const {
ContextifyScript,
makeContext,