Skip to content

Commit 96e8250

Browse files
starkwanggibfahn
starkwang
authored and
gibfahn
committed
lib: use destructuring for some constants
This change is to unify the declaration for constants into using destructuring on the top-level-module scope, reducing some redundant code. PR-URL: #16063 Backport-PR-URL: #16494 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
1 parent fdc072b commit 96e8250

34 files changed

+131
-134
lines changed

‎lib/_http_agent.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ const net = require('net');
2525
const util = require('util');
2626
const EventEmitter = require('events');
2727
const debug = util.debuglog('http');
28-
const async_id_symbol = process.binding('async_wrap').async_id_symbol;
29-
const nextTick = require('internal/process/next_tick').nextTick;
28+
const { async_id_symbol } = process.binding('async_wrap');
29+
const { nextTick } = require('internal/process/next_tick');
3030

3131
// New Agent code.
3232

‎lib/_http_client.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,21 @@
2424
const util = require('util');
2525
const net = require('net');
2626
const url = require('url');
27-
const HTTPParser = process.binding('http_parser').HTTPParser;
27+
const { HTTPParser } = process.binding('http_parser');
2828
const assert = require('assert').ok;
29-
const common = require('_http_common');
30-
const httpSocketSetup = common.httpSocketSetup;
31-
const parsers = common.parsers;
32-
const freeParser = common.freeParser;
33-
const debug = common.debug;
34-
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
29+
const {
30+
_checkIsHttpToken: checkIsHttpToken,
31+
debug,
32+
freeParser,
33+
httpSocketSetup,
34+
parsers
35+
} = require('_http_common');
36+
const { OutgoingMessage } = require('_http_outgoing');
3537
const Agent = require('_http_agent');
36-
const Buffer = require('buffer').Buffer;
38+
const { Buffer } = require('buffer');
3739
const { urlToOptions, searchParamsSymbol } = require('internal/url');
38-
const outHeadersKey = require('internal/http').outHeadersKey;
39-
const nextTick = require('internal/process/next_tick').nextTick;
40+
const { outHeadersKey } = require('internal/http');
41+
const { nextTick } = require('internal/process/next_tick');
4042

4143
// The actual list of disallowed characters in regexp form is more like:
4244
// /[^A-Za-z0-9\-._~!$&'()*+,;=/:@]/
@@ -149,7 +151,7 @@ function ClientRequest(options, cb) {
149151
}
150152

151153
if (methodIsString && method) {
152-
if (!common._checkIsHttpToken(method)) {
154+
if (!checkIsHttpToken(method)) {
153155
throw new TypeError('Method must be a valid HTTP token');
154156
}
155157
method = this.method = method.toUpperCase();

‎lib/_http_common.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222
'use strict';
2323

2424
const binding = process.binding('http_parser');
25-
const methods = binding.methods;
26-
const HTTPParser = binding.HTTPParser;
25+
const { methods, HTTPParser } = binding;
2726

2827
const FreeList = require('internal/freelist');
29-
const ondrain = require('internal/http').ondrain;
28+
const { ondrain } = require('internal/http');
3029
const incoming = require('_http_incoming');
31-
const emitDestroy = require('async_hooks').emitDestroy;
32-
const IncomingMessage = incoming.IncomingMessage;
33-
const readStart = incoming.readStart;
34-
const readStop = incoming.readStop;
30+
const { emitDestroy } = require('async_hooks');
31+
const {
32+
IncomingMessage,
33+
readStart,
34+
readStop
35+
} = incoming;
3536

3637
const debug = require('util').debuglog('http');
3738

‎lib/_http_outgoing.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@ const Stream = require('stream');
2626
const util = require('util');
2727
const internalUtil = require('internal/util');
2828
const internalHttp = require('internal/http');
29-
const Buffer = require('buffer').Buffer;
29+
const { Buffer } = require('buffer');
3030
const common = require('_http_common');
3131
const checkIsHttpToken = common._checkIsHttpToken;
3232
const checkInvalidHeaderChar = common._checkInvalidHeaderChar;
33-
const outHeadersKey = require('internal/http').outHeadersKey;
34-
const async_id_symbol = process.binding('async_wrap').async_id_symbol;
35-
const nextTick = require('internal/process/next_tick').nextTick;
33+
const { outHeadersKey } = require('internal/http');
34+
const { async_id_symbol } = process.binding('async_wrap');
35+
const { nextTick } = require('internal/process/next_tick');
3636

37-
const CRLF = common.CRLF;
38-
const debug = common.debug;
39-
const utcDate = internalHttp.utcDate;
37+
const { CRLF, debug } = common;
38+
const { utcDate } = internalHttp;
4039

4140
var RE_FIELDS =
4241
/^(?:Connection|Transfer-Encoding|Content-Length|Date|Expect|Trailer|Upgrade)$/i;

‎lib/_http_server.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@
2323

2424
const util = require('util');
2525
const net = require('net');
26-
const HTTPParser = process.binding('http_parser').HTTPParser;
26+
const { HTTPParser } = process.binding('http_parser');
2727
const assert = require('assert').ok;
28-
const common = require('_http_common');
29-
const parsers = common.parsers;
30-
const freeParser = common.freeParser;
31-
const debug = common.debug;
32-
const CRLF = common.CRLF;
33-
const continueExpression = common.continueExpression;
34-
const chunkExpression = common.chunkExpression;
35-
const httpSocketSetup = common.httpSocketSetup;
36-
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
28+
const {
29+
parsers,
30+
freeParser,
31+
debug,
32+
CRLF,
33+
continueExpression,
34+
chunkExpression,
35+
httpSocketSetup,
36+
_checkInvalidHeaderChar: checkInvalidHeaderChar
37+
} = require('_http_common');
38+
const { OutgoingMessage } = require('_http_outgoing');
3739
const { outHeadersKey, ondrain } = require('internal/http');
3840

3941
const STATUS_CODES = {
@@ -222,7 +224,7 @@ function writeHead(statusCode, reason, obj) {
222224
headers = obj;
223225
}
224226

225-
if (common._checkInvalidHeaderChar(this.statusMessage))
227+
if (checkInvalidHeaderChar(this.statusMessage))
226228
throw new Error('Invalid character in statusMessage.');
227229

228230
var statusLine = 'HTTP/1.1 ' + statusCode + ' ' + this.statusMessage + CRLF;

‎lib/_stream_readable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Readable.ReadableState = ReadableState;
2626

2727
const EE = require('events');
2828
const Stream = require('stream');
29-
const Buffer = require('buffer').Buffer;
29+
const { Buffer } = require('buffer');
3030
const util = require('util');
3131
const debug = util.debuglog('stream');
3232
const BufferList = require('internal/streams/BufferList');

‎lib/_stream_wrap.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
const assert = require('assert');
44
const util = require('util');
5-
const Socket = require('net').Socket;
6-
const JSStream = process.binding('js_stream').JSStream;
75
// TODO(bmeurer): Change this back to const once hole checks are
86
// properly optimized away early in Ignition+TurboFan.
97
var Buffer = require('buffer').Buffer;
8+
const { Socket } = require('net');
9+
const { JSStream } = process.binding('js_stream');
1010
const uv = process.binding('uv');
1111
const debug = util.debuglog('stream_wrap');
1212

‎lib/_stream_writable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Writable.WritableState = WritableState;
3131
const util = require('util');
3232
const internalUtil = require('internal/util');
3333
const Stream = require('stream');
34-
const Buffer = require('buffer').Buffer;
34+
const { Buffer } = require('buffer');
3535
const destroyImpl = require('internal/streams/destroy');
3636

3737
util.inherits(Writable, Stream);

‎lib/_tls_common.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323

2424
const tls = require('tls');
2525

26-
const SSL_OP_CIPHER_SERVER_PREFERENCE =
27-
process.binding('constants').crypto.SSL_OP_CIPHER_SERVER_PREFERENCE;
26+
const { SSL_OP_CIPHER_SERVER_PREFERENCE } = process.binding('constants').crypto;
2827

2928
// Lazily loaded
3029
var crypto = null;

‎lib/_tls_legacy.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ const internalUtil = require('internal/util');
2525
internalUtil.assertCrypto();
2626

2727
const assert = require('assert');
28-
const Buffer = require('buffer').Buffer;
28+
const { Buffer } = require('buffer');
2929
const common = require('_tls_common');
30-
const Connection = process.binding('crypto').Connection;
30+
const { Connection } = process.binding('crypto');
3131
const EventEmitter = require('events');
3232
const stream = require('stream');
33-
const Timer = process.binding('timer_wrap').Timer;
33+
const { Timer } = process.binding('timer_wrap');
3434
const tls = require('tls');
3535
const util = require('util');
3636

‎lib/_tls_wrap.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ const net = require('net');
2929
const tls = require('tls');
3030
const util = require('util');
3131
const common = require('_tls_common');
32-
const StreamWrap = require('_stream_wrap').StreamWrap;
33-
const Buffer = require('buffer').Buffer;
32+
const { StreamWrap } = require('_stream_wrap');
33+
const { Buffer } = require('buffer');
3434
const debug = util.debuglog('tls');
35-
const Timer = process.binding('timer_wrap').Timer;
35+
const { Timer } = process.binding('timer_wrap');
3636
const tls_wrap = process.binding('tls_wrap');
37-
const TCP = process.binding('tcp_wrap').TCP;
38-
const Pipe = process.binding('pipe_wrap').Pipe;
37+
const { TCP } = process.binding('tcp_wrap');
38+
const { Pipe } = process.binding('pipe_wrap');
3939
const kDisableRenegotiation = Symbol('disable-renegotiation');
4040

4141
function onhandshakestart() {

‎lib/child_process.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@ const debug = util.debuglog('child_process');
3030

3131
const uv = process.binding('uv');
3232
const spawn_sync = process.binding('spawn_sync');
33-
const Buffer = require('buffer').Buffer;
34-
const Pipe = process.binding('pipe_wrap').Pipe;
33+
const { Buffer } = require('buffer');
34+
const { Pipe } = process.binding('pipe_wrap');
3535
const child_process = require('internal/child_process');
36+
const {
37+
_validateStdio,
38+
setupChannel,
39+
ChildProcess
40+
} = child_process;
3641

3742
const errnoException = util._errnoException;
38-
const _validateStdio = child_process._validateStdio;
39-
const setupChannel = child_process.setupChannel;
40-
const ChildProcess = exports.ChildProcess = child_process.ChildProcess;
43+
exports.ChildProcess = ChildProcess;
4144

4245
function stdioStringToArray(option) {
4346
switch (option) {

‎lib/dgram.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,17 @@
2323

2424
const assert = require('assert');
2525
const errors = require('internal/errors');
26-
const Buffer = require('buffer').Buffer;
26+
const { Buffer } = require('buffer');
2727
const dns = require('dns');
2828
const util = require('util');
2929
const { isUint8Array } = require('internal/util/types');
3030
const EventEmitter = require('events');
31-
const setInitTriggerId = require('async_hooks').setInitTriggerId;
32-
const UV_UDP_REUSEADDR = process.binding('constants').os.UV_UDP_REUSEADDR;
33-
const async_id_symbol = process.binding('async_wrap').async_id_symbol;
34-
const nextTick = require('internal/process/next_tick').nextTick;
31+
const { setInitTriggerId } = require('async_hooks');
32+
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
33+
const { async_id_symbol } = process.binding('async_wrap');
34+
const { nextTick } = require('internal/process/next_tick');
3535

36-
const UDP = process.binding('udp_wrap').UDP;
37-
const SendWrap = process.binding('udp_wrap').SendWrap;
36+
const { UDP, SendWrap } = process.binding('udp_wrap');
3837

3938
const BIND_STATE_UNBOUND = 0;
4039
const BIND_STATE_BINDING = 1;

‎lib/dns.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const util = require('util');
2525

2626
const cares = process.binding('cares_wrap');
2727
const uv = process.binding('uv');
28-
const internalNet = require('internal/net');
28+
const { isLegalPort } = require('internal/net');
2929
const { customPromisifyArgs } = require('internal/util');
3030

3131
const {
@@ -36,9 +36,6 @@ const {
3636
isIP
3737
} = cares;
3838

39-
const isLegalPort = internalNet.isLegalPort;
40-
41-
4239
function errnoException(err, syscall, hostname) {
4340
// FIXME(bnoordhuis) Remove this backwards compatibility nonsense and pass
4441
// the true error to the user. ENOTFOUND is not even a proper POSIX error!

‎lib/domain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
const util = require('util');
3030
const EventEmitter = require('events');
31-
const inherits = util.inherits;
31+
const { inherits } = util;
3232

3333
// communicate with events module, but don't require that
3434
// module to have to load this one, since this module has

‎lib/fs.js

+10-12
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,28 @@ const { createPromise, promiseResolve } = process.binding('util');
3333

3434
const binding = process.binding('fs');
3535
const fs = exports;
36-
const Buffer = require('buffer').Buffer;
36+
const { Buffer } = require('buffer');
3737
const errors = require('internal/errors');
38-
const Stream = require('stream').Stream;
38+
const { Readable, Writable } = require('stream');
3939
const EventEmitter = require('events');
40-
const FSReqWrap = binding.FSReqWrap;
41-
const FSEvent = process.binding('fs_event_wrap').FSEvent;
40+
const { FSReqWrap } = binding;
41+
const { FSEvent } = process.binding('fs_event_wrap');
4242
const internalFS = require('internal/fs');
43-
const internalURL = require('internal/url');
43+
const { getPathFromURL } = require('internal/url');
4444
const internalUtil = require('internal/util');
45-
const assertEncoding = internalFS.assertEncoding;
46-
const stringToFlags = internalFS.stringToFlags;
47-
const getPathFromURL = internalURL.getPathFromURL;
45+
const {
46+
assertEncoding,
47+
stringToFlags
48+
} = internalFS;
4849

4950
Object.defineProperty(exports, 'constants', {
5051
configurable: false,
5152
enumerable: true,
5253
value: constants
5354
});
5455

55-
const Readable = Stream.Readable;
56-
const Writable = Stream.Writable;
57-
5856
const kMinPoolSpace = 128;
59-
const kMaxLength = require('buffer').kMaxLength;
57+
const { kMaxLength } = require('buffer');
6058

6159
const isWindows = process.platform === 'win32';
6260

‎lib/http.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222
'use strict';
2323

2424
const agent = require('_http_agent');
25-
const client = require('_http_client');
25+
const { ClientRequest } = require('_http_client');
2626
const common = require('_http_common');
2727
const incoming = require('_http_incoming');
2828
const outgoing = require('_http_outgoing');
2929
const server = require('_http_server');
3030

31-
const Server = server.Server;
32-
const ClientRequest = client.ClientRequest;
31+
const { Server } = server;
3332

3433
function createServer(requestListener) {
3534
return new Server(requestListener);

‎lib/internal/child_process.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
'use strict';
22

33
const errors = require('internal/errors');
4-
const StringDecoder = require('string_decoder').StringDecoder;
4+
const { StringDecoder } = require('string_decoder');
55
const EventEmitter = require('events');
66
const net = require('net');
77
const dgram = require('dgram');
88
const util = require('util');
99
const assert = require('assert');
10-
11-
const Process = process.binding('process_wrap').Process;
12-
const WriteWrap = process.binding('stream_wrap').WriteWrap;
1310
const uv = process.binding('uv');
14-
const Pipe = process.binding('pipe_wrap').Pipe;
15-
const TTY = process.binding('tty_wrap').TTY;
16-
const TCP = process.binding('tcp_wrap').TCP;
17-
const UDP = process.binding('udp_wrap').UDP;
11+
const { Process } = process.binding('process_wrap');
12+
const { WriteWrap } = process.binding('stream_wrap');
13+
const { Pipe } = process.binding('pipe_wrap');
14+
const { TTY } = process.binding('tty_wrap');
15+
const { TCP } = process.binding('tcp_wrap');
16+
const { UDP } = process.binding('udp_wrap');
1817
const SocketList = require('internal/socket_list');
1918
const { convertToValidSignal } = require('internal/util');
2019
const { isUint8Array } = require('internal/util/types');
2120

2221
const errnoException = util._errnoException;
23-
const SocketListSend = SocketList.SocketListSend;
24-
const SocketListReceive = SocketList.SocketListReceive;
22+
const { SocketListSend, SocketListReceive } = SocketList;
2523

2624
const MAX_HANDLE_RETRANSMISSIONS = 3;
2725

‎lib/internal/cluster/master.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22
const assert = require('assert');
3-
const fork = require('child_process').fork;
3+
const { fork } = require('child_process');
44
const util = require('util');
55
const EventEmitter = require('events');
66
const RoundRobinHandle = require('internal/cluster/round_robin_handle');

0 commit comments

Comments
 (0)