🐛 FIX: Sort + API Outcome

Author: ahmadawais

utils/getAll.js

@@ -6,18 +6,21 @@ const { sortKeys, sortOrders } = require("./table.js");
 module.exports = async (spinner, table, states, country, options) => {
 	if (!country && !states) {
 		const api = await axios.get(`https://corona.lmao.ninja/countries`);
-		let all = api.data.map(one => Object.values(one));
+		let allCountries = api.data.map(country => Object.values(country));
 
 		const sortIndex = sortKeys.indexOf(options.sort);
 
 		if (sortIndex != -1) {
 			const dir = sortOrders[sortIndex];
-			all = all.sort((a, b) => (a[sortIndex] > b[sortIndex] ? dir : -dir));
+			allCountries = allCountries.sort((a, b) =>
+				a[sortIndex] > b[sortIndex] ? dir : -dir
+			);
 		}
 
-		all.map(one => {
-			one = one.map(d => comma(d));
-			return table.push(one);
+		allCountries.map((oneCountry, count) => {
+			oneCountry = [oneCountry[0], ...oneCountry.slice(2, oneCountry.length)];
+			oneCountry = oneCountry.map(stat => comma(stat));
+			return table.push([count + 1, ...oneCountry]);
 		});
 		spinner.stopAndPersist();
 		spinner.info(`${chalk.cyan(`Sorted by:`)} ${options.sort}`);

utils/getCountry.js

@@ -19,9 +19,13 @@ module.exports = async (spinner, table, states, country) => {
 			);
 			process.exit(0);
 		}
-		let data = Object.values(api.data);
-		data = data.map(d => comma(d));
-		table.push(data);
+		let dataPerCountry = Object.values(api.data);
+		dataPerCountry = [
+			dataPerCountry[0],
+			...dataPerCountry.slice(2, dataPerCountry.length)
+		];
+		dataPerCountry = dataPerCountry.map(stat => comma(stat));
+		table.push([`—`, ...dataPerCountry]);
 		spinner.stopAndPersist();
 		console.log(table.toString());
 	}

utils/getStates.js

@@ -6,18 +6,20 @@ const { sortStateKeys, sortStateOrders } = require("./table.js");
 module.exports = async (spinner, table, states, options) => {
 	if (states) {
 		const api = await axios.get(`https://corona.lmao.ninja/states`);
-		let all = api.data.map(one => Object.values(one));
+		let allStates = api.data.map(one => Object.values(one));
 
 		const sortIndex = sortStateKeys.indexOf(options.sort);
 
 		if (sortIndex != -1) {
 			const dir = sortStateOrders[sortIndex];
-			all = all.sort((a, b) => (a[sortIndex] > b[sortIndex] ? dir : -dir));
+			allStates = allStates.sort((a, b) =>
+				a[sortIndex] > b[sortIndex] ? dir : -dir
+			);
 		}
 
-		all.map(one => {
-			one = one.map(d => comma(d));
-			return table.push(one);
+		allStates.map((oneState, count) => {
+			oneState = oneState.map(d => comma(d));
+			return table.push([count + 1, ...oneState]);
 		});
 
 		spinner.stopAndPersist();

utils/getWorldwide.js

@@ -7,6 +7,7 @@ module.exports = async (table, states) => {
 		let data = Object.values(all.data);
 		data = data.map(d => comma(d));
 		table.push([
+			`—`,
 			`Worldwide`,
 			data[0],
 			`—`,

utils/table.js

@@ -5,6 +5,7 @@ const dim = chalk.dim;
 
 module.exports = {
 	single: [
+		`#`,
 		`Country`,
 		`Cases`,
 		`Cases ${dim(`(today)`)}`,
@@ -16,6 +17,7 @@ module.exports = {
 		`Per Million`
 	],
 	colored: [
+		`#`,
 		`Country`,
 		`Cases`,
 		`Cases ${dim(`(today)`)}`,
@@ -28,6 +30,7 @@ module.exports = {
 	],
 	sortKeys: [
 		`country`,
+		`country-info`,
 		`cases`,
 		`cases-today`,
 		`deaths`,
@@ -38,6 +41,7 @@ module.exports = {
 		`per-million`
 	],
 	singleStates: [
+		`#`,
 		`State`,
 		`Cases`,
 		`Cases ${dim(`(today)`)}`,
@@ -47,6 +51,7 @@ module.exports = {
 		`Active`
 	],
 	coloredStates: [
+		`#`,
 		`State`,
 		`Cases`,
 		`Cases ${dim(`(today)`)}`,
@@ -64,7 +69,7 @@ module.exports = {
 		`recovered`,
 		`active`
 	],
-	sortOrders: [1, -1, -1, -1, -1, -1, -1, -1, -1],
+	sortOrders: [1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
 	sortStateOrders: [1, -1, -1, -1, -1, -1, -1],
 	style: { head: ["cyan"] }
 };