@hubspot/cli 7.0.0-experimental.0 → 7.0.0-experimental.2

package/bin/cli.js

@@ -3,18 +3,19 @@
 const yargs = require('yargs');
 const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
-const fs = require('fs');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
-const { loadConfig, configFileExists, getConfigPath, } = require('@hubspot/local-dev-lib/config');
+const { loadConfig, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
 const { setLogLevel, getCommandName, injectAccountIdMiddleware, } = require('../lib/commonOpts');
+const { validateAccount } = require('../lib/validation');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
 const { i18n } = require('../lib/lang');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { UI_COLORS, uiCommandReference } = require('../lib/ui');
+const { checkAndWarnGitInclusion } = require('../lib/ui/git');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -119,21 +120,79 @@ const performChecks = argv => {
 const setRequestHeaders = () => {
     addUserAgentHeader('HubSpot CLI', pkg.version);
 };
+const isTargetedCommand = (options, commandMap) => {
+    const checkCommand = (options, commandMap) => {
+        const currentCommand = options._[0];
+        if (!commandMap[currentCommand]) {
+            return false;
+        }
+        if (commandMap[currentCommand].target) {
+            return true;
+        }
+        const subCommands = commandMap[currentCommand].subCommands || {};
+        if (options._.length > 1) {
+            return checkCommand({ _: options._.slice(1) }, subCommands);
+        }
+        return false;
+    };
+    return checkCommand(options, commandMap);
+};
+const SKIP_CONFIG_VALIDATION = {
+    init: { target: true },
+    auth: { target: true },
+};
 const loadConfigMiddleware = async (options) => {
-    if (configFileExists(true)) {
-        loadConfig('', options);
-        if (options.config) {
-            logger.error(i18n(`${i18nKey}.loadConfigMiddleware.configFileExists`, {
-                configPath: getConfigPath(),
-            }));
+    const maybeValidateConfig = () => {
+        if (!isTargetedCommand(options, SKIP_CONFIG_VALIDATION) &&
+            !validateConfig()) {
             process.exit(EXIT_CODES.ERROR);
         }
+    };
+    if (configFileExists(true) && options.config) {
+        logger.error(i18n(`${i18nKey}.loadConfigMiddleware.configFileExists`, {
+            configPath: getConfigPath(),
+        }));
+        process.exit(EXIT_CODES.ERROR);
     }
-    // We need to load the config when options.config exists,
-    // so that getAccountIdFromConfig() in injectAccountIdMiddleware reads from the right config
-    if (options.config && fs.existsSync(options.config)) {
+    else if (!options._.includes('init')) {
         const { config: configPath } = options;
-        await loadConfig(configPath, options);
+        loadConfig(configPath, options);
+    }
+    maybeValidateConfig();
+};
+const checkAndWarnGitInclusionMiddleware = () => {
+    checkAndWarnGitInclusion(getConfigPath());
+};
+const accountsSubCommands = {
+    target: false,
+    subCommands: {
+        clean: { target: true },
+        list: { target: true },
+        ls: { target: true },
+        remove: { target: true },
+    },
+};
+const sandboxesSubCommands = {
+    target: false,
+    subCommands: {
+        delete: { target: true },
+    },
+};
+const SKIP_ACCOUNT_VALIDATION = {
+    init: { target: true },
+    auth: { target: true },
+    account: accountsSubCommands,
+    accounts: accountsSubCommands,
+    sandbox: sandboxesSubCommands,
+    sandboxes: sandboxesSubCommands,
+};
+const validateAccountOptions = async (options) => {
+    let validAccount = true;
+    if (!isTargetedCommand(options, SKIP_ACCOUNT_VALIDATION)) {
+        validAccount = await validateAccount(options);
+    }
+    if (!validAccount) {
+        process.exit(EXIT_CODES.ERROR);
     }
 };
 const argv = yargs
@@ -144,6 +203,8 @@ const argv = yargs
     setRequestHeaders,
     loadConfigMiddleware,
     injectAccountIdMiddleware,
+    checkAndWarnGitInclusionMiddleware,
+    validateAccountOptions,
 ])
     .exitProcess(false)
     .fail(handleFailure)

package/bin/hs

@@ -1,3 +1,5 @@
 #!/usr/bin/env node
 
+require('./silenceErrors')
+
 require('./cli');

package/bin/hscms

@@ -1,3 +1,5 @@
 #!/usr/bin/env node
 
+require('./silenceErrors')
+
 require('./cli');

package/bin/silenceErrors.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/bin/silenceErrors.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const SILENCED_ERRORS = ['DeprecationWarning:'];
+const originalConsoleError = console.error;
+console.error = msg => {
+    const isSilencedError = SILENCED_ERRORS.some(error => typeof msg === 'string' && msg.includes(error));
+    if (isSilencedError) {
+        return;
+    }
+    originalConsoleError(msg);
+};

package/commands/account/clean.js

@@ -5,7 +5,6 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { accessTokenForPersonalAccessKey, } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { addTestingOptions, addConfigOptions } = require('../../lib/commonOpts');
 const { promptUser } = require('../../lib/prompts/promptUtils');
@@ -20,7 +19,6 @@ exports.command = 'clean';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { qa } = options;
-    await loadAndValidateOptions(options, false);
     trackCommandUsage('accounts-clean', null);
     const accountsList = getConfigAccounts();
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');

package/commands/account/info.js

@@ -5,14 +5,12 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getAccessToken } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { addConfigOptions } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { getTableContents } = require('../../lib/ui/table');
 const i18nKey = 'commands.account.subcommands.info';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.command = 'info [account]';
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { derivedAccountId } = options;
     const config = getAccountConfig(derivedAccountId);
     // check if the provided account is using a personal access key, if not, show an error

package/commands/account/list.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { addConfigOptions } = require('../../lib/commonOpts');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { isSandbox, isDeveloperTestAccount } = require('../../lib/accountTypes');
 const { i18n } = require('../../lib/lang');
 const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubspot/local-dev-lib/constants/config');
@@ -62,10 +61,8 @@ const getPortalData = mappedPortalData => {
     return portalData;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
     const { derivedAccountId } = options;
     trackCommandUsage('accounts-list', null, derivedAccountId);
-    const config = getConfig();
     const configPath = getConfigPath();
     const accountsList = getConfigAccounts();
     const mappedPortalData = sortAndMapPortals(accountsList);
@@ -77,7 +74,7 @@ exports.handler = async (options) => {
     ]));
     logger.log(i18n(`${i18nKey}.configPath`, { configPath }));
     logger.log(i18n(`${i18nKey}.defaultAccount`, {
-        account: getConfigDefaultAccount(config),
+        account: getConfigDefaultAccount(),
     }));
     logger.log(i18n(`${i18nKey}.accounts`));
     logger.log(getTableContents(portalData, { border: { bodyLeft: '  ' } }));

package/commands/account/remove.js

@@ -3,19 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { addConfigOptions } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId: getAccountIdFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { loadConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId: getAccountIdFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const i18nKey = 'commands.account.subcommands.remove';
 exports.command = 'remove [account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
     const { account } = options;
     let accountToRemove = account;
-    let config = getConfig();
     if (accountToRemove && !getAccountIdFromConfig(accountToRemove)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,
@@ -23,7 +20,7 @@ exports.handler = async (options) => {
         }));
     }
     if (!accountToRemove || !getAccountIdFromConfig(accountToRemove)) {
-        accountToRemove = await selectAccountFromConfig(config, i18n(`${i18nKey}.prompts.selectAccountToRemove`));
+        accountToRemove = await selectAccountFromConfig(i18n(`${i18nKey}.prompts.selectAccountToRemove`));
     }
     trackCommandUsage('accounts-remove', null, getAccountIdFromConfig(accountToRemove));
     const currentDefaultAccount = getConfigDefaultAccount();
@@ -32,11 +29,11 @@ exports.handler = async (options) => {
         accountName: accountToRemove,
     }));
     // Get updated version of the config
-    config = getConfig();
+    loadConfig(getConfigPath(), options);
     if (accountToRemove === currentDefaultAccount) {
         logger.log();
         logger.log(i18n(`${i18nKey}.logs.replaceDefaultAccount`));
-        const newDefaultAccount = await selectAccountFromConfig(config);
+        const newDefaultAccount = await selectAccountFromConfig();
         updateDefaultAccount(newDefaultAccount);
     }
 };

package/commands/account/rename.js

@@ -5,13 +5,11 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { renameAccount } = require('@hubspot/local-dev-lib/config');
 const { addConfigOptions, addAccountOptions } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.account.subcommands.rename';
 exports.command = 'rename <accountName> <newName>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    loadAndValidateOptions(options);
     const { accountName, newName, derivedAccountId } = options;
     trackCommandUsage('accounts-rename', null, derivedAccountId);
     await renameAccount(accountName, newName);

package/commands/account/use.js

@@ -2,27 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, updateDefaultAccount, getAccountId: getAccountIdFromConfig, } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, updateDefaultAccount, getAccountId: getAccountIdFromConfig, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const i18nKey = 'commands.account.subcommands.use';
 exports.command = 'use [account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
-    const config = getConfig();
     let newDefaultAccount = options.account;
     if (!newDefaultAccount) {
-        newDefaultAccount = await selectAccountFromConfig(config);
+        newDefaultAccount = await selectAccountFromConfig();
     }
     else if (!getAccountIdFromConfig(newDefaultAccount)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: newDefaultAccount,
             configPath: getConfigPath(),
         }));
-        newDefaultAccount = await selectAccountFromConfig(config);
+        newDefaultAccount = await selectAccountFromConfig();
     }
     trackCommandUsage('accounts-use', null, getAccountIdFromConfig(newDefaultAccount));
     updateDefaultAccount(newDefaultAccount);

package/commands/auth.js

@@ -8,7 +8,7 @@ const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments
 const { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, } = require('@hubspot/local-dev-lib/constants/config');
 const { i18n } = require('../lib/lang');
 const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { updateAccountConfig, writeConfig, getConfigPath, loadConfig, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues, toKebabCase, } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const { personalAccessKeyPrompt, OAUTH_FLOW, } = require('../lib/prompts/personalAccessKeyPrompt');
@@ -115,9 +115,8 @@ exports.handler = async (options) => {
         }));
     }
     else {
-        const config = getConfig();
         logger.info(i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-            accountName: getConfigDefaultAccount(config),
+            accountName: getConfigDefaultAccount(),
         }));
     }
     logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {

package/commands/cms/lighthouseScore.js

@@ -5,7 +5,6 @@ const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('../../lib/lang');
 const { fetchThemes } = require('@hubspot/local-dev-lib/api/designManager');
@@ -53,7 +52,6 @@ const selectTheme = async (accountId) => {
     return selectedTheme;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { target, verbose, theme, derivedAccountId } = options;
     const includeDesktopScore = target === 'desktop' || !verbose;
     const includeMobileScore = target === 'mobile' || !verbose;

package/commands/config/set.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { promptUser } = require('../../lib/prompts/promptUtils');
@@ -47,7 +46,6 @@ const handleConfigUpdate = async (accountId, options) => {
     return false;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { derivedAccountId } = options;
     trackCommandUsage('config-set', null, derivedAccountId);
     const configUpdated = await handleConfigUpdate(derivedAccountId, options);

package/commands/create.js

@@ -27,7 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs-extra');
 const { logError } = require('../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { setLogLevel, addGlobalOptions } = require('../lib/commonOpts');
+const { setLogLevel, addGlobalOptions, addConfigOptions, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
@@ -100,6 +100,7 @@ exports.builder = yargs => {
         type: 'boolean',
         hidden: true,
     });
+    addConfigOptions(yargs);
     addGlobalOptions(yargs);
     return yargs;
 };

package/commands/customObject/create.js

@@ -5,7 +5,7 @@ const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
-const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../lib/validation');
+const { checkAndConvertToJson } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { batchCreateObjects, } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../lib/lang');
@@ -16,7 +16,6 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { path, name: providedName, derivedAccountId } = options;
     let definitionPath = path;
-    await loadAndValidateOptions(options);
     trackCommandUsage('custom-object-batch-create', null, derivedAccountId);
     if (!definitionPath) {
         definitionPath = await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputPath`));

package/commands/customObject/schema/create.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
-const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../../lib/validation');
+const { checkAndConvertToJson } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions } = require('../../../lib/commonOpts');
 const { getEnv, isConfigFlagEnabled, } = require('@hubspot/local-dev-lib/config');
@@ -20,7 +20,6 @@ exports.command = 'create';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { path, derivedAccountId } = options;
-    await loadAndValidateOptions(options);
     trackCommandUsage('custom-object-schema-create', null, derivedAccountId);
     const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);

package/commands/customObject/schema/delete.js

@@ -5,7 +5,6 @@ const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../../lib/prompts/promptUtils");
 const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { deleteObjectSchema, } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../../lib/lang');
@@ -15,7 +14,6 @@ exports.command = 'delete [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { name: providedName, force, derivedAccountId } = options;
-    await loadAndValidateOptions(options);
     trackCommandUsage('custom-object-schema-delete', null, derivedAccountId);
     let name;
     try {

package/commands/customObject/schema/fetch-all.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const promptUtils_1 = require("../../../lib/prompts/promptUtils");
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { downloadSchemas, getResolvedPath, } = require('@hubspot/local-dev-lib/customObjects');
 const { i18n } = require('../../../lib/lang');
@@ -13,7 +12,6 @@ const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetchAll';
 exports.command = 'fetch-all [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { derivedAccountId, dest: providedDest } = options;
     trackCommandUsage('custom-object-schema-fetch-all', null, derivedAccountId);
     try {

package/commands/customObject/schema/fetch.js

@@ -10,7 +10,6 @@ const { CONFIG_FLAGS } = require('../../../lib/constants');
 const { downloadSchema, getResolvedPath, } = require('@hubspot/local-dev-lib/customObjects');
 const { fetchSchema } = require('@hubspot/local-dev-lib/api/fileTransport');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { i18n } = require('../../../lib/lang');
 const { logError } = require('../../../lib/errorHandlers');
@@ -19,7 +18,6 @@ exports.command = 'fetch [name] [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { name: providedName, dest: providedDest, derivedAccountId } = options;
-    await loadAndValidateOptions(options);
     trackCommandUsage('custom-object-schema-fetch', null, derivedAccountId);
     let name;
     try {

package/commands/customObject/schema/list.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../../lib/errorHandlers/index');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { listSchemas } = require('../../../lib/schema');
 const { i18n } = require('../../../lib/lang');
@@ -11,7 +10,6 @@ const i18nKey = 'commands.customObject.subcommands.schema.subcommands.list';
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { derivedAccountId } = options;
     trackCommandUsage('custom-object-schema-list', null, derivedAccountId);
     try {

package/commands/customObject/schema/update.js

@@ -7,7 +7,7 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
-const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../../lib/validation');
+const { checkAndConvertToJson } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions } = require('../../../lib/commonOpts');
 const { CONFIG_FLAGS } = require('../../../lib/constants');
@@ -22,7 +22,6 @@ exports.command = 'update [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { path, name: providedName, derivedAccountId } = options;
-    await loadAndValidateOptions(options);
     trackCommandUsage('custom-object-schema-update', null, derivedAccountId);
     const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);

package/commands/doctor.js

@@ -18,11 +18,11 @@ exports.command = 'doctor';
 exports.describe = i18n(`${i18nKey}.describe`);
 const handler = async ({ outputDir, }) => {
     const doctor = new Doctor_1.Doctor();
-    (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId);
+    (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId || undefined);
     const output = await doctor.diagnose();
     const totalCount = (output?.errorCount || 0) + (output?.warningCount || 0);
     if (totalCount > 0) {
-        (0, usageTracking_1.trackCommandMetadataUsage)(exports.command, { success: false, type: totalCount }, doctor.accountId);
+        (0, usageTracking_1.trackCommandMetadataUsage)(exports.command, { successful: false, type: totalCount }, doctor.accountId || undefined);
     }
     if (!outputDir) {
         if (output?.diagnosis) {

package/commands/fetch.js

@@ -5,7 +5,7 @@ const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addConfigOptions, addAccountOptions, addOverwriteOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, getCmsPublishMode, addGlobalOptions, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
-const { validateCmsPublishMode, loadAndValidateOptions, } = require('../lib/validation');
+const { validateCmsPublishMode } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.fetch';
@@ -15,7 +15,6 @@ exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { src, dest } = options;
-    await loadAndValidateOptions(options);
     if (!validateCmsPublishMode(options)) {
         process.exit(EXIT_CODES.ERROR);
     }
@@ -25,7 +24,7 @@ exports.handler = async (options) => {
     }
     const { derivedAccountId } = options;
     const cmsPublishMode = getCmsPublishMode(options);
-    trackCommandUsage('fetch', { mode: cmsPublishMode }, accountId);
+    trackCommandUsage('fetch', { mode: cmsPublishMode }, derivedAccountId);
     try {
         // Fetch and write file/folder.
         await downloadFileOrFolder(derivedAccountId, src, resolveLocalPath(dest), cmsPublishMode, options);

package/commands/filemanager/fetch.js

@@ -5,7 +5,6 @@ const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { resolveLocalPath } = require('../../lib/filesystem');
 const { addConfigOptions, addAccountOptions, addOverwriteOptions, addGlobalOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.filemanager.subcommands.fetch';
@@ -15,7 +14,6 @@ exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { src, includeArchived, derivedAccountId, overwrite } = options;
-    await loadAndValidateOptions(options);
     if (typeof src !== 'string') {
         logger.error(i18n(`${i18nKey}.errors.sourceRequired`));
         process.exit(EXIT_CODES.ERROR);

package/commands/filemanager/upload.js

@@ -11,7 +11,6 @@ const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { addConfigOptions, addGlobalOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.filemanager.subcommands.upload';
@@ -20,7 +19,6 @@ exports.command = 'upload <src> <dest>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { src, dest, derivedAccountId } = options;
-    await loadAndValidateOptions(options);
     const absoluteSrcPath = path.resolve(getCwd(), src);
     let stats;
     try {

package/commands/filemanager.js

@@ -8,9 +8,6 @@ const i18nKey = 'commands.filemanager';
 exports.command = 'filemanager';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
-    yargs
-        .command(upload)
-        .command(fetch)
-        .demandCommand(1, '');
+    yargs.command(upload).command(fetch).demandCommand(1, '');
     return yargs;
 };

package/commands/function/deploy.js

@@ -9,7 +9,6 @@ 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');
@@ -17,7 +16,6 @@ const i18nKey = 'commands.function.subcommands.deploy';
 exports.command = 'deploy <path>';
 exports.describe = false;
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { path: functionPath, derivedAccountId } = options;
     const splitFunctionPath = functionPath.split('.');
     trackCommandUsage('functions-deploy', null, derivedAccountId);

package/commands/function/list.js

@@ -8,14 +8,12 @@ const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 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.function.subcommands.list';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 exports.command = ['list', 'ls'];
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    loadAndValidateOptions(options);
     const { derivedAccountId } = options;
     trackCommandUsage('functions-list', null, derivedAccountId);
     logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));