Improve integer parsing in commands

src/command-handlers/teamMembers.ts

@@ -1,15 +1,12 @@
 import { getTeamMembers as getTeamMembersRequest } from '../endpoints';
 import { getTeamDeviceCredentials, flattenJsonArrayOfObject, jsonToCsv, epochTimestampToIso } from '../utils';
 
-interface GetTeamMembersParams {
-    page: number;
-    limit: number;
+interface GetTeamMembersOpts {
     csv: boolean;
     humanReadable: boolean;
 }
 
-export const runTeamMembers = async (params: GetTeamMembersParams) => {
-    const { page, limit } = params;
+export const runTeamMembers = async (page: number, limit: number, options: GetTeamMembersOpts) => {
     const teamDeviceCredentials = getTeamDeviceCredentials();
 
     const response = await getTeamMembersRequest({
@@ -18,7 +15,7 @@ export const runTeamMembers = async (params: GetTeamMembersParams) => {
         limit,
     });
 
-    if (params.humanReadable) {
+    if (options.humanReadable) {
         response.members = response.members.map((member) => {
             const memberWithHumanReadableDates = {
                 ...member,
@@ -37,7 +34,7 @@ export const runTeamMembers = async (params: GetTeamMembersParams) => {
         });
     }
 
-    if (params.csv) {
+    if (options.csv) {
         if (response.pages) {
             console.log(`Page ${response.page + 1} of ${response.pages}`);
         }

src/commands/index.ts

@@ -1,4 +1,4 @@
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
 import { devicesCommands } from './devices';
 import { teamCommands } from './team';
 import { configureCommands } from './configure';
@@ -24,10 +24,13 @@ export const rootCommands = (params: { program: Command }) => {
         .command('password')
         .alias('p')
         .description('Retrieve a password from the local vault and copy it to the clipboard')
-        .option(
-            '-o, --output <type>',
-            'How to print the passwords among `clipboard, password, json`. The JSON option outputs all the matching credentials',
-            'clipboard'
+        .addOption(
+            new Option(
+                '-o, --output <type>',
+                'How to print the passwords. The JSON option outputs all the matching credentials'
+            )
+                .choices(['clipboard', 'password', 'json'])
+                .default('clipboard')
         )
         .argument(
             '[filters...]',

src/commands/team/index.ts

@@ -2,7 +2,7 @@ import { Command } from 'commander';
 import { teamCredentialsCommands } from './credentials';
 import { CouldNotFindTeamCredentialsError } from '../../errors';
 import { runTeamLogs, runTeamMembers, runTeamReport } from '../../command-handlers';
-import { getTeamDeviceCredentials } from '../../utils';
+import { customParseInt, getTeamDeviceCredentials } from '../../utils';
 
 export const teamCommands = (params: { program: Command }) => {
     const { program } = params;
@@ -27,18 +27,11 @@ export const teamCommands = (params: { program: Command }) => {
         .command('members')
         .alias('m')
         .description('List team members')
-        .argument('[page]', 'Page number', '0')
-        .argument('[limit]', 'Limit of members per page', '0')
+        .argument('[page]', 'Page number', customParseInt, 0)
+        .argument('[limit]', 'Limit of members per page', customParseInt, 0)
         .option('--csv', 'Output in CSV format')
         .option('--human-readable', 'Output dates in human readable format')
-        .action(async (page: string, limit: string, options: { csv: boolean; humanReadable: boolean }) => {
-            await runTeamMembers({
-                page: parseInt(page),
-                limit: parseInt(limit),
-                csv: options.csv,
-                humanReadable: options.humanReadable,
-            });
-        });
+        .action(runTeamMembers);
 
     teamGroup
         .command('logs')
@@ -56,8 +49,6 @@ export const teamCommands = (params: { program: Command }) => {
         .command('report')
         .alias('r')
         .description('Get team report')
-        .argument('[days]', 'Number of days in history', '0')
-        .action(async (days: string) => {
-            await runTeamReport({ days: parseInt(days) });
-        });
+        .argument('[days]', 'Number of days in history', customParseInt, 0)
+        .action(runTeamReport);
 };

src/index.ts

@@ -6,6 +6,11 @@ import { cliVersionToString, CLI_VERSION } from './cliVersion';
 import { rootCommands } from './commands';
 import { initDeviceCredentials, initTeamDeviceCredentials } from './utils';
 
+const errorColor = (str: string) => {
+    // Add ANSI escape codes to display text in red.
+    return `\x1b[31m${str}\x1b[0m`;
+};
+
 const debugLevel = process.argv.indexOf('--debug') !== -1 ? 'debug' : 'info';
 
 winston.configure({
@@ -21,11 +26,15 @@ const program = new Command();
 
 program.name('dcli').description('Dashlane CLI').version(cliVersionToString(CLI_VERSION));
 
+program.configureOutput({
+    outputError: (str, write) => write(errorColor(str)),
+});
+
 program.option('--debug', 'Print debug messages');
 
 rootCommands({ program });
 
 program.parseAsync().catch((error: Error) => {
-    console.error(`ERROR:`, error.message);
+    console.error(errorColor(`error: ${error.message}`));
     process.exit(1);
 });

src/utils/strings.ts

@@ -1,3 +1,4 @@
+import commander from 'commander';
 import { Parser } from '@json2csv/plainjs';
 import { flatten } from '@json2csv/transforms';
 
@@ -14,6 +15,15 @@ export const parseBooleanString = (booleanString: string): boolean => {
     throw new Error("The provided boolean variable should be either 'true' or 'false'");
 };
 
+export const customParseInt = (value: string, _dummyPrevious: unknown) => {
+    // parseInt takes a string and a radix
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+        throw new commander.InvalidArgumentError('Not a number.');
+    }
+    return parsedValue;
+};
+
 /** Remove underscores and capitalize string */
 export const removeUnderscoresAndCapitalize = (string: string): string => {
     return string