📦 NEW: Sort Validation

Author: ahmadawais

utils/getCountries.js

@@ -7,6 +7,7 @@ const { sortingKeys } = require('./table.js');
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
 const orderBy = require('lodash.orderby');
+const sortValidation = require('./sortValidation.js');
 
 module.exports = async (
 	spinner,
@@ -17,6 +18,8 @@ module.exports = async (
 	{ sortBy, limit, reverse }
 ) => {
 	if (!countryName && !states && !bar) {
+		sortValidation(sortBy, spinner);
+
 		const [err, response] = await to(
 			axios.get(`https://corona.lmao.ninja/v2/countries`)
 		);

utils/getCountryChart.js

@@ -75,6 +75,7 @@ module.exports = async (spinner, countryName, { chart, log }) => {
 		spinner.stop();
 		line.setData([casesSeries, deathsSeries, recoveredSeries]);
 		screen.render();
+
 		await new Promise((resolve, _) => {
 			screen.key(['escape', 'q', 'C-c', 'enter', 'space'], (ch, key) => {
 				return process.exit(0);

utils/getStates.js

@@ -7,9 +7,11 @@ const { sortingStateKeys } = require('./table.js');
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
 const orderBy = require('lodash.orderby');
+const sortStateValidation = require('./sortStateValidation.js');
 
 module.exports = async (spinner, table, states, { sortBy, limit, reverse }) => {
 	if (states) {
+		sortStateValidation(sortBy, spinner);
 		const [err, response] = await to(
 			axios.get(`https://corona.lmao.ninja/v2/states`)
 		);

utils/sortStateValidation.js

@@ -0,0 +1,23 @@
+const sym = require('log-symbols');
+const { sortingStateKeys } = require('./table.js');
+const { red, green, dim } = require('chalk');
+
+module.exports = (sortBy, spinner) => {
+	if (sortBy !== 'cases') {
+		if (Object.keys(sortingStateKeys).indexOf(sortBy) === -1) {
+			spinner.stop();
+			console.log(`${sym.error} ${red(`Wrong sorting key!`)}`);
+			console.log(`${sym.info} You can only sort by:
+${dim(`-`)} ${green(`cases`)}
+${dim(`-`)} ${green(`cases-today`)}
+${dim(`-`)} ${green(`deaths`)}
+${dim(`-`)} ${green(`deaths-today`)}
+${dim(`-`)} ${green(`active`)}\n`);
+			process.exit(0);
+		}
+		// It is a custom sort.
+		return true;
+	}
+	// Not a custom sort.
+	return false;
+};

utils/sortValidation.js

@@ -0,0 +1,26 @@
+const sym = require('log-symbols');
+const { sortingKeys } = require('./table.js');
+const { red, green, dim } = require('chalk');
+
+module.exports = (sortBy, spinner) => {
+	if (sortBy !== 'cases') {
+		if (Object.keys(sortingKeys).indexOf(sortBy) === -1) {
+			spinner.stop();
+			console.log(`${sym.error} ${red(`Wrong sorting key!`)}`);
+			console.log(`${sym.info} You can only sort by:
+${dim(`-`)} ${green(`cases`)}
+${dim(`-`)} ${green(`cases-today`)}
+${dim(`-`)} ${green(`deaths`)}
+${dim(`-`)} ${green(`deaths-today`)}
+${dim(`-`)} ${green(`recovered`)}
+${dim(`-`)} ${green(`active`)}
+${dim(`-`)} ${green(`critical`)}
+${dim(`-`)} ${green(`per-million`)}\n`);
+			process.exit(0);
+		}
+		// It is a custom sort.
+		return true;
+	}
+	// Not a custom sort.
+	return false;
+};