@hubspot/cli 7.5.4-experimental.0 → 7.5.4

package/api/migrate.d.ts

@@ -10,10 +10,14 @@ interface BaseMigrationApp {
 }
 export interface MigratableApp extends BaseMigrationApp {
     isMigratable: true;
+    unmigratableReason?: undefined;
 }
+export declare const CLI_UNMIGRATABLE_REASONS: {
+    readonly PART_OF_PROJECT_ALREADY: "PART_OF_PROJECT_ALREADY";
+};
 export interface UnmigratableApp extends BaseMigrationApp {
     isMigratable: false;
-    unmigratableReason: keyof typeof UNMIGRATABLE_REASONS;
+    unmigratableReason: keyof typeof UNMIGRATABLE_REASONS | keyof typeof CLI_UNMIGRATABLE_REASONS;
 }
 export type MigrationApp = MigratableApp | UnmigratableApp;
 export interface ListAppsResponse {
@@ -48,13 +52,19 @@ export interface MigrationSuccess extends MigrationBaseStatus {
     status: typeof MIGRATION_STATUS.SUCCESS;
     buildId: number;
 }
+interface ComponentError {
+    componentType: string;
+    developerSymbol?: string;
+    errorMessage: string;
+}
 export interface MigrationFailed extends MigrationBaseStatus {
     status: typeof MIGRATION_STATUS.FAILURE;
-    projectErrorsDetail?: string;
-    componentErrorDetails: Record<string, string>;
+    projectErrorDetail: string;
+    componentErrors: ComponentError[];
 }
 export type MigrationStatus = MigrationInProgress | MigrationInputRequired | MigrationSuccess | MigrationFailed;
-export declare function listAppsForMigration(accountId: number): HubSpotPromise<ListAppsResponse>;
+export declare function isMigrationStatus(error: unknown): error is MigrationStatus;
+export declare function listAppsForMigration(accountId: number, platformVersion: string): HubSpotPromise<ListAppsResponse>;
 export declare function initializeMigration(accountId: number, applicationId: number, platformVersion: string): HubSpotPromise<InitializeMigrationResponse>;
 export declare function continueMigration(portalId: number, migrationId: number, componentUids: Record<string, string>, projectName: string): HubSpotPromise<ContinueMigrationResponse>;
 export declare function checkMigrationStatusV2(accountId: number, id: number): HubSpotPromise<MigrationStatus>;

package/api/migrate.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLI_UNMIGRATABLE_REASONS = void 0;
+exports.isMigrationStatus = isMigrationStatus;
 exports.listAppsForMigration = listAppsForMigration;
 exports.initializeMigration = initializeMigration;
 exports.continueMigration = continueMigration;
@@ -7,9 +9,21 @@ exports.checkMigrationStatusV2 = checkMigrationStatusV2;
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const http_1 = require("@hubspot/local-dev-lib/http");
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
-async function listAppsForMigration(accountId) {
+exports.CLI_UNMIGRATABLE_REASONS = {
+    PART_OF_PROJECT_ALREADY: 'PART_OF_PROJECT_ALREADY',
+};
+function isMigrationStatus(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'id' in error &&
+        'status' in error);
+}
+async function listAppsForMigration(accountId, platformVersion) {
     return http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/list-apps`,
+        params: {
+            platformVersion: mapPlatformVersionToEnum(platformVersion),
+        },
     });
 }
 function mapPlatformVersionToEnum(platformVersion) {
@@ -37,7 +51,7 @@ async function continueMigration(portalId, migrationId, componentUids, projectNa
         },
     });
 }
-function checkMigrationStatusV2(accountId, id) {
+async function checkMigrationStatusV2(accountId, id) {
     return http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/migrations/${id}/status`,
     });

package/bin/cli.js

@@ -1,79 +1,85 @@
 #!/usr/bin/env node
 "use strict";
-const yargs = require('yargs');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logError } = require('../lib/errorHandlers/index');
-const { setLogLevel, getCommandName } = require('../lib/commonOpts');
-const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { loadConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } = require('../lib/middleware/configMiddleware');
-const { notifyAboutUpdates, } = require('../lib/middleware/notificationsMiddleware');
-const { checkAndWarnGitInclusionMiddleware, } = require('../lib/middleware/gitMiddleware');
-const { performChecks } = require('../lib/middleware/yargsChecksMiddleware');
-const { setRequestHeaders } = require('../lib/middleware/requestMiddleware');
-const { checkFireAlarms } = require('../lib/middleware/fireAlarmMiddleware');
-const removeCommand = require('../commands/remove');
-const initCommand = require('../commands/init');
-const logsCommand = require('../commands/logs');
-const lintCommand = require('../commands/lint');
-const hubdbCommand = require('../commands/hubdb');
-const watchCommand = require('../commands/watch');
-const authCommand = require('../commands/auth');
-const uploadCommand = require('../commands/upload');
-const createCommand = require('../commands/create');
-const fetchCommand = require('../commands/fetch');
-const filemanagerCommand = require('../commands/filemanager');
-const secretCommands = require('../commands/secret');
-const customObjectCommand = require('../commands/customObject');
-const functionCommands = require('../commands/function');
-const listCommand = require('../commands/list');
-const openCommand = require('../commands/open');
-const mvCommand = require('../commands/mv');
-const projectCommands = require('../commands/project');
-const themeCommand = require('../commands/theme');
-const moduleCommand = require('../commands/module');
-const configCommand = require('../commands/config');
-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 appCommand = require('../commands/app');
-notifyAboutUpdates();
-const getTerminalWidth = () => {
-    const width = yargs.terminalWidth();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const yargs_1 = __importDefault(require("yargs"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const index_1 = require("../lib/errorHandlers/index");
+const commonOpts_1 = require("../lib/commonOpts");
+const usageTracking_1 = require("../lib/usageTracking");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const configMiddleware_1 = require("../lib/middleware/configMiddleware");
+const autoUpdateMiddleware_1 = require("../lib/middleware/autoUpdateMiddleware");
+const gitMiddleware_1 = require("../lib/middleware/gitMiddleware");
+const yargsChecksMiddleware_1 = require("../lib/middleware/yargsChecksMiddleware");
+const requestMiddleware_1 = require("../lib/middleware/requestMiddleware");
+const fireAlarmMiddleware_1 = require("../lib/middleware/fireAlarmMiddleware");
+const remove_1 = __importDefault(require("../commands/remove"));
+const init_1 = __importDefault(require("../commands/init"));
+const logs_1 = __importDefault(require("../commands/logs"));
+const lint_1 = __importDefault(require("../commands/lint"));
+const hubdb_1 = __importDefault(require("../commands/hubdb"));
+const watch_1 = __importDefault(require("../commands/watch"));
+const auth_1 = __importDefault(require("../commands/auth"));
+const upload_1 = __importDefault(require("../commands/upload"));
+const create_1 = __importDefault(require("../commands/create"));
+const fetch_1 = __importDefault(require("../commands/fetch"));
+const filemanager_1 = __importDefault(require("../commands/filemanager"));
+const secret_1 = __importDefault(require("../commands/secret"));
+const customObject_1 = __importDefault(require("../commands/customObject"));
+const function_1 = __importDefault(require("../commands/function"));
+const list_1 = __importDefault(require("../commands/list"));
+const open_1 = __importDefault(require("../commands/open"));
+const mv_1 = __importDefault(require("../commands/mv"));
+const project_1 = __importDefault(require("../commands/project"));
+const theme_1 = __importDefault(require("../commands/theme"));
+const module_1 = __importDefault(require("../commands/module"));
+const config_1 = __importDefault(require("../commands/config"));
+const account_1 = __importDefault(require("../commands/account"));
+const sandbox_1 = __importDefault(require("../commands/sandbox"));
+const cms_1 = __importDefault(require("../commands/cms"));
+const feedback_1 = __importDefault(require("../commands/feedback"));
+const doctor_1 = __importDefault(require("../commands/doctor"));
+const completion_1 = __importDefault(require("../commands/completion"));
+const app_1 = __importDefault(require("../commands/app"));
+const getStarted_1 = __importDefault(require("../commands/getStarted"));
+const mcp_1 = __importDefault(require("../commands/mcp"));
+function getTerminalWidth() {
+    const width = yargs_1.default.terminalWidth();
     if (width >= 100)
         return width * 0.9;
     return width;
-};
-const handleFailure = (msg, err, yargs) => {
+}
+function handleFailure(msg, err, yargs) {
     if (msg) {
-        logger.error(msg);
+        logger_1.logger.error(msg);
     }
     else if (err) {
-        logError(err);
+        (0, index_1.logError)(err);
     }
     if (msg === null) {
         yargs.showHelp('log');
-        process.exit(EXIT_CODES.SUCCESS);
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     else {
-        process.exit(EXIT_CODES.ERROR);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-};
-const argv = yargs
+}
+const argv = yargs_1.default
     .usage('The command line interface to interact with HubSpot.')
     // loadConfigMiddleware loads the new hidden config for all commands
     .middleware([
-    setLogLevel,
-    setRequestHeaders,
-    handleDeprecatedEnvVariables,
-    loadConfigMiddleware,
-    injectAccountIdMiddleware,
-    checkAndWarnGitInclusionMiddleware,
-    validateAccountOptions,
-    checkFireAlarms,
+    commonOpts_1.setLogLevel,
+    requestMiddleware_1.setRequestHeaders,
+    configMiddleware_1.handleDeprecatedEnvVariables,
+    configMiddleware_1.loadConfigMiddleware,
+    configMiddleware_1.injectAccountIdMiddleware,
+    autoUpdateMiddleware_1.autoUpdateCLI,
+    gitMiddleware_1.checkAndWarnGitInclusionMiddleware,
+    configMiddleware_1.validateAccountOptions,
+    fireAlarmMiddleware_1.checkFireAlarms,
 ])
     .exitProcess(false)
     .fail(handleFailure)
@@ -89,47 +95,46 @@ const argv = yargs
     hidden: true,
     type: 'boolean',
 })
-    .check(performChecks)
-    .command(authCommand)
-    .command(initCommand)
-    .command(logsCommand)
-    .command(cmsCommand)
-    .command(lintCommand)
-    .command(hubdbCommand)
-    .command(watchCommand)
-    .command(removeCommand)
-    .command(uploadCommand)
-    .command(createCommand)
-    .command(fetchCommand)
-    .command(filemanagerCommand)
-    .command(secretCommands)
-    .command(customObjectCommand)
-    .command(functionCommands)
-    .command({
-    ...listCommand,
-    aliases: 'ls',
-})
-    .command(openCommand)
-    .command(mvCommand)
-    .command(projectCommands)
-    .command(themeCommand)
-    .command(moduleCommand)
-    .command(configCommand)
-    .command(accountCommands)
-    .command(sandboxesCommand)
-    .command(feedbackCommand)
-    .command(doctorCommand)
-    .command(completionCommand)
-    .command(appCommand)
+    .check(yargsChecksMiddleware_1.performChecks)
+    .command(auth_1.default)
+    .command(init_1.default)
+    .command(logs_1.default)
+    .command(cms_1.default)
+    .command(lint_1.default)
+    .command(hubdb_1.default)
+    .command(watch_1.default)
+    .command(remove_1.default)
+    .command(upload_1.default)
+    .command(create_1.default)
+    .command(fetch_1.default)
+    .command(filemanager_1.default)
+    .command(secret_1.default)
+    .command(customObject_1.default)
+    .command(function_1.default)
+    .command(list_1.default)
+    .command(open_1.default)
+    .command(mv_1.default)
+    .command(project_1.default)
+    .command(theme_1.default)
+    .command(module_1.default)
+    .command(config_1.default)
+    .command(account_1.default)
+    .command(sandbox_1.default)
+    .command(feedback_1.default)
+    .command(doctor_1.default)
+    .command(completion_1.default)
+    .command(app_1.default)
+    .command(getStarted_1.default)
+    .command(mcp_1.default)
     .help()
     .alias('h', 'help')
     .recommendCommands()
     .demandCommand(1, '')
     .wrap(getTerminalWidth())
     .strict().argv;
-if (argv.help) {
-    trackHelpUsage(getCommandName(argv));
+if ('help' in argv && argv.help !== undefined) {
+    (0, usageTracking_1.trackHelpUsage)((0, commonOpts_1.getCommandName)(argv));
 }
-if (argv.convertFields) {
-    trackConvertFieldsUsage(getCommandName(argv));
+if ('convertFields' in argv && argv.convertFields !== undefined) {
+    (0, usageTracking_1.trackConvertFieldsUsage)((0, commonOpts_1.getCommandName)(argv));
 }

package/commands/account/auth.d.ts

@@ -1,10 +1,8 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "auth";
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountAuthArgs = CommonArgs & ConfigArgs & {
     disableTracking?: boolean;
+} & {
+    personalAccessKey?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountAuthArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountAuthArgs>;
-export {};
+declare const accountAuthCommand: YargsCommandModule<unknown, AccountAuthArgs>;
+export default accountAuthCommand;

package/commands/account/auth.js

@@ -1,50 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = exports.describe = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const config_1 = require("@hubspot/local-dev-lib/config");
 const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const commonOpts_1 = require("../../lib/commonOpts");
 const configMigrate_1 = require("../../lib/configMigrate");
 const process_1 = require("../../lib/process");
 const index_1 = require("../../lib/errorHandlers/index");
-const lang_1 = require("../../lib/lang");
 const usageTracking_1 = require("../../lib/usageTracking");
 const personalAccessKeyPrompt_1 = require("../../lib/prompts/personalAccessKeyPrompt");
 const accountNamePrompt_1 = require("../../lib/prompts/accountNamePrompt");
 const setAsDefaultAccountPrompt_1 = require("../../lib/prompts/setAsDefaultAccountPrompt");
 const index_2 = require("../../lib/errorHandlers/index");
-const usageTracking_2 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const en_1 = require("../../lang/en");
+const logger_1 = require("../../lib/ui/logger");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
     COMPLETE: 'complete',
 };
-async function updateConfig(env, doesConfigExist, disableTracking, authType, account) {
+const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+async function updateConfigWithNewAccount(env, configAlreadyExists, providedPersonalAccessKey, accountId) {
     try {
-        const { personalAccessKey } = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
-            env,
-            account,
-        });
+        const { personalAccessKey } = providedPersonalAccessKey
+            ? { personalAccessKey: providedPersonalAccessKey }
+            : await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
+                env,
+                account: accountId,
+            });
         const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
-        const defaultName = token.hubName ? (0, text_1.toKebabCase)(token.hubName) : undefined;
-        const name = doesConfigExist
+        const defaultAccountName = token.hubName
+            ? (0, text_1.toKebabCase)(token.hubName)
+            : undefined;
+        const accountName = configAlreadyExists
             ? undefined
-            : (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName)).name;
-        const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, name, !doesConfigExist);
+            : (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultAccountName)).name;
+        const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, accountName, !configAlreadyExists);
         if (!updatedConfig)
             return null;
-        if (doesConfigExist && !updatedConfig.name) {
-            updatedConfig.name = (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName)).name;
+        // Can happen if the user is re-authenticating an account with no name
+        if (configAlreadyExists && !updatedConfig.name) {
+            updatedConfig.name = (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultAccountName)).name;
             (0, config_1.updateAccountConfig)({
                 ...updatedConfig,
             });
@@ -53,91 +55,81 @@ async function updateConfig(env, doesConfigExist, disableTracking, authType, acc
         return updatedConfig;
     }
     catch (e) {
-        if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
-        }
         (0, index_1.debugError)(e);
         return null;
     }
 }
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
-exports.command = 'auth';
-async function handler(args) {
-    const { providedAccountId, disableTracking } = args;
-    const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+async function handleConfigMigration() {
     const deprecatedConfigExists = (0, migrate_1.configFileExists)(false);
     const globalConfigExists = (0, migrate_1.configFileExists)(true);
-    if (deprecatedConfigExists) {
-        if (globalConfigExists) {
-            try {
-                await (0, configMigrate_1.handleMerge)(providedAccountId);
-            }
-            catch (error) {
-                (0, index_2.logError)(error);
-                (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
-                    command: 'hs account auth',
-                    type: 'Merge configs',
-                    successful: false,
-                }, providedAccountId);
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    // No deprecated config exists, so no migration is needed
+    if (!deprecatedConfigExists) {
+        return true;
+    }
+    // Global config exists, so we need to merge the deprecated config with the global config
+    if (globalConfigExists) {
+        try {
+            const mergeConfirmed = await (0, configMigrate_1.handleMerge)();
+            if (!mergeConfirmed) {
+                logger_1.uiLogger.log('');
+                logger_1.uiLogger.log(en_1.commands.account.subcommands.auth.errors.mergeNotConfirmed);
             }
+            return mergeConfirmed;
         }
-        else {
-            try {
-                await (0, configMigrate_1.handleMigration)(providedAccountId);
-            }
-            catch (error) {
-                (0, index_2.logError)(error);
-                (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
-                    command: 'hs account auth',
-                    type: 'Migrate a single config',
-                    successful: false,
-                }, providedAccountId);
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
-            }
+        catch (error) {
+            (0, index_2.logError)(error);
+            return false;
+        }
+    }
+    // Global config does not exist, so we only need to migrate the deprecated config
+    try {
+        const migrationConfirmed = await (0, configMigrate_1.handleMigration)();
+        if (!migrationConfirmed) {
+            logger_1.uiLogger.log('');
+            logger_1.uiLogger.log(en_1.commands.account.subcommands.auth.errors.migrationNotConfirmed);
         }
+        return migrationConfirmed;
+    }
+    catch (error) {
+        (0, index_2.logError)(error);
+        return false;
     }
+}
+const describe = en_1.commands.account.subcommands.auth.describe;
+const command = 'auth';
+async function handler(args) {
+    const { providedAccountId, disableTracking, personalAccessKey: providedPersonalAccessKey, } = args;
     if (!disableTracking) {
         (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
         await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
     }
-    const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
+    const configMigrationSuccess = await handleConfigMigration();
+    if (!configMigrationSuccess) {
+        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const configAlreadyExists = (0, migrate_1.configFileExists)(true);
     if (!configAlreadyExists) {
         (0, config_1.createEmptyConfigFile)({}, true);
     }
     (0, config_1.loadConfig)('');
     (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
-    const updatedConfig = await updateConfig(env, configAlreadyExists, disableTracking, authType, providedAccountId);
+    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, providedAccountId);
     if (!updatedConfig) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.auth.errors.failedToUpdateConfig'));
+        if (!disableTracking) {
+            await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
+        }
+        logger_1.uiLogger.error(en_1.commands.account.subcommands.auth.errors.failedToUpdateConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const { name } = updatedConfig;
     const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(updatedConfig);
-    // If the config file was just created, we don't need to prompt the user to set as default
     if (!configAlreadyExists) {
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileCreated', {
-            configPath: (0, config_1.getConfigPath)('', true),
-        }));
-        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileUpdated', {
-            account: name || accountId || '',
-        }));
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.success(en_1.commands.account.subcommands.auth.success.configFileCreated((0, migrate_1.getConfigPath)('', true)));
+        logger_1.uiLogger.success(en_1.commands.account.subcommands.auth.success.configFileUpdated(accountId));
     }
     else {
-        const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(name);
-        logger_1.logger.log('');
-        if (setAsDefault) {
-            logger_1.logger.success((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
-                accountName: name,
-            }));
-        }
-        else {
-            logger_1.logger.info((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-                accountName: (0, config_1.getConfigDefaultAccount)(),
-            }));
-        }
+        await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(updatedConfig.name);
     }
     (0, ui_1.uiFeatureHighlight)([
         'helpCommand',
@@ -149,10 +141,10 @@ async function handler(args) {
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
+function accountAuthBuilder(yargs) {
     yargs.options({
         account: {
-            describe: (0, lang_1.i18n)('commands.account.subcommands.auth.options.account.describe'),
+            describe: en_1.commands.account.subcommands.auth.options.account,
             type: 'string',
             alias: 'a',
         },
@@ -161,8 +153,23 @@ function builder(yargs) {
             hidden: true,
             default: false,
         },
+        'personal-access-key': {
+            describe: en_1.commands.account.subcommands.auth.options.personalAccessKey,
+            type: 'string',
+            hidden: false,
+            alias: 'pak',
+        },
     });
-    (0, commonOpts_1.addTestingOptions)(yargs);
-    (0, commonOpts_1.addGlobalOptions)(yargs);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountAuthBuilder, command, en_1.commands.account.subcommands.auth.verboseDescribe, {
+    useGlobalOptions: true,
+    useTestingOptions: true,
+});
+const accountAuthCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountAuthCommand;

package/commands/account/clean.d.ts

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

package/commands/account/clean.js

@@ -3,9 +3,6 @@ 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 personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
@@ -16,15 +13,15 @@ const config_2 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const commonOpts_1 = require("../../lib/commonOpts");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const table_1 = require("../../lib/ui/table");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const ui_1 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
-exports.command = 'clean';
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'clean';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
 async function handler(args) {
     const { qa } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-clean');
@@ -131,9 +128,19 @@ async function handler(args) {
     logger_1.logger.log('');
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addTestingOptions)(yargs);
+function accountCleanBuilder(yargs) {
     yargs.example([['$0 accounts clean']]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountCleanBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useTestingOptions: true,
+});
+const accountCleanCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountCleanCommand;