@hubspot/cli 6.4.1-beta.0 → 7.0.0-beta.0

package/bin/cli.js

@@ -5,14 +5,17 @@ const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
+const { loadConfig, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
-const { setLogLevel, getCommandName } = require('../lib/commonOpts');
+const { setLogLevel, getCommandName, injectAccountIdMiddleware, } = require('../lib/commonOpts');
+const { validateAccount } = require('../lib/validation');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
 const { i18n } = require('../lib/lang');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { UI_COLORS, uiCommandReference } = require('../lib/ui');
+const { checkAndWarnGitInclusion } = require('../lib/ui/git');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -24,9 +27,9 @@ const uploadCommand = require('../commands/upload');
 const createCommand = require('../commands/create');
 const fetchCommand = require('../commands/fetch');
 const filemanagerCommand = require('../commands/filemanager');
-const secretsCommand = require('../commands/secrets');
+const secretCommands = require('../commands/secret');
 const customObjectCommand = require('../commands/customObject');
-const functionsCommand = require('../commands/functions');
+const functionCommands = require('../commands/function');
 const listCommand = require('../commands/list');
 const openCommand = require('../commands/open');
 const mvCommand = require('../commands/mv');
@@ -34,11 +37,12 @@ const projectCommands = require('../commands/project');
 const themeCommand = require('../commands/theme');
 const moduleCommand = require('../commands/module');
 const configCommand = require('../commands/config');
-const accountsCommand = require('../commands/accounts');
+const accountCommands = require('../commands/account');
 const sandboxesCommand = require('../commands/sandbox');
 const cmsCommand = require('../commands/cms');
 const feedbackCommand = require('../commands/feedback');
 const doctorCommand = require('../commands/doctor');
+const completionCommand = require('../commands/completion');
 const notifier = updateNotifier({
     pkg: { ...pkg, name: '@hubspot/cli' },
     distTag: 'latest',
@@ -81,7 +85,7 @@ const handleFailure = (msg, err, yargs) => {
         logError(err);
     }
     if (msg === null) {
-        yargs.showHelp();
+        yargs.showHelp('log');
         process.exit(EXIT_CODES.SUCCESS);
     }
     else {
@@ -116,17 +120,106 @@ const performChecks = argv => {
 const setRequestHeaders = () => {
     addUserAgentHeader('HubSpot CLI', pkg.version);
 };
+const isTargetedCommand = (options, commandMap) => {
+    const checkCommand = (options, commandMap) => {
+        const currentCommand = options._[0];
+        if (!commandMap[currentCommand]) {
+            return false;
+        }
+        if (commandMap[currentCommand].target) {
+            return true;
+        }
+        const subCommands = commandMap[currentCommand].subCommands || {};
+        if (options._.length > 1) {
+            return checkCommand({ _: options._.slice(1) }, subCommands);
+        }
+        return false;
+    };
+    return checkCommand(options, commandMap);
+};
+const SKIP_CONFIG_VALIDATION = {
+    init: { target: true },
+    auth: { target: true },
+};
+const loadConfigMiddleware = async (options) => {
+    // Skip this when no command is provided
+    if (!options._.length) {
+        return;
+    }
+    const maybeValidateConfig = () => {
+        if (!isTargetedCommand(options, SKIP_CONFIG_VALIDATION) &&
+            !validateConfig()) {
+            process.exit(EXIT_CODES.ERROR);
+        }
+    };
+    if (configFileExists(true) && options.config) {
+        logger.error(i18n(`${i18nKey}.loadConfigMiddleware.configFileExists`, {
+            configPath: getConfigPath(),
+        }));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    else if (!options._.includes('init')) {
+        const { config: configPath } = options;
+        loadConfig(configPath, options);
+    }
+    maybeValidateConfig();
+};
+const checkAndWarnGitInclusionMiddleware = options => {
+    // Skip this when no command is provided
+    if (!options._.length) {
+        return;
+    }
+    checkAndWarnGitInclusion(getConfigPath());
+};
+const accountsSubCommands = {
+    target: false,
+    subCommands: {
+        clean: { target: true },
+        list: { target: true },
+        ls: { target: true },
+        remove: { target: true },
+    },
+};
+const sandboxesSubCommands = {
+    target: false,
+    subCommands: {
+        delete: { target: true },
+    },
+};
+const SKIP_ACCOUNT_VALIDATION = {
+    init: { target: true },
+    auth: { target: true },
+    account: accountsSubCommands,
+    accounts: accountsSubCommands,
+    sandbox: sandboxesSubCommands,
+    sandboxes: sandboxesSubCommands,
+};
+const validateAccountOptions = async (options) => {
+    // Skip this when no command is provided
+    if (!options._.length) {
+        return;
+    }
+    let validAccount = true;
+    if (!isTargetedCommand(options, SKIP_ACCOUNT_VALIDATION)) {
+        validAccount = await validateAccount(options);
+    }
+    if (!validAccount) {
+        process.exit(EXIT_CODES.ERROR);
+    }
+};
 const argv = yargs
     .usage('The command line interface to interact with HubSpot.')
-    .middleware([setLogLevel, setRequestHeaders])
+    // loadConfigMiddleware loads the new hidden config for all commands
+    .middleware([
+    setLogLevel,
+    setRequestHeaders,
+    loadConfigMiddleware,
+    injectAccountIdMiddleware,
+    checkAndWarnGitInclusionMiddleware,
+    validateAccountOptions,
+])
     .exitProcess(false)
     .fail(handleFailure)
-    .option('debug', {
-    alias: 'd',
-    default: false,
-    describe: 'Set log level to debug',
-    type: 'boolean',
-})
     .option('noHyperlinks', {
     default: false,
     describe: 'prevent hyperlinks from displaying in the ui',
@@ -152,9 +245,9 @@ const argv = yargs
     .command(createCommand)
     .command(fetchCommand)
     .command(filemanagerCommand)
-    .command(secretsCommand)
+    .command(secretCommands)
     .command(customObjectCommand)
-    .command(functionsCommand)
+    .command(functionCommands)
     .command({
     ...listCommand,
     aliases: 'ls',
@@ -165,14 +258,15 @@ const argv = yargs
     .command(themeCommand)
     .command(moduleCommand)
     .command(configCommand)
-    .command(accountsCommand)
+    .command(accountCommands)
     .command(sandboxesCommand)
     .command(feedbackCommand)
     .command(doctorCommand)
+    .command(completionCommand)
     .help()
+    .alias('h', 'help')
     .recommendCommands()
     .demandCommand(1, '')
-    .completion()
     .wrap(getTerminalWidth())
     .strict().argv;
 if (argv.help) {

package/bin/hs

@@ -1,3 +1,5 @@
 #!/usr/bin/env node
 
+require('./silenceErrors')
+
 require('./cli');

package/bin/hscms

@@ -1,3 +1,5 @@
 #!/usr/bin/env node
 
+require('./silenceErrors')
+
 require('./cli');

package/bin/silenceErrors.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/bin/silenceErrors.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const SILENCED_ERRORS = ['DeprecationWarning:'];
+const originalConsoleError = console.error;
+console.error = msg => {
+    const isSilencedError = SILENCED_ERRORS.some(error => typeof msg === 'string' && msg.includes(error));
+    if (isSilencedError) {
+        return;
+    }
+    originalConsoleError(msg);
+};

package/commands/{accounts → account}/clean.js

@@ -5,24 +5,23 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { accessTokenForPersonalAccessKey, } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
+const { addTestingOptions, addConfigOptions } = require('../../lib/commonOpts');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('../../lib/ui/table');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('../../lib/ui');
+const { deleteAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const i18nKey = 'commands.accounts.subcommands.clean';
+const i18nKey = 'commands.account.subcommands.clean';
 exports.command = 'clean';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { qa } = options;
-    await loadAndValidateOptions(options, false);
-    const config = getConfig();
     trackCommandUsage('accounts-clean', null);
-    const filteredTestAccounts = config.portals.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
+    const accountsList = getConfigAccounts();
+    const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
         logger.log(i18n(`${i18nKey}.noResults`));
         process.exit(EXIT_CODES.SUCCESS);
@@ -36,7 +35,7 @@ exports.handler = async (options) => {
     });
     for (const account of filteredTestAccounts) {
         try {
-            await accessTokenForPersonalAccessKey(account.portalId, true);
+            await accessTokenForPersonalAccessKey(getAccountIdentifier(account), true);
         }
         catch (error) {
             if (isSpecifiedError(error, {
@@ -62,7 +61,9 @@ exports.handler = async (options) => {
                 count: accountsToRemove.length,
             }),
         });
-        logger.log(getTableContents(accountsToRemove.map(p => [uiAccountDescription(p.portalId)]), { border: { bodyLeft: '  ' } }));
+        logger.log(getTableContents(accountsToRemove.map(p => [
+            uiAccountDescription(getAccountIdentifier(p)),
+        ]), { border: { bodyLeft: '  ' } }));
         const { accountsCleanPrompt } = await promptUser([
             {
                 name: 'accountsCleanPrompt',
@@ -94,8 +95,6 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     addTestingOptions(yargs);
     yargs.example([['$0 accounts clean']]);
     return yargs;

package/commands/{accounts → account}/info.js

@@ -4,24 +4,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getAccessToken } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { getAccountId, addAccountOptions, addConfigOptions, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { addConfigOptions } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const { getTableContents } = require('../../lib/ui/table');
-const i18nKey = 'commands.accounts.subcommands.info';
+const i18nKey = 'commands.account.subcommands.info';
 exports.describe = i18n(`${i18nKey}.describe`);
-exports.command = 'info [--account]';
+exports.command = 'info [account]';
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    const config = getAccountConfig(accountId);
+    const { derivedAccountId } = options;
+    const config = getAccountConfig(derivedAccountId);
     // check if the provided account is using a personal access key, if not, show an error
-    if (config.authType === 'personalaccesskey') {
+    if (config && config.authType === 'personalaccesskey') {
         const { name, personalAccessKey, env } = config;
-        const response = await getAccessToken(personalAccessKey, env, accountId);
+        const response = await getAccessToken(personalAccessKey, env, derivedAccountId);
         const scopeGroups = response.scopeGroups.map(s => [s]);
         logger.log(i18n(`${i18nKey}.name`, { name }));
-        logger.log(i18n(`${i18nKey}.accountId`, { accountId }));
+        logger.log(i18n(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
         logger.log(i18n(`${i18nKey}.scopeGroups`));
         logger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
@@ -31,14 +29,10 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     addConfigOptions(yargs);
-    addAccountOptions(yargs);
     yargs.example([
         ['$0 accounts info', i18n(`${i18nKey}.examples.default`)],
-        [
-            '$0 accounts info --account=MyAccount',
-            i18n(`${i18nKey}.examples.nameBased`),
-        ],
-        ['$0 accounts info --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts info MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
+        ['$0 accounts info 1234567', i18n(`${i18nKey}.examples.idBased`)],
     ]);
     return yargs;
 };

package/commands/{accounts → account}/list.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
+const { addConfigOptions } = require('../../lib/commonOpts');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { addConfigOptions, addAccountOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { isSandbox, isDeveloperTestAccount } = require('../../lib/accountTypes');
 const { i18n } = require('../../lib/lang');
 const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubspot/local-dev-lib/constants/config');
-const i18nKey = 'commands.accounts.subcommands.list';
-exports.command = 'list';
+const i18nKey = 'commands.account.subcommands.list';
+exports.command = ['list', 'ls'];
 exports.describe = i18n(`${i18nKey}.describe`);
 const sortAndMapPortals = portals => {
     const mappedPortalData = {};
@@ -21,7 +21,7 @@ const sortAndMapPortals = portals => {
         (p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
             p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER))
         .forEach(portal => {
-        mappedPortalData[portal.portalId] = [portal];
+        mappedPortalData[getAccountIdentifier(portal)] = [portal];
     });
     // Non-standard portals (sandbox, developer test account)
     portals
@@ -34,7 +34,7 @@ const sortAndMapPortals = portals => {
             ];
         }
         else {
-            mappedPortalData[p.portalId] = [p];
+            mappedPortalData[getAccountIdentifier(p)] = [p];
         }
     });
     return mappedPortalData;
@@ -42,7 +42,7 @@ const sortAndMapPortals = portals => {
 const getPortalData = mappedPortalData => {
     const portalData = [];
     Object.entries(mappedPortalData).forEach(([key, set]) => {
-        const hasParentPortal = set.filter(p => p.portalId === parseInt(key, 10))[0];
+        const hasParentPortal = set.filter(p => getAccountIdentifier(p) === parseInt(key, 10))[0];
         set.forEach(portal => {
             let name = `${portal.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[portal.accountType]}]`;
             if (isSandbox(portal)) {
@@ -55,18 +55,17 @@ const getPortalData = mappedPortalData => {
                     name = `↳ ${name}`;
                 }
             }
-            portalData.push([name, portal.portalId, portal.authType]);
+            portalData.push([name, getAccountIdentifier(portal), portal.authType]);
         });
     });
     return portalData;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
-    const accountId = getAccountId(options);
-    trackCommandUsage('accounts-list', null, accountId);
-    const config = getConfig();
+    const { derivedAccountId } = options;
+    trackCommandUsage('accounts-list', null, derivedAccountId);
     const configPath = getConfigPath();
-    const mappedPortalData = sortAndMapPortals(config.portals);
+    const accountsList = getConfigAccounts();
+    const mappedPortalData = sortAndMapPortals(accountsList);
     const portalData = getPortalData(mappedPortalData);
     portalData.unshift(getTableHeader([
         i18n(`${i18nKey}.labels.name`),
@@ -74,13 +73,14 @@ exports.handler = async (options) => {
         i18n(`${i18nKey}.labels.authType`),
     ]));
     logger.log(i18n(`${i18nKey}.configPath`, { configPath }));
-    logger.log(i18n(`${i18nKey}.defaultAccount`, { account: config.defaultPortal }));
+    logger.log(i18n(`${i18nKey}.defaultAccount`, {
+        account: getConfigDefaultAccount(),
+    }));
     logger.log(i18n(`${i18nKey}.accounts`));
     logger.log(getTableContents(portalData, { border: { bodyLeft: '  ' } }));
 };
 exports.builder = yargs => {
     addConfigOptions(yargs);
-    addAccountOptions(yargs);
     yargs.example([['$0 accounts list']]);
     return yargs;
 };

package/commands/{accounts → account}/remove.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const { addConfigOptions } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId: getAccountIdFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { loadConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId: getAccountIdFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const i18nKey = 'commands.accounts.subcommands.remove';
-exports.command = 'remove [--account]';
+const i18nKey = 'commands.account.subcommands.remove';
+exports.command = 'remove [account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
-    let config = getConfig();
-    let accountToRemove = options.account;
+    const { account } = options;
+    let accountToRemove = account;
     if (accountToRemove && !getAccountIdFromConfig(accountToRemove)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,
@@ -21,7 +20,7 @@ exports.handler = async (options) => {
         }));
     }
     if (!accountToRemove || !getAccountIdFromConfig(accountToRemove)) {
-        accountToRemove = await selectAccountFromConfig(config, i18n(`${i18nKey}.prompts.selectAccountToRemove`));
+        accountToRemove = await selectAccountFromConfig(i18n(`${i18nKey}.prompts.selectAccountToRemove`));
     }
     trackCommandUsage('accounts-remove', null, getAccountIdFromConfig(accountToRemove));
     const currentDefaultAccount = getConfigDefaultAccount();
@@ -30,25 +29,23 @@ exports.handler = async (options) => {
         accountName: accountToRemove,
     }));
     // Get updated version of the config
-    config = getConfig();
+    loadConfig(getConfigPath(), options);
     if (accountToRemove === currentDefaultAccount) {
         logger.log();
         logger.log(i18n(`${i18nKey}.logs.replaceDefaultAccount`));
-        const newDefaultAccount = await selectAccountFromConfig(config);
+        const newDefaultAccount = await selectAccountFromConfig();
         updateDefaultAccount(newDefaultAccount);
     }
 };
 exports.builder = yargs => {
-    yargs.option('account', {
+    addConfigOptions(yargs);
+    yargs.positional('account', {
         describe: i18n(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
     yargs.example([
         ['$0 accounts remove', i18n(`${i18nKey}.examples.default`)],
-        [
-            '$0 accounts remove --account=MyAccount',
-            i18n(`${i18nKey}.examples.byName`),
-        ],
+        ['$0 accounts remove MyAccount', i18n(`${i18nKey}.examples.byName`)],
     ]);
     return yargs;
 };

package/commands/{accounts → account}/rename.js

@@ -3,18 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { renameAccount } = require('@hubspot/local-dev-lib/config');
-const { addConfigOptions, addAccountOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.accounts.subcommands.rename';
+const i18nKey = 'commands.account.subcommands.rename';
 exports.command = 'rename <accountName> <newName>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    loadAndValidateOptions(options);
-    const { accountName, newName } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('accounts-rename', null, accountId);
+    const { accountName, newName, derivedAccountId } = options;
+    trackCommandUsage('accounts-rename', null, derivedAccountId);
     await renameAccount(accountName, newName);
     return logger.log(i18n(`${i18nKey}.success.renamed`, {
         name: accountName,

package/commands/{accounts → account}/use.js

@@ -2,27 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, updateDefaultAccount, getAccountId: getAccountIdFromConfig, } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, updateDefaultAccount, getAccountId: getAccountIdFromConfig, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const i18nKey = 'commands.accounts.subcommands.use';
-exports.command = 'use [--account]';
+const i18nKey = 'commands.account.subcommands.use';
+exports.command = 'use [account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
-    const config = getConfig();
     let newDefaultAccount = options.account;
     if (!newDefaultAccount) {
-        newDefaultAccount = await selectAccountFromConfig(config);
+        newDefaultAccount = await selectAccountFromConfig();
     }
     else if (!getAccountIdFromConfig(newDefaultAccount)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: newDefaultAccount,
             configPath: getConfigPath(),
         }));
-        newDefaultAccount = await selectAccountFromConfig(config);
+        newDefaultAccount = await selectAccountFromConfig();
     }
     trackCommandUsage('accounts-use', null, getAccountIdFromConfig(newDefaultAccount));
     updateDefaultAccount(newDefaultAccount);
@@ -31,17 +28,14 @@ exports.handler = async (options) => {
     }));
 };
 exports.builder = yargs => {
-    yargs.option('account', {
+    yargs.positional('account', {
         describe: i18n(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
     yargs.example([
         ['$0 accounts use', i18n(`${i18nKey}.examples.default`)],
-        [
-            '$0 accounts use --account=MyAccount',
-            i18n(`${i18nKey}.examples.nameBased`),
-        ],
-        ['$0 accounts use --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts use MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
+        ['$0 accounts use 1234567', i18n(`${i18nKey}.examples.idBased`)],
     ]);
     return yargs;
 };

package/commands/account.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const { addGlobalOptions } = require('../lib/commonOpts');
+const { i18n } = require('../lib/lang');
+const list = require('./account/list');
+const rename = require('./account/rename');
+const use = require('./account/use');
+const info = require('./account/info');
+const remove = require('./account/remove');
+const clean = require('./account/clean');
+const i18nKey = 'commands.account';
+exports.command = ['account', 'accounts'];
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.builder = yargs => {
+    addGlobalOptions(yargs);
+    yargs
+        .command(list)
+        .command(rename)
+        .command(use)
+        .command(info)
+        .command(remove)
+        .command(clean)
+        .demandCommand(1, '');
+    return yargs;
+};