refactor: use switch instead of multiple else-if

lib/browser/api/browser-window.ts

@@ -55,23 +55,30 @@ BrowserWindow.prototype._init = function (this: BWT) {
 
   const warn = deprecate.warnOnceMessage('\'scroll-touch-{begin,end,edge}\' are deprecated and will be removed. Please use the WebContents \'input-event\' event instead.');
   this.webContents.on('input-event', (_, e) => {
-    if (e.type === 'gestureScrollBegin') {
+    switch (e.type) {
+      case 'gestureScrollBegin': {
         if (this.listenerCount('scroll-touch-begin') !== 0) {
           warn();
           this.emit('scroll-touch-edge');
           this.emit('scroll-touch-begin');
         }
-    } else if (e.type === 'gestureScrollUpdate') {
+        break;
+      }
+      case 'gestureScrollUpdate': {
         if (this.listenerCount('scroll-touch-edge') !== 0) {
           warn();
           this.emit('scroll-touch-edge');
         }
-    } else if (e.type === 'gestureScrollEnd') {
+        break;
+      }
+      case 'gestureScrollEnd': {
         if (this.listenerCount('scroll-touch-end') !== 0) {
           warn();
           this.emit('scroll-touch-edge');
           this.emit('scroll-touch-end');
         }
+        break;
+      }
     }
   });
 

lib/browser/api/net-client-request.ts

@@ -461,9 +461,12 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
 
     this._urlLoader.on('redirect', (event, redirectInfo, headers) => {
       const { statusCode, newMethod, newUrl } = redirectInfo;
-      if (this._redirectPolicy === 'error') {
+      switch (this._redirectPolicy) {
+        case 'error': {
           this._die(new Error('Attempted to redirect, but redirect policy was \'error\''));
-      } else if (this._redirectPolicy === 'manual') {
+          break;
+        }
+        case 'manual': {
           let _followRedirect = false;
           this._followRedirectCb = () => { _followRedirect = true; };
           try {
@@ -474,7 +477,9 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
               this._die(new Error('Redirect was cancelled'));
             }
           }
-      } else if (this._redirectPolicy === 'follow') {
+          break;
+        }
+        case 'follow': {
         // Calling followRedirect() when the redirect policy is 'follow' is
         // allowed but does nothing. (Perhaps it should throw an error
         // though...? Since the redirect will happen regardless.)
@@ -484,9 +489,12 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
           } finally {
             this._followRedirectCb = undefined;
           }
-      } else {
+          break;
+        }
+        default: {
           this._die(new Error(`Unexpected redirect policy '${this._redirectPolicy}'`));
         }
+      }
     });
 
     this._urlLoader.on('upload-progress', (event, position, total) => {

lib/browser/api/protocol.ts

@@ -48,12 +48,25 @@ function convertToRequestBody (uploadData: ProtocolRequest['uploadData']): Reque
       } else {
         if (!chunks.length) { return controller.close(); }
         const chunk = chunks.shift()!;
-        if (chunk.type === 'rawData') { controller.enqueue(chunk.bytes); } else if (chunk.type === 'file') {
-          current = Readable.toWeb(createReadStream(chunk.filePath, { start: chunk.offset ?? 0, end: chunk.length >= 0 ? chunk.offset + chunk.length : undefined })).getReader();
+        switch (chunk.type) {
+          case 'rawData': {
+            controller.enqueue(chunk.bytes);
+            break;
+          }
+          case 'file': {
+            const stream = createReadStream(chunk.filePath, {
+              start: chunk.offset ?? 0,
+              end: chunk.length >= 0 ? chunk.offset + chunk.length : undefined
+            });
+            current = Readable.toWeb(stream).getReader();
             this.pull!(controller);
-        } else if (chunk.type === 'stream') {
+            break;
+          }
+          case 'stream': {
             current = makeStreamFromPipe(chunk.body).getReader();
             this.pull!(controller);
+            break;
+          }
         }
       }
     }

spec/api-browser-window-spec.ts

@@ -591,23 +591,35 @@ describe('BrowserWindow module', () => {
         let url = null as unknown as string;
         before(async () => {
           server = http.createServer((req, res) => {
-            if (req.url === '/navigate-top') {
+            switch (req.url) {
+              case '/navigate-top': {
                 res.end('<a target=_top href="/">navigate _top</a>');
-            } else if (req.url === '/navigate-iframe') {
+                break;
+              }
+              case '/navigate-iframe': {
                 res.end('<a href="/test">navigate iframe</a>');
-            } else if (req.url === '/navigate-iframe?navigated') {
+                break;
+              }
+              case '/navigate-iframe?navigated': {
                 res.end('Successfully navigated');
-            } else if (req.url === '/navigate-iframe-immediately') {
+                break;
+              }
+              case '/navigate-iframe-immediately': {
                 res.end(`
                 <script type="text/javascript" charset="utf-8">
                   location.href += '?navigated'
                 </script>
               `);
-            } else if (req.url === '/navigate-iframe-immediately?navigated') {
+                break;
+              }
+              case '/navigate-iframe-immediately?navigated': {
                 res.end('Successfully navigated');
-            } else {
+                break;
+              }
+              default: {
                 res.end('');
               }
+            }
           });
           url = (await listen(server)).url;
         });
@@ -882,19 +894,29 @@ describe('BrowserWindow module', () => {
         ];
         before(async () => {
           server = http.createServer((req, res) => {
-            if (req.url === '/navigate') {
+            switch (req.url) {
+              case '/navigate': {
                 res.end('<a href="/">navigate</a>');
-            } else if (req.url === '/redirect') {
+                break;
+              }
+              case '/redirect': {
                 res.end('<a href="/redirect2">redirect</a>');
-            } else if (req.url === '/redirect2') {
+                break;
+              }
+              case '/redirect2': {
                 res.statusCode = 302;
                 res.setHeader('location', url);
                 res.end();
-            } else if (req.url === '/in-page') {
+                break;
+              }
+              case '/in-page': {
                 res.end('<a href="#in-page">redirect</a><div id="in-page"></div>');
-            } else {
+                break;
+              }
+              default: {
                 res.end('');
               }
+            }
           });
           url = (await listen(server)).url;
         });

spec/api-crash-reporter-spec.ts

@@ -501,25 +501,29 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.env.DISABLE_CRASH_REPORTER_
     });
 
     function crash (processType: string, remotely: Function) {
-      if (processType === 'main') {
+      switch (processType) {
+        case 'main': {
           return remotely(() => {
             setTimeout().then(() => { process.crash(); });
           });
-      } else if (processType === 'renderer') {
+        }
+        case 'renderer': {
           return remotely(() => {
             const { BrowserWindow } = require('electron');
             const bw = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
             bw.loadURL('about:blank');
             bw.webContents.executeJavaScript('process.crash()');
           });
-      } else if (processType === 'sandboxed-renderer') {
+        }
+        case 'sandboxed-renderer': {
           const preloadPath = path.join(__dirname, 'fixtures', 'apps', 'crash', 'sandbox-preload.js');
           return remotely((preload: string) => {
             const { BrowserWindow } = require('electron');
             const bw = new BrowserWindow({ show: false, webPreferences: { sandbox: true, preload, contextIsolation: false } });
             bw.loadURL('about:blank');
           }, preloadPath);
-      } else if (processType === 'node') {
+        }
+        case 'node': {
           const crashScriptPath = path.join(__dirname, 'fixtures', 'apps', 'crash', 'node-crash.js');
           return remotely((crashScriptPath: string) => {
             const { app } = require('electron');
@@ -530,6 +534,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.env.DISABLE_CRASH_REPORTER_
           }, crashScriptPath);
         }
       }
+    }
 
     const processList = process.platform === 'linux' ? ['main', 'renderer', 'sandboxed-renderer']
       : ['main', 'renderer', 'sandboxed-renderer', 'node'];

spec/api-web-contents-spec.ts

@@ -1415,19 +1415,29 @@ describe('webContents module', () => {
     before(async () => {
       server = http.createServer((req, res) => {
         const respond = () => {
-          if (req.url === '/redirect-cross-site') {
+          switch (req.url) {
+            case '/redirect-cross-site': {
               res.setHeader('Location', `${crossSiteUrl}/redirected`);
               res.statusCode = 302;
               res.end();
-          } else if (req.url === '/redirected') {
+              break;
+            }
+            case '/redirected': {
               res.end('<html><script>window.localStorage</script></html>');
-          } else if (req.url === '/first-window-open') {
+              break;
+            }
+            case '/first-window-open': {
               res.end(`<html><script>window.open('${serverUrl}/second-window-open', 'first child');</script></html>`);
-          } else if (req.url === '/second-window-open') {
+              break;
+            }
+            case '/second-window-open': {
               res.end('<html><script>window.open(\'wrong://url\', \'second child\');</script></html>');
-          } else {
+              break;
+            }
+            default: {
               res.end();
             }
+          }
         };
         setTimeout().then(respond);
       });

spec/chromium-spec.ts

@@ -628,15 +628,22 @@ describe('chromium features', () => {
         }
       });
       w.webContents.on('ipc-message', (event, channel, message) => {
-        if (channel === 'reload') {
+        switch (channel) {
+          case 'reload': {
             w.webContents.reload();
-        } else if (channel === 'error') {
+            break;
+          }
+          case 'error': {
             done(message);
-        } else if (channel === 'response') {
+            break;
+          }
+          case 'response': {
             expect(message).to.equal('Hello from serviceWorker!');
             session.fromPartition('sw-file-scheme-spec').clearStorageData({
               storages: ['serviceworkers']
             }).then(() => done());
+            break;
+          }
         }
       });
       w.webContents.on('render-process-gone', () => done(new Error('WebContents crashed.')));
@@ -666,11 +673,16 @@ describe('chromium features', () => {
         }
       });
       w.webContents.on('ipc-message', (event, channel, message) => {
-        if (channel === 'reload') {
+        switch (channel) {
+          case 'reload': {
             w.webContents.reload();
-        } else if (channel === 'error') {
+            break;
+          }
+          case 'error': {
             done(`unexpected error : ${message}`);
-        } else if (channel === 'response') {
+            break;
+          }
+          case 'response': {
             expect(message).to.equal('Hello from serviceWorker!');
             customSession.clearStorageData({
               storages: ['serviceworkers']
@@ -678,6 +690,8 @@ describe('chromium features', () => {
               customSession.protocol.uninterceptProtocol('file');
               done();
             });
+            break;
+          }
         }
       });
       w.webContents.on('render-process-gone', () => done(new Error('WebContents crashed.')));
@@ -702,11 +716,16 @@ describe('chromium features', () => {
         }
       });
       w.webContents.on('ipc-message', (event, channel, message) => {
-        if (channel === 'reload') {
+        switch (channel) {
+          case 'reload': {
             w.webContents.reload();
-        } else if (channel === 'error') {
+            break;
+          }
+          case 'error': {
             done(`unexpected error : ${message}`);
-        } else if (channel === 'response') {
+            break;
+          }
+          case 'response': {
             expect(message).to.equal('Hello from serviceWorker!');
             customSession.clearStorageData({
               storages: ['serviceworkers']
@@ -714,6 +733,8 @@ describe('chromium features', () => {
               customSession.protocol.uninterceptProtocol(serviceWorkerScheme);
               done();
             });
+            break;
+          }
         }
       });
       w.webContents.on('render-process-gone', () => done(new Error('WebContents crashed.')));
@@ -2431,12 +2452,19 @@ describe('font fallback', () => {
     const fonts = await getRenderedFonts(html);
     expect(fonts).to.be.an('array');
     expect(fonts).to.have.length(1);
-    if (process.platform === 'win32') {
+    switch (process.platform) {
+      case 'win32': {
         expect(fonts[0].familyName).to.equal('Arial');
-    } else if (process.platform === 'darwin') {
+        break;
+      }
+      case 'darwin': {
         expect(fonts[0].familyName).to.equal('Helvetica');
-    } else if (process.platform === 'linux') {
+        break;
+      }
+      case 'linux': {
         expect(fonts[0].familyName).to.equal('DejaVu Sans');
+        break;
+      }
     } // I think this depends on the distro? We don't specify a default.
   });
 
@@ -2909,16 +2937,23 @@ ifdescribe((process.platform !== 'linux' || app.isUnityRunning()))('navigator.se
 
     it('setAppBadge can be called in a ServiceWorker', (done) => {
       w.webContents.on('ipc-message', (event, channel, message) => {
-        if (channel === 'reload') {
+        switch (channel) {
+          case 'reload': {
             w.webContents.reload();
-        } else if (channel === 'error') {
+            break;
+          }
+          case 'error': {
             done(message);
-        } else if (channel === 'response') {
+            break;
+          }
+          case 'response': {
             expect(message).to.equal('SUCCESS setting app badge');
             expect(waitForBadgeCount(expectedBadgeCount)).to.eventually.equal(expectedBadgeCount);
             session.fromPartition('sw-file-scheme-spec').clearStorageData({
               storages: ['serviceworkers']
             }).then(() => done());
+            break;
+          }
         }
       });
       w.webContents.on('render-process-gone', () => done(new Error('WebContents crashed.')));
@@ -2927,19 +2962,28 @@ ifdescribe((process.platform !== 'linux' || app.isUnityRunning()))('navigator.se
 
     it('clearAppBadge can be called in a ServiceWorker', (done) => {
       w.webContents.on('ipc-message', (event, channel, message) => {
-        if (channel === 'reload') {
+        switch (channel) {
+          case 'reload': {
             w.webContents.reload();
-        } else if (channel === 'setAppBadge') {
+            break;
+          }
+          case 'setAppBadge': {
             expect(message).to.equal('SUCCESS setting app badge');
             expect(waitForBadgeCount(expectedBadgeCount)).to.eventually.equal(expectedBadgeCount);
-        } else if (channel === 'error') {
+            break;
+          }
+          case 'error': {
             done(message);
-        } else if (channel === 'response') {
+            break;
+          }
+          case 'response': {
             expect(message).to.equal('SUCCESS clearing app badge');
             expect(waitForBadgeCount(expectedBadgeCount)).to.eventually.equal(expectedBadgeCount);
             session.fromPartition('sw-file-scheme-spec').clearStorageData({
               storages: ['serviceworkers']
             }).then(() => done());
+            break;
+          }
         }
       });
       w.webContents.on('render-process-gone', () => done(new Error('WebContents crashed.')));

spec/fixtures/apps/crash/main.js

@@ -25,9 +25,12 @@ crashReporter.start({
 app.whenReady().then(() => {
   const crashType = app.commandLine.getSwitchValue('crash-type');
 
-  if (crashType === 'main') {
+  switch (crashType) {
+    case 'main': {
       process.crash();
-  } else if (crashType === 'renderer') {
+      break;
+    }
+    case 'renderer': {
       const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
       w.loadURL('about:blank');
       if (setExtraParameters) {
@@ -39,7 +42,9 @@ app.whenReady().then(() => {
       }
       w.webContents.executeJavaScript('process.crash()');
       w.webContents.on('render-process-gone', () => process.exit(0));
-  } else if (crashType === 'sandboxed-renderer') {
+      break;
+    }
+    case 'sandboxed-renderer': {
       const w = new BrowserWindow({
         show: false,
         webPreferences: {
@@ -50,15 +55,21 @@ app.whenReady().then(() => {
       });
       w.loadURL(`about:blank?set_extra=${setExtraParameters ? 1 : 0}`);
       w.webContents.on('render-process-gone', () => process.exit(0));
-  } else if (crashType === 'node') {
+      break;
+    }
+    case 'node': {
       const crashPath = path.join(__dirname, 'node-crash.js');
       const child = childProcess.fork(crashPath, { silent: true });
       child.on('exit', () => process.exit(0));
-  } else if (crashType === 'node-fork') {
+      break;
+    }
+    case 'node-fork': {
       const scriptPath = path.join(__dirname, 'fork.js');
       const child = childProcess.fork(scriptPath, { silent: true });
       child.on('exit', () => process.exit(0));
-  } else if (crashType === 'node-extra-args') {
+      break;
+    }
+    case 'node-extra-args': {
       let exitcode = -1;
       const crashPath = path.join(__dirname, 'node-extra-args.js');
       const child = childProcess.fork(crashPath, ['--enable-logging'], { silent: true });
@@ -67,10 +78,13 @@ app.whenReady().then(() => {
         if (JSON.stringify(forkedArgs) !== JSON.stringify(child.spawnargs)) { exitcode = 1; } else { exitcode = 0; }
         process.exit(exitcode);
       });
-  } else {
+      break;
+    }
+    default: {
       console.error(`Unrecognized crash type: '${crashType}'`);
       process.exit(1);
     }
+  }
 });
 
 setTimeout(() => app.exit(), 30000);