@hubspot/cli 7.0.1-experimental.0 → 7.0.2-beta.0

package/README.md

@@ -1,6 +1,6 @@
 # @hubspot/cli
 
-[![Official Release](https://img.shields.io/npm/v/@hubspot/cli/latest?label=Official%20Release)](https://www.npmjs.com/package/@hubspot/cli) [![Latest Version](https://img.shields.io/github/v/tag/hubspot/hubspot-cli?label=Latest%20Version)](https://www.npmjs.com/package/@hubspot/cli?activeTab=versions)
+[![Official Release](https://img.shields.io/npm/v/@hubspot/cli/latest?label=Official%20Release)](https://www.npmjs.com/package/@hubspot/cli) [![Latest Beta Version](https://img.shields.io/npm/v/@hubspot/cli/next?label=Latest%20Beta%20Version)](https://www.npmjs.com/package/@hubspot/cli?activeTab=versions)
 
 A CLI for HubSpot developers to enable local development and automation. [Learn more about building on HubSpot](https://developers.hubspot.com).
 
@@ -58,14 +58,15 @@ There are two ways that the tools can authenticate with HubSpot.
 3. Select `OAuth2` and follow the steps
 
 _**Note:** The Account ID used should be the Test Account ID (not the developer app ID). Client ID and Client Secret are from the developer app._
+
 ### Exit Codes
 
 The CLI will exit with one of the following exit codes:
+
 - `0`: A successful run
 - `1`: There was a config problem or an internal error
 - `2`: There are warnings or validation issues
 
-
 ## Changelog
 
 The best way to stay up to date is to check out the [Github Releases](https://github.com/HubSpot/hubspot-cli/releases) and also follow our [developer changelog posts](https://developers.hubspot.com/changelog) for an easier to read breakdown of major changes.

package/bin/cli.js

@@ -5,16 +5,16 @@ const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
-const { loadConfig, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
+const { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
-const { setLogLevel, getCommandName, injectAccountIdMiddleware, } = require('../lib/commonOpts');
+const { setLogLevel, getCommandName } = 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 { UI_COLORS, uiCommandReference, uiDeprecatedTag } = require('../lib/ui');
 const { checkAndWarnGitInclusion } = require('../lib/ui/git');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
@@ -141,6 +141,32 @@ const SKIP_CONFIG_VALIDATION = {
     init: { target: true },
     auth: { target: true },
 };
+const handleDeprecatedEnvVariables = options => {
+    // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
+    // The HubSpot GH Deploy Action still uses HUBSPOT_PORTAL_ID
+    if (options.useEnv &&
+        process.env.HUBSPOT_PORTAL_ID &&
+        !process.env.HUBSPOT_ACCOUNT_ID) {
+        uiDeprecatedTag(i18n(`${i18nKey}.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
+            configPath: getConfigPath(),
+        }));
+        process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
+    }
+};
+/**
+ * Auto-injects the derivedAccountId flag into all commands
+ */
+const injectAccountIdMiddleware = async (options) => {
+    const { account } = options;
+    // Preserves the original --account flag for certain commands.
+    options.providedAccountId = account;
+    if (options.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
+        options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+    }
+    else {
+        options.derivedAccountId = getAccountId(account);
+    }
+};
 const loadConfigMiddleware = async (options) => {
     // Skip this when no command is provided
     if (!options._.length) {
@@ -158,9 +184,14 @@ const loadConfigMiddleware = async (options) => {
         }));
         process.exit(EXIT_CODES.ERROR);
     }
-    else if (!options._.includes('init')) {
+    else if (!isTargetedCommand(options, { init: { target: true } })) {
         const { config: configPath } = options;
-        loadConfig(configPath, options);
+        const config = loadConfig(configPath, options);
+        // We don't run validateConfig() for auth because users should be able to run it when
+        // no accounts are configured, but we still want to exit if the config file is not found
+        if (isTargetedCommand(options, { auth: { target: true } }) && !config) {
+            process.exit(EXIT_CODES.ERROR);
+        }
     }
     maybeValidateConfig();
 };
@@ -213,6 +244,7 @@ const argv = yargs
     .middleware([
     setLogLevel,
     setRequestHeaders,
+    handleDeprecatedEnvVariables,
     loadConfigMiddleware,
     injectAccountIdMiddleware,
     checkAndWarnGitInclusionMiddleware,

package/commands/account/info.d.ts

@@ -1 +1,8 @@
+import { Argv, ArgumentsCamelCase } from 'yargs';
+import { CommonArgs, ConfigArgs } from '../../types/Yargs';
+export declare const describe: string;
+export declare const command = "info [account]";
+type AccountInfoArgs = CommonArgs & ConfigArgs;
+export declare function handler(args: ArgumentsCamelCase<AccountInfoArgs>): Promise<void>;
+export declare function builder(yargs: Argv): Argv<AccountInfoArgs>;
 export {};

package/commands/account/info.js

@@ -1,38 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-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 { i18n } = require('../../lib/lang');
-const { getTableContents } = require('../../lib/ui/table');
+exports.command = exports.describe = void 0;
+exports.handler = handler;
+exports.builder = builder;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
+const commonOpts_1 = require("../../lib/commonOpts");
+const lang_1 = require("../../lib/lang");
+const table_1 = require("../../lib/ui/table");
 const i18nKey = 'commands.account.subcommands.info';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
 exports.command = 'info [account]';
-exports.handler = async (options) => {
-    const { derivedAccountId } = options;
-    const config = getAccountConfig(derivedAccountId);
+async function handler(args) {
+    const { derivedAccountId } = args;
+    const config = (0, config_1.getAccountConfig)(derivedAccountId);
     // check if the provided account is using a personal access key, if not, show an error
     if (config && config.authType === 'personalaccesskey') {
         const { name, personalAccessKey, env } = config;
-        const response = await getAccessToken(personalAccessKey, env, derivedAccountId);
-        const scopeGroups = response.scopeGroups.map(s => [s]);
-        logger.log(i18n(`${i18nKey}.name`, { name }));
-        logger.log(i18n(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
-        logger.log(i18n(`${i18nKey}.scopeGroups`));
-        logger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
+        let scopeGroups = [];
+        const response = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env, derivedAccountId);
+        scopeGroups = response.scopeGroups.map(s => [s]);
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.name`, { name: name }));
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.scopeGroups`));
+        logger_1.logger.log((0, table_1.getTableContents)(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
     else {
-        logger.log(i18n(`${i18nKey}.errors.notUsingPersonalAccessKey`));
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.notUsingPersonalAccessKey`));
     }
-};
-exports.builder = yargs => {
-    addConfigOptions(yargs);
+}
+function builder(yargs) {
+    (0, commonOpts_1.addConfigOptions)(yargs);
     yargs.example([
-        ['$0 accounts info', i18n(`${i18nKey}.examples.default`)],
-        ['$0 accounts info MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts info 1234567', i18n(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts info', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        ['$0 accounts info MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.nameBased`)],
+        ['$0 accounts info 1234567', (0, lang_1.i18n)(`${i18nKey}.examples.idBased`)],
     ]);
     return yargs;
-};
+}

package/commands/account/remove.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { addConfigOptions } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { loadConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId: getAccountIdFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { loadConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
@@ -13,16 +13,16 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { account } = options;
     let accountToRemove = account;
-    if (accountToRemove && !getAccountIdFromConfig(accountToRemove)) {
+    if (accountToRemove && !getAccountId(accountToRemove)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,
             configPath: getConfigPath(),
         }));
     }
-    if (!accountToRemove || !getAccountIdFromConfig(accountToRemove)) {
+    if (!accountToRemove || !getAccountId(accountToRemove)) {
         accountToRemove = await selectAccountFromConfig(i18n(`${i18nKey}.prompts.selectAccountToRemove`));
     }
-    trackCommandUsage('accounts-remove', null, getAccountIdFromConfig(accountToRemove));
+    trackCommandUsage('accounts-remove', null, getAccountId(accountToRemove));
     const currentDefaultAccount = getConfigDefaultAccount();
     await deleteAccount(accountToRemove);
     logger.success(i18n(`${i18nKey}.success.accountRemoved`, {

package/commands/account/use.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfigPath, updateDefaultAccount, getAccountId: getAccountIdFromConfig, } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, updateDefaultAccount, getAccountId, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
@@ -14,14 +14,14 @@ exports.handler = async (options) => {
     if (!newDefaultAccount) {
         newDefaultAccount = await selectAccountFromConfig();
     }
-    else if (!getAccountIdFromConfig(newDefaultAccount)) {
+    else if (!getAccountId(newDefaultAccount)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: newDefaultAccount,
             configPath: getConfigPath(),
         }));
         newDefaultAccount = await selectAccountFromConfig();
     }
-    trackCommandUsage('accounts-use', null, getAccountIdFromConfig(newDefaultAccount));
+    trackCommandUsage('accounts-use', null, getAccountId(newDefaultAccount));
     updateDefaultAccount(newDefaultAccount);
     return logger.success(i18n(`${i18nKey}.success.defaultAccountUpdated`, {
         accountName: newDefaultAccount,

package/commands/auth.js

@@ -8,13 +8,13 @@ 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, getConfigPath, loadConfig, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { updateAccountConfig, writeConfig, getConfigPath, loadConfig, getConfigDefaultAccount, getAccountId, } = 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');
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const { setAsDefaultAccountPrompt, } = require('../lib/prompts/setAsDefaultAccountPrompt');
-const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, addGlobalOptions, } = require('../lib/commonOpts');
+const { addConfigOptions, setLogLevel, addTestingOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -129,7 +129,7 @@ exports.handler = async (options) => {
         'accountOption',
         'accountsListCommand',
     ]);
-    const accountId = getAccountId({ account: accountName });
+    const accountId = getAccountId(accountName);
     await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
     process.exit(EXIT_CODES.SUCCESS);
 };

package/commands/customObject/create.js

@@ -16,7 +16,11 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { path, name: providedName, derivedAccountId } = options;
     let definitionPath = path;
+    let name = providedName;
     trackCommandUsage('custom-object-batch-create', null, derivedAccountId);
+    if (!name) {
+        name = await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputName`));
+    }
     if (!definitionPath) {
         definitionPath = await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputPath`));
     }
@@ -25,7 +29,6 @@ exports.handler = async (options) => {
     if (!objectJson) {
         process.exit(EXIT_CODES.ERROR);
     }
-    const name = providedName || (await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputSchema`)));
     try {
         await batchCreateObjects(derivedAccountId, name, objectJson);
         logger.success(i18n(`${i18nKey}.success.objectsCreated`));

package/commands/function/deploy.js

@@ -38,7 +38,7 @@ exports.handler = async (options) => {
     });
     try {
         const { data: buildId } = await buildPackage(derivedAccountId, functionPath);
-        const successResp = await poll(getBuildStatus, derivedAccountId, buildId);
+        const successResp = await poll(() => getBuildStatus(derivedAccountId, buildId));
         const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
         SpinniesManager.succeed('loading');
         await outputBuildLog(successResp.cdnUrl);

package/commands/hubdb/create.js

@@ -42,9 +42,9 @@ exports.handler = async (options) => {
     trackCommandUsage('hubdb-create', null, derivedAccountId);
     let filePath;
     try {
-        const { path: filePath } = 'path' in options
+        const filePath = 'path' in options
             ? path.resolve(getCwd(), options.path)
-            : await selectPathPrompt(options);
+            : path.resolve(getCwd(), (await selectPathPrompt(options)).path);
         if (!checkAndConvertToJson(filePath)) {
             process.exit(EXIT_CODES.ERROR);
         }

package/commands/init.js

@@ -67,7 +67,7 @@ exports.describe = i18n(`${i18nKey}.describe`, {
     configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 });
 exports.handler = async (options) => {
-    const { auth: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = options;
+    const { authType: 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)) ||

package/commands/logs.js

@@ -44,13 +44,7 @@ const endpointLog = async (accountId, functionPath, options) => {
                 handleLogsError(e, accountId, functionPath);
             }
         };
-        await tailLogs({
-            accountId,
-            compact,
-            tailCall,
-            fetchLatest,
-            name: functionPath,
-        });
+        await tailLogs(accountId, functionPath, fetchLatest, tailCall, compact);
     }
     else if (latest) {
         try {

package/commands/project/cloneApp.js

@@ -68,7 +68,7 @@ exports.handler = async (options) => {
             text: i18n(`${i18nKey}.cloneStatus.inProgress`),
         });
         const { data: { exportId }, } = await cloneApp(derivedAccountId, appId);
-        const { status } = await poll(checkCloneStatus, derivedAccountId, exportId);
+        const { status } = await poll(() => checkCloneStatus(derivedAccountId, exportId));
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
             const baseDestPath = path.resolve(getCwd(), projectDest);

package/commands/project/create.js

@@ -56,6 +56,12 @@ exports.builder = yargs => {
         },
     });
     yargs.example([['$0 project create', i18n(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project create --template-source HubSpot/ui-extensions-examples',
+            i18n(`${i18nKey}.examples.templateSource`),
+        ],
+    ]);
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);

package/commands/project/deploy.js

@@ -75,7 +75,7 @@ exports.handler = async (options) => {
                 default: latestBuild.buildId === deployedBuildId
                     ? undefined
                     : latestBuild.buildId,
-                validate: () => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, derivedAccountId),
+                validate: buildId => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, derivedAccountId),
             });
             buildIdToDeploy = deployBuildIdPromptResponse.buildId;
         }

package/commands/project/dev.js

@@ -14,7 +14,8 @@ const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const { isSandbox, isDeveloperTestAccount, isStandardAccount, isAppDeveloperAccount, } = require('../../lib/accountTypes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { findProjectComponents, getProjectComponentTypes, COMPONENT_TYPES, } = require('../../lib/projects/structure');
+const { ComponentTypes } = require('../../types/Projects');
+const { findProjectComponents, getProjectComponentTypes, } = require('../../lib/projects/structure');
 const { confirmDefaultAccountIsTarget, suggestRecommendedNestedAccount, checkIfDefaultAccountIsSupported, createSandboxForLocalDev, createDeveloperTestAccountForLocalDev, createNewProjectForLocalDev, createInitialBuildForNewProject, useExistingDevTestAccount, checkIfAccountFlagIsSupported, checkIfParentAccountIsAuthed, } = require('../../lib/localDev');
 const i18nKey = 'commands.project.subcommands.dev';
 exports.command = 'dev';
@@ -35,8 +36,8 @@ exports.handler = async (options) => {
     const components = await findProjectComponents(projectDir);
     const runnableComponents = components.filter(component => component.runnable);
     const componentTypes = getProjectComponentTypes(runnableComponents);
-    const hasPrivateApps = !!componentTypes[COMPONENT_TYPES.privateApp];
-    const hasPublicApps = !!componentTypes[COMPONENT_TYPES.publicApp];
+    const hasPrivateApps = !!componentTypes[ComponentTypes.PrivateApp];
+    const hasPublicApps = !!componentTypes[ComponentTypes.PublicApp];
     if (runnableComponents.length === 0) {
         logger.error(i18n(`${i18nKey}.errors.noRunnableComponents`, {
             projectDir,

package/commands/project/installDeps.js

@@ -9,16 +9,14 @@ const { promptUser } = require('../../lib/prompts/promptUtils');
 const path = require('path');
 const { i18n } = require('../../lib/lang');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { getAccountId } = require('../../lib/commonOpts');
 const { uiBetaTag } = require('../../lib/ui');
 const i18nKey = `commands.project.subcommands.installDeps`;
 exports.command = 'install-deps [packages..]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.help.describe`), false);
 exports.handler = async (options) => {
-    const { packages } = options || {};
+    const { derivedAccountId, packages } = options || {};
     try {
-        const accountId = getAccountId(options);
-        trackCommandUsage('project-install-deps', null, accountId);
+        trackCommandUsage('project-install-deps', null, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             logger.error(i18n(`${i18nKey}.noProjectConfig`));

package/commands/project/migrateApp.js

@@ -126,7 +126,7 @@ exports.handler = async (options) => {
         });
         const { data: migrateResponse } = await migrateApp(derivedAccountId, appId, projectName);
         const { id } = migrateResponse;
-        const pollResponse = await poll(checkMigrationStatus, derivedAccountId, id);
+        const pollResponse = await poll(() => checkMigrationStatus(derivedAccountId, id));
         const { status, project } = pollResponse;
         if (status === 'SUCCESS') {
             const absoluteDestPath = path.resolve(getCwd(), projectDest);

package/commands/project/upload.js

@@ -22,17 +22,17 @@ exports.handler = async (options) => {
     const { forceCreate, message, derivedAccountId } = options;
     const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    const { projectConfig, projectDir } = await getProjectConfig();
     trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
+    const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
     await ensureProjectExists(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, options.translate);
-        if (result.uploadError) {
-            if (isSpecifiedError(result.uploadError, {
+        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        if (uploadError) {
+            if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
             })) {
                 logger.log();
@@ -40,7 +40,7 @@ exports.handler = async (options) => {
                 logger.log();
             }
             else {
-                logError(result.uploadError, new ApiErrorContext({
+                logError(uploadError, new ApiErrorContext({
                     accountId: derivedAccountId,
                     request: 'project upload',
                 }));
@@ -80,11 +80,6 @@ exports.builder = yargs => {
             type: 'string',
             default: '',
         },
-        translate: {
-            hidden: true,
-            type: 'boolean',
-            default: false,
-        },
     });
     yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);

package/commands/project/watch.js

@@ -71,9 +71,9 @@ exports.handler = async (options) => {
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, startWatching);
-            if (result.uploadError) {
-                if (isSpecifiedError(result.uploadError, {
+            const { uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, startWatching);
+            if (uploadError) {
+                if (isSpecifiedError(uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
                 })) {
                     logger.log();
@@ -81,7 +81,7 @@ exports.handler = async (options) => {
                     logger.log();
                 }
                 else {
-                    logError(result.uploadError, new ApiErrorContext({
+                    logError(uploadError, new ApiErrorContext({
                         accountId: derivedAccountId,
                         request: 'project upload',
                     }));

package/commands/sandbox/create.js

@@ -6,7 +6,7 @@ const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { uiFeatureHighlight, uiBetaTag } = require('../../lib/ui');
-const { sandboxTypeMap, getAvailableSyncTypes, syncTypes, validateSandboxUsageLimits, } = require('../../lib/sandboxes');
+const { SANDBOX_TYPE_MAP, getAvailableSyncTypes, SYNC_TYPES, validateSandboxUsageLimits, } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -17,7 +17,7 @@ const { logError } = require('../../lib/errorHandlers/index');
 const { isMissingScopeError } = require('@hubspot/local-dev-lib/errors/index');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubspot/local-dev-lib/constants/config');
-const { buildNewAccount } = require('../../lib/buildAccount');
+const { buildSandbox } = require('../../lib/buildAccount');
 const { hubspotAccountNamePrompt, } = require('../../lib/prompts/accountNamePrompt');
 const i18nKey = 'commands.sandbox.subcommands.create';
 exports.command = 'create';
@@ -38,7 +38,7 @@ exports.handler = async (options) => {
     }
     let typePrompt;
     let namePrompt;
-    if ((type && !sandboxTypeMap[type.toLowerCase()]) || !type) {
+    if ((type && !SANDBOX_TYPE_MAP[type.toLowerCase()]) || !type) {
         if (!force) {
             typePrompt = await sandboxTypePrompt();
         }
@@ -48,7 +48,7 @@ exports.handler = async (options) => {
         }
     }
     const sandboxType = type
-        ? sandboxTypeMap[type.toLowerCase()]
+        ? SANDBOX_TYPE_MAP[type.toLowerCase()]
         : typePrompt.type;
     // Check usage limits and exit if parent portal has no available sandboxes for the selected type
     try {
@@ -97,27 +97,16 @@ exports.handler = async (options) => {
         }
     }
     try {
-        const { result } = await buildNewAccount({
-            name: sandboxName,
-            accountType: sandboxType,
-            accountConfig,
-            env,
-            force,
-        });
+        const result = await buildSandbox(sandboxName, accountConfig, sandboxType, env, force);
         const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
         // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
         const handleSyncSandbox = async (syncTasks) => {
-            await syncSandbox({
-                accountConfig: sandboxAccountConfig,
-                parentAccountConfig: accountConfig,
-                env,
-                syncTasks,
-            });
+            await syncSandbox(sandboxAccountConfig, accountConfig, env, syncTasks);
         };
         try {
             let availableSyncTasks = await getAvailableSyncTypes(accountConfig, sandboxAccountConfig);
             if (!contactRecordsSyncPromptResult) {
-                availableSyncTasks = availableSyncTasks.filter(t => t.type !== syncTypes.OBJECT_RECORDS);
+                availableSyncTasks = availableSyncTasks.filter(t => t.type !== SYNC_TYPES.OBJECT_RECORDS);
             }
             await handleSyncSandbox(availableSyncTasks);
         }

package/commands/sandbox/delete.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, getAccountId, addTestingOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logError, debugError } = require('../../lib/errorHandlers/index');
@@ -9,7 +9,7 @@ const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { deleteSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { i18n } = require('../../lib/lang');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
-const { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getAccountId, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -40,10 +40,8 @@ exports.handler = async (options) => {
             process.exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxAccountId = getAccountId({
-        account: providedAccountId || accountPrompt.account,
-    });
-    const isDefaultAccount = sandboxAccountId === getAccountId(getConfigDefaultAccount());
+    const sandboxAccountId = getAccountId(providedAccountId || accountPrompt.account);
+    const isDefaultAccount = sandboxAccountId === getAccountId();
     const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(sandboxAccountId)));
     let parentAccountId;
     const accountsList = getConfigAccounts();
@@ -54,9 +52,7 @@ exports.handler = async (options) => {
             }
             else if (!force) {
                 const parentAccountPrompt = await deleteSandboxPrompt(true);
-                parentAccountId = getAccountId({
-                    account: parentAccountPrompt.account,
-                });
+                parentAccountId = getAccountId(parentAccountPrompt.account);
             }
             else {
                 logger.error(i18n(`${i18nKey}.failure.noParentAccount`));
@@ -66,7 +62,7 @@ exports.handler = async (options) => {
     }
     const url = `${baseUrl}/sandboxes/${parentAccountId}`;
     const command = `hs auth ${getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
-    if (parentAccountId && !getAccountId({ account: parentAccountId })) {
+    if (parentAccountId && !getAccountId(parentAccountId)) {
         logger.log('');
         logger.error(i18n(`${i18nKey}.failure.noParentPortalAvailable`, {
             parentAccountId,

package/commands/theme/preview.js

@@ -17,7 +17,8 @@ const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { handleExit, handleKeypress } = require('../../lib/process');
 const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
 const { getProjectConfig } = require('../../lib/projects');
-const { findProjectComponents, COMPONENT_TYPES, } = require('../../lib/projects/structure');
+const { findProjectComponents } = require('../../lib/projects/structure');
+const { ComponentTypes } = require('../../types/Projects');
 const { preview } = require('@hubspot/theme-preview-dev-server');
 const { hasFeature } = require('../../lib/hasFeature');
 const i18nKey = 'commands.theme.subcommands.preview';
@@ -73,7 +74,7 @@ const determineSrcAndDest = async (options) => {
         let themeJsonPath = getThemeJSONPath();
         if (!themeJsonPath) {
             const projectComponents = await findProjectComponents(projectDir);
-            const themeComponents = projectComponents.filter(c => c.type === COMPONENT_TYPES.hublTheme);
+            const themeComponents = projectComponents.filter(c => c.type === ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
                 logger.error(i18n(`${i18nKey}.errors.noThemeComponents`));
                 process.exit(EXIT_CODES.ERROR);