Fix ESLint issues, make code consistent, remove unused code and dependencies.

Author: XhmikosR

app.js

@@ -1,16 +1,13 @@
 const express = require('express');
-const app = express();
-const lookup = require('country-code-lookup');
 const morgan = require('morgan');
-const stripAnsi = require('strip-ansi');
-
-const port = process.env.PORT || 3001;
 
 const { getCountryTable, getJSONData, getJSONDataForCountry } = require('./lib/byCountry');
 const { getCompleteTable } = require('./lib/corona');
 const { lookupCountry } = require('./lib/helpers');
 const { getLiveUpdates } = require('./lib/reddit.js');
 
+const app = express();
+const port = process.env.PORT || 3001;
 
 function errorHandler(error, res) {
   console.error(error);
@@ -26,13 +23,11 @@ app.use((req, res, next) => {
   next();
 });
 
-
-
 app.get('/', (req, res) => {
-  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gim) !== null;
   const format = req.query.format ? req.query.format : '';
-  const minimal = req.query.minimal === 'true' ? true : false;
-  const emojis = req.query.emojis === 'true' ? true : false;
+  const minimal = req.query.minimal === 'true';
+  const emojis = req.query.emojis === 'true';
   const top = req.query.top ? Number(req.query.top) : 1000;
 
   if (format.toLowerCase() === 'json') {
@@ -49,24 +44,25 @@ app.get('/', (req, res) => {
 
 app.get('/updates', (req, res) => {
   const format = req.query.format ? req.query.format : '';
-  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gim) !== null;
   if (format.toLowerCase() === 'json') {
     return getLiveUpdates({ json: true, isCurl }).then(result => {
       return res.json(result);
     }).catch(error => errorHandler(error, res));
   }
+
   return getLiveUpdates({ json: false, isCurl }).then(result => {
     return res.send(result);
   }).catch(error => errorHandler(error, res));
 });
 
 app.get('/:country', (req, res) => {
   const { country } = req.params;
-  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gim) !== null;
   const format = req.query.format ? req.query.format : '';
-  const minimal = req.query.minimal === 'true' ? true : false;
-  const emojis = req.query.emojis === 'true' ? true : false;
-  if (!country || 'ALL' === country.toUpperCase()) {
+  const minimal = req.query.minimal === 'true';
+  const emojis = req.query.emojis === 'true';
+  if (!country || country.toUpperCase() === 'ALL') {
     if (format.toLowerCase() === 'json') {
       return getJSONData().then(result => {
         return res.json(result);
@@ -79,13 +75,13 @@ app.get('/:country', (req, res) => {
       }).catch(error => errorHandler(error, res));
   }
 
-  let lookupObj = lookupCountry(country);
+  const lookupObj = lookupCountry(country);
 
   if (!lookupObj) {
     return res.send(`
     Country not found.
-    Try full country name or country code.
-    Ex:
+    Try the full country name or country code.
+    Example:
       - /UK: for United Kingdom
       - /US: for United States of America.
       - /Italy: for Italy.
@@ -106,5 +102,4 @@ app.get('/:country', (req, res) => {
     }).catch(error => errorHandler(error, res));
 });
 
-
-app.listen(port, () => console.log(`Running on ${port}`));
+app.listen(port, () => console.log(`Running on ${port}`));

bin/index.js

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
-const yargonaut = require('yargonaut').style('green');
+
 const yargs = require('yargs');
 const chalk = require('chalk');
 const { getCompleteTable } = require('../lib/corona');
 const { getCountryTable } = require('../lib/byCountry');
 const { lookupCountry } = require('../lib/helpers');
 
 const { argv } = yargs
-  .command('$0 [country]','Tool to track COVID-19 statistics from terminal', yargs =>
+  .command('$0 [country]', 'Tool to track COVID-19 statistics from terminal', yargs =>
     yargs.positional('country', {
       coerce(arg) {
-        if ('ALL' === arg.toUpperCase()) {
+        if (arg.toUpperCase() === 'ALL') {
           return 'ALL';
         }
+
         const country = lookupCountry(arg);
         if (!country) {
           let error = `Country '${arg}' not found.\n`;
@@ -23,6 +24,7 @@ const { argv } = yargs
           error += '- Italy: for Italy.\n';
           throw new Error(chalk.red.bold(error));
         }
+
         return country.iso2;
       },
       describe: 'Filter table by country',
@@ -57,12 +59,11 @@ const { argv } = yargs
   .strict()
   .help('help');
 
-
 const { emojis, country, minimal, top } = argv;
 (
   country === 'ALL'
     ? getCompleteTable({ emojis, minimal, top })
     : getCountryTable({ countryCode: country, emojis, minimal })
 )
   .then(console.log)
-  .catch(console.error);
+  .catch(console.error);

lib/api.js

@@ -1,17 +1,23 @@
 const NodeCache = require('node-cache');
 const axios = require('axios');
-const myCache = new NodeCache( { stdTTL: 100, checkperiod: 600 } );
+
+const myCache = new NodeCache({ stdTTL: 100, checkperiod: 600 });
 const CORONA_ALL_KEY = 'coronaAll';
 
 exports.getCoronaData = async () => {
   const coronaCache = myCache.get(CORONA_ALL_KEY);
+
   if (coronaCache) {
     return coronaCache;
   }
+
   const result = await axios('https://coronavirus-tracker-api.herokuapp.com/all');
+
   if (!result || !result.data) {
-    throw new Error(`Source API faliure.`);
+    throw new Error('Source API failure.');
   }
+
   myCache.set(CORONA_ALL_KEY, result.data, 60 * 15);
+
   return result.data;
-}
+};

lib/byCountry.js

@@ -1,12 +1,9 @@
 const Table = require('cli-table3');
-const axios = require('axios');
 const _ = require('lodash');
-const chalk = require('chalk');
 const helpers = require('./helpers');
 const api = require('./api');
 const stripAnsi = require('strip-ansi');
 const {
-  getCountry,
   getConfirmed,
   getActive,
   getDeaths,
@@ -19,7 +16,6 @@ const {
   calRecoveredPer,
   getOneDayChange,
   getOneWeekChange,
-  getRateOfGrowth,
   getTotalStats,
   footer,
 } = require('./helpers');
@@ -52,35 +48,35 @@ function getDataByState(confirmed, deaths, recovered) {
   const countryArr = extraStats(
     Object.keys(countryMap).map(key => countryMap[key])
   );
-  return _.sortBy(countryArr, (o) => -o.confirmed)
+  return _.sortBy(countryArr, (o) => -o.confirmed);
 }
 
 function extraStats(dataArr) {
-  return dataArr.map(obj => Object.assign({}, obj,
-    {
-      active: calActive(obj),
-      mortalityPer: calMortalityPer(obj),
-      recoveredPer: calRecoveredPer(obj),
-    })
+  return dataArr.map(obj => ({
+    ...obj,
+    active: calActive(obj),
+    mortalityPer: calMortalityPer(obj),
+    recoveredPer: calRecoveredPer(obj),
+  })
   );
 }
 
 exports.getJSONData = async () => {
   const data = await api.getCoronaData();
-  const { latest, confirmed, deaths, recovered } = data;
+  const { confirmed, deaths, recovered } = data;
   const countryData = getDataByState(confirmed, deaths, recovered);
   const totalStats = getTotalStats(countryData);
   totalStats.country = 'World';
   return countryData.concat(totalStats);
-}
+};
 
 exports.getJSONDataForCountry = async (countryCode) => {
   const data = await api.getCoronaData();
-  const { latest, confirmed, deaths, recovered } = data;
-  const countryData = getDataByState(confirmed, deaths, recovered, countryCode)
+  const { confirmed, deaths, recovered } = data;
+  const countryData = getDataByState(confirmed, deaths, recovered)
     .filter(obj => obj.countryCode === countryCode);
   return countryData;
-}
+};
 
 exports.getCountryTable = async ({
   countryCode,
@@ -94,11 +90,11 @@ exports.getCountryTable = async ({
     style: helpers.getTableStyles(minimal),
   });
   const data = await api.getCoronaData();
-  const { latest, confirmed, deaths, recovered } = data;
+  const { confirmed, deaths, recovered } = data;
   const countryData = getDataByState(confirmed, deaths, recovered)
     .filter(obj => obj.countryCode === countryCode);
 
-  if(countryData.length === 0) {
+  if (countryData.length === 0) {
     throw new Error(`Country code ${countryCode} does not match anything in the database.`);
   }
 
@@ -114,10 +110,9 @@ exports.getCountryTable = async ({
       getRecoveredPer(totalStats.recoveredPer),
       getOneDayChange(totalStats),
       getOneWeekChange(totalStats),
-      // '',
-      // getEmoji(countryData[0].countryCode),
     ]
-  })
+  });
+
   if (countryData.length > 1) {
     let rank = 1;
     countryData.forEach(cd => {
@@ -132,13 +127,13 @@ exports.getCountryTable = async ({
         getRecoveredPer(cd.recoveredPer),
         getOneDayChange(cd),
         getOneWeekChange(cd),
-        // getRateOfGrowth(cd),
-        ... (emojis ? [countryEmoji] : [])
-      ]
-      table.push({ [rank++]: values })
+        ...(emojis ? [countryEmoji] : [])
+      ];
+      table.push({ [rank++]: values });
     });
   }
-  const lastUpdated = countryData[0].lastUpdated;
+
+  const { lastUpdated } = countryData[0];
   if (!isCurl) {
     const template = `<!DOCTYPE html>
     <html lang="en">
@@ -164,5 +159,6 @@ exports.getCountryTable = async ({
     </html>`;
     return stripAnsi(template);
   }
+
   return table.toString() + footer(lastUpdated);
-}
+};