Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d803355

Browse filesBrowse files
avivkellertargos
avivkeller
authored and
targos
committed
lib: prefer optional chaining
PR-URL: #55045 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent cbfc980 commit d803355
Copy full SHA for d803355

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

52 files changed

+228
-121
lines changed
Open diff view settings
Collapse file

‎eslint.config.mjs‎

Copy file name to clipboardExpand all lines: eslint.config.mjs
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ export default [
313313
'node-core/no-unescaped-regexp-dot': 'error',
314314
'node-core/no-duplicate-requires': 'error',
315315
'node-core/prefer-proto': 'error',
316+
'node-core/prefer-optional-chaining': 'error',
316317
},
317318
},
318319
// #endregion
Collapse file

‎lib/_http_agent.js‎

Copy file name to clipboardExpand all lines: lib/_http_agent.js
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function Agent(options) {
128128
}
129129

130130
const requests = this.requests[name];
131-
if (requests && requests.length) {
131+
if (requests?.length) {
132132
const req = requests.shift();
133133
const reqAsyncRes = req[kRequestAsyncResource];
134134
if (reqAsyncRes) {
@@ -437,7 +437,7 @@ Agent.prototype.removeSocket = function removeSocket(s, options) {
437437
}
438438

439439
let req;
440-
if (this.requests[name] && this.requests[name].length) {
440+
if (this.requests[name]?.length) {
441441
debug('removeSocket, have a request, make a socket');
442442
req = this.requests[name][0];
443443
} else {
@@ -449,7 +449,7 @@ Agent.prototype.removeSocket = function removeSocket(s, options) {
449449
for (let i = 0; i < keys.length; i++) {
450450
const prop = keys[i];
451451
// Check whether this specific origin is already at maxSockets
452-
if (this.sockets[prop] && this.sockets[prop].length) break;
452+
if (this.sockets[prop]?.length) break;
453453
debug('removeSocket, have a request with different origin,' +
454454
' make a socket');
455455
req = this.requests[prop][0];
Collapse file

‎lib/_http_client.js‎

Copy file name to clipboardExpand all lines: lib/_http_client.js
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ function ClientRequest(input, options, cb) {
174174

175175
const protocol = options.protocol || defaultAgent.protocol;
176176
let expectedProtocol = defaultAgent.protocol;
177-
if (this.agent && this.agent.protocol)
177+
if (this.agent?.protocol)
178178
expectedProtocol = this.agent.protocol;
179179

180180
if (options.path) {
@@ -190,7 +190,7 @@ function ClientRequest(input, options, cb) {
190190
}
191191

192192
const defaultPort = options.defaultPort ||
193-
(this.agent && this.agent.defaultPort);
193+
(this.agent?.defaultPort);
194194

195195
const optsWithoutSignal = { __proto__: null, ...options };
196196

@@ -553,7 +553,7 @@ function socketOnData(d) {
553553
socket.destroy();
554554
req.socket._hadError = true;
555555
emitErrorEvent(req, ret);
556-
} else if (parser.incoming && parser.incoming.upgrade) {
556+
} else if (parser.incoming?.upgrade) {
557557
// Upgrade (if status code 101) or CONNECT
558558
const bytesParsed = ret;
559559
const res = parser.incoming;
@@ -591,7 +591,7 @@ function socketOnData(d) {
591591
// Requested Upgrade or used CONNECT method, but have no handler.
592592
socket.destroy();
593593
}
594-
} else if (parser.incoming && parser.incoming.complete &&
594+
} else if (parser.incoming?.complete &&
595595
// When the status code is informational (100, 102-199),
596596
// the server will send a final response after this client
597597
// sends a request body, so we must not free the parser.
@@ -838,7 +838,7 @@ function tickOnSocket(req, socket) {
838838

839839
if (
840840
req.timeout !== undefined ||
841-
(req.agent && req.agent.options && req.agent.options.timeout)
841+
(req.agent?.options?.timeout)
842842
) {
843843
listenSocketTimeout(req);
844844
}
Collapse file

‎lib/_http_common.js‎

Copy file name to clipboardExpand all lines: lib/_http_common.js
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
8585
}
8686

8787
// Parser is also used by http client
88-
const ParserIncomingMessage = (socket && socket.server &&
89-
socket.server[kIncomingMessage]) ||
88+
const ParserIncomingMessage = (socket?.server?.[kIncomingMessage]) ||
9089
IncomingMessage;
9190

9291
const incoming = parser.incoming = new ParserIncomingMessage(socket);
Collapse file

‎lib/_http_incoming.js‎

Copy file name to clipboardExpand all lines: lib/_http_incoming.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ IncomingMessage.prototype._destroy = function _destroy(err, cb) {
242242

243243
IncomingMessage.prototype._addHeaderLines = _addHeaderLines;
244244
function _addHeaderLines(headers, n) {
245-
if (headers && headers.length) {
245+
if (headers?.length) {
246246
let dest;
247247
if (this.complete) {
248248
this.rawTrailers = headers;
Collapse file

‎lib/_http_outgoing.js‎

Copy file name to clipboardExpand all lines: lib/_http_outgoing.js
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ OutgoingMessage.prototype._send = function _send(data, encoding, callback, byteL
423423
OutgoingMessage.prototype._writeRaw = _writeRaw;
424424
function _writeRaw(data, encoding, callback, size) {
425425
const conn = this[kSocket];
426-
if (conn && conn.destroyed) {
426+
if (conn?.destroyed) {
427427
// The socket was destroyed. If we're still trying to write to it,
428428
// then we haven't gotten the 'close' event yet.
429429
return false;
@@ -789,7 +789,7 @@ OutgoingMessage.prototype.getHeader = function getHeader(name) {
789789
return;
790790

791791
const entry = headers[name.toLowerCase()];
792-
return entry && entry[1];
792+
return entry?.[1];
793793
};
794794

795795

@@ -1073,7 +1073,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
10731073
};
10741074

10751075
function onFinish(outmsg) {
1076-
if (outmsg && outmsg.socket && outmsg.socket._hadError) return;
1076+
if (outmsg?.socket?._hadError) return;
10771077
outmsg.emit('finish');
10781078
}
10791079

@@ -1188,7 +1188,7 @@ OutgoingMessage.prototype._finish = function _finish() {
11881188
OutgoingMessage.prototype._flush = function _flush() {
11891189
const socket = this[kSocket];
11901190

1191-
if (socket && socket.writable) {
1191+
if (socket?.writable) {
11921192
// There might be remaining data in this.output; write it out
11931193
const ret = this._flushOutput(socket);
11941194

Collapse file

‎lib/_http_server.js‎

Copy file name to clipboardExpand all lines: lib/_http_server.js
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ function connectionListenerInternal(server, socket) {
738738
socket.setEncoding = socketSetEncoding;
739739

740740
// We only consume the socket if it has never been consumed before.
741-
if (socket._handle && socket._handle.isStreamBase &&
741+
if (socket._handle?.isStreamBase &&
742742
!socket._handle._consumed) {
743743
parser._consumed = true;
744744
socket._handle._consumed = true;
@@ -783,7 +783,7 @@ function socketOnDrain(socket, state) {
783783
}
784784

785785
function socketOnTimeout() {
786-
const req = this.parser && this.parser.incoming;
786+
const req = this.parser?.incoming;
787787
const reqTimeout = req && !req.complete && req.emit('timeout', this);
788788
const res = this._httpMessage;
789789
const resTimeout = res && res.emit('timeout', this);
@@ -918,7 +918,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
918918
prepareError(ret, parser, d);
919919
debug('parse error', ret);
920920
socketOnError.call(socket, ret);
921-
} else if (parser.incoming && parser.incoming.upgrade) {
921+
} else if (parser.incoming?.upgrade) {
922922
// Upgrade or CONNECT
923923
const req = parser.incoming;
924924
debug('SERVER upgrade or connect', req.method);
@@ -963,7 +963,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
963963

964964
function clearIncoming(req) {
965965
req = req || this;
966-
const parser = req.socket && req.socket.parser;
966+
const parser = req.socket?.parser;
967967
// Reset the .incoming property so that the request object can be gc'ed.
968968
if (parser && parser.incoming === req) {
969969
if (req.readableEnded) {
@@ -1180,7 +1180,7 @@ function onSocketResume() {
11801180
}
11811181

11821182
function onSocketPause() {
1183-
if (this._handle && this._handle.reading) {
1183+
if (this._handle?.reading) {
11841184
this._handle.reading = false;
11851185
this._handle.readStop();
11861186
}
Collapse file

‎lib/_tls_wrap.js‎

Copy file name to clipboardExpand all lines: lib/_tls_wrap.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ function initRead(tlsSocket, socket) {
489489
return;
490490

491491
// Socket already has some buffered data - emulate receiving it
492-
if (socket && socket.readableLength) {
492+
if (socket?.readableLength) {
493493
let buf;
494494
while ((buf = socket.read()) !== null)
495495
tlsSocket._handle.receive(buf);
@@ -1683,7 +1683,7 @@ function onConnectSecure() {
16831683
if (!verifyError && !this.isSessionReused()) {
16841684
const hostname = options.servername ||
16851685
options.host ||
1686-
(options.socket && options.socket._host) ||
1686+
(options.socket?._host) ||
16871687
'localhost';
16881688
const cert = this.getPeerCertificate(true);
16891689
verifyError = options.checkServerIdentity(hostname, cert);
Collapse file

‎lib/assert.js‎

Copy file name to clipboardExpand all lines: lib/assert.js
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ function expectedException(actual, expected, message, fn) {
446446
message = 'The error is expected to be an instance of ' +
447447
`"${expected.name}". Received `;
448448
if (isError(actual)) {
449-
const name = (actual.constructor && actual.constructor.name) ||
449+
const name = (actual.constructor?.name) ||
450450
actual.name;
451451
if (expected.name === name) {
452452
message += 'an error with identical name but a different prototype.';
@@ -569,7 +569,7 @@ function expectsError(stackStartFn, actual, error, message) {
569569

570570
if (actual === NO_EXCEPTION_SENTINEL) {
571571
let details = '';
572-
if (error && error.name) {
572+
if (error?.name) {
573573
details += ` (${error.name})`;
574574
}
575575
details += message ? `: ${message}` : '.';
@@ -627,7 +627,7 @@ function expectsNoError(stackStartFn, actual, error, message) {
627627
expected: error,
628628
operator: stackStartFn.name,
629629
message: `Got unwanted ${fnType}${details}\n` +
630-
`Actual message: "${actual && actual.message}"`,
630+
`Actual message: "${actual?.message}"`,
631631
stackStartFn,
632632
});
633633
}
Collapse file

‎lib/child_process.js‎

Copy file name to clipboardExpand all lines: lib/child_process.js
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,17 +392,15 @@ function execFile(file, args, options, callback) {
392392
let stderr;
393393
if (encoding ||
394394
(
395-
child.stdout &&
396-
child.stdout.readableEncoding
395+
child.stdout?.readableEncoding
397396
)) {
398397
stdout = ArrayPrototypeJoin(_stdout, '');
399398
} else {
400399
stdout = Buffer.concat(_stdout);
401400
}
402401
if (encoding ||
403402
(
404-
child.stderr &&
405-
child.stderr.readableEncoding
403+
child.stderr?.readableEncoding
406404
)) {
407405
stderr = ArrayPrototypeJoin(_stderr, '');
408406
} else {
@@ -855,7 +853,7 @@ function spawnSync(file, args, options) {
855853

856854
// We may want to pass data in on any given fd, ensure it is a valid buffer
857855
for (let i = 0; i < options.stdio.length; i++) {
858-
const input = options.stdio[i] && options.stdio[i].input;
856+
const input = options.stdio[i]?.input;
859857
if (input != null) {
860858
const pipe = options.stdio[i] = { ...options.stdio[i] };
861859
if (isArrayBufferView(input)) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.