@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/{functions → function}/deploy.js

@@ -2,26 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { uiAccountDescription } = require('../../lib/ui');
 const { poll } = require('../../lib/polling');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { buildPackage, getBuildStatus, } = require('@hubspot/local-dev-lib/api/functions');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { outputBuildLog } = require('../../lib/serverlessLogs');
 const { i18n } = require('../../lib/lang');
 const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
-const i18nKey = 'commands.functions.subcommands.deploy';
+const i18nKey = 'commands.function.subcommands.deploy';
 exports.command = 'deploy <path>';
 exports.describe = false;
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { path: functionPath } = options;
-    const accountId = getAccountId(options);
+    const { path: functionPath, derivedAccountId } = options;
     const splitFunctionPath = functionPath.split('.');
-    trackCommandUsage('functions-deploy', null, accountId);
+    trackCommandUsage('functions-deploy', null, derivedAccountId);
     if (!splitFunctionPath.length ||
         splitFunctionPath[splitFunctionPath.length - 1] !== 'functions') {
         logger.error(i18n(`${i18nKey}.errors.notFunctionsFolder`, {
@@ -35,18 +32,18 @@ exports.handler = async (options) => {
     SpinniesManager.init();
     SpinniesManager.add('loading', {
         text: i18n(`${i18nKey}.loading`, {
-            account: uiAccountDescription(accountId),
+            account: uiAccountDescription(derivedAccountId),
             functionPath,
         }),
     });
     try {
-        const { data: buildId } = await buildPackage(accountId, functionPath);
-        const successResp = await poll(getBuildStatus, accountId, buildId);
+        const { data: buildId } = await buildPackage(derivedAccountId, functionPath);
+        const successResp = await poll(getBuildStatus, derivedAccountId, buildId);
         const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
         SpinniesManager.succeed('loading');
         await outputBuildLog(successResp.cdnUrl);
         logger.success(i18n(`${i18nKey}.success.deployed`, {
-            accountId,
+            accountId: derivedAccountId,
             buildTimeSeconds,
             functionPath,
         }));
@@ -54,7 +51,7 @@ exports.handler = async (options) => {
     catch (e) {
         SpinniesManager.fail('loading', {
             text: i18n(`${i18nKey}.loadingFailed`, {
-                account: uiAccountDescription(accountId),
+                account: uiAccountDescription(derivedAccountId),
                 functionPath,
             }),
         });
@@ -70,7 +67,10 @@ exports.handler = async (options) => {
             }));
         }
         else {
-            logError(e, new ApiErrorContext({ accountId, request: functionPath }));
+            logError(e, new ApiErrorContext({
+                accountId: derivedAccountId,
+                request: functionPath,
+            }));
         }
     }
 };

package/commands/{functions → function}/list.js

@@ -6,21 +6,19 @@ const { getRoutes } = require('@hubspot/local-dev-lib/api/functions');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.functions.subcommands.list';
+const i18nKey = 'commands.function.subcommands.list';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-exports.command = 'list';
+exports.command = ['list', 'ls'];
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('functions-list', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('functions-list', null, derivedAccountId);
     logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
-    const { data: routesResp } = await getRoutes(accountId).catch(async (e) => {
-        logError(e, new ApiErrorContext({ accountId }));
+    const { data: routesResp } = await getRoutes(derivedAccountId).catch(async (e) => {
+        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
         process.exit(EXIT_CODES.SUCCESS);
     });
     if (!routesResp.objects.length) {

package/commands/{functions → function}/server.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { start: startTestServer } = require('@hubspot/serverless-dev-runtime');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.functions.subcommands.server';
+const i18nKey = 'commands.function.subcommands.server';
 exports.command = 'server <path>';
 exports.describe = false;
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { path: functionPath } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('functions-server', null, accountId);
+    const { path: functionPath, derivedAccountId } = options;
+    trackCommandUsage('functions-server', null, derivedAccountId);
     logger.debug(i18n(`${i18nKey}.debug.startingServer`, {
         functionPath,
     }));
     startTestServer({
-        accountId,
+        accountId: derivedAccountId,
         ...options,
     });
 };

package/commands/function.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const { addGlobalOptions } = require('../lib/commonOpts');
+const list = require('./function/list');
+const deploy = require('./function/deploy');
+const server = require('./function/server');
+const { i18n } = require('../lib/lang');
+const i18nKey = 'commands.function';
+exports.command = ['function', 'functions'];
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.builder = yargs => {
+    addGlobalOptions(yargs);
+    yargs.command(list).command(deploy).command(server).demandCommand(1, '');
+    return yargs;
+};

package/commands/hubdb/clear.js

@@ -5,26 +5,30 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../lib/errorHandlers/index');
 const { clearHubDbTableRows } = require('@hubspot/local-dev-lib/hubdb');
 const { publishTable } = require('@hubspot/local-dev-lib/api/hubdb');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { selectHubDBTablePrompt, } = require('../../lib/prompts/selectHubDBTablePrompt');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.clear';
-exports.command = 'clear <tableId>';
+exports.command = 'clear [table-id]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { tableId } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('hubdb-clear', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('hubdb-clear', null, derivedAccountId);
     try {
-        const { deletedRowCount } = await clearHubDbTableRows(accountId, tableId);
+        const { tableId } = 'tableId' in options
+            ? options
+            : await selectHubDBTablePrompt({
+                accountId: derivedAccountId,
+                options,
+            });
+        const { deletedRowCount } = await clearHubDbTableRows(derivedAccountId, tableId);
         if (deletedRowCount > 0) {
             logger.log(i18n(`${i18nKey}.logs.removedRows`, {
                 deletedRowCount,
                 tableId,
             }));
-            const { data: { rowCount }, } = await publishTable(accountId, tableId);
+            const { data: { rowCount }, } = await publishTable(derivedAccountId, tableId);
             logger.log(i18n(`${i18nKey}.logs.rowCount`, {
                 rowCount,
                 tableId,
@@ -44,7 +48,7 @@ exports.builder = yargs => {
     addAccountOptions(yargs);
     addConfigOptions(yargs);
     addUseEnvironmentOptions(yargs);
-    yargs.positional('tableId', {
+    yargs.positional('table-id', {
         describe: i18n(`${i18nKey}.positionals.tableId.describe`),
         type: 'string',
     });

package/commands/hubdb/create.js

@@ -6,34 +6,58 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../lib/errorHandlers/index');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { createHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
-const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../lib/validation');
+const { untildify, isValidPath } = require('@hubspot/local-dev-lib/path');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { checkAndConvertToJson } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.create';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-exports.command = 'create <src>';
+exports.command = 'create';
 exports.describe = i18n(`${i18nKey}.describe`);
+function selectPathPrompt(options) {
+    return promptUser([
+        {
+            name: 'path',
+            message: i18n(`${i18nKey}.enterPath`),
+            when: !options.path,
+            validate: (input) => {
+                if (!input) {
+                    return i18n(`${i18nKey}.errors.pathRequired`);
+                }
+                if (!isValidPath(input)) {
+                    return i18n(`${i18nKey}.errors.invalidCharacters`);
+                }
+                return true;
+            },
+            filter: (input) => {
+                return untildify(input);
+            },
+        },
+    ]);
+}
 exports.handler = async (options) => {
-    const { src } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('hubdb-create', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('hubdb-create', null, derivedAccountId);
+    let filePath;
     try {
-        const filePath = path.resolve(getCwd(), src);
+        const filePath = 'path' in options
+            ? path.resolve(getCwd(), options.path)
+            : path.resolve(getCwd(), (await selectPathPrompt(options)).path);
         if (!checkAndConvertToJson(filePath)) {
             process.exit(EXIT_CODES.ERROR);
         }
-        const table = await createHubDbTable(accountId, path.resolve(getCwd(), src));
+        const table = await createHubDbTable(derivedAccountId, path.resolve(getCwd(), filePath));
         logger.success(i18n(`${i18nKey}.success.create`, {
-            accountId,
+            accountId: derivedAccountId,
             rowCount: table.rowCount,
             tableId: table.tableId,
         }));
     }
     catch (e) {
         logger.error(i18n(`${i18nKey}.errors.create`, {
-            src,
+            filePath,
         }));
         logError(e);
     }
@@ -42,8 +66,8 @@ exports.builder = yargs => {
     addAccountOptions(yargs);
     addConfigOptions(yargs);
     addUseEnvironmentOptions(yargs);
-    yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+    yargs.options('path', {
+        describe: i18n(`${i18nKey}.options.path.describe`),
         type: 'string',
     });
 };

package/commands/hubdb/delete.js

@@ -4,24 +4,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../lib/errorHandlers/index');
 const { deleteTable } = require('@hubspot/local-dev-lib/api/hubdb');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { selectHubDBTablePrompt, } = require('../../lib/prompts/selectHubDBTablePrompt');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.delete';
-exports.command = 'delete <tableId>';
+exports.command = 'delete [table-id]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { tableId } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('hubdb-delete', null, accountId);
+    const { force, derivedAccountId } = options;
+    trackCommandUsage('hubdb-delete', null, derivedAccountId);
     try {
-        await deleteTable(accountId, tableId);
+        const { tableId } = 'tableId' in options
+            ? options
+            : await selectHubDBTablePrompt({
+                accountId: derivedAccountId,
+                options,
+            });
+        if (!force) {
+            const { shouldDeleteTable } = await promptUser({
+                name: 'shouldDeleteTable',
+                type: 'confirm',
+                message: i18n(`${i18nKey}.shouldDeleteTable`, { tableId }),
+            });
+            if (!shouldDeleteTable) {
+                process.exit(EXIT_CODES.SUCCESS);
+            }
+        }
+        await deleteTable(derivedAccountId, tableId);
         logger.success(i18n(`${i18nKey}.success.delete`, {
-            accountId,
+            accountId: derivedAccountId,
             tableId,
         }));
+        process.exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
         logger.error(i18n(`${i18nKey}.errors.delete`, {
@@ -34,8 +51,12 @@ exports.builder = yargs => {
     addAccountOptions(yargs);
     addConfigOptions(yargs);
     addUseEnvironmentOptions(yargs);
-    yargs.positional('tableId', {
+    yargs.positional('table-id', {
         describe: i18n(`${i18nKey}.positionals.tableId.describe`),
         type: 'string',
     });
+    yargs.option('force', {
+        describe: i18n(`${i18nKey}.options.force.describe`),
+        type: 'boolean',
+    });
 };

package/commands/hubdb/fetch.js

@@ -4,20 +4,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../lib/errorHandlers/index');
 const { downloadHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { selectHubDBTablePrompt, } = require('../../lib/prompts/selectHubDBTablePrompt');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.fetch';
-exports.command = 'fetch <tableId> [dest]';
+exports.command = 'fetch [table-id] [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { tableId, dest } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('hubdb-fetch', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('hubdb-fetch', null, derivedAccountId);
     try {
-        const { filePath } = await downloadHubDbTable(accountId, tableId, dest);
+        const promptAnswers = await selectHubDBTablePrompt({
+            accountId: derivedAccountId,
+            options,
+            skipDestPrompt: false,
+        });
+        const tableId = options.tableId || promptAnswers.tableId;
+        const dest = options.dest || promptAnswers.dest;
+        const { filePath } = await downloadHubDbTable(derivedAccountId, tableId, dest);
         logger.success(i18n(`${i18nKey}.success.fetch`, {
             path: filePath,
             tableId,
@@ -31,7 +36,7 @@ exports.builder = yargs => {
     addAccountOptions(yargs);
     addConfigOptions(yargs);
     addUseEnvironmentOptions(yargs);
-    yargs.positional('tableId', {
+    yargs.positional('table-id', {
         describe: i18n(`${i18nKey}.positionals.tableId.describe`),
         type: 'string',
     });

package/commands/hubdb.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addGlobalOptions } = require('../lib/commonOpts');
 const createCommand = require('./hubdb/create');
 const fetchCommand = require('./hubdb/fetch');
 const deleteCommand = require('./hubdb/delete');
@@ -11,8 +11,7 @@ const i18nKey = 'commands.hubdb';
 exports.command = 'hubdb';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs
         .command(clearCommand)
         .command(createCommand)

package/commands/init.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const path = require('path');
 const fs = require('fs-extra');
-const { getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
-const { addConfigOptions } = require('../lib/commonOpts');
+const { getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, loadConfig, configFileExists, } = require('@hubspot/local-dev-lib/config');
+const { addConfigOptions, addGlobalOptions } = require('../lib/commonOpts');
 const { handleExit } = require('../lib/process');
 const { checkAndAddConfigToGitignore, } = require('@hubspot/local-dev-lib/gitignore');
 const { debugError, logError } = require('../lib/errorHandlers/index');
@@ -62,13 +62,16 @@ const AUTH_TYPE_NAMES = {
     [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
     [OAUTH_AUTH_METHOD.value]: OAUTH_AUTH_METHOD.name,
 };
-exports.command = 'init [--account]';
+exports.command = 'init';
 exports.describe = i18n(`${i18nKey}.describe`, {
     configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 });
 exports.handler = async (options) => {
-    const { auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value, c, account: optionalAccount, disableTracking, } = options;
-    const configPath = (c && path.join(getCwd(), c)) || getConfigPath();
+    const { auth: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = options;
+    const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
+        PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    const configPath = (configFlagValue && path.join(getCwd(), configFlagValue)) ||
+        getConfigPath('', useHiddenConfig);
     setLogLevel(options);
     if (!disableTracking) {
         trackCommandUsage('init', {
@@ -86,20 +89,32 @@ exports.handler = async (options) => {
     if (!disableTracking) {
         await trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
     }
-    createEmptyConfigFile({ path: configPath });
+    const doesOtherConfigFileExist = configFileExists(!useHiddenConfig);
+    if (doesOtherConfigFileExist) {
+        const path = getConfigPath('', !useHiddenConfig);
+        logger.error(i18n(`${i18nKey}.errors.bothConfigFilesNotAllowed`, { path }));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
+    createEmptyConfigFile({ path: configPath }, useHiddenConfig);
+    //Needed to load deprecated config
+    loadConfig(configPath, options);
     handleExit(deleteEmptyConfigFile);
     try {
-        const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](env, optionalAccount);
-        const configPath = getConfigPath();
+        const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](env, providedAccountId);
         try {
             checkAndAddConfigToGitignore(configPath);
         }
         catch (e) {
             debugError(e);
         }
+        let newConfigPath = configPath;
+        if (!newConfigPath && !useHiddenConfig) {
+            newConfigPath = `${getCwd()}/${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
+        }
         logger.log('');
         logger.success(i18n(`${i18nKey}.success.configFileCreated`, {
-            configPath,
+            configPath: newConfigPath,
         }));
         logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {
             authType: AUTH_TYPE_NAMES[authType],
@@ -120,30 +135,38 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    yargs.options({
-        auth: {
-            describe: i18n(`${i18nKey}.options.auth.describe`),
+    yargs
+        .options({
+        'auth-type': {
+            describe: i18n(`${i18nKey}.options.authType.describe`),
             type: 'string',
             choices: [
                 `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
                 `${OAUTH_AUTH_METHOD.value}`,
             ],
             default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-            defaultDescription: i18n(`${i18nKey}.options.auth.defaultDescription`, {
+            defaultDescription: i18n(`${i18nKey}.options.authType.defaultDescription`, {
                 defaultType: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
             }),
         },
         account: {
             describe: i18n(`${i18nKey}.options.account.describe`),
             type: 'string',
+            alias: 'a',
         },
         'disable-tracking': {
             type: 'boolean',
             hidden: true,
             default: false,
         },
-    });
+        'use-hidden-config': {
+            describe: i18n(`${i18nKey}.options.useHiddenConfig.describe`),
+            type: 'boolean',
+        },
+    })
+        .conflicts('use-hidden-config', 'config');
     addConfigOptions(yargs);
     addTestingOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/lint.js

@@ -5,10 +5,9 @@ exports.builder = exports.handler = exports.describe = exports.command = void 0;
 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, getAccountId, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
-const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.lint';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -45,23 +44,22 @@ function printHublValidationResult({ file, validation }) {
 }
 const handler = async (options) => {
     const { path: lintPath } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
+    const { derivedAccountId } = options;
     const localPath = resolveLocalPath(lintPath);
     const groupName = i18n(`${i18nKey}.groupName`, {
         path: localPath,
     });
-    trackCommandUsage('lint', null, accountId);
+    trackCommandUsage('lint', null, derivedAccountId);
     logger.group(groupName);
     let count = 0;
     try {
-        await lint(accountId, localPath, result => {
+        await lint(derivedAccountId, localPath, result => {
             count += printHublValidationResult(result);
         });
     }
     catch (err) {
         logger.groupEnd(groupName);
-        logError(err, { accountId });
+        logError(err, { accountId: derivedAccountId });
         process.exit(EXIT_CODES.ERROR);
     }
     logger.groupEnd(groupName);
@@ -73,6 +71,7 @@ exports.handler = handler;
 const builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs.positional('path', {
         describe: i18n(`${i18nKey}.positionals.path.describe`),
         type: 'string',

package/commands/list.js

@@ -2,31 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const chalk = require('chalk');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addGlobalOptions, addUseEnvironmentOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { isPathFolder } = require('../lib/filesystem');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../lib/errorHandlers/index');
 const { getDirectoryContentsByPath, } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } = require('../lib/constants');
-const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.list';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 exports.command = 'list [path]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { path } = options;
+    const { path, derivedAccountId } = options;
     const directoryPath = path || '/';
-    const accountId = getAccountId(options);
     let contentsResp;
-    trackCommandUsage('list', null, accountId);
+    trackCommandUsage('list', null, derivedAccountId);
     logger.debug(i18n(`${i18nKey}.gettingPathContents`, {
         path: directoryPath,
     }));
     try {
-        const { data } = await getDirectoryContentsByPath(accountId, directoryPath);
+        const { data } = await getDirectoryContentsByPath(derivedAccountId, directoryPath);
         contentsResp = data;
     }
     catch (e) {
@@ -64,6 +61,7 @@ exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };
 const addColorToContents = fileOrFolder => {