Merge pull request #19 from xandris/yargs

add basic CLI support, --emojis flag, [country] positional argument

Author: sagarkarira

app.js

@@ -7,7 +7,7 @@ const port = process.env.PORT || 3001;
 
 const { getCountryTable, getJSONData, getJSONDataForCountry } = require('./lib/byCountry');
 const { getCompleteTable } = require('./lib/corona');
-const { countryUpperCase } = require('./lib/helpers');
+const { countryUpperCase, lookupCountry } = require('./lib/helpers');
 
 
 function errorHandler(error, res) {
@@ -34,11 +34,10 @@ app.get('/', (req, res) => {
 });
 
 app.get('/:country', (req, res) => {
-  const { country } = countryUpperCase(req.params);
-  let lookupObj = null;
+  const { country } = req.params;
   const format = req.query.format ? req.query.format : '';
 
-  if (!country || country === 'All') {
+  if (!country || 'ALL' === country.toUpperCase()) {
     if (format.toLowerCase() === 'json') {
       return getJSONData().then(result => {
         res.setHeader('Cache-Control', 's-maxage=900');
@@ -53,13 +52,8 @@ app.get('/:country', (req, res) => {
     }).catch(error => errorHandler(error, res));
   }
 
-  try {
-    lookupObj = lookup.byIso(country)
-      || lookup.byFips(country)
-      || lookup.byCountry(country);
-  } catch (error) {
-    lookupObj = lookup.byFips(country) || lookup.byCountry(country);
-  }
+  let lookupObj = lookupCountry(country);
+
   if (!lookupObj) {
     return res.send(`
     Country not found.
@@ -70,6 +64,7 @@ app.get('/:country', (req, res) => {
       - /India: for India.
     `);
   }
+
   const { iso2 } = lookupObj;
 
   if (format.toLowerCase() === 'json') {

bin/index.js

@@ -1,7 +1,57 @@
 #!/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 COVID-19 statistics for the world or the given country', yargs =>
+    yargs.positional('country', {
+      coerce(arg) {
+        if ('ALL' === arg.toUpperCase()) {
+          return 'ALL';
+        }
+        const country = lookupCountry(arg);
+        if (!country) {
+          let error = `Country '${arg}' not found.\n`;
+          error += 'Try full country name or country code.\n';
+          error += 'Ex:\n';
+          error += '- UK: for United Kingdom \n';
+          error += '- US: for United States of America.\n';
+          error += '- Italy: for Italy.\n';
+          throw new Error(chalk.red.bold(error));
+        }
+        return country.iso2;
+      },
+      describe: 'Filter table by country',
+      default: 'all',
+      type: 'string'
+    })
+  )
+  .options({
+    e: {
+      alias: 'emojis',
+      describe: 'Show emojis in table',
+      default: false,
+      type: 'boolean'
+    },
+    c: {
+      alias: 'color',
+      describe: 'Show colors formatted output',
+      type: 'boolean'
+    }
+  })
+  .strict()
+  .help('help');
 
-getCompleteTable()
+const { emojis, country } = argv;
+(
+  country === 'ALL'
+    ? getCompleteTable(emojis)
+    : getCountryTable(country, emojis)
+)
   .then(console.log)
   .catch(console.error);

lib/byCountry.js

@@ -79,20 +79,20 @@ exports.getJSONDataForCountry = async (countryCode) => {
   return countryData;
 }
 
-exports.getCountryTable = async (countryCode) => {
+exports.getCountryTable = async (countryCode, emojis = false) => {
   const head = [
     '',
     'State',
     'Confirmed',
-    'Recovered',
-    'Deaths',
-    'Active',
+    `Recovered${emojis ? ' 😀' : ''}`,
+    `Deaths${emojis ? ' 😞' : ''}`,
+    `Active${emojis ? ' 😷' : ''}`,
     'Mortality %',
     'Recovered %',
     '1 Day ▲',
     '1 Week ▲',
     // 'RoG',
-    // '🏳',
+    ...( emojis ?  ['🏳'] : [] ),
   ];
   const table = new Table({
     head,
@@ -105,6 +105,11 @@ exports.getCountryTable = async (countryCode) => {
   const { latest, confirmed, deaths, recovered } = data;
   const countryData = getDataByState(confirmed, deaths, recovered)
     .filter(obj => obj.countryCode === countryCode);
+
+  if(countryData.length === 0) {
+    throw new Error(`Country code ${countryCode} does not match anything in the database.`);
+  }
+
   const totalStats = getTotalStats(countryData);
   table.push({
     [countryData[0].country]: [
@@ -136,7 +141,7 @@ exports.getCountryTable = async (countryCode) => {
         getOneDayChange(cd),
         getOneWeekChange(cd),
         // getRateOfGrowth(cd),
-        // getEmoji(cd.countryCode),
+        ... (emojis ? [countryEmoji] : [])
       ]
       table.push({ [rank++]: values })
     });

lib/corona.js

@@ -79,20 +79,20 @@ function extraStats(dataArr) {
   );
 }
 
-exports.getCompleteTable = async () => {
+exports.getCompleteTable = async (emojis = false) => {
   const head = [
     '',
     'Country',
-    'Confirmed',
-    'Recovered',
-    'Deaths',
-    'Active',
+    `Confirmed ${emojis ? ' ✅': ''}`,
+    `Recovered${emojis ? ' 😀' : ''}`,
+    `Deaths${emojis ? ' 😞' : ''}`,
+    `Active${emojis ? ' 😷' : ''}`,
     'Mortality %',
     'Recovered %',
     '1 Day ▲',
     '1 Week ▲',
     // 'RoG',
-    // '🏳',
+    ...( emojis ?  ['🏳'] : [] ),
   ];
   const table = new Table({
     head,
@@ -117,7 +117,7 @@ exports.getCompleteTable = async () => {
       getOneDayChange(worldStats),
       getOneWeekChange(worldStats),
       // '',
-      // '🌎'
+      ...( emojis ? ['🌎'] : [] )
     ]
   })
   let rank = 1;
@@ -134,7 +134,7 @@ exports.getCompleteTable = async () => {
       getOneDayChange(cd),
       getOneWeekChange(cd),
       // getRateOfGrowth(cd),
-      // getEmoji(cd.countryCode),
+      ...(emojis ? [countryEmoji] : [])
     ]
     table.push({ [rank++]: values })
   });

lib/helpers.js

@@ -3,6 +3,7 @@ const h = require('humanize-number');
 const emojiFlags = require('emoji-flags');
 const _ = require('lodash');
 const moment = require('moment');
+const lookup = require('country-code-lookup');
 const e = exports;
 
 e.getCountry = (country) => {
@@ -145,12 +146,22 @@ e.getTotalStats = (countryData) => {
   return worldStats;
 };
 
-e.countryUpperCase = (countryParams) => {
-  if(countryParams.country.length > 2 ){
-    const country =  countryParams.country.toLowerCase().split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
-    return { country };
+e.countryUpperCase = country => {
+  if(country.length > 2){
+    return country.toLowerCase().split(/\s+/).map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+  }
+  return country;
+};
+
+e.lookupCountry = country => {
+  country = e.countryUpperCase(country);
+  try {
+    return lookup.byIso(country)
+        || lookup.byFips(country)
+        || lookup.byCountry(country);
+  } catch (error) {
+    return lookup.byFips(country) || lookup.byCountry(country);
   }
-  return countryParams;
 };
 
 e.footer = (lastUpdated) => `

now.json

@@ -3,7 +3,7 @@
   "builds": [
       {
           "src": "*.js",
-          "use": "@now/node-server"
+          "use": "@now/node"
       }
   ],
   "routes": [