NEW: Add omit column feature

index.js

@@ -38,23 +38,23 @@ const options = { sortBy, limit, reverse, minimal };
 	init(minimal);
 	const [input] = cli.input;
 	input === 'help' && (await cli.showHelp(0));
-	const states = input === 'states' ? true : false;
+	const states = input === 'states';
 	const country = input;
 
 	// Table
 	const head = xcolor ? single : colored;
 	const headStates = xcolor ? singleStates : coloredStates;
+
 	const border = minimal ? borderless : {};
-	const table = !states
-		? new Table({ head, style, chars: border })
-		: new Table({ head: headStates, style, chars: border });
+	const tableHead = states ? headStates : head;
+	const table = new Table({ head: tableHead, style, chars: border });
 
 	// Display data.
 	spinner.start();
 	const lastUpdated = await getWorldwide(table, states);
-	await getCountry(spinner, table, states, country);
-	await getStates(spinner, table, states, options);
-	await getCountries(spinner, table, states, country, options);
+	await getCountry({ spinner, table, states, country, tableHead });
+	await getStates({ spinner, table, states, options, tableHead });
+	await getCountries({ spinner, table, states, country, options, tableHead });
 
 	theEnd(lastUpdated, states, minimal);
 })();

utils/cli.js

@@ -25,6 +25,8 @@ module.exports = meow(
 	  ${green(`corona`)} ${yellow(`-x`)}
 	  ${green(`corona`)} ${yellow(`--sort`)} ${cyan(`cases-today`)}
 	  ${green(`corona`)} ${yellow(`-s`)} ${cyan(`critical`)}
+	  ${green(`corona`)} ${yellow(`--omit`)} ${cyan(`deaths-today_cases_critical`)}
+	  ${green(`corona`)} ${yellow(`--o`)} ${cyan(`country`)}
 
 	❯ You can also run command + option at once:
 	  ${green(`corona`)} ${cyan(`china`)} ${yellow(`-x`)} ${yellow(`-s cases`)}
@@ -58,6 +60,11 @@ module.exports = meow(
 				type: 'boolean',
 				defualt: false,
 				alias: 'm'
+			},
+			omit: {
+				type: 'string',
+				default: '',
+				alias: 'o'
 			}
 		}
 	}

utils/columnsMapper.js

@@ -0,0 +1,44 @@
+module.exports = {
+	single: {
+		'#': 0,
+		country: 1,
+		cases: 2,
+		'cases-today': 3,
+		deaths: 4,
+		'deaths-today': 5,
+		recovered: 6,
+		active: 7,
+		critical: 8,
+		'per-milion': 9
+	},
+	colored: {
+		'#': 0,
+		country: 1,
+		cases: 2,
+		'cases-today': 3,
+		deaths: 4,
+		'deaths-today': 5,
+		recovered: 6,
+		active: 7,
+		critical: 8,
+		'per-milion': 9
+	},
+	singleStates: {
+		'#': 0,
+		state: 1,
+		cases: 2,
+		'cases-today': 3,
+		deaths: 4,
+		'deaths-today': 5,
+		active: 6
+	},
+	coloredStates: {
+		'#': 0,
+		state: 1,
+		cases: 2,
+		'cases-today': 3,
+		deaths: 4,
+		'deaths-today': 5,
+		active: 6
+	}
+};

utils/deleteColumns.js

@@ -0,0 +1,35 @@
+const mapper = require('./columnsMapper');
+const cli = require('./cli');
+
+// returns indices of table rows which user wants to omit form output in descending order
+const parseCli = (states, separator = '_') => {
+	const input = cli.flags.omit;
+	if (!input || typeof input !== 'string') return [];
+	return input
+		.split(separator)
+		.reduce((accumulator, current) => {
+			if (states) {
+				return mapper.singleStates[current]
+					? [...accumulator, mapper.singleStates[current]]
+					: accumulator;
+			}
+			return mapper.single[current]
+				? [...accumulator, mapper.single[current]]
+				: accumulator;
+		}, [])
+		.sort((a, b) => (a > b ? -1 : 1));
+};
+
+const deleteColumns = (table, tableHead, input) => {
+	input.forEach((key) => {
+		tableHead.splice(key, 1);
+		table.forEach((row) => {
+			row.splice(key, 1);
+		});
+	});
+};
+
+module.exports = {
+	parseCli,
+	deleteColumns
+};

utils/getCountries.js

@@ -7,14 +7,16 @@ const { sortingKeys } = require('./table.js');
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
 const orderBy = require('lodash.orderby');
+const { parseCli, deleteColumns } = require('./deleteColumns');
 
-module.exports = async (
+module.exports = async ({
 	spinner,
 	table,
 	states,
 	countryName,
-	{ sortBy, limit, reverse }
-) => {
+	options: { sortBy, limit, reverse },
+	tableHead
+}) => {
 	if (!countryName && !states) {
 		const [err, response] = await to(
 			axios.get(`https://corona.lmao.ninja/countries`)
@@ -49,6 +51,9 @@ module.exports = async (
 			]);
 		});
 
+		const input = parseCli(states);
+		deleteColumns(table, tableHead, input);
+
 		spinner.stopAndPersist();
 		const isRev = reverse ? `${dim(` & `)}${cyan(`Order`)}: reversed` : ``;
 		spinner.info(`${cyan(`Sorted by:`)} ${sortBy}${isRev}`);

utils/getCountry.js

@@ -5,8 +5,9 @@ const comma = require('comma-number');
 const red = chalk.red;
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
+const { deleteColumns } = require('./deleteColumns');
 
-module.exports = async (spinner, table, states, countryName) => {
+module.exports = async ({ spinner, table, states, countryName, tableHead }) => {
 	if (countryName && !states) {
 		const [err, response] = await to(
 			axios.get(`https://corona.lmao.ninja/countries/${countryName}`)
@@ -36,6 +37,9 @@ module.exports = async (spinner, table, states, countryName) => {
 			comma(thisCountry.critical),
 			comma(thisCountry.casesPerOneMillion)
 		]);
+		const input = parseCli(states);
+		deleteColumns(table, tableHead, input);
+
 		spinner.stopAndPersist();
 		console.log(table.toString());
 	}

utils/getStates.js

@@ -7,8 +7,15 @@ const { sortingStateKeys } = require('./table.js');
 const to = require('await-to-js').default;
 const handleError = require('cli-handle-error');
 const orderBy = require('lodash.orderby');
+const { deleteColumns, parseCli } = require('./deleteColumns');
 
-module.exports = async (spinner, table, states, { sortBy, limit, reverse }) => {
+module.exports = async ({
+	spinner,
+	table,
+	states,
+	options: { sortBy, limit, reverse },
+	tableHead
+}) => {
 	if (states) {
 		const [err, response] = await to(
 			axios.get(`https://corona.lmao.ninja/states`)
@@ -36,6 +43,9 @@ module.exports = async (spinner, table, states, { sortBy, limit, reverse }) => {
 			]);
 		});
 
+		const input = parseCli(states);
+		deleteColumns(table, tableHead, input);
+
 		spinner.stopAndPersist();
 		const isRev = reverse ? `${dim(` & `)}${cyan(`Order`)}: reversed` : ``;
 		spinner.info(`${cyan(`Sorted by:`)} ${sortBy}${isRev}`);