@hubspot/cli 7.4.9-experimental.0 → 7.4.10-beta.0

package/commands/init.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -29,7 +27,6 @@ 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");
-const i18nKey = 'commands.init';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -63,8 +60,8 @@ 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,
 };
-exports.command = 'init';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const command = 'init';
+const describe = (0, lang_1.i18n)(`commands.init.describe`);
 async function handler(args) {
     const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
@@ -78,11 +75,18 @@ async function handler(args) {
         });
     }
     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);
+    }
     if (fs_extra_1.default.existsSync(configPath)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.configFileExists`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.configFileExists`, {
             configPath: configPath,
         }));
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.logs.updateConfig`));
+        logger_1.logger.info((0, lang_1.i18n)(`commands.init.logs.updateConfig`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
@@ -91,7 +95,7 @@ async function handler(args) {
     const doesOtherConfigFileExist = (0, config_1.configFileExists)(!useHiddenConfig);
     if (doesOtherConfigFileExist) {
         const path = (0, config_1.getConfigPath)('', !useHiddenConfig);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.bothConfigFilesNotAllowed`, { path: path }));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.bothConfigFilesNotAllowed`, { path: path }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
@@ -114,21 +118,18 @@ async function handler(args) {
             accountId = oauthResult.accountId;
             name = oauthResult.name;
         }
+        const configPath = (0, config_1.getConfigPath)();
         try {
             (0, gitignore_1.checkAndAddConfigToGitignore)(configPath);
         }
         catch (e) {
             (0, index_1.debugError)(e);
         }
-        let newConfigPath = configPath;
-        if (!newConfigPath && !useHiddenConfig) {
-            newConfigPath = `${(0, path_2.getCwd)()}/${config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
-        }
         logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileCreated`, {
-            configPath: newConfigPath,
+        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileCreated`, {
+            configPath: configPath,
         }));
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileUpdated`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileUpdated`, {
             authType: AUTH_TYPE_NAMES[authType],
             account: name || accountId,
         }));
@@ -149,7 +150,7 @@ async function handler(args) {
 function initBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.authType.describe`),
+            describe: (0, lang_1.i18n)(`commands.init.options.authType.describe`),
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -158,7 +159,7 @@ function initBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+            describe: (0, lang_1.i18n)(`commands.init.options.account.describe`),
             type: 'string',
             alias: 'a',
         },
@@ -167,16 +168,11 @@ function initBuilder(yargs) {
             hidden: true,
             default: false,
         },
-        'use-hidden-config': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.useHiddenConfig.describe`),
-            hidden: true,
-            type: 'boolean',
-        },
     });
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, exports.command, (0, lang_1.i18n)(`${i18nKey}.verboseDescribe`, {
+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,
@@ -185,3 +181,12 @@ exports.builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, exports.comman
     useConfigOptions: true,
     useTestingOptions: true,
 });
+const initCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = initCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = initCommand;

package/commands/lint.d.ts

@@ -1,4 +1,6 @@
-export declare const command = "lint <path>";
-export declare const describe: null;
-export declare const handler: (options: any) => Promise<void>;
-export declare const builder: (yargs: any) => any;
+import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../types/Yargs';
+type LintArgs = CommonArgs & ConfigArgs & AccountArgs & {
+    path: string;
+};
+declare const lintCommand: YargsCommandModule<unknown, LintArgs>;
+export default lintCommand;

package/commands/lint.js

@@ -1,26 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.handler = exports.describe = exports.command = void 0;
-// @ts-nocheck
-const { lint } = require('@hubspot/local-dev-lib/cms/validate');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logError } = require('../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../lib/commonOpts');
-const { resolveLocalPath } = require('../lib/filesystem');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.lint';
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-exports.command = 'lint <path>';
+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");
+const command = 'lint <path>';
 // Hiding since this command is still experimental
-exports.describe = null; //'Lint a file or folder for HubL syntax';
+const describe = undefined; //'Lint a file or folder for HubL syntax';
 function getErrorsFromHublValidationObject(validation) {
     return ((validation && validation.meta && validation.meta.template_errors) || []);
 }
 function printHublValidationError(err) {
     const { severity, message, lineno, startPosition } = err;
     const method = severity === 'FATAL' ? 'error' : 'warn';
-    logger[method]('[%d, %d]: %s', lineno, startPosition, message);
+    logger_1.logger[method]('[%d, %d]: %s', lineno, startPosition, message);
 }
 function printHublValidationResult({ file, validation }) {
     let count = 0;
@@ -31,7 +28,7 @@ function printHublValidationResult({ file, validation }) {
     if (!errors.length) {
         return count;
     }
-    logger.group(file);
+    logger_1.logger.group(file);
     errors.forEach(err => {
         if (err.reason !== 'SYNTAX_ERROR') {
             return;
@@ -39,49 +36,52 @@ function printHublValidationResult({ file, validation }) {
         ++count;
         printHublValidationError(err);
     });
-    logger.groupEnd();
+    logger_1.logger.groupEnd();
     return count;
 }
-const handler = async (options) => {
-    const { path: lintPath } = options;
-    const { derivedAccountId } = options;
-    const localPath = resolveLocalPath(lintPath);
-    const groupName = i18n(`${i18nKey}.groupName`, {
+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`, {
         path: localPath,
     });
-    trackCommandUsage('lint', null, derivedAccountId);
-    logger.group(groupName);
+    (0, usageTracking_1.trackCommandUsage)('lint', undefined, derivedAccountId);
+    logger_1.logger.group(groupName);
     let count = 0;
     try {
-        await lint(derivedAccountId, localPath, result => {
-            count += printHublValidationResult(result);
+        await (0, validate_1.lint)(derivedAccountId, localPath, (result) => {
+            return (count += printHublValidationResult(result));
         });
     }
     catch (err) {
-        logger.groupEnd(groupName);
-        logError(err, { accountId: derivedAccountId });
-        process.exit(EXIT_CODES.ERROR);
+        logger_1.logger.groupEnd();
+        (0, index_1.logError)(err, { accountId: derivedAccountId });
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger.groupEnd(groupName);
-    logger.log(i18n(`${i18nKey}.issuesFound`, {
+    logger_1.logger.groupEnd();
+    logger_1.logger.log((0, lang_1.i18n)(`commands.lint.issuesFound`, {
         count,
     }));
-};
-exports.handler = handler;
-const builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addGlobalOptions(yargs);
+}
+function lintBuilder(yargs) {
     yargs.positional('path', {
-        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        describe: (0, lang_1.i18n)(`commands.lint.positionals.path.describe`),
+        required: true,
         type: 'string',
     });
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(lintBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const lintCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
-exports.builder = builder;
-module.exports = {
-    builder: exports.builder,
-    handler: exports.handler,
-    command: exports.command,
-    describe: exports.describe,
-};
+exports.default = lintCommand;
+// TODO Remove this after cli.ts is ported to TS
+module.exports = lintCommand;

package/commands/list.d.ts

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

package/commands/list.js

@@ -3,11 +3,7 @@ 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 chalk_1 = __importDefault(require("chalk"));
-const commonOpts_1 = require("../lib/commonOpts");
 const usageTracking_1 = require("../lib/usageTracking");
 const filesystem_1 = require("../lib/filesystem");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -16,7 +12,7 @@ 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 i18nKey = 'commands.list';
+const yargsUtils_1 = require("../lib/yargsUtils");
 function addColorToContents(fileOrFolder) {
     if (!(0, filesystem_1.isPathFolder)(fileOrFolder)) {
         return chalk_1.default.reset.cyan(fileOrFolder);
@@ -43,14 +39,14 @@ function sortContents(a, b) {
     }
     return a.localeCompare(b);
 }
-exports.command = 'list [path]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const command = ['list [path]', 'ls [path]'];
+const describe = (0, lang_1.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)(`${i18nKey}.gettingPathContents`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.list.gettingPathContents`, {
         path: directoryPath,
     }));
     try {
@@ -62,7 +58,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!contentsResp.folder) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.noFilesFoundAtPath`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.list.noFilesFoundAtPath`, {
             path: directoryPath,
         }));
         return;
@@ -72,7 +68,7 @@ async function handler(args) {
         ? ['@hubspot', ...contentsResp.children]
         : contentsResp.children;
     if (contents.length === 0) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.noFilesFoundAtPath`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.list.noFilesFoundAtPath`, {
             path: directoryPath,
         }));
         return;
@@ -84,15 +80,26 @@ async function handler(args) {
     logger_1.logger.log(folderContentsOutput);
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+function cmsListBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: (0, lang_1.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, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const cmsListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = cmsListCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = cmsListCommand;

package/commands/logs.d.ts

@@ -1 +1,10 @@
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule, EnvironmentArgs } from '../types/Yargs';
+type LogsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    endpoint?: string;
+    latest?: boolean;
+    compact?: boolean;
+    follow?: boolean;
+    limit?: number;
+};
+declare const logsCommand: YargsCommandModule<unknown, LogsArgs>;
+export default logsCommand;

package/commands/logs.js

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addGlobalOptions, } = require('../lib/commonOpts');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { outputLogs } = require('../lib/ui/serverlessFunctionLogs');
-const { getFunctionLogs, getLatestFunctionLog, } = require('@hubspot/local-dev-lib/api/functions');
-const { tailLogs } = require('../lib/serverlessLogs');
-const { i18n } = require('../lib/lang');
-const { promptUser } = require('../lib/prompts/promptUtils');
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
-const i18nKey = 'commands.logs';
+const usageTracking_1 = require("../lib/usageTracking");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const serverlessFunctionLogs_1 = require("../lib/ui/serverlessFunctionLogs");
+const functions_1 = require("@hubspot/local-dev-lib/api/functions");
+const serverlessLogs_1 = require("../lib/serverlessLogs");
+const lang_1 = require("../lib/lang");
+const promptUtils_1 = require("../lib/prompts/promptUtils");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const yargsUtils_1 = require("../lib/yargsUtils");
 const handleLogsError = (e, accountId, functionPath) => {
-    if (isHubSpotHttpError(e) && (e.status === 404 || e.status == 400)) {
-        logger.error(i18n(`${i18nKey}.errors.noLogsFound`, {
+    if ((0, index_1.isHubSpotHttpError)(e) && (e.status === 404 || e.status == 400)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.logs.errors.noLogsFound`, {
             accountId,
             functionPath,
         }));
@@ -22,101 +20,111 @@ const handleLogsError = (e, accountId, functionPath) => {
 };
 const endpointLog = async (accountId, functionPath, options) => {
     const { limit, latest, follow, compact } = options;
-    const requestOptions = {
+    const requestParams = {
         limit,
         latest,
         follow,
-        compact,
         endpoint: functionPath,
     };
-    logger.debug(i18n(`${i18nKey}.gettingLogs`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.logs.gettingLogs`, {
         latest,
         functionPath,
     }));
     let logsResp;
     if (follow) {
-        const tailCall = after => getFunctionLogs(accountId, functionPath, { after });
+        const tailCall = (after) => (0, functions_1.getFunctionLogs)(accountId, functionPath, { after });
         const fetchLatest = () => {
             try {
-                return getLatestFunctionLog(accountId, functionPath);
+                return (0, functions_1.getLatestFunctionLog)(accountId, functionPath);
             }
             catch (e) {
                 handleLogsError(e, accountId, functionPath);
+                return Promise.reject(e);
             }
         };
-        await tailLogs(accountId, functionPath, fetchLatest, tailCall, compact);
+        await (0, serverlessLogs_1.tailLogs)(accountId, functionPath, fetchLatest, tailCall, compact);
     }
     else if (latest) {
         try {
-            const { data } = await getLatestFunctionLog(accountId, functionPath);
+            const { data } = await (0, functions_1.getLatestFunctionLog)(accountId, functionPath);
             logsResp = data;
         }
         catch (e) {
             handleLogsError(e, accountId, functionPath);
-            process.exit(EXIT_CODES.ERROR);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
     else {
         try {
-            const { data } = await getFunctionLogs(accountId, functionPath, requestOptions);
+            const { data } = await (0, functions_1.getFunctionLogs)(accountId, functionPath, requestParams);
             logsResp = data;
         }
         catch (e) {
             handleLogsError(e, accountId, functionPath);
-            process.exit(EXIT_CODES.ERROR);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
     if (logsResp) {
-        return outputLogs(logsResp, requestOptions);
+        return (0, serverlessFunctionLogs_1.outputLogs)(logsResp, { compact });
     }
 };
-exports.command = 'logs [endpoint]';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.handler = async (options) => {
+const command = 'logs [endpoint]';
+const describe = (0, lang_1.i18n)(`commands.logs.describe`);
+const handler = async (options) => {
     const { endpoint: endpointArgValue, latest, derivedAccountId } = options;
-    trackCommandUsage('logs', { latest }, derivedAccountId);
-    const { endpointPromptValue } = await promptUser({
+    (0, usageTracking_1.trackCommandUsage)('logs', latest ? { action: 'latest' } : {}, derivedAccountId);
+    const { endpointPromptValue } = await (0, promptUtils_1.promptUser)({
         name: 'endpointPromptValue',
-        message: i18n(`${i18nKey}.endpointPrompt`),
+        message: (0, lang_1.i18n)(`commands.logs.endpointPrompt`),
         when: !endpointArgValue,
     });
-    endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
+    await endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
 };
-exports.builder = yargs => {
+function logsBuilder(yargs) {
     yargs.positional('endpoint', {
-        describe: i18n(`${i18nKey}.positionals.endpoint.describe`),
+        describe: (0, lang_1.i18n)(`commands.logs.positionals.endpoint.describe`),
         type: 'string',
     });
     yargs
         .options({
         latest: {
             alias: 'l',
-            describe: i18n(`${i18nKey}.options.latest.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.latest.describe`),
             type: 'boolean',
         },
         compact: {
-            describe: i18n(`${i18nKey}.options.compact.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.compact.describe`),
             type: 'boolean',
         },
         follow: {
             alias: ['f'],
-            describe: i18n(`${i18nKey}.options.follow.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.follow.describe`),
             type: 'boolean',
         },
         limit: {
-            describe: i18n(`${i18nKey}.options.limit.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.limit.describe`),
             type: 'number',
         },
     })
         .conflicts('follow', 'limit');
     yargs.example([
-        ['$0 logs my-endpoint', i18n(`${i18nKey}.examples.default`)],
-        ['$0 logs my-endpoint --limit=10', i18n(`${i18nKey}.examples.limit`)],
-        ['$0 logs my-endpoint --follow', i18n(`${i18nKey}.examples.follow`)],
+        ['$0 logs my-endpoint', (0, lang_1.i18n)(`commands.logs.examples.default`)],
+        ['$0 logs my-endpoint --limit=10', (0, lang_1.i18n)(`commands.logs.examples.limit`)],
+        ['$0 logs my-endpoint --follow', (0, lang_1.i18n)(`commands.logs.examples.follow`)],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(logsBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const logsCommand = {
+    command,
+    describe,
+    builder,
+    handler,
 };
+exports.default = logsCommand;
+module.exports = logsCommand;

package/commands/module/marketplace-validate.d.ts

@@ -1 +1,6 @@
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type MarketplaceValidateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    src: string;
+};
+declare const marketplaceValidateCommand: YargsCommandModule<unknown, MarketplaceValidateArgs>;
+export default marketplaceValidateCommand;

package/commands/module/marketplace-validate.js

@@ -1,39 +1,50 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
-const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.module.subcommands.marketplaceValidate';
-exports.command = 'marketplace-validate <src>';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.handler = async (options) => {
-    const { src, derivedAccountId } = options;
-    trackCommandUsage('validate', null, derivedAccountId);
-    SpinniesManager.init();
-    SpinniesManager.add('marketplaceValidation', {
-        text: i18n(`${i18nKey}.logs.validatingModule`, {
+const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
+const usageTracking_1 = require("../../lib/usageTracking");
+const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
+const lang_1 = require("../../lib/lang");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'marketplace-validate <src>';
+const describe = (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.describe`);
+async function handler(args) {
+    const { src, derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('validate', undefined, derivedAccountId);
+    SpinniesManager_1.default.init();
+    SpinniesManager_1.default.add('marketplaceValidation', {
+        text: (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.logs.validatingModule`, {
             path: src,
         }),
     });
     const assetType = 'MODULE';
-    const validationId = await kickOffValidation(derivedAccountId, assetType, src);
-    await pollForValidationFinish(derivedAccountId, validationId);
-    SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
-    processValidationErrors(i18nKey, validationResults);
-    displayValidationResults(i18nKey, validationResults);
-    process.exit();
-};
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
+    const validationId = await (0, marketplaceValidate_1.kickOffValidation)(derivedAccountId, assetType, src);
+    await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
+    SpinniesManager_1.default.remove('marketplaceValidation');
+    const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
+    (0, marketplaceValidate_1.processValidationErrors)('commands.module.subcommands.marketplaceValidate', validationResults);
+    (0, marketplaceValidate_1.displayValidationResults)('commands.module.subcommands.marketplaceValidate', validationResults);
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function marketplaceValidateBuilder(yargs) {
     yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        describe: (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.positionals.src.describe`),
         type: 'string',
     });
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(marketplaceValidateBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const marketplaceValidateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = marketplaceValidateCommand;