lib: prefer logical assignment

PR-URL: nodejs#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>
louwers · Oct 9, 2024 · 7178588 · 7178588
1 parent 09d10b5
commit 7178588
Show file tree

Hide file tree

Showing 73 changed files with 177 additions and 301 deletions.
diff --git a/benchmark/_http-benchmarkers.js b/benchmark/_http-benchmarkers.js
@@ -110,7 +110,7 @@ class TestDoubleBenchmarker {
   }
 
   create(options) {
-    process.env.duration = process.env.duration || options.duration || 5;
+    process.env.duration ||= options.duration || 5;
 
     const scheme = options.scheme || 'http';
     const env = {

diff --git a/benchmark/common.js b/benchmark/common.js
@@ -113,8 +113,7 @@ class Benchmark {
       }
       const [, key, value] = match;
       if (configs[key] !== undefined) {
-        if (!cliOptions[key])
-          cliOptions[key] = [];
+        cliOptions[key] ||= [];
         cliOptions[key].push(
           // Infer the type from the config object and parse accordingly
           typeof configs[key][0] === 'number' ? +value : value,
@@ -177,10 +176,9 @@ class Benchmark {
 
   http(options, cb) {
     const http_options = { ...options };
-    http_options.benchmarker = http_options.benchmarker ||
-                               this.config.benchmarker ||
-                               this.extra_options.benchmarker ||
-                               http_benchmarkers.default_http_benchmarker;
+    http_options.benchmarker ||= this.config.benchmarker ||
+                                 this.extra_options.benchmarker ||
+                                 http_benchmarkers.default_http_benchmarker;
     http_benchmarkers.run(
       http_options, (error, code, used_benchmarker, result, elapsed) => {
         if (cb) {

diff --git a/benchmark/es/defaultparams-bench.js b/benchmark/es/defaultparams-bench.js
@@ -9,8 +9,8 @@ const bench = common.createBenchmark(main, {
 });
 
 function oldStyleDefaults(x, y) {
-  x = x || 1;
-  y = y || 2;
+  x ||= 1;
+  y ||= 2;
   assert.strictEqual(x, 1);
   assert.strictEqual(y, 2);
 }

diff --git a/benchmark/perf_hooks/resourcetiming.js b/benchmark/perf_hooks/resourcetiming.js
@@ -21,18 +21,12 @@ function createTimingInfo({
   finalConnectionTimingInfo = null,
 }) {
   if (finalConnectionTimingInfo !== null) {
-    finalConnectionTimingInfo.domainLookupStartTime =
-        finalConnectionTimingInfo.domainLookupStartTime || 0;
-    finalConnectionTimingInfo.domainLookupEndTime =
-        finalConnectionTimingInfo.domainLookupEndTime || 0;
-    finalConnectionTimingInfo.connectionStartTime =
-        finalConnectionTimingInfo.connectionStartTime || 0;
-    finalConnectionTimingInfo.connectionEndTime =
-        finalConnectionTimingInfo.connectionEndTime || 0;
-    finalConnectionTimingInfo.secureConnectionStartTime =
-        finalConnectionTimingInfo.secureConnectionStartTime || 0;
-    finalConnectionTimingInfo.ALPNNegotiatedProtocol =
-        finalConnectionTimingInfo.ALPNNegotiatedProtocol || [];
+    finalConnectionTimingInfo.domainLookupStartTime ||= 0;
+    finalConnectionTimingInfo.domainLookupEndTime ||= 0;
+    finalConnectionTimingInfo.connectionStartTime ||= 0;
+    finalConnectionTimingInfo.connectionEndTime ||= 0;
+    finalConnectionTimingInfo.secureConnectionStartTime ||= 0;
+    finalConnectionTimingInfo.ALPNNegotiatedProtocol ||= [];
   }
   return {
     startTime,

diff --git a/benchmark/zlib/deflate.js b/benchmark/zlib/deflate.js
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
 
 function main({ n, method, inputLen }) {
   // Default method value for testing.
-  method = method || 'deflate';
+  method ||= 'deflate';
   const chunk = Buffer.alloc(inputLen, 'a');
 
   switch (method) {

diff --git a/benchmark/zlib/inflate.js b/benchmark/zlib/inflate.js
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
 
 function main({ n, method, inputLen }) {
   // Default method value for tests.
-  method = method || 'inflate';
+  method ||= 'inflate';
   const chunk = zlib.deflateSync(Buffer.alloc(inputLen, 'a'));
 
   let i = 0;

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -144,6 +144,7 @@ export default [
           ignorePattern: '.*',
         },
       }],
+      'logical-assignment-operators': ['error', 'always', { enforceForIfStatements: true }],
       'default-case-last': 'error',
       'dot-notation': 'error',
       'eqeqeq': ['error', 'smart'],

diff --git a/lib/_http_agent.js b/lib/_http_agent.js
@@ -246,9 +246,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
   normalizeServerName(options, req);
 
   const name = this.getName(options);
-  if (!this.sockets[name]) {
-    this.sockets[name] = [];
-  }
+  this.sockets[name] ||= [];
 
   const freeSockets = this.freeSockets[name];
   let socket;
@@ -284,9 +282,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
   } else {
     debug('wait for socket');
     // We are over limit so we'll add it to the queue.
-    if (!this.requests[name]) {
-      this.requests[name] = [];
-    }
+    this.requests[name] ||= [];
 
     // Used to create sockets for pending requests from different origin
     req[kRequestOptions] = options;
@@ -313,9 +309,7 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
   const oncreate = once((err, s) => {
     if (err)
       return cb(err);
-    if (!this.sockets[name]) {
-      this.sockets[name] = [];
-    }
+    this.sockets[name] ||= [];
     this.sockets[name].push(s);
     this.totalSocketCount++;
     debug('sockets', name, this.sockets[name].length, this.totalSocketCount);

diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -347,8 +347,8 @@ function ClientRequest(input, options, cb) {
       opts = { ...optsWithoutSignal };
       if (opts.socketPath) {
         opts.path = opts.socketPath;
-      } else if (opts.path) {
-        opts.path = undefined;
+      } else {
+        opts.path &&= undefined;
       }
     }
     if (typeof opts.createConnection === 'function') {

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -357,8 +357,7 @@ function writeHead(statusCode, reason, obj) {
     this.statusMessage = reason;
   } else {
     // writeHead(statusCode[, headers])
-    if (!this.statusMessage)
-      this.statusMessage = STATUS_CODES[statusCode] || 'unknown';
+    this.statusMessage ||= STATUS_CODES[statusCode] || 'unknown';
     obj ??= reason;
   }
   this.statusCode = statusCode;
@@ -510,9 +509,7 @@ function storeHTTPOptions(options) {
 
 function setupConnectionsTracking() {
   // Start connection handling
-  if (!this[kConnections]) {
-    this[kConnections] = new ConnectionsList();
-  }
+  this[kConnections] ||= new ConnectionsList();
 
   if (this[kConnectionsCheckingInterval]) {
     clearInterval(this[kConnectionsCheckingInterval]);
@@ -923,8 +920,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
     const req = parser.incoming;
     debug('SERVER upgrade or connect', req.method);
 
-    if (!d)
-      d = parser.getCurrentBuffer();
+    d ||= parser.getCurrentBuffer();
 
     socket.removeListener('data', state.onData);
     socket.removeListener('end', state.onEnd);
@@ -962,7 +958,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
 }
 
 function clearIncoming(req) {
-  req = req || this;
+  req ||= this;
   const parser = req.socket?.parser;
   // Reset the .incoming property so that the request object can be gc'ed.
   if (parser && parser.incoming === req) {

diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -57,7 +57,7 @@ const {
 } = require('internal/tls/secure-context');
 
 function toV(which, v, def) {
-  if (v == null) v = def;
+  v ??= def;
   if (v === 'TLSv1') return TLS1_VERSION;
   if (v === 'TLSv1.1') return TLS1_1_VERSION;
   if (v === 'TLSv1.2') return TLS1_2_VERSION;
@@ -94,8 +94,7 @@ function SecureContext(secureProtocol, secureOptions, minVersion, maxVersion) {
 }
 
 function createSecureContext(options) {
-  if (!options) options = kEmptyObject;
-
+  options ||= kEmptyObject;
   const {
     honorCipherOrder,
     minVersion,

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -1328,7 +1328,7 @@ function Server(options, listener) {
     listener = options;
     options = kEmptyObject;
   } else if (options == null || typeof options === 'object') {
-    options = options ?? kEmptyObject;
+    options ??= kEmptyObject;
   } else {
     throw new ERR_INVALID_ARG_TYPE('options', 'Object', options);
   }

diff --git a/lib/assert.js b/lib/assert.js
@@ -750,7 +750,7 @@ function internalMatch(string, regexp, message, fn) {
     const generatedMessage = !message;
 
     // 'The input was expected to not match the regular expression ' +
-    message = message || (typeof string !== 'string' ?
+    message ||= (typeof string !== 'string' ?
       'The "string" argument must be of type string. Received type ' +
         `${typeof string} (${inspect(string)})` :
       (match ?

diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -269,7 +269,7 @@ class AsyncResource {
   }
 
   static bind(fn, type, thisArg) {
-    type = type || fn.name;
+    type ||= fn.name;
     return (new AsyncResource(type || 'bound-anonymous-fn')).bind(fn, thisArg);
   }
 }

diff --git a/lib/child_process.js b/lib/child_process.js
@@ -138,7 +138,7 @@ function fork(modulePath, args = [], options) {
     validateObject(options, 'options');
   }
   options = { __proto__: null, ...options, shell: false };
-  options.execPath = options.execPath || process.execPath;
+  options.execPath ||= process.execPath;
   validateArgumentNullCheck(options.execPath, 'options.execPath');
 
   // Prepare arguments for fork:
@@ -272,19 +272,15 @@ function normalizeExecFileArgs(file, args, options, callback) {
     args = null;
   }
 
-  if (args == null) {
-    args = [];
-  }
+  args ??= [];
 
   if (typeof options === 'function') {
     callback = options;
   } else if (options != null) {
     validateObject(options, 'options');
   }
 
-  if (options == null) {
-    options = kEmptyObject;
-  }
+  options ??= kEmptyObject;
 
   if (callback != null) {
     validateFunction(callback, 'callback');
@@ -415,13 +411,11 @@ function execFile(file, args, options, callback) {
     if (args?.length)
       cmd += ` ${ArrayPrototypeJoin(args, ' ')}`;
 
-    if (!ex) {
-      ex = genericNodeError(`Command failed: ${cmd}\n${stderr}`, {
-        code: code < 0 ? getSystemErrorName(code) : code,
-        killed: child.killed || killed,
-        signal: signal,
-      });
-    }
+    ex ||= genericNodeError(`Command failed: ${cmd}\n${stderr}`, {
+      code: code < 0 ? getSystemErrorName(code) : code,
+      killed: child.killed || killed,
+      signal: signal,
+    });
 
     ex.cmd = cmd;
     callback(ex, stdout, stderr);

diff --git a/lib/dgram.js b/lib/dgram.js
@@ -96,8 +96,7 @@ const SEND_BUFFER = false;
 // Lazily loaded
 let _cluster = null;
 function lazyLoadCluster() {
-  if (!_cluster) _cluster = require('cluster');
-  return _cluster;
+  return _cluster ??= require('cluster');
 }
 
 function Socket(type, listener) {

diff --git a/lib/events.js b/lib/events.js
@@ -338,7 +338,7 @@ EventEmitter.init = function(opts) {
     this[kShapeMode] = true;
   }
 
-  this._maxListeners = this._maxListeners || undefined;
+  this._maxListeners ||= undefined;
 
 
   if (opts?.captureRejections) {
@@ -458,7 +458,7 @@ EventEmitter.prototype.emit = function emit(type, ...args) {
   if (events !== undefined) {
     if (doError && events[kErrorMonitor] !== undefined)
       this.emit(kErrorMonitor, ...args);
-    doError = (doError && events.error === undefined);
+    doError &&= events.error === undefined;
   } else if (!doError)
     return false;
 

diff --git a/lib/internal/assert.js b/lib/internal/assert.js
@@ -2,10 +2,7 @@
 
 let error;
 function lazyError() {
-  if (!error) {
-    error = require('internal/errors').codes.ERR_INTERNAL_ASSERTION;
-  }
-  return error;
+  return error ??= require('internal/errors').codes.ERR_INTERNAL_ASSERTION;
 }
 
 function assert(value, message) {

diff --git a/lib/internal/bootstrap/switches/is_not_main_thread.js b/lib/internal/bootstrap/switches/is_not_main_thread.js
@@ -37,8 +37,7 @@ const {
 
 let workerStdio;
 function lazyWorkerStdio() {
-  if (!workerStdio) workerStdio = createWorkerStdio();
-  return workerStdio;
+  return workerStdio ??= createWorkerStdio();
 }
 
 function getStdout() { return lazyWorkerStdio().stdout; }

diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
@@ -853,8 +853,7 @@ function setupChannel(target, channel, serializationMode) {
 
     if (err === 0) {
       if (handle) {
-        if (!this._handleQueue)
-          this._handleQueue = [];
+        this._handleQueue ||= [];
         if (obj?.postSend)
           obj.postSend(message, handle, options, callback, target);
       }
@@ -1010,9 +1009,7 @@ function getValidStdio(stdio, sync) {
     }
 
     // Defaults
-    if (stdio == null) {
-      stdio = i < 3 ? 'pipe' : 'ignore';
-    }
+    stdio ??= i < 3 ? 'pipe' : 'ignore';
 
     if (stdio === 'ignore') {
       ArrayPrototypePush(acc, { type: 'ignore' });

diff --git a/lib/internal/cluster/child.js b/lib/internal/cluster/child.js
@@ -167,9 +167,7 @@ function rr(message, { indexesKey, index }, cb) {
   let fakeHandle = null;
 
   function ref() {
-    if (!fakeHandle) {
-      fakeHandle = setInterval(noop, TIMEOUT_MAX);
-    }
+    fakeHandle ||= setInterval(noop, TIMEOUT_MAX);
   }
 
   function unref() {

diff --git a/lib/internal/cluster/primary.js b/lib/internal/cluster/primary.js
@@ -301,8 +301,7 @@ function queryServer(worker, message) {
     handles.set(key, handle);
   }
 
-  if (!handle.data)
-    handle.data = message.data;
+  handle.data ||= message.data;
 
   // Set custom server data
   handle.add(worker, (errno, reply, handle) => {

diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
@@ -201,8 +201,7 @@ ObjectDefineProperties(Console.prototype, {
           enumerable: false,
           configurable: true,
           get() {
-            if (!stdout) stdout = object.stdout;
-            return stdout;
+            return stdout ||= object.stdout;
           },
           set(value) { stdout = value; },
         },
@@ -211,8 +210,7 @@ ObjectDefineProperties(Console.prototype, {
           enumerable: false,
           configurable: true,
           get() {
-            if (!stderr) { stderr = object.stderr; }
-            return stderr;
+            return stderr ||= object.stderr;
           },
           set(value) { stderr = value; },
         },