tools: enable no-else-return lint rule

Refs: #32644
Refs: #32662

PR-URL: #32667
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

Author: lpinca

.eslintrc.js

@@ -129,6 +129,7 @@ module.exports = {
     'no-dupe-else-if': 'error',
     'no-duplicate-case': 'error',
     'no-duplicate-imports': 'error',
+    'no-else-return': ['error', { allowElseIf: true }],
     'no-empty-character-class': 'error',
     'no-ex-assign': 'error',
     'no-extra-boolean-cast': 'error',

benchmark/es/spread-bench.js

@@ -16,11 +16,10 @@ function makeTest(count, rest) {
     return function test(...args) {
       assert.strictEqual(count, args.length);
     };
-  } else {
-    return function test() {
-      assert.strictEqual(count, arguments.length);
-    };
   }
+  return function test() {
+    assert.strictEqual(count, arguments.length);
+  };
 }
 
 function main({ n, context, count, rest, method }) {

benchmark/scatter.js

@@ -30,9 +30,8 @@ let printHeader = true;
 function csvEncodeValue(value) {
   if (typeof value === 'number') {
     return value.toString();
-  } else {
-    return `"${value.replace(/"/g, '""')}"`;
   }
+  return `"${value.replace(/"/g, '""')}"`;
 }
 
 (function recursive(i) {

lib/_http_incoming.js

@@ -248,9 +248,8 @@ function matchKnownFields(field, lowercased) {
   }
   if (lowercased) {
     return '\u0000' + field;
-  } else {
-    return matchKnownFields(field.toLowerCase(), true);
   }
+  return matchKnownFields(field.toLowerCase(), true);
 }
 // Add the given (field, value) pair to the message
 //

lib/_stream_readable.js

@@ -372,8 +372,7 @@ function howMuchToRead(n, state) {
     // Only flow one buffer at a time.
     if (state.flowing && state.length)
       return state.buffer.first().length;
-    else
-      return state.length;
+    return state.length;
   }
   if (n <= state.length)
     return n;

lib/_stream_writable.js

@@ -298,10 +298,9 @@ Writable.prototype.write = function(chunk, encoding, cb) {
     process.nextTick(cb, err);
     errorOrDestroy(this, err, true);
     return false;
-  } else {
-    state.pendingcb++;
-    return writeOrBuffer(this, state, chunk, encoding, cb);
   }
+  state.pendingcb++;
+  return writeOrBuffer(this, state, chunk, encoding, cb);
 };
 
 Writable.prototype.cork = function() {

lib/_tls_wrap.js

@@ -1503,13 +1503,12 @@ function onConnectSecure() {
     if (options.rejectUnauthorized) {
       this.destroy(verifyError);
       return;
-    } else {
-      debug('client emit secureConnect. rejectUnauthorized: %s, ' +
-            'authorizationError: %s', options.rejectUnauthorized,
-            this.authorizationError);
-      this.secureConnecting = false;
-      this.emit('secureConnect');
     }
+    debug('client emit secureConnect. rejectUnauthorized: %s, ' +
+          'authorizationError: %s', options.rejectUnauthorized,
+          this.authorizationError);
+    this.secureConnecting = false;
+    this.emit('secureConnect');
   } else {
     this.authorized = true;
     debug('client emit secureConnect. authorized:', this.authorized);

lib/dns.js

@@ -261,9 +261,8 @@ function resolve(hostname, rrtype, callback) {
 
   if (typeof resolver === 'function') {
     return resolver.call(this, hostname, callback);
-  } else {
-    throw new ERR_INVALID_OPT_VALUE('rrtype', rrtype);
   }
+  throw new ERR_INVALID_OPT_VALUE('rrtype', rrtype);
 }
 
 function defaultResolverSetServers(servers) {

lib/events.js

@@ -577,9 +577,8 @@ EventEmitter.prototype.rawListeners = function rawListeners(type) {
 EventEmitter.listenerCount = function(emitter, type) {
   if (typeof emitter.listenerCount === 'function') {
     return emitter.listenerCount(type);
-  } else {
-    return listenerCount.call(emitter, type);
   }
+  return listenerCount.call(emitter, type);
 };
 
 EventEmitter.prototype.listenerCount = listenerCount;

lib/fs.js

@@ -1545,9 +1545,8 @@ function encodeRealpathResult(result, options) {
   const asBuffer = Buffer.from(result);
   if (options.encoding === 'buffer') {
     return asBuffer;
-  } else {
-    return asBuffer.toString(options.encoding);
   }
+  return asBuffer.toString(options.encoding);
 }
 
 // Finds the next portion of a (partial) path, up to the next path delimiter