@hubspot/cli 7.7.0-experimental.2 → 7.7.0

package/commands/init.js

@@ -1,115 +1,115 @@
-"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_extra_1 = __importDefault(require("fs-extra"));
-const config_1 = require("@hubspot/local-dev-lib/config");
-const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const gitignore_1 = require("@hubspot/local-dev-lib/gitignore");
-const config_2 = require("@hubspot/local-dev-lib/constants/config");
-const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
-const path_2 = require("@hubspot/local-dev-lib/path");
-const text_1 = require("@hubspot/local-dev-lib/text");
-const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const commonOpts_1 = require("../lib/commonOpts");
-const yargsUtils_1 = require("../lib/yargsUtils");
-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 promptUtils_1 = require("../lib/prompts/promptUtils");
-const personalAccessKeyPrompt_1 = require("../lib/prompts/personalAccessKeyPrompt");
-const accountNamePrompt_1 = require("../lib/prompts/accountNamePrompt");
-const oauth_1 = require("../lib/oauth");
-const exitCodes_1 = require("../lib/enums/exitCodes");
-const ui_1 = require("../lib/ui");
+import path from 'path';
+import fs from 'fs-extra';
+import { loadConfig, getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, configFileExists, } from '@hubspot/local-dev-lib/config';
+import { OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
+import { checkAndAddConfigToGitignore } from '@hubspot/local-dev-lib/gitignore';
+import { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
+import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { toKebabCase } from '@hubspot/local-dev-lib/text';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { setLogLevel } from '../lib/commonOpts.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { handleExit } from '../lib/process.js';
+import { debugError, logError } from '../lib/errorHandlers/index.js';
+import { trackCommandUsage, trackAuthAction } from '../lib/usageTracking.js';
+import { promptUser } from '../lib/prompts/promptUtils.js';
+import { OAUTH_FLOW, personalAccessKeyPrompt, } from '../lib/prompts/personalAccessKeyPrompt.js';
+import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
+import { authenticateWithOauth } from '../lib/oauth.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { uiCommandReference, uiFeatureHighlight } from '../lib/ui/index.js';
+import { uiLogger } from '../lib/ui/logger.js';
+import { commands } from '../lang/en.js';
+import { parseStringToNumber } from '../lib/parsing.js';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
     COMPLETE: 'complete',
 };
 async function personalAccessKeyConfigCreationFlow(env, account) {
-    const { personalAccessKey } = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({ env, account });
+    const { personalAccessKey } = await personalAccessKeyPrompt({ env, account });
     let updatedConfig;
     try {
-        const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
-        const defaultName = token.hubName ? (0, text_1.toKebabCase)(token.hubName) : undefined;
-        const { name } = await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName);
-        updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, name, true);
+        const token = await getAccessToken(personalAccessKey, env);
+        const defaultName = token.hubName ? toKebabCase(token.hubName) : undefined;
+        const { name } = await cliAccountNamePrompt(defaultName);
+        updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env, name, true);
     }
     catch (e) {
-        (0, index_1.logError)(e);
+        logError(e);
     }
     return updatedConfig;
 }
 async function oauthConfigCreationFlow(env) {
-    const configData = await (0, promptUtils_1.promptUser)(personalAccessKeyPrompt_1.OAUTH_FLOW);
+    const configData = await promptUser(OAUTH_FLOW);
     const accountConfig = {
         ...configData,
         env,
     };
-    await (0, oauth_1.authenticateWithOauth)(accountConfig);
-    (0, config_1.updateDefaultAccount)(accountConfig.name);
+    await authenticateWithOauth(accountConfig);
+    updateDefaultAccount(accountConfig.name);
     return accountConfig;
 }
 const AUTH_TYPE_NAMES = {
-    [auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
-    [auth_1.OAUTH_AUTH_METHOD.value]: auth_1.OAUTH_AUTH_METHOD.name,
+    [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
+    [OAUTH_AUTH_METHOD.value]: OAUTH_AUTH_METHOD.name,
 };
 const command = 'init';
-const describe = (0, lang_1.i18n)(`commands.init.describe`);
+const describe = commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, useHiddenConfig, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = parseStringToNumber(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        uiLogger.error(commands.init.errors.invalidAccountIdProvided);
+        process.exit(EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
-        auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-    const configPath = (configFlagValue && path_1.default.join((0, path_2.getCwd)(), configFlagValue)) ||
-        (0, config_1.getConfigPath)('', useHiddenConfig);
-    (0, commonOpts_1.setLogLevel)(args);
+        PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    const configPath = (configFlagValue && path.join(getCwd(), configFlagValue)) ||
+        getConfigPath('', useHiddenConfig);
+    setLogLevel(args);
     if (!disableTracking) {
-        (0, usageTracking_1.trackCommandUsage)('init', {
+        trackCommandUsage('init', {
             authType,
         });
     }
-    const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
-    if ((0, config_1.configFileExists)(true)) {
-        const globalConfigPath = (0, config_1.getConfigPath)('', true);
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.globalConfigFileExists`, {
-            configPath: globalConfigPath,
-        }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    const env = args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    if (configFileExists(true)) {
+        uiLogger.error(commands.init.errors.globalConfigFileExists);
+        process.exit(EXIT_CODES.ERROR);
     }
-    if (fs_extra_1.default.existsSync(configPath)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.configFileExists`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.info((0, lang_1.i18n)(`commands.init.logs.updateConfig`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    if (fs.existsSync(configPath)) {
+        uiLogger.error(commands.init.errors.configFileExists(configPath));
+        uiLogger.info(commands.init.logs.updateConfig);
+        process.exit(EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
-        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+        await trackAuthAction('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
-    const doesOtherConfigFileExist = (0, config_1.configFileExists)(!useHiddenConfig);
+    const doesOtherConfigFileExist = configFileExists(!useHiddenConfig);
     if (doesOtherConfigFileExist) {
-        const path = (0, config_1.getConfigPath)('', !useHiddenConfig);
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.bothConfigFilesNotAllowed`, { path: path }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        const path = getConfigPath('', !useHiddenConfig);
+        uiLogger.error(commands.init.errors.bothConfigFilesNotAllowed(path));
+        process.exit(EXIT_CODES.ERROR);
     }
-    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
-    (0, config_1.createEmptyConfigFile)({ path: configPath }, useHiddenConfig);
+    createEmptyConfigFile({ path: configPath }, useHiddenConfig);
     //Needed to load deprecated config
-    (0, config_1.loadConfig)(configPath, args);
-    (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
+    loadConfig(configPath, args);
+    handleExit(deleteEmptyConfigFile);
     try {
         let accountId;
         let name;
-        if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, providedAccountId);
+        if (authType === PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, parsedUserProvidedAccountId);
             if (personalAccessKeyResult) {
-                accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(personalAccessKeyResult);
+                accountId = getAccountIdentifier(personalAccessKeyResult);
                 name = personalAccessKeyResult.name;
             }
         }
@@ -118,48 +118,48 @@ async function handler(args) {
             accountId = oauthResult.accountId;
             name = oauthResult.name;
         }
-        const configPath = (0, config_1.getConfigPath)();
+        const configPath = getConfigPath();
         try {
-            (0, gitignore_1.checkAndAddConfigToGitignore)(configPath);
+            checkAndAddConfigToGitignore(configPath);
         }
         catch (e) {
-            (0, index_1.debugError)(e);
+            debugError(e);
         }
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileCreated`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileUpdated`, {
-            authType: AUTH_TYPE_NAMES[authType],
-            account: name || accountId,
-        }));
-        (0, ui_1.uiFeatureHighlight)(['helpCommand', 'authCommand', 'accountsListCommand']);
+        uiLogger.log('');
+        uiLogger.success(commands.init.success.configFileCreated(configPath));
+        uiLogger.success(commands.init.success.configFileUpdated(AUTH_TYPE_NAMES[authType], name || accountId));
+        uiFeatureHighlight([
+            'getStartedCommand',
+            'helpCommand',
+            'authCommand',
+            'accountsListCommand',
+        ]);
         if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.COMPLETE, accountId);
+            await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
         }
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        process.exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
-        (0, index_1.logError)(err);
+        logError(err);
         if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, providedAccountId);
+            await trackAuthAction('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         }
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
 }
 function initBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`commands.init.options.authType.describe`),
+            describe: commands.init.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.init.options.account.describe`),
+            describe: commands.init.options.account.describe,
             type: 'string',
             alias: 'a',
         },
@@ -172,11 +172,7 @@ function initBuilder(yargs) {
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
-    command: (0, ui_1.uiCommandReference)('hs auth'),
-    configName: config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-}), {
+const builder = makeYargsBuilder(initBuilder, command, commands.init.verboseDescribe(DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, uiCommandReference('hs auth'), PERSONAL_ACCESS_KEY_AUTH_METHOD.value), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,
@@ -187,6 +183,4 @@ const initCommand = {
     handler,
     builder,
 };
-exports.default = initCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = initCommand;
+export default initCommand;

package/commands/lint.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../types/Yargs';
+import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../types/Yargs.js';
 type LintArgs = CommonArgs & ConfigArgs & AccountArgs & {
     path: string;
 };

package/commands/lint.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const validate_1 = require("@hubspot/local-dev-lib/cms/validate");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const index_1 = require("../lib/errorHandlers/index");
-const usageTracking_1 = require("../lib/usageTracking");
-const lang_1 = require("../lib/lang");
-const filesystem_1 = require("../lib/filesystem");
-const exitCodes_1 = require("../lib/enums/exitCodes");
-const yargsUtils_1 = require("../lib/yargsUtils");
+import { lint } from '@hubspot/local-dev-lib/cms/validate';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { logError } from '../lib/errorHandlers/index.js';
+import { trackCommandUsage } from '../lib/usageTracking.js';
+import { i18n } from '../lib/lang.js';
+import { resolveLocalPath } from '../lib/filesystem.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = 'lint <path>';
 // Hiding since this command is still experimental
 const describe = undefined; //'Lint a file or folder for HubL syntax';
@@ -17,7 +15,7 @@ function getErrorsFromHublValidationObject(validation) {
 function printHublValidationError(err) {
     const { severity, message, lineno, startPosition } = err;
     const method = severity === 'FATAL' ? 'error' : 'warn';
-    logger_1.logger[method]('[%d, %d]: %s', lineno, startPosition, message);
+    logger[method]('[%d, %d]: %s', lineno, startPosition, message);
 }
 function printHublValidationResult({ file, validation }) {
     let count = 0;
@@ -28,7 +26,7 @@ function printHublValidationResult({ file, validation }) {
     if (!errors.length) {
         return count;
     }
-    logger_1.logger.group(file);
+    logger.group(file);
     errors.forEach(err => {
         if (err.reason !== 'SYNTAX_ERROR') {
             return;
@@ -36,42 +34,42 @@ function printHublValidationResult({ file, validation }) {
         ++count;
         printHublValidationError(err);
     });
-    logger_1.logger.groupEnd();
+    logger.groupEnd();
     return count;
 }
 async function handler(args) {
     const { path: lintPath, derivedAccountId } = args;
-    const localPath = (0, filesystem_1.resolveLocalPath)(lintPath);
-    const groupName = (0, lang_1.i18n)(`commands.lint.groupName`, {
+    const localPath = resolveLocalPath(lintPath);
+    const groupName = i18n(`commands.lint.groupName`, {
         path: localPath,
     });
-    (0, usageTracking_1.trackCommandUsage)('lint', undefined, derivedAccountId);
-    logger_1.logger.group(groupName);
+    trackCommandUsage('lint', undefined, derivedAccountId);
+    logger.group(groupName);
     let count = 0;
     try {
-        await (0, validate_1.lint)(derivedAccountId, localPath, (result) => {
+        await lint(derivedAccountId, localPath, (result) => {
             return (count += printHublValidationResult(result));
         });
     }
     catch (err) {
-        logger_1.logger.groupEnd();
-        (0, index_1.logError)(err, { accountId: derivedAccountId });
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.groupEnd();
+        logError(err, { accountId: derivedAccountId });
+        process.exit(EXIT_CODES.ERROR);
     }
-    logger_1.logger.groupEnd();
-    logger_1.logger.log((0, lang_1.i18n)(`commands.lint.issuesFound`, {
+    logger.groupEnd();
+    logger.log(i18n(`commands.lint.issuesFound`, {
         count,
     }));
 }
 function lintBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`commands.lint.positionals.path.describe`),
+        describe: i18n(`commands.lint.positionals.path.describe`),
         required: true,
         type: 'string',
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(lintBuilder, command, describe, {
+const builder = makeYargsBuilder(lintBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -82,6 +80,4 @@ const lintCommand = {
     handler,
     builder,
 };
-exports.default = lintCommand;
-// TODO Remove this after cli.ts is ported to TS
-module.exports = lintCommand;
+export default lintCommand;

package/commands/list.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs.js';
 type ListArgs = CommonArgs & ConfigArgs & EnvironmentArgs & AccountArgs & {
     path: string;
 };

package/commands/list.js

@@ -1,64 +1,59 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chalk_1 = __importDefault(require("chalk"));
-const usageTracking_1 = require("../lib/usageTracking");
-const filesystem_1 = require("../lib/filesystem");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const index_1 = require("../lib/errorHandlers/index");
-const fileMapper_1 = require("@hubspot/local-dev-lib/api/fileMapper");
-const constants_1 = require("../lib/constants");
-const lang_1 = require("../lib/lang");
-const exitCodes_1 = require("../lib/enums/exitCodes");
-const yargsUtils_1 = require("../lib/yargsUtils");
+import chalk from 'chalk';
+import { trackCommandUsage } from '../lib/usageTracking.js';
+import { isPathFolder } from '../lib/filesystem.js';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { logError } from '../lib/errorHandlers/index.js';
+import { getDirectoryContentsByPath } from '@hubspot/local-dev-lib/api/fileMapper';
+import { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } from '../lib/constants.js';
+import { i18n } from '../lib/lang.js';
+import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
 function addColorToContents(fileOrFolder) {
-    if (!(0, filesystem_1.isPathFolder)(fileOrFolder)) {
-        return chalk_1.default.reset.cyan(fileOrFolder);
+    if (!isPathFolder(fileOrFolder)) {
+        return chalk.reset.cyan(fileOrFolder);
     }
-    if (fileOrFolder === constants_1.HUBSPOT_FOLDER || fileOrFolder === constants_1.MARKETPLACE_FOLDER) {
-        return chalk_1.default.reset.bold.blue(fileOrFolder);
+    if (fileOrFolder === HUBSPOT_FOLDER || fileOrFolder === MARKETPLACE_FOLDER) {
+        return chalk.reset.bold.blue(fileOrFolder);
     }
-    return chalk_1.default.reset.blue(fileOrFolder);
+    return chalk.reset.blue(fileOrFolder);
 }
 function sortContents(a, b) {
     // Pin @hubspot folder to top
-    if (a === constants_1.HUBSPOT_FOLDER) {
+    if (a === HUBSPOT_FOLDER) {
         return -1;
     }
-    else if (b === constants_1.HUBSPOT_FOLDER) {
+    else if (b === HUBSPOT_FOLDER) {
         return 1;
     }
     // Pin @marketplace folder to top
-    if (a === constants_1.MARKETPLACE_FOLDER) {
+    if (a === MARKETPLACE_FOLDER) {
         return -1;
     }
-    else if (b === constants_1.MARKETPLACE_FOLDER) {
+    else if (b === MARKETPLACE_FOLDER) {
         return 1;
     }
     return a.localeCompare(b);
 }
 const command = ['list [path]', 'ls [path]'];
-const describe = (0, lang_1.i18n)(`commands.list.describe`);
+const describe = i18n(`commands.list.describe`);
 async function handler(args) {
     const { path, derivedAccountId } = args;
     const directoryPath = path || '/';
     let contentsResp;
-    (0, usageTracking_1.trackCommandUsage)('list', undefined, derivedAccountId);
-    logger_1.logger.debug((0, lang_1.i18n)(`commands.list.gettingPathContents`, {
+    trackCommandUsage('list', undefined, derivedAccountId);
+    logger.debug(i18n(`commands.list.gettingPathContents`, {
         path: directoryPath,
     }));
     try {
-        const { data } = await (0, fileMapper_1.getDirectoryContentsByPath)(derivedAccountId, directoryPath);
+        const { data } = await getDirectoryContentsByPath(derivedAccountId, directoryPath);
         contentsResp = data;
     }
     catch (e) {
-        (0, index_1.logError)(e);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
     }
     if (!contentsResp.folder) {
-        logger_1.logger.info((0, lang_1.i18n)(`commands.list.noFilesFoundAtPath`, {
+        logger.info(i18n(`commands.list.noFilesFoundAtPath`, {
             path: directoryPath,
         }));
         return;
@@ -68,7 +63,7 @@ async function handler(args) {
         ? ['@hubspot', ...contentsResp.children]
         : contentsResp.children;
     if (contents.length === 0) {
-        logger_1.logger.info((0, lang_1.i18n)(`commands.list.noFilesFoundAtPath`, {
+        logger.info(i18n(`commands.list.noFilesFoundAtPath`, {
             path: directoryPath,
         }));
         return;
@@ -77,18 +72,18 @@ async function handler(args) {
         .map(addColorToContents)
         .sort(sortContents)
         .join('\n');
-    logger_1.logger.log(folderContentsOutput);
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    logger.log(folderContentsOutput);
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function cmsListBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`commands.list.positionals.path.describe`),
+        describe: i18n(`commands.list.positionals.path.describe`),
         type: 'string',
     });
     yargs.example([['$0 list'], ['$0 list /'], ['$0 list my-modules']]);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(cmsListBuilder, command, describe, {
+const builder = makeYargsBuilder(cmsListBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -100,6 +95,4 @@ const cmsListCommand = {
     handler,
     builder,
 };
-exports.default = cmsListCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = cmsListCommand;
+export default cmsListCommand;

package/commands/logs.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule, EnvironmentArgs } from '../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule, EnvironmentArgs } from '../types/Yargs.js';
 type LogsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     endpoint?: string;
     latest?: boolean;