Update xo and apply corrections (#141)

Author: mquevill

index.d.ts

@@ -6,13 +6,13 @@ declare namespace electronDl {
 		transferredBytes: number;
 		totalBytes: number;
 	}
-	
+
 	interface File {
-		filename: string,
-		path: string,
-		fileSize: number,
-		mimeType: string,
-		url: string
+		filename: string;
+		path: string;
+		fileSize: number;
+		mimeType: string;
+		url: string;
 	}
 
 	interface Options {
@@ -68,10 +68,10 @@ declare namespace electronDl {
 		Optional callback that receives an object containing information about the progress of the current download item.
 		*/
 		readonly onProgress?: (progress: Progress) => void;
-		
+
 		/**
 		Optional callback that receives an object containing information about the combined progress of all download items done within any registered window.
-		
+
 		Each time a new download is started, the next callback will include it. The progress percentage could therefore become smaller again.
 		This callback provides the same data that is used for the progress bar on the app icon.
 		*/
@@ -81,7 +81,7 @@ declare namespace electronDl {
 		Optional callback that receives the [download item](https://electronjs.org/docs/api/download-item) for which the download has been cancelled.
 		*/
 		readonly onCancel?: (item: DownloadItem) => void;
-		
+
 		/**
 		Optional callback that receives an object with information about an item that has been completed. It is called for each completed item.
 		*/
@@ -112,6 +112,7 @@ declare namespace electronDl {
 	}
 }
 
+// eslint-disable-next-line no-redeclare
 declare const electronDl: {
 	/**
 	Register the helper for all windows.

index.js

@@ -17,7 +17,7 @@ const getFilenameFromMime = (name, mime) => {
 
 const majorElectronVersion = () => {
 	const version = process.versions.electron.split('.');
-	return parseInt(version[0], 10);
+	return Number.parseInt(version[0], 10);
 };
 
 const getWindowFromBrowserView = webContents => {
@@ -75,11 +75,7 @@ function registerListener(session, options, callback = () => {}) {
 			const filename = item.getFilename();
 			const name = path.extname(filename) ? filename : getFilenameFromMime(filename, item.getMimeType());
 
-			if (options.overwrite) {
-				filePath = path.join(directory, name);
-			} else {
-				filePath = unusedFilename.sync(path.join(directory, name));
-			}
+			filePath = options.overwrite ? path.join(directory, name) : unusedFilename.sync(path.join(directory, name));
 		}
 
 		const errorMessage = options.errorMessage || 'The download of {filename} was interrupted';
@@ -147,6 +143,7 @@ function registerListener(session, options, callback = () => {}) {
 				session.removeListener('will-download', listener);
 			}
 
+			// eslint-disable-next-line unicorn/prefer-switch
 			if (state === 'cancelled') {
 				if (typeof options.onCancel === 'function') {
 					options.onCancel(item);

lib/samples.js

@@ -7,11 +7,11 @@ const {v4: uuidv4} = require('uuid');
 
 const fixtureDir = path.join(__dirname, '../mock/fixtures');
 
-const setup = async numFiles => {
+const setup = async numberFiles => {
 	const promises = [];
 	const files = [];
 
-	while (files.length < numFiles) {
+	while (files.length < numberFiles) {
 		const filename = `${uuidv4()}.zip`;
 		promises.push(cpFile(path.join(fixtureDir, 'electron-master.zip'), path.join(fixtureDir, filename)));
 		files.push(filename);

package.json

@@ -41,8 +41,9 @@
 		"pify": "^4.0.1",
 		"spectron": "^9.0.0",
 		"tsd": "^0.17.0",
+		"typescript": "^4.4.3",
 		"uuid": "^8.3.2",
-		"xo": "^0.25.3"
+		"xo": "^0.39.0"
 	},
 	"xo": {
 		"envs": [

run.js

@@ -1,8 +1,8 @@
 'use strict';
 const electron = require('electron');
 const minimist = require('minimist');
-const samples = require('./lib/samples');
-const server = require('./lib/server');
+const samples = require('./lib/samples.js');
+const server = require('./lib/server.js');
 const electronDl = require('.');
 
 electronDl();
@@ -27,8 +27,8 @@ const argv = minimist(process.argv.slice(2));
 		downloadThroughput: 1024 * 1024
 	});
 
-	const numSampleFiles = 'files' in argv ? argv.files : 5;
-	const files = await samples.setup(numSampleFiles);
+	const numberSampleFiles = 'files' in argv ? argv.files : 5;
+	const files = await samples.setup(numberSampleFiles);
 	await win.loadURL(`http://localhost:8080/index.html?files=${JSON.stringify(files)}`);
 })();