@hubspot/cli 7.5.3-experimental.0 → 7.5.3

package/commands/account/createOverride.js

@@ -0,0 +1,121 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
+const lang_1 = require("../../lib/lang");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const usageTracking_1 = require("../../lib/usageTracking");
+const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
+const index_1 = require("../../lib/errorHandlers/index");
+const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create-override [account]';
+const describe = (0, lang_1.i18n)('commands.account.subcommands.createOverride.describe', {
+    hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+});
+async function handler(args) {
+    let overrideDefaultAccount = args.account;
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!globalConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const accountOverride = (0, config_2.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.createOverride.accountOverride', {
+            accountOverride,
+            overrideFilePath,
+        }));
+        const { replaceOverrideFile } = await (0, promptUtils_1.promptUser)({
+            type: 'confirm',
+            name: 'replaceOverrideFile',
+            message: (0, lang_1.i18n)('commands.account.subcommands.createOverride.prompts.replaceOverrideFile'),
+        });
+        logger_1.logger.log('');
+        if (!replaceOverrideFile) {
+            const accountId = (0, config_2.getAccountId)(accountOverride) || undefined;
+            (0, usageTracking_1.trackCommandMetadataUsage)('account-createOverride', {
+                command: 'hs account create-override',
+                step: 'Reject overwriting an override via prompt',
+            }, accountId);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+    }
+    if (!overrideDefaultAccount) {
+        overrideDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
+    }
+    else if (!(0, config_2.getAccountId)(overrideDefaultAccount)) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.accountNotFound', {
+            configPath: (0, config_2.getConfigPath)() || '',
+        }));
+        overrideDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
+    }
+    const accountId = (0, config_2.getAccountId)(overrideDefaultAccount);
+    try {
+        const overrideFilePath = path_1.default.join((0, path_2.getCwd)(), config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
+        await fs_extra_1.default.writeFile(overrideFilePath, accountId.toString(), 'utf8');
+        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.createOverride.success', {
+            overrideFilePath,
+        }));
+        const trackingId = accountId || undefined;
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            step: 'Confirm overwriting an override via prompt',
+            successful: true,
+        }, trackingId);
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    catch (e) {
+        (0, index_1.logError)(e);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+function accountCreateOverrideBuilder(yargs) {
+    yargs.positional('account', {
+        describe: (0, lang_1.i18n)('commands.account.subcommands.createOverride.options.account.describe'),
+        type: 'string',
+    });
+    yargs.example([
+        [
+            '$0 account create-override',
+            (0, lang_1.i18n)('commands.account.subcommands.createOverride.examples.default', {
+                hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+            }),
+        ],
+        [
+            '$0 account create-override 12345678',
+            (0, lang_1.i18n)('commands.account.subcommands.createOverride.examples.idBased', {
+                hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+            }),
+        ],
+        [
+            '$0 account create-override MyAccount',
+            (0, lang_1.i18n)('commands.account.subcommands.createOverride.examples.nameBased', {
+                hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+            }),
+        ],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountCreateOverrideBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const accountCreateOverrideCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountCreateOverrideCommand;

package/commands/account/info.d.ts

@@ -1,8 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "info [account]";
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountInfoArgs = CommonArgs & ConfigArgs;
-export declare function handler(args: ArgumentsCamelCase<AccountInfoArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<AccountInfoArgs>>;
-export {};
+declare const accountInfoCommand: YargsCommandModule<unknown, AccountInfoArgs>;
+export default accountInfoCommand;

package/commands/account/info.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.command = exports.describe = void 0;
-exports.handler = handler;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const lang_1 = require("../../lib/lang");
+const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
-exports.command = 'info [account]';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
+const command = 'info [account]';
 async function handler(args) {
     const { derivedAccountId } = args;
     const config = (0, config_1.getAccountConfig)(derivedAccountId);
@@ -19,6 +18,28 @@ async function handler(args) {
         let scopeGroups = [];
         const response = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env, derivedAccountId);
         scopeGroups = response.scopeGroups.map(s => [s]);
+        // If a default account is present in the config, display it
+        const configPath = (0, config_1.getConfigPath)();
+        if (configPath) {
+            logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.defaultAccountTitle`));
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.configPath`, {
+                configPath,
+            })}`);
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.defaultAccount`, {
+                account: (0, config_1.getDisplayDefaultAccount)(),
+            })}`);
+        }
+        // If a default account override is present, display it
+        const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+        if (overrideFilePath) {
+            logger_1.logger.log('');
+            logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.overrideFilePathTitle`));
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.overrideFilePath`, { overrideFilePath })}`);
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.overrideAccount`, {
+                account: (0, config_1.getConfigDefaultAccount)(),
+            })}`);
+        }
+        logger_1.logger.log('');
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.name`, { name: name }));
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.accountId`, {
             accountId: derivedAccountId,
@@ -51,4 +72,14 @@ function accountInfoBuilder(yargs) {
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(accountInfoBuilder, exports.command, exports.describe, { useConfigOptions: true });
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountInfoBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const accountInfoCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountInfoCommand;

package/commands/account/list.d.ts

@@ -1,8 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command: string[];
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountListArgs = CommonArgs & ConfigArgs;
-export declare function handler(args: ArgumentsCamelCase<AccountListArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountListArgs>;
-export {};
+declare const accountListCommand: YargsCommandModule<unknown, AccountListArgs>;
+export default accountListCommand;

package/commands/account/list.js

@@ -1,19 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const commonOpts_1 = require("../../lib/commonOpts");
+const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
 const usageTracking_1 = require("../../lib/usageTracking");
 const accountTypes_1 = require("../../lib/accountTypes");
 const lang_1 = require("../../lib/lang");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
-exports.command = ['list', 'ls'];
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.list.describe');
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = ['list', 'ls'];
+const describe = (0, lang_1.i18n)('commands.account.subcommands.list.describe');
 function sortAndMapAccounts(accounts) {
     const mappedAccountData = {};
     // Standard and app developer accounts
@@ -80,17 +78,42 @@ async function handler(args) {
         (0, lang_1.i18n)('commands.account.subcommands.list.labels.accountId'),
         (0, lang_1.i18n)('commands.account.subcommands.list.labels.authType'),
     ]));
-    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.configPath', {
-        configPath: configPath,
-    }));
-    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.defaultAccount', {
-        account: (0, config_1.getConfigDefaultAccount)(),
-    }));
-    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.accounts'));
+    // If a default account is present in the config, display it
+    if (configPath) {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.defaultAccountTitle`));
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.configPath`, {
+            configPath,
+        })}`);
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.defaultAccount`, {
+            account: (0, config_1.getDisplayDefaultAccount)(),
+        })}`);
+        logger_1.logger.log('');
+    }
+    // If a default account override is present, display it
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (overrideFilePath) {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.overrideFilePathTitle`));
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.overrideFilePath`, { overrideFilePath })}`);
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.overrideAccount`, {
+            account: (0, config_1.getConfigDefaultAccount)(),
+        })}`);
+        logger_1.logger.log('');
+    }
+    logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.accounts`));
     logger_1.logger.log((0, table_1.getTableContents)(accountData, { border: { bodyLeft: '  ' } }));
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
+function accountListBuilder(yargs) {
     yargs.example([['$0 accounts list']]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountListBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const accountListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountListCommand;

package/commands/account/remove.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command = "remove [account]";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountRemoveArgs = CommonArgs & ConfigArgs & {
     account?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountRemoveArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountRemoveArgs>;
-export {};
+declare const accountRemoveCommand: YargsCommandModule<unknown, AccountRemoveArgs>;
+export default accountRemoveCommand;

package/commands/account/remove.js

@@ -1,16 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
+const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const errorHandlers_1 = require("../../lib/errorHandlers");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-const commonOpts_1 = require("../../lib/commonOpts");
-exports.command = 'remove [account]';
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.remove.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'remove [account]';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.remove.describe`);
 async function handler(args) {
     const { account } = args;
     let accountToRemove = account;
@@ -25,21 +28,47 @@ async function handler(args) {
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-remove', undefined, (0, config_1.getAccountId)(accountToRemove));
     const currentDefaultAccount = (0, config_1.getConfigDefaultAccount)();
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (overrideFilePath &&
+        accountOverride &&
+        accountOverride === accountToRemove) {
+        const { deleteOverrideFile } = await (0, promptUtils_1.promptUser)({
+            type: 'confirm',
+            name: 'deleteOverrideFile',
+            message: (0, lang_1.i18n)(`commands.account.subcommands.remove.prompts.deleteOverrideFile`, {
+                overrideFilePath,
+                accountName: accountToRemove,
+            }),
+        });
+        try {
+            if (deleteOverrideFile) {
+                fs_1.default.unlinkSync(overrideFilePath);
+            }
+        }
+        catch (error) {
+            (0, errorHandlers_1.logError)(error);
+        }
+    }
     await (0, config_1.deleteAccount)(accountToRemove);
     logger_1.logger.success((0, lang_1.i18n)(`commands.account.subcommands.remove.success.accountRemoved`, {
         accountName: accountToRemove,
     }));
     // Get updated version of the config
     (0, config_1.loadConfig)((0, config_1.getConfigPath)());
-    if (accountToRemove === currentDefaultAccount) {
+    const accountToRemoveId = (0, config_1.getAccountId)(accountToRemove);
+    let defaultAccountId;
+    if (currentDefaultAccount) {
+        defaultAccountId = (0, config_1.getAccountId)(currentDefaultAccount);
+    }
+    if (accountToRemoveId === defaultAccountId) {
         logger_1.logger.log();
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.remove.logs.replaceDefaultAccount`));
         const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
         (0, config_1.updateDefaultAccount)(newDefaultAccount);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
+function accountRemoveBuilder(yargs) {
     yargs.positional('account', {
         describe: (0, lang_1.i18n)(`commands.account.subcommands.remove.options.account.describe`),
         type: 'string',
@@ -56,3 +85,14 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountRemoveBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const accountRemoveCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountRemoveCommand;

package/commands/account/removeOverride.d.ts

@@ -0,0 +1,6 @@
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type RemoveOverrideArgs = CommonArgs & {
+    force?: boolean;
+};
+declare const accountRemoveOverrideCommand: YargsCommandModule<unknown, RemoveOverrideArgs>;
+export default accountRemoveOverrideCommand;

package/commands/account/removeOverride.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const config_2 = require("@hubspot/local-dev-lib/constants/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
+const lang_1 = require("../../lib/lang");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const usageTracking_1 = require("../../lib/usageTracking");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const index_1 = require("../../lib/errorHandlers/index");
+const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'remove-override';
+const describe = (0, lang_1.i18n)('commands.account.subcommands.removeOverride.describe', {
+    overrideFile: config_2.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+});
+async function handler(args) {
+    const { force } = args;
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!globalConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        const accountId = (0, config_1.getAccountId)(accountOverride) || undefined;
+        if (!force) {
+            logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.removeOverride.accountOverride', {
+                accountOverride,
+                overrideFilePath,
+            }));
+            const { deleteOverrideFile } = await (0, promptUtils_1.promptUser)({
+                type: 'confirm',
+                name: 'deleteOverrideFile',
+                message: (0, lang_1.i18n)('commands.account.subcommands.removeOverride.prompts.deleteOverrideFile', {
+                    accountOverride,
+                    overrideFilePath,
+                }),
+            });
+            logger_1.logger.log('');
+            if (!deleteOverrideFile) {
+                (0, usageTracking_1.trackCommandMetadataUsage)('account-removeOverride', {
+                    command: 'hs account remove-override',
+                    step: 'Reject removing override via prompt',
+                }, accountId);
+                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+            }
+        }
+        try {
+            fs_extra_1.default.unlinkSync(overrideFilePath);
+            logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.removeOverride.success'));
+            (0, usageTracking_1.trackCommandMetadataUsage)('account-removeOverride', {
+                command: 'hs account remove-override',
+                step: 'Confirm removing override file (via prompt/force)',
+                successful: true,
+            }, accountId);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        catch (error) {
+            (0, index_1.logError)(error);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+    }
+    else {
+        logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.removeOverride.noOverrideFile'));
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+}
+function accountRemoveOverrideBuilder(yargs) {
+    yargs.options('force', {
+        describe: (0, lang_1.i18n)('commands.account.subcommands.removeOverride.options.force.describe'),
+        type: 'boolean',
+    });
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountRemoveOverrideBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const accountRemoveOverrideCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountRemoveOverrideCommand;

package/commands/account/rename.d.ts

@@ -1,11 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command = "rename <account-name> <new-name>";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountRenameArgs = CommonArgs & ConfigArgs & {
     accountName: string;
     newName: string;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountRenameArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountRenameArgs>;
-export {};
+declare const accountRenameCommand: YargsCommandModule<unknown, AccountRenameArgs>;
+export default accountRenameCommand;

package/commands/account/rename.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-exports.command = 'rename <account-name> <new-name>';
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.rename.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'rename <account-name> <new-name>';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.rename.describe`);
 async function handler(args) {
     const { accountName, newName, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-rename', undefined, derivedAccountId);
@@ -28,9 +25,7 @@ async function handler(args) {
     }));
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
+function accountRenameBuilder(yargs) {
     yargs.positional('account-name', {
         describe: (0, lang_1.i18n)(`commands.account.subcommands.rename.positionals.accountName.describe`),
         type: 'string',
@@ -44,3 +39,15 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountRenameBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const accountRenameCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountRenameCommand;

package/commands/account/use.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const command = "use [account]";
-export declare const describe: string;
-interface AccountUseArgs extends CommonArgs {
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type AccountUseArgs = CommonArgs & {
     account?: string;
-}
-export declare function handler(args: ArgumentsCamelCase<AccountUseArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountUseArgs>;
-export {};
+};
+declare const accountUseCommand: YargsCommandModule<unknown, AccountUseArgs>;
+export default accountUseCommand;

package/commands/account/use.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-exports.command = 'use [account]';
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.use.describe');
+const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'use [account]';
+const describe = (0, lang_1.i18n)('commands.account.subcommands.use.describe');
 async function handler(args) {
     let newDefaultAccount = args.account;
     if (!newDefaultAccount) {
@@ -23,12 +22,24 @@ async function handler(args) {
         newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-use', undefined, (0, config_1.getAccountId)(newDefaultAccount));
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        logger_1.logger.warn((0, lang_1.i18n)(`commands.account.subcommands.use.accountOverride`, {
+            accountOverride,
+        }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.use.accountOverrideCommands`, {
+            createOverrideCommand: (0, ui_1.uiCommandReference)('hs account create-override'),
+            removeOverrideCommand: (0, ui_1.uiCommandReference)('hs account remove-override'),
+        }));
+        logger_1.logger.log('');
+    }
     (0, config_1.updateDefaultAccount)(newDefaultAccount);
     return logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.use.success.defaultAccountUpdated', {
         accountName: newDefaultAccount,
     }));
 }
-function builder(yargs) {
+function accountUseBuilder(yargs) {
     yargs.positional('account', {
         describe: (0, lang_1.i18n)('commands.account.subcommands.use.options.account.describe'),
         type: 'string',
@@ -49,3 +60,13 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountUseBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const accountUseCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountUseCommand;

package/commands/account.d.ts

@@ -1,4 +1,3 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string;
-export declare function builder(yargs: Argv): Argv;
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const accountCommand: YargsCommandModuleBucket;
+export default accountCommand;