@hubspot/cli 7.6.0-beta.5 → 7.6.0-beta.7

package/commands/account/auth.js

@@ -1,67 +1,66 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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 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 configMigrate_1 = require("../../lib/configMigrate");
-const process_1 = require("../../lib/process");
-const index_1 = require("../../lib/errorHandlers/index");
-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 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");
+import { loadConfig, updateAccountConfig, writeConfig, createEmptyConfigFile, deleteEmptyConfigFile, } from '@hubspot/local-dev-lib/config';
+import { configFileExists, getConfigPath, } from '@hubspot/local-dev-lib/config/migrate';
+import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { toKebabCase } from '@hubspot/local-dev-lib/text';
+import { PERSONAL_ACCESS_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
+import { handleMerge, handleMigration } from '../../lib/configMigrate.js';
+import { handleExit } from '../../lib/process.js';
+import { debugError } from '../../lib/errorHandlers/index.js';
+import { trackCommandUsage, trackAuthAction } from '../../lib/usageTracking.js';
+import { personalAccessKeyPrompt } from '../../lib/prompts/personalAccessKeyPrompt.js';
+import { cliAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
+import { setAsDefaultAccountPrompt } from '../../lib/prompts/setAsDefaultAccountPrompt.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { uiFeatureHighlight } from '../../lib/ui/index.js';
+import { parseStringToNumber } from '../../lib/parsing.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
     COMPLETE: 'complete',
 };
-const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+const authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
 async function updateConfigWithNewAccount(env, configAlreadyExists, providedPersonalAccessKey, accountId) {
     try {
         const { personalAccessKey } = providedPersonalAccessKey
             ? { personalAccessKey: providedPersonalAccessKey }
-            : await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
+            : await personalAccessKeyPrompt({
                 env,
                 account: accountId,
             });
-        const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
+        const token = await getAccessToken(personalAccessKey, env);
         const defaultAccountName = token.hubName
-            ? (0, text_1.toKebabCase)(token.hubName)
+            ? toKebabCase(token.hubName)
             : undefined;
         const accountName = configAlreadyExists
             ? undefined
-            : (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultAccountName)).name;
-        const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, accountName, !configAlreadyExists);
+            : (await cliAccountNamePrompt(defaultAccountName)).name;
+        const updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env, accountName, !configAlreadyExists);
         if (!updatedConfig)
             return null;
         // 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.name = (await cliAccountNamePrompt(defaultAccountName)).name;
+            updateAccountConfig({
                 ...updatedConfig,
             });
-            (0, config_1.writeConfig)();
+            writeConfig();
         }
         return updatedConfig;
     }
     catch (e) {
-        (0, index_1.debugError)(e);
+        debugError(e);
         return null;
     }
 }
 async function handleConfigMigration() {
-    const deprecatedConfigExists = (0, migrate_1.configFileExists)(false);
-    const globalConfigExists = (0, migrate_1.configFileExists)(true);
+    const deprecatedConfigExists = configFileExists(false);
+    const globalConfigExists = configFileExists(true);
     // No deprecated config exists, so no migration is needed
     if (!deprecatedConfigExists) {
         return true;
@@ -69,83 +68,93 @@ async function handleConfigMigration() {
     // 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)();
+            const mergeConfirmed = await handleMerge();
             if (!mergeConfirmed) {
-                logger_1.uiLogger.log('');
-                logger_1.uiLogger.log(en_1.commands.account.subcommands.auth.errors.mergeNotConfirmed);
+                uiLogger.log('');
+                uiLogger.log(commands.account.subcommands.auth.errors.mergeNotConfirmed);
             }
             return mergeConfirmed;
         }
         catch (error) {
-            (0, index_2.logError)(error);
+            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)();
+        const migrationConfirmed = await handleMigration();
         if (!migrationConfirmed) {
-            logger_1.uiLogger.log('');
-            logger_1.uiLogger.log(en_1.commands.account.subcommands.auth.errors.migrationNotConfirmed);
+            uiLogger.log('');
+            uiLogger.log(commands.account.subcommands.auth.errors.migrationNotConfirmed);
         }
         return migrationConfirmed;
     }
     catch (error) {
-        (0, index_2.logError)(error);
+        logError(error);
         return false;
     }
 }
-const describe = en_1.commands.account.subcommands.auth.describe;
+const describe = commands.account.subcommands.auth.describe;
 const command = 'auth';
 async function handler(args) {
-    const { disableTracking, personalAccessKey: providedPersonalAccessKey, derivedAccountId, } = args;
+    const { disableTracking, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    if (userProvidedAccount) {
+        try {
+            parsedUserProvidedAccountId = parseStringToNumber(userProvidedAccount);
+        }
+        catch (err) {
+            uiLogger.error(commands.account.subcommands.auth.errors.invalidAccountIdProvided);
+            process.exit(EXIT_CODES.ERROR);
+        }
+    }
     if (!disableTracking) {
-        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, derivedAccountId);
-        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
+        trackCommandUsage('account-auth', {}, parsedUserProvidedAccountId);
+        await trackAuthAction('account-auth', authType, TRACKING_STATUS.STARTED);
     }
     const configMigrationSuccess = await handleConfigMigration();
     if (!configMigrationSuccess) {
-        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        await trackAuthAction('account-auth', authType, TRACKING_STATUS.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
-    const configAlreadyExists = (0, migrate_1.configFileExists)(true);
+    const configAlreadyExists = configFileExists(true);
     if (!configAlreadyExists) {
-        (0, config_1.createEmptyConfigFile)({}, true);
+        createEmptyConfigFile({}, true);
     }
-    (0, config_1.loadConfig)('');
-    (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
-    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, derivedAccountId);
+    loadConfig('');
+    handleExit(deleteEmptyConfigFile);
+    const updatedConfig = await updateConfigWithNewAccount(args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, parsedUserProvidedAccountId);
     if (!updatedConfig) {
         if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
+            await 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);
+        uiLogger.error(commands.account.subcommands.auth.errors.failedToUpdateConfig);
+        process.exit(EXIT_CODES.ERROR);
     }
-    const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(updatedConfig);
+    const accountId = getAccountIdentifier(updatedConfig);
     if (!configAlreadyExists) {
-        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));
+        uiLogger.log('');
+        uiLogger.success(commands.account.subcommands.auth.success.configFileCreated(getConfigPath('', true)));
+        uiLogger.success(commands.account.subcommands.auth.success.configFileUpdated(accountId));
     }
     else {
-        await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(updatedConfig.name);
+        await setAsDefaultAccountPrompt(updatedConfig.name);
     }
-    (0, ui_1.uiFeatureHighlight)([
+    uiFeatureHighlight([
         'helpCommand',
         'accountAuthCommand',
         'accountsListCommand',
     ]);
     if (!disableTracking) {
-        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+        await trackAuthAction('account-auth', authType, TRACKING_STATUS.COMPLETE, accountId);
     }
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function accountAuthBuilder(yargs) {
     yargs.options({
         account: {
-            describe: en_1.commands.account.subcommands.auth.options.account,
-            type: 'string',
+            describe: commands.account.subcommands.auth.options.account,
+            type: 'number',
             alias: 'a',
         },
         'disable-tracking': {
@@ -154,7 +163,7 @@ function accountAuthBuilder(yargs) {
             default: false,
         },
         'personal-access-key': {
-            describe: en_1.commands.account.subcommands.auth.options.personalAccessKey,
+            describe: commands.account.subcommands.auth.options.personalAccessKey,
             type: 'string',
             hidden: false,
             alias: 'pak',
@@ -162,7 +171,7 @@ function accountAuthBuilder(yargs) {
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(accountAuthBuilder, command, en_1.commands.account.subcommands.auth.verboseDescribe, {
+const builder = makeYargsBuilder(accountAuthBuilder, command, commands.account.subcommands.auth.verboseDescribe, {
     useGlobalOptions: true,
     useTestingOptions: true,
 });
@@ -172,4 +181,4 @@ const accountAuthCommand = {
     handler,
     builder,
 };
-exports.default = accountAuthCommand;
+export default accountAuthCommand;

package/commands/account/clean.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
 type AccountCleanArgs = CommonArgs & ConfigArgs & {
     qa?: boolean;
 };

package/commands/account/clean.js

@@ -1,55 +1,50 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
-const config_1 = require("@hubspot/local-dev-lib/config");
-const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const index_1 = require("@hubspot/local-dev-lib/errors/index");
-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 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");
-const yargsUtils_1 = require("../../lib/yargsUtils");
+import fs from 'fs';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personalAccessKey';
+import { loadConfig, getConfigPath, deleteAccount, getConfigAccounts, getConfigDefaultAccount, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
+import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { i18n } from '../../lib/lang.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { promptUser } from '../../lib/prompts/promptUtils.js';
+import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
+import { getTableContents } from '../../lib/ui/table.js';
+import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { uiAccountDescription } from '../../lib/ui/index.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'clean';
-const describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
+const describe = i18n(`commands.account.subcommands.clean.describe`);
 async function handler(args) {
     const { qa } = args;
-    (0, usageTracking_1.trackCommandUsage)('accounts-clean');
-    const accountsList = (0, config_1.getConfigAccounts)() || [];
+    trackCommandUsage('accounts-clean');
+    const accountsList = getConfigAccounts() || [];
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
-        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.noResults`));
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        logger.log(i18n(`commands.account.subcommands.clean.noResults`));
+        process.exit(EXIT_CODES.SUCCESS);
     }
     const accountsToRemove = [];
-    SpinniesManager_1.default.init({
+    SpinniesManager.init({
         succeedColor: 'white',
     });
-    SpinniesManager_1.default.add('accountsClean', {
-        text: (0, lang_1.i18n)(`commands.account.subcommands.clean.loading.add`),
+    SpinniesManager.add('accountsClean', {
+        text: i18n(`commands.account.subcommands.clean.loading.add`),
     });
     for (const account of filteredTestAccounts) {
         try {
-            const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(account);
-            await (0, personalAccessKey_1.accessTokenForPersonalAccessKey)(accountId, true);
+            const accountId = getAccountIdentifier(account);
+            await accessTokenForPersonalAccessKey(accountId, true);
         }
         catch (error) {
-            if ((0, index_1.isSpecifiedError)(error, {
+            if (isSpecifiedError(error, {
                 statusCode: 401,
                 category: 'INVALID_AUTHENTICATION',
                 subCategory: 'LocalDevAuthErrorType.PORTAL_NOT_ACTIVE',
             }) ||
-                (0, index_1.isSpecifiedError)(error, {
+                isSpecifiedError(error, {
                     statusCode: 404,
                     category: 'INVALID_AUTHENTICATION',
                     subCategory: 'LocalDevAuthErrorType.INVALID_PORTAL_ID',
@@ -60,32 +55,32 @@ async function handler(args) {
     }
     if (accountsToRemove.length > 0) {
         const oneAccountFound = accountsToRemove.length === 1;
-        SpinniesManager_1.default.succeed('accountsClean', {
-            text: (0, lang_1.i18n)(oneAccountFound
+        SpinniesManager.succeed('accountsClean', {
+            text: i18n(oneAccountFound
                 ? `commands.account.subcommands.clean.inactiveAccountsFound.one`
                 : `commands.account.subcommands.clean.inactiveAccountsFound.other`, {
                 count: accountsToRemove.length,
             }),
         });
-        logger_1.logger.log((0, table_1.getTableContents)(accountsToRemove.map(p => [
-            (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(p)),
+        logger.log(getTableContents(accountsToRemove.map(p => [
+            uiAccountDescription(getAccountIdentifier(p)),
         ]), { border: { bodyLeft: '  ' } }));
-        let promptMessage = (0, lang_1.i18n)(oneAccountFound
+        let promptMessage = i18n(oneAccountFound
             ? `commands.account.subcommands.clean.confirm.one`
             : `commands.account.subcommands.clean.confirm.other`, {
             count: accountsToRemove.length,
         });
-        const accountOverride = (0, config_2.getCWDAccountOverride)();
-        const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
+        const accountOverride = getCWDAccountOverride();
+        const overrideFilePath = getDefaultAccountOverrideFilePath();
         const accountOverrideMatches = accountsToRemove.some(account => account.name === accountOverride ||
             // @ts-expect-error: Default account override files can only exist with global config
             account.accountId === accountOverride);
         if (overrideFilePath && accountOverride && accountOverrideMatches) {
-            promptMessage = `${promptMessage}${(0, lang_1.i18n)(`commands.account.subcommands.clean.defaultAccountOverride`, {
+            promptMessage = `${promptMessage}${i18n(`commands.account.subcommands.clean.defaultAccountOverride`, {
                 overrideFilePath,
             })}`;
         }
-        const { accountsCleanPrompt } = await (0, promptUtils_1.promptUser)([
+        const { accountsCleanPrompt } = await promptUser([
             {
                 name: 'accountsCleanPrompt',
                 type: 'confirm',
@@ -93,46 +88,46 @@ async function handler(args) {
             },
         ]);
         if (accountsCleanPrompt) {
-            logger_1.logger.log('');
+            logger.log('');
             try {
                 if (overrideFilePath) {
-                    fs_1.default.unlinkSync(overrideFilePath);
+                    fs.unlinkSync(overrideFilePath);
                 }
             }
             catch (error) {
-                (0, errorHandlers_1.logError)(error);
+                logError(error);
             }
             for (const accountToRemove of accountsToRemove) {
-                await (0, config_1.deleteAccount)(accountToRemove.name);
-                logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.removeSuccess`, {
+                await deleteAccount(accountToRemove.name);
+                logger.log(i18n(`commands.account.subcommands.clean.removeSuccess`, {
                     accountName: accountToRemove.name,
                 }));
             }
             // Get updated version of the config
-            (0, config_1.loadConfig)((0, config_1.getConfigPath)());
-            const defaultAccount = (0, config_1.getConfigDefaultAccount)();
+            loadConfig(getConfigPath());
+            const defaultAccount = getConfigDefaultAccount();
             if (defaultAccount &&
                 accountsToRemove.some(p => p.name === defaultAccount)) {
-                logger_1.logger.log();
-                logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.replaceDefaultAccount`));
-                const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
-                (0, config_1.updateDefaultAccount)(newDefaultAccount);
+                logger.log();
+                logger.log(i18n(`commands.account.subcommands.clean.replaceDefaultAccount`));
+                const newDefaultAccount = await selectAccountFromConfig();
+                updateDefaultAccount(newDefaultAccount);
             }
         }
     }
     else {
-        SpinniesManager_1.default.succeed('accountsClean', {
-            text: (0, lang_1.i18n)(`commands.account.subcommands.clean.noResults`),
+        SpinniesManager.succeed('accountsClean', {
+            text: i18n(`commands.account.subcommands.clean.noResults`),
         });
     }
-    logger_1.logger.log('');
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    logger.log('');
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function accountCleanBuilder(yargs) {
     yargs.example([['$0 accounts clean']]);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(accountCleanBuilder, command, describe, {
+const builder = makeYargsBuilder(accountCleanBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,
@@ -143,4 +138,4 @@ const accountCleanCommand = {
     handler,
     builder,
 };
-exports.default = accountCleanCommand;
+export default accountCleanCommand;

package/commands/account/createOverride.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 type AccountCreateOverrideArgs = CommonArgs & {
     account: string | number;
 };