Skip to content

Commit 6e3e99c

Browse files
avivkellerruyadorno
avivkeller
authored and
ruyadorno
committed
lib: prefer logical assignment
PR-URL: #55044 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: LiviaMedeiros <livia@cirno.name>
1 parent c81c818 commit 6e3e99c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+178
-304
lines changed

‎benchmark/_http-benchmarkers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class TestDoubleBenchmarker {
110110
}
111111

112112
create(options) {
113-
process.env.duration = process.env.duration || options.duration || 5;
113+
process.env.duration ||= options.duration || 5;
114114

115115
const scheme = options.scheme || 'http';
116116
const env = {

‎benchmark/common.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ class Benchmark {
113113
}
114114
const [, key, value] = match;
115115
if (configs[key] !== undefined) {
116-
if (!cliOptions[key])
117-
cliOptions[key] = [];
116+
cliOptions[key] ||= [];
118117
cliOptions[key].push(
119118
// Infer the type from the config object and parse accordingly
120119
typeof configs[key][0] === 'number' ? +value : value,
@@ -177,10 +176,9 @@ class Benchmark {
177176

178177
http(options, cb) {
179178
const http_options = { ...options };
180-
http_options.benchmarker = http_options.benchmarker ||
181-
this.config.benchmarker ||
182-
this.extra_options.benchmarker ||
183-
http_benchmarkers.default_http_benchmarker;
179+
http_options.benchmarker ||= this.config.benchmarker ||
180+
this.extra_options.benchmarker ||
181+
http_benchmarkers.default_http_benchmarker;
184182
http_benchmarkers.run(
185183
http_options, (error, code, used_benchmarker, result, elapsed) => {
186184
if (cb) {

‎benchmark/es/defaultparams-bench.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const bench = common.createBenchmark(main, {
99
});
1010

1111
function oldStyleDefaults(x, y) {
12-
x = x || 1;
13-
y = y || 2;
12+
x ||= 1;
13+
y ||= 2;
1414
assert.strictEqual(x, 1);
1515
assert.strictEqual(y, 2);
1616
}

‎benchmark/perf_hooks/resourcetiming.js

+6-12
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,12 @@ function createTimingInfo({
2121
finalConnectionTimingInfo = null,
2222
}) {
2323
if (finalConnectionTimingInfo !== null) {
24-
finalConnectionTimingInfo.domainLookupStartTime =
25-
finalConnectionTimingInfo.domainLookupStartTime || 0;
26-
finalConnectionTimingInfo.domainLookupEndTime =
27-
finalConnectionTimingInfo.domainLookupEndTime || 0;
28-
finalConnectionTimingInfo.connectionStartTime =
29-
finalConnectionTimingInfo.connectionStartTime || 0;
30-
finalConnectionTimingInfo.connectionEndTime =
31-
finalConnectionTimingInfo.connectionEndTime || 0;
32-
finalConnectionTimingInfo.secureConnectionStartTime =
33-
finalConnectionTimingInfo.secureConnectionStartTime || 0;
34-
finalConnectionTimingInfo.ALPNNegotiatedProtocol =
35-
finalConnectionTimingInfo.ALPNNegotiatedProtocol || [];
24+
finalConnectionTimingInfo.domainLookupStartTime ||= 0;
25+
finalConnectionTimingInfo.domainLookupEndTime ||= 0;
26+
finalConnectionTimingInfo.connectionStartTime ||= 0;
27+
finalConnectionTimingInfo.connectionEndTime ||= 0;
28+
finalConnectionTimingInfo.secureConnectionStartTime ||= 0;
29+
finalConnectionTimingInfo.ALPNNegotiatedProtocol ||= [];
3630
}
3731
return {
3832
startTime,

‎benchmark/zlib/deflate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
1010

1111
function main({ n, method, inputLen }) {
1212
// Default method value for testing.
13-
method = method || 'deflate';
13+
method ||= 'deflate';
1414
const chunk = Buffer.alloc(inputLen, 'a');
1515

1616
switch (method) {

‎benchmark/zlib/inflate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
1010

1111
function main({ n, method, inputLen }) {
1212
// Default method value for tests.
13-
method = method || 'inflate';
13+
method ||= 'inflate';
1414
const chunk = zlib.deflateSync(Buffer.alloc(inputLen, 'a'));
1515

1616
let i = 0;

‎eslint.config.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ export default [
142142
ignorePattern: '.*',
143143
},
144144
}],
145+
'logical-assignment-operators': ['error', 'always', { enforceForIfStatements: true }],
145146
'default-case-last': 'error',
146147
'dot-notation': 'error',
147148
'eqeqeq': ['error', 'smart'],

‎lib/_http_agent.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
246246
normalizeServerName(options, req);
247247

248248
const name = this.getName(options);
249-
if (!this.sockets[name]) {
250-
this.sockets[name] = [];
251-
}
249+
this.sockets[name] ||= [];
252250

253251
const freeSockets = this.freeSockets[name];
254252
let socket;
@@ -284,9 +282,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
284282
} else {
285283
debug('wait for socket');
286284
// We are over limit so we'll add it to the queue.
287-
if (!this.requests[name]) {
288-
this.requests[name] = [];
289-
}
285+
this.requests[name] ||= [];
290286

291287
// Used to create sockets for pending requests from different origin
292288
req[kRequestOptions] = options;
@@ -313,9 +309,7 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
313309
const oncreate = once((err, s) => {
314310
if (err)
315311
return cb(err);
316-
if (!this.sockets[name]) {
317-
this.sockets[name] = [];
318-
}
312+
this.sockets[name] ||= [];
319313
this.sockets[name].push(s);
320314
this.totalSocketCount++;
321315
debug('sockets', name, this.sockets[name].length, this.totalSocketCount);

‎lib/_http_client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ function ClientRequest(input, options, cb) {
348348
opts = { ...optsWithoutSignal };
349349
if (opts.socketPath) {
350350
opts.path = opts.socketPath;
351-
} else if (opts.path) {
352-
opts.path = undefined;
351+
} else {
352+
opts.path &&= undefined;
353353
}
354354
}
355355
if (typeof opts.createConnection === 'function') {

‎lib/_http_server.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,7 @@ function writeHead(statusCode, reason, obj) {
364364
this.statusMessage = reason;
365365
} else {
366366
// writeHead(statusCode[, headers])
367-
if (!this.statusMessage)
368-
this.statusMessage = STATUS_CODES[statusCode] || 'unknown';
367+
this.statusMessage ||= STATUS_CODES[statusCode] || 'unknown';
369368
obj ??= reason;
370369
}
371370
this.statusCode = statusCode;
@@ -517,9 +516,7 @@ function storeHTTPOptions(options) {
517516

518517
function setupConnectionsTracking() {
519518
// Start connection handling
520-
if (!this[kConnections]) {
521-
this[kConnections] = new ConnectionsList();
522-
}
519+
this[kConnections] ||= new ConnectionsList();
523520

524521
if (this[kConnectionsCheckingInterval]) {
525522
clearInterval(this[kConnectionsCheckingInterval]);
@@ -930,8 +927,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
930927
const req = parser.incoming;
931928
debug('SERVER upgrade or connect', req.method);
932929

933-
if (!d)
934-
d = parser.getCurrentBuffer();
930+
d ||= parser.getCurrentBuffer();
935931

936932
socket.removeListener('data', state.onData);
937933
socket.removeListener('end', state.onEnd);
@@ -969,7 +965,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
969965
}
970966

971967
function clearIncoming(req) {
972-
req = req || this;
968+
req ||= this;
973969
const parser = req.socket?.parser;
974970
// Reset the .incoming property so that the request object can be gc'ed.
975971
if (parser && parser.incoming === req) {

‎lib/_tls_common.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const {
5757
} = require('internal/tls/secure-context');
5858

5959
function toV(which, v, def) {
60-
if (v == null) v = def;
60+
v ??= def;
6161
if (v === 'TLSv1') return TLS1_VERSION;
6262
if (v === 'TLSv1.1') return TLS1_1_VERSION;
6363
if (v === 'TLSv1.2') return TLS1_2_VERSION;
@@ -94,8 +94,7 @@ function SecureContext(secureProtocol, secureOptions, minVersion, maxVersion) {
9494
}
9595

9696
function createSecureContext(options) {
97-
if (!options) options = kEmptyObject;
98-
97+
options ||= kEmptyObject;
9998
const {
10099
honorCipherOrder,
101100
minVersion,

‎lib/_tls_wrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,7 @@ function Server(options, listener) {
13281328
listener = options;
13291329
options = kEmptyObject;
13301330
} else if (options == null || typeof options === 'object') {
1331-
options = options ?? kEmptyObject;
1331+
options ??= kEmptyObject;
13321332
} else {
13331333
throw new ERR_INVALID_ARG_TYPE('options', 'Object', options);
13341334
}

‎lib/assert.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ function internalMatch(string, regexp, message, fn) {
750750
const generatedMessage = !message;
751751

752752
// 'The input was expected to not match the regular expression ' +
753-
message = message || (typeof string !== 'string' ?
753+
message ||= (typeof string !== 'string' ?
754754
'The "string" argument must be of type string. Received type ' +
755755
`${typeof string} (${inspect(string)})` :
756756
(match ?

‎lib/async_hooks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class AsyncResource {
269269
}
270270

271271
static bind(fn, type, thisArg) {
272-
type = type || fn.name;
272+
type ||= fn.name;
273273
return (new AsyncResource(type || 'bound-anonymous-fn')).bind(fn, thisArg);
274274
}
275275
}

‎lib/child_process.js

+8-14
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function fork(modulePath, args = [], options) {
138138
validateObject(options, 'options');
139139
}
140140
options = { __proto__: null, ...options, shell: false };
141-
options.execPath = options.execPath || process.execPath;
141+
options.execPath ||= process.execPath;
142142
validateArgumentNullCheck(options.execPath, 'options.execPath');
143143

144144
// Prepare arguments for fork:
@@ -272,19 +272,15 @@ function normalizeExecFileArgs(file, args, options, callback) {
272272
args = null;
273273
}
274274

275-
if (args == null) {
276-
args = [];
277-
}
275+
args ??= [];
278276

279277
if (typeof options === 'function') {
280278
callback = options;
281279
} else if (options != null) {
282280
validateObject(options, 'options');
283281
}
284282

285-
if (options == null) {
286-
options = kEmptyObject;
287-
}
283+
options ??= kEmptyObject;
288284

289285
if (callback != null) {
290286
validateFunction(callback, 'callback');
@@ -415,13 +411,11 @@ function execFile(file, args, options, callback) {
415411
if (args?.length)
416412
cmd += ` ${ArrayPrototypeJoin(args, ' ')}`;
417413

418-
if (!ex) {
419-
ex = genericNodeError(`Command failed: ${cmd}\n${stderr}`, {
420-
code: code < 0 ? getSystemErrorName(code) : code,
421-
killed: child.killed || killed,
422-
signal: signal,
423-
});
424-
}
414+
ex ||= genericNodeError(`Command failed: ${cmd}\n${stderr}`, {
415+
code: code < 0 ? getSystemErrorName(code) : code,
416+
killed: child.killed || killed,
417+
signal: signal,
418+
});
425419

426420
ex.cmd = cmd;
427421
callback(ex, stdout, stderr);

‎lib/dgram.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ const SEND_BUFFER = false;
9494
// Lazily loaded
9595
let _cluster = null;
9696
function lazyLoadCluster() {
97-
if (!_cluster) _cluster = require('cluster');
98-
return _cluster;
97+
return _cluster ??= require('cluster');
9998
}
10099

101100
function Socket(type, listener) {

‎lib/events.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ EventEmitter.init = function(opts) {
355355
this[kShapeMode] = true;
356356
}
357357

358-
this._maxListeners = this._maxListeners || undefined;
358+
this._maxListeners ||= undefined;
359359

360360

361361
if (opts?.captureRejections) {
@@ -475,7 +475,7 @@ EventEmitter.prototype.emit = function emit(type, ...args) {
475475
if (events !== undefined) {
476476
if (doError && events[kErrorMonitor] !== undefined)
477477
this.emit(kErrorMonitor, ...args);
478-
doError = (doError && events.error === undefined);
478+
doError &&= events.error === undefined;
479479
} else if (!doError)
480480
return false;
481481

‎lib/internal/assert.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
let error;
44
function lazyError() {
5-
if (!error) {
6-
error = require('internal/errors').codes.ERR_INTERNAL_ASSERTION;
7-
}
8-
return error;
5+
return error ??= require('internal/errors').codes.ERR_INTERNAL_ASSERTION;
96
}
107

118
function assert(value, message) {

‎lib/internal/bootstrap/switches/is_not_main_thread.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ const {
3737

3838
let workerStdio;
3939
function lazyWorkerStdio() {
40-
if (!workerStdio) workerStdio = createWorkerStdio();
41-
return workerStdio;
40+
return workerStdio ??= createWorkerStdio();
4241
}
4342

4443
function getStdout() { return lazyWorkerStdio().stdout; }

‎lib/internal/child_process.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -853,8 +853,7 @@ function setupChannel(target, channel, serializationMode) {
853853

854854
if (err === 0) {
855855
if (handle) {
856-
if (!this._handleQueue)
857-
this._handleQueue = [];
856+
this._handleQueue ||= [];
858857
if (obj?.postSend)
859858
obj.postSend(message, handle, options, callback, target);
860859
}
@@ -1010,9 +1009,7 @@ function getValidStdio(stdio, sync) {
10101009
}
10111010

10121011
// Defaults
1013-
if (stdio == null) {
1014-
stdio = i < 3 ? 'pipe' : 'ignore';
1015-
}
1012+
stdio ??= i < 3 ? 'pipe' : 'ignore';
10161013

10171014
if (stdio === 'ignore') {
10181015
ArrayPrototypePush(acc, { type: 'ignore' });

‎lib/internal/cluster/child.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ function rr(message, { indexesKey, index }, cb) {
167167
let fakeHandle = null;
168168

169169
function ref() {
170-
if (!fakeHandle) {
171-
fakeHandle = setInterval(noop, TIMEOUT_MAX);
172-
}
170+
fakeHandle ||= setInterval(noop, TIMEOUT_MAX);
173171
}
174172

175173
function unref() {

‎lib/internal/cluster/primary.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,7 @@ function queryServer(worker, message) {
301301
handles.set(key, handle);
302302
}
303303

304-
if (!handle.data)
305-
handle.data = message.data;
304+
handle.data ||= message.data;
306305

307306
// Set custom server data
308307
handle.add(worker, (errno, reply, handle) => {

‎lib/internal/console/constructor.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ ObjectDefineProperties(Console.prototype, {
201201
enumerable: false,
202202
configurable: true,
203203
get() {
204-
if (!stdout) stdout = object.stdout;
205-
return stdout;
204+
return stdout ||= object.stdout;
206205
},
207206
set(value) { stdout = value; },
208207
},
@@ -211,8 +210,7 @@ ObjectDefineProperties(Console.prototype, {
211210
enumerable: false,
212211
configurable: true,
213212
get() {
214-
if (!stderr) { stderr = object.stderr; }
215-
return stderr;
213+
return stderr ||= object.stderr;
216214
},
217215
set(value) { stderr = value; },
218216
},

0 commit comments

Comments
 (0)