@hubspot/cli 7.7.0-experimental.2 → 7.7.0

package/commands/app/secret/update.js

@@ -1,68 +1,67 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devSecrets_1 = require("@hubspot/local-dev-lib/api/devSecrets");
-const index_1 = require("../../../lib/errorHandlers/index");
-const usageTracking_1 = require("../../../lib/usageTracking");
-const secretPrompt_1 = require("../../../lib/prompts/secretPrompt");
-const selectAppPrompt_1 = require("../../../lib/prompts/selectAppPrompt");
-const promptUtils_1 = require("../../../lib/prompts/promptUtils");
-const en_1 = require("../../../lang/en");
-const exitCodes_1 = require("../../../lib/enums/exitCodes");
-const yargsUtils_1 = require("../../../lib/yargsUtils");
-const logger_1 = require("../../../lib/ui/logger");
+import { fetchAppSecrets, updateAppSecret, } from '@hubspot/local-dev-lib/api/devSecrets';
+import { logError } from '../../../lib/errorHandlers/index.js';
+import { trackCommandUsage } from '../../../lib/usageTracking.js';
+import { secretValuePrompt } from '../../../lib/prompts/secretPrompt.js';
+import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
+import { listPrompt } from '../../../lib/prompts/promptUtils.js';
+import { commands } from '../../../lang/en.js';
+import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
+import { uiLogger } from '../../../lib/ui/logger.js';
+import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'update [name]';
-const describe = en_1.commands.app.subcommands.secret.subcommands.update.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.update.describe, false);
 async function handler(args) {
     const { derivedAccountId } = args;
-    (0, usageTracking_1.trackCommandUsage)('app-secret-update', {}, derivedAccountId);
-    const appSecretApp = await (0, selectAppPrompt_1.selectAppPrompt)(derivedAccountId, args.app);
+    trackCommandUsage('app-secret-update', {}, derivedAccountId);
+    const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
     if (!appSecretApp) {
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
     let appSecretToUpdate = args.name;
     if (!appSecretToUpdate) {
         let appSecrets = [];
         try {
-            const { data: secrets } = await (0, devSecrets_1.fetchAppSecrets)(derivedAccountId, appSecretApp.id);
+            const { data: secrets } = await fetchAppSecrets(derivedAccountId, appSecretApp.id);
             if (secrets.secretKeys.length > 0) {
                 appSecrets = secrets.secretKeys.map(secret => secret.secretKey);
             }
         }
         catch (err) {
-            (0, index_1.logError)(err);
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            logError(err);
+            process.exit(EXIT_CODES.ERROR);
         }
         if (appSecrets.length === 0) {
-            logger_1.uiLogger.error(en_1.commands.app.subcommands.secret.subcommands.update.errors.noSecrets);
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            uiLogger.error(commands.app.subcommands.secret.subcommands.update.errors.noSecrets);
+            process.exit(EXIT_CODES.ERROR);
         }
-        appSecretToUpdate = await (0, promptUtils_1.listPrompt)(en_1.commands.app.subcommands.secret.subcommands.update.selectSecret, { choices: appSecrets });
+        appSecretToUpdate = await listPrompt(commands.app.subcommands.secret.subcommands.update.selectSecret, { choices: appSecrets });
     }
-    const { secretValue } = await (0, secretPrompt_1.secretValuePrompt)();
+    const { secretValue } = await secretValuePrompt();
     try {
-        await (0, devSecrets_1.updateAppSecret)(derivedAccountId, appSecretApp.id, appSecretToUpdate, secretValue);
-        logger_1.uiLogger.log('');
-        logger_1.uiLogger.success(en_1.commands.app.subcommands.secret.subcommands.update.success(appSecretApp.name, appSecretToUpdate));
+        await updateAppSecret(derivedAccountId, appSecretApp.id, appSecretToUpdate, secretValue);
+        uiLogger.log('');
+        uiLogger.success(commands.app.subcommands.secret.subcommands.update.success(appSecretApp.name, appSecretToUpdate));
     }
     catch (err) {
-        (0, index_1.logError)(err);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logError(err);
+        process.exit(EXIT_CODES.ERROR);
     }
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function updateAppSecretBuilder(yargs) {
     yargs.positional('name', {
-        describe: en_1.commands.app.subcommands.secret.subcommands.update.positionals.name,
+        describe: commands.app.subcommands.secret.subcommands.update.positionals.name,
         type: 'string',
     });
     yargs.option('app', {
-        describe: en_1.commands.app.subcommands.secret.subcommands.update.options.app,
+        describe: commands.app.subcommands.secret.subcommands.update.options.app,
         type: 'number',
     });
-    yargs.example('update my-secret --app=1234567890', en_1.commands.app.subcommands.secret.subcommands.update.example);
+    yargs.example('update my-secret --app=1234567890', commands.app.subcommands.secret.subcommands.update.example);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(updateAppSecretBuilder, command, describe, {
+const builder = makeYargsBuilder(updateAppSecretBuilder, command, describe, {
     useGlobalOptions: true,
     useAccountOptions: true,
     useConfigOptions: true,
@@ -74,4 +73,4 @@ const updateAppSecretCommand = {
     handler,
     builder,
 };
-exports.default = updateAppSecretCommand;
+export default updateAppSecretCommand;

package/commands/app/secret.d.ts

@@ -1,3 +1,3 @@
-import { YargsCommandModuleBucket } from '../../types/Yargs';
+import { YargsCommandModuleBucket } from '../../types/Yargs.js';
 declare const appSecretCommand: YargsCommandModuleBucket;
 export default appSecretCommand;

package/commands/app/secret.js

@@ -1,30 +1,26 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const en_1 = require("../../lang/en");
-const yargsUtils_1 = require("../../lib/yargsUtils");
-const add_1 = __importDefault(require("./secret/add"));
-const delete_1 = __importDefault(require("./secret/delete"));
-const list_1 = __importDefault(require("./secret/list"));
-const update_1 = __importDefault(require("./secret/update"));
+import { commands } from '../../lang/en.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import addAppSecretCommand from './secret/add.js';
+import deleteAppSecretCommand from './secret/delete.js';
+import listAppSecretsCommand from './secret/list.js';
+import updateAppSecretCommand from './secret/update.js';
+import { uiBetaTag } from '../../lib/ui/index.js';
 const command = ['secret', 'secrets'];
-const describe = undefined; // commands.app.subcommands.secret.describe;
+const describe = uiBetaTag(commands.app.subcommands.secret.describe, false);
 function appSecretBuilder(yargs) {
     yargs
-        .command(add_1.default)
-        .command(delete_1.default)
-        .command(list_1.default)
-        .command(update_1.default)
+        .command(addAppSecretCommand)
+        .command(deleteAppSecretCommand)
+        .command(listAppSecretsCommand)
+        .command(updateAppSecretCommand)
         .demandCommand(1, '');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(appSecretBuilder, command, en_1.commands.app.subcommands.secret.describe);
+const builder = makeYargsBuilder(appSecretBuilder, command, commands.app.subcommands.secret.describe);
 const appSecretCommand = {
     command,
     describe,
     builder,
     handler: () => { },
 };
-exports.default = appSecretCommand;
+export default appSecretCommand;

package/commands/app.d.ts

@@ -1,3 +1,3 @@
-import { YargsCommandModuleBucket } from '../types/Yargs';
+import { YargsCommandModuleBucket } from '../types/Yargs.js';
 declare const appCommand: YargsCommandModuleBucket;
 export default appCommand;

package/commands/app.js

@@ -1,25 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const migrate_1 = __importDefault(require("./app/migrate"));
-const secret_1 = __importDefault(require("./app/secret"));
-const yargsUtils_1 = require("../lib/yargsUtils");
+import migrateCommand from './app/migrate.js';
+import appSecretCommand from './app/secret.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { commands } from '../lang/en.js';
 const command = ['app', 'apps'];
-// Keep the command hidden for now
-const describe = undefined;
+const describe = commands.app.describe;
 function appBuilder(yargs) {
-    yargs.command(migrate_1.default).command(secret_1.default).demandCommand(1, '');
+    yargs.command(migrateCommand).command(appSecretCommand).demandCommand(1, '');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(appBuilder, command, describe);
+const builder = makeYargsBuilder(appBuilder, command, describe);
 const appCommand = {
     command,
     describe,
     builder,
     handler: () => { },
 };
-exports.default = appCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = appCommand;
+export default appCommand;

package/commands/auth.d.ts

@@ -1,6 +1,8 @@
-import { AccountArgs, CommonArgs, ConfigArgs, TestingArgs, YargsCommandModule } from '../types/Yargs';
+import { AccountArgs, CommonArgs, ConfigArgs, TestingArgs, YargsCommandModule } from '../types/Yargs.js';
 type AuthArgs = CommonArgs & ConfigArgs & TestingArgs & AccountArgs & {
     authType?: string;
+} & {
+    personalAccessKey?: string;
 };
 declare const authCommand: YargsCommandModule<unknown, AuthArgs>;
 export default authCommand;

package/commands/auth.js

@@ -1,59 +1,64 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const git_1 = require("../lib/ui/git");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const config_1 = require("@hubspot/local-dev-lib/constants/config");
-const lang_1 = require("../lib/lang");
-const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
-const config_2 = require("@hubspot/local-dev-lib/config");
-const text_1 = require("@hubspot/local-dev-lib/text");
-const promptUtils_1 = require("../lib/prompts/promptUtils");
-const personalAccessKeyPrompt_1 = require("../lib/prompts/personalAccessKeyPrompt");
-const accountNamePrompt_1 = require("../lib/prompts/accountNamePrompt");
-const setAsDefaultAccountPrompt_1 = require("../lib/prompts/setAsDefaultAccountPrompt");
-const commonOpts_1 = require("../lib/commonOpts");
-const yargsUtils_1 = require("../lib/yargsUtils");
-const usageTracking_1 = require("../lib/usageTracking");
-const oauth_1 = require("../lib/oauth");
-const exitCodes_1 = require("../lib/enums/exitCodes");
-const ui_1 = require("../lib/ui");
-const index_1 = require("../lib/errorHandlers/index");
+import { checkAndWarnGitInclusion } from '../lib/ui/git.js';
+import { OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
+import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
+import { updateAccountConfig, writeConfig, getConfigPath, loadConfig, getAccountId, configFileExists, } from '@hubspot/local-dev-lib/config';
+import { commaSeparatedValues, toKebabCase } from '@hubspot/local-dev-lib/text';
+import { promptUser } from '../lib/prompts/promptUtils.js';
+import { personalAccessKeyPrompt, OAUTH_FLOW, } from '../lib/prompts/personalAccessKeyPrompt.js';
+import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
+import { setAsDefaultAccountPrompt } from '../lib/prompts/setAsDefaultAccountPrompt.js';
+import { setLogLevel } from '../lib/commonOpts.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { trackAuthAction, trackCommandUsage } from '../lib/usageTracking.js';
+import { authenticateWithOauth } from '../lib/oauth.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { uiFeatureHighlight } from '../lib/ui/index.js';
+import { logError } from '../lib/errorHandlers/index.js';
+import { commands } from '../lang/en.js';
+import { uiLogger } from '../lib/ui/logger.js';
+import { parseStringToNumber } from '../lib/parsing.js';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
     COMPLETE: 'complete',
 };
 const ALLOWED_AUTH_METHODS = [
-    auth_1.OAUTH_AUTH_METHOD.value,
-    auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+    OAUTH_AUTH_METHOD.value,
+    PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
 ];
-const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)(ALLOWED_AUTH_METHODS);
+const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(ALLOWED_AUTH_METHODS);
 const command = 'auth';
-const describe = (0, lang_1.i18n)('commands.auth.describe');
+const describe = commands.auth.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = args;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = parseStringToNumber(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        uiLogger.error(commands.auth.errors.invalidAccountIdProvided);
+        process.exit(EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
-        auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-    (0, commonOpts_1.setLogLevel)(args);
-    const env = qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
+        PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    setLogLevel(args);
+    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
     // Needed to load deprecated config
-    (0, config_2.loadConfig)(configFlagValue);
-    const configPath = (0, config_2.getConfigPath)();
+    loadConfig(configFlagValue);
+    const configPath = getConfigPath();
     if (configPath) {
-        (0, git_1.checkAndWarnGitInclusion)(configPath);
+        checkAndWarnGitInclusion(configPath);
     }
-    if ((0, config_2.configFileExists)(true)) {
-        const globalConfigPath = (0, config_2.getConfigPath)('', true);
-        logger_1.logger.error((0, lang_1.i18n)(`commands.auth.errors.globalConfigFileExists`, {
-            configPath: globalConfigPath,
-            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    if (configFileExists(true)) {
+        uiLogger.error(commands.auth.errors.globalConfigFileExists('hs account auth'));
+        process.exit(EXIT_CODES.ERROR);
     }
-    (0, usageTracking_1.trackCommandUsage)('auth');
-    (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.STARTED, providedAccountId);
+    trackCommandUsage('auth');
+    trackAuthAction('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     let configData;
     let updatedConfig;
     let validName;
@@ -61,106 +66,93 @@ async function handler(args) {
     let token;
     let defaultName;
     switch (authType) {
-        case auth_1.OAUTH_AUTH_METHOD.value:
-            configData = await (0, promptUtils_1.promptUser)(personalAccessKeyPrompt_1.OAUTH_FLOW);
-            await (0, oauth_1.authenticateWithOauth)({
+        case OAUTH_AUTH_METHOD.value:
+            configData = await promptUser(OAUTH_FLOW);
+            await authenticateWithOauth({
                 ...configData,
                 env,
             });
-            successAuthMethod = auth_1.OAUTH_AUTH_METHOD.name;
+            successAuthMethod = OAUTH_AUTH_METHOD.name;
             break;
-        case auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            configData = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
-                env,
-                account: providedAccountId,
-            });
+        case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
+            const { personalAccessKey } = providedPersonalAccessKey
+                ? { personalAccessKey: providedPersonalAccessKey }
+                : await personalAccessKeyPrompt({
+                    env,
+                    account: parsedUserProvidedAccountId,
+                });
             try {
-                token = await (0, personalAccessKey_1.getAccessToken)(configData.personalAccessKey, env);
-                defaultName = token.hubName ? (0, text_1.toKebabCase)(token.hubName) : undefined;
-                updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, configData.personalAccessKey, env);
+                token = await getAccessToken(personalAccessKey, env);
+                defaultName = token.hubName ? toKebabCase(token.hubName) : undefined;
+                updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env);
             }
             catch (e) {
-                (0, index_1.logError)(e);
+                logError(e);
             }
             if (!updatedConfig) {
                 break;
             }
             validName = updatedConfig.name;
             if (!validName) {
-                const { name: namePrompt } = await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName);
+                const { name: namePrompt } = await cliAccountNamePrompt(defaultName);
                 validName = namePrompt;
             }
-            (0, config_2.updateAccountConfig)({
+            updateAccountConfig({
                 ...updatedConfig,
                 env: updatedConfig.env,
                 tokenInfo: updatedConfig.auth.tokenInfo,
                 name: validName,
             });
-            (0, config_2.writeConfig)();
-            successAuthMethod = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
+            writeConfig();
+            successAuthMethod = PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
             break;
         default:
-            logger_1.logger.error((0, lang_1.i18n)('commands.auth.errors.unsupportedAuthType', {
-                supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
-                type: authType,
-            }));
+            uiLogger.error(commands.auth.errors.unsupportedAuthType(authType, SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT));
             break;
     }
     if (!successAuthMethod) {
-        await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.ERROR, providedAccountId);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
+        process.exit(EXIT_CODES.ERROR);
     }
-    const nameFromConfigData = 'name' in configData ? configData.name : undefined;
+    const nameFromConfigData = configData && 'name' in configData ? configData.name : undefined;
     const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
-    const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
-    logger_1.logger.log('');
-    if (setAsDefault) {
-        logger_1.logger.success((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount', {
-            accountName,
-        }));
-    }
-    else {
-        logger_1.logger.info((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault', {
-            accountName: (0, config_2.getConfigDefaultAccount)(),
-        }));
-    }
-    logger_1.logger.success((0, lang_1.i18n)('commands.auth.success.configFileUpdated', {
-        configFilename: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        authType: successAuthMethod,
-        accountName,
-    }));
-    (0, ui_1.uiFeatureHighlight)([
+    await setAsDefaultAccountPrompt(accountName);
+    uiLogger.success(commands.auth.success.configFileUpdated(accountName, DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, successAuthMethod));
+    uiFeatureHighlight([
         'accountsUseCommand',
         'accountOption',
         'accountsListCommand',
     ]);
-    const accountId = (0, config_2.getAccountId)(accountName) || undefined;
-    await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    const accountId = getAccountId(accountName) || undefined;
+    await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function authBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)('commands.auth.options.authType.describe'),
+            describe: commands.auth.options.authType.describe,
             type: 'string',
             choices: [
-                `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
-                `${auth_1.OAUTH_AUTH_METHOD.value}`,
+                `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
+                `${OAUTH_AUTH_METHOD.value}`,
             ],
-            default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+            default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)('commands.auth.options.account.describe'),
+            describe: commands.auth.options.account.describe,
             type: 'string',
             alias: 'a',
         },
+        'personal-access-key': {
+            describe: commands.auth.options.personalAccessKey.describe,
+            type: 'string',
+            hidden: false,
+            alias: 'pak',
+        },
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    configName: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-}), {
+const builder = makeYargsBuilder(authBuilder, command, commands.auth.verboseDescribe(PERSONAL_ACCESS_KEY_AUTH_METHOD.value, DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,
@@ -171,6 +163,4 @@ const authCommand = {
     handler,
     builder,
 };
-exports.default = authCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = authCommand;
+export default authCommand;

package/commands/cms/convertFields.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 type ConvertFieldsArgs = CommonArgs & {
     src: string;
     fieldOptions: string[];

package/commands/cms/convertFields.js

@@ -1,40 +1,35 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
-const path_2 = require("@hubspot/local-dev-lib/path");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const fs_2 = require("@hubspot/local-dev-lib/fs");
-const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
-const lang_1 = require("../../lib/lang");
-const handleFieldsJS_1 = require("@hubspot/local-dev-lib/cms/handleFieldsJS");
-const usageTracking_1 = require("../../lib/usageTracking");
-const index_1 = require("../../lib/errorHandlers/index");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const yargsUtils_1 = require("../../lib/yargsUtils");
+import path from 'path';
+import fs from 'fs';
+import { createIgnoreFilter } from '@hubspot/local-dev-lib/ignoreRules';
+import { isAllowedExtension, getCwd } from '@hubspot/local-dev-lib/path';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { walk } from '@hubspot/local-dev-lib/fs';
+import { getThemeJSONPath } from '@hubspot/local-dev-lib/cms/themes';
+import { i18n } from '../../lib/lang.js';
+import { FieldsJs, isConvertableFieldJs, } from '@hubspot/local-dev-lib/cms/handleFieldsJS';
+import { trackConvertFieldsUsage } from '../../lib/usageTracking.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'convert-fields';
-const describe = (0, lang_1.i18n)(`commands.convertFields.describe`);
+const describe = i18n(`commands.convertFields.describe`);
 function invalidPath(src) {
-    logger_1.logger.error((0, lang_1.i18n)(`commands.convertFields.errors.invalidPath`, {
+    logger.error(i18n(`commands.convertFields.errors.invalidPath`, {
         path: src,
     }));
-    process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    process.exit(EXIT_CODES.ERROR);
 }
 async function handler(args) {
     let stats;
     let projectRoot;
     let src;
     try {
-        src = path_1.default.resolve((0, path_2.getCwd)(), args.src);
-        const themeJSONPath = (0, themes_1.getThemeJSONPath)(args.src);
+        src = path.resolve(getCwd(), args.src);
+        const themeJSONPath = getThemeJSONPath(args.src);
         projectRoot = themeJSONPath
-            ? path_1.default.dirname(themeJSONPath)
-            : path_1.default.dirname((0, path_2.getCwd)());
-        stats = fs_1.default.statSync(src);
+            ? path.dirname(themeJSONPath)
+            : path.dirname(getCwd());
+        stats = fs.statSync(src);
         if (!stats.isFile() && !stats.isDirectory()) {
             invalidPath(args.src);
             return;
@@ -43,13 +38,13 @@ async function handler(args) {
     catch (e) {
         invalidPath(args.src);
     }
-    (0, usageTracking_1.trackConvertFieldsUsage)('process');
+    trackConvertFieldsUsage('process');
     if (!src || !stats || !projectRoot) {
         invalidPath(args.src);
         return;
     }
     if (stats.isFile()) {
-        const fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, src, undefined, args.fieldOptions).init();
+        const fieldsJs = await new FieldsJs(projectRoot, src, undefined, args.fieldOptions).init();
         if (fieldsJs.rejected)
             return;
         fieldsJs.saveOutput();
@@ -57,22 +52,22 @@ async function handler(args) {
     else if (stats && stats.isDirectory()) {
         let filePaths = [];
         try {
-            filePaths = await (0, fs_2.walk)(src);
+            filePaths = await walk(src);
         }
         catch (e) {
-            (0, index_1.logError)(e);
+            logError(e);
         }
         const allowedFilePaths = filePaths
             .filter(file => {
-            if (!(0, path_2.isAllowedExtension)(file)) {
+            if (!isAllowedExtension(file)) {
                 return false;
             }
             return true;
         })
-            .filter((0, ignoreRules_1.createIgnoreFilter)(false));
+            .filter(createIgnoreFilter(false));
         for (const filePath of allowedFilePaths) {
-            if ((0, handleFieldsJS_1.isConvertableFieldJs)(projectRoot, filePath, true)) {
-                const fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, filePath, undefined, args.fieldOptions).init();
+            if (isConvertableFieldJs(projectRoot, filePath, true)) {
+                const fieldsJs = await new FieldsJs(projectRoot, filePath, undefined, args.fieldOptions).init();
                 if (fieldsJs.rejected)
                     return;
                 fieldsJs.saveOutput();
@@ -82,23 +77,23 @@ async function handler(args) {
 }
 function convertFieldsBuilder(yargs) {
     yargs.option('src', {
-        describe: (0, lang_1.i18n)(`commands.convertFields.positionals.src.describe`),
+        describe: i18n(`commands.convertFields.positionals.src.describe`),
         type: 'string',
         required: true,
-        demandOption: (0, lang_1.i18n)(`commands.convertFields.errors.missingSrc`),
+        demandOption: i18n(`commands.convertFields.errors.missingSrc`),
     });
     yargs.option('fieldOptions', {
-        describe: (0, lang_1.i18n)(`commands.convertFields.options.options.describe`),
+        describe: i18n(`commands.convertFields.options.options.describe`),
         type: 'array',
         default: [''],
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(convertFieldsBuilder, command, describe);
+const builder = makeYargsBuilder(convertFieldsBuilder, command, describe);
 const convertFieldsCommand = {
     command,
     describe,
     handler,
     builder,
 };
-exports.default = convertFieldsCommand;
+export default convertFieldsCommand;

package/commands/cms/getReactModule.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 type GetReactModuleArgs = CommonArgs & {
     name?: string;
     dest?: string;