@hubspot/cli 5.1.4-beta.2 → 5.1.4-beta.3

package/commands/accounts/list.js

@@ -13,13 +13,11 @@ const {
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { isSandbox, getSandboxName } = require('../../lib/sandboxes');
-const {
-  isDeveloperTestAccount,
-  DEV_TEST_ACCOUNT_STRING,
-} = require('../../lib/developerTestAccounts');
+const { isDeveloperTestAccount } = require('../../lib/developerTestAccounts');
 const { i18n } = require('../../lib/lang');
 const {
   HUBSPOT_ACCOUNT_TYPES,
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.accounts.subcommands.list';
@@ -31,22 +29,18 @@ const sortAndMapPortals = portals => {
   const mappedPortalData = {};
   // Standard and app developer portals
   portals
-    .filter(p =>
-      p.accountType
-        ? p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
-          p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER
-        : p.sandboxAccountType === null
+    .filter(
+      p =>
+        p.accountType &&
+        (p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
+          p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER)
     )
     .forEach(portal => {
       mappedPortalData[portal.portalId] = [portal];
     });
   // Non-standard portals (sandbox, developer test account)
   portals
-    .filter(p =>
-      p.accountType
-        ? isSandbox(p) || isDeveloperTestAccount(p)
-        : p.sandboxAccountType !== null
-    )
+    .filter(p => p.accountType && (isSandbox(p) || isDeveloperTestAccount(p)))
     .forEach(p => {
       if (p.parentAccountId) {
         mappedPortalData[p.parentAccountId] = [
@@ -71,7 +65,9 @@ const getPortalData = mappedPortalData => {
           name = `↳ ${name}`;
         }
       } else if (isDeveloperTestAccount(portal)) {
-        name = `${portal.name} [${DEV_TEST_ACCOUNT_STRING}]`;
+        name = `${portal.name} [${
+          HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
+        }]`;
         if (set.length > 1) {
           name = `↳ ${name}`;
         }

package/commands/project/deploy.js

@@ -36,9 +36,9 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const accountConfig = getAccountConfig(accountId);
   const { project: projectOption, buildId: buildIdOption } = options;
-  const sandboxType = accountConfig && accountConfig.sandboxAccountType;
+  const accountType = accountConfig && accountConfig.accountType;
 
-  trackCommandUsage('project-deploy', { type: sandboxType }, accountId);
+  trackCommandUsage('project-deploy', { type: accountType }, accountId);
 
   const { projectConfig } = await getProjectConfig();
 

package/commands/project/dev.js

@@ -69,11 +69,11 @@ const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { isDeveloperTestAccount } = require('../../lib/developerTestAccounts');
 const {
-  isDeveloperTestAccount,
-  DEV_TEST_ACCOUNT_STRING,
-} = require('../../lib/developerTestAccounts');
-const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
+  HUBSPOT_ACCOUNT_TYPES,
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
@@ -116,7 +116,7 @@ exports.handler = async options => {
       accountConfig.name,
       defaultAccountIsSandbox
         ? `${getSandboxTypeAsString(accountConfig.accountType)} sandbox`
-        : DEV_TEST_ACCOUNT_STRING
+        : HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
     );
 
     if (useDefaultAccount) {
@@ -152,7 +152,7 @@ exports.handler = async options => {
     try {
       await validateSandboxUsageLimits(
         accountConfig,
-        DEVELOPER_SANDBOX_TYPE,
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
         env
       );
     } catch (err) {
@@ -176,7 +176,9 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
     try {
-      const { name } = await sandboxNamePrompt(DEVELOPER_SANDBOX_TYPE);
+      const { name } = await sandboxNamePrompt(
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+      );
 
       trackCommandMetadataUsage(
         'sandbox-create',
@@ -186,7 +188,7 @@ exports.handler = async options => {
 
       const { result } = await buildSandbox({
         name,
-        type: DEVELOPER_SANDBOX_TYPE,
+        type: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
         accountConfig,
         env,
       });

package/commands/project/upload.js

@@ -39,9 +39,9 @@ exports.handler = async options => {
   const { forceCreate, path: projectPath, message } = options;
   const accountId = getAccountId(options);
   const accountConfig = getAccountConfig(accountId);
-  const sandboxType = accountConfig && accountConfig.sandboxAccountType;
+  const accountType = accountConfig && accountConfig.accountType;
 
-  trackCommandUsage('project-upload', { type: sandboxType }, accountId);
+  trackCommandUsage('project-upload', { type: accountType }, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 

package/commands/sandbox/create.js

@@ -13,7 +13,6 @@ const { buildSandbox } = require('../../lib/sandboxCreate');
 const { uiFeatureHighlight, uiAccountDescription } = require('../../lib/ui');
 const {
   sandboxTypeMap,
-  getSandboxTypeAsString,
   getAvailableSyncTypes,
   syncTypes,
   validateSandboxUsageLimits,
@@ -35,7 +34,10 @@ const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
@@ -54,13 +56,16 @@ exports.handler = async options => {
 
   // Default account is not a production portal
   if (
-    accountConfig.sandboxAccountType &&
-    accountConfig.sandboxAccountType !== null
+    accountConfig.accountType &&
+    accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD
   ) {
     logger.error(
-      i18n(`${i18nKey}.failure.creatingWithinSandbox`, {
-        sandboxType: getSandboxTypeAsString(accountConfig.sandboxAccountType),
-        sandboxName: accountConfig.name,
+      i18n(`${i18nKey}.failure.invalidAccountType`, {
+        accountType:
+          HUBSPOT_ACCOUNT_TYPE_STRINGS[
+            HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]
+          ],
+        accountName: accountConfig.name,
       })
     );
     process.exit(EXIT_CODES.ERROR);
@@ -69,7 +74,7 @@ exports.handler = async options => {
   let typePrompt;
   let namePrompt;
 
-  if ((type && !sandboxTypeMap[type]) || !type) {
+  if ((type && !sandboxTypeMap[type.toLowerCase()]) || !type) {
     if (!force) {
       typePrompt = await sandboxTypePrompt();
     } else {
@@ -77,7 +82,9 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
   }
-  const sandboxType = sandboxTypeMap[type] || sandboxTypeMap[typePrompt.type];
+  const sandboxType = type
+    ? sandboxTypeMap[type.toLowerCase()]
+    : typePrompt.type;
 
   // Check usage limits and exit if parent portal has no available sandboxes for the selected type
   try {
@@ -117,11 +124,15 @@ exports.handler = async options => {
   let contactRecordsSyncPromptResult = true;
   if (!force) {
     const syncI18nKey = 'cli.lib.sandbox.sync';
+    const sandboxLangKey =
+      sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+        ? 'developer'
+        : 'standard';
     const { sandboxSyncPrompt } = await promptUser([
       {
         name: 'sandboxSyncPrompt',
         type: 'confirm',
-        message: i18n(`${syncI18nKey}.confirm.createFlow.${sandboxType}`, {
+        message: i18n(`${syncI18nKey}.confirm.createFlow.${sandboxLangKey}`, {
           parentAccountName: uiAccountDescription(accountId),
           sandboxName,
         }),
@@ -135,7 +146,7 @@ exports.handler = async options => {
           name: 'contactRecordsSyncPrompt',
           type: 'confirm',
           message: i18n(
-            `${syncI18nKey}.confirm.syncContactRecords.${sandboxType}`
+            `${syncI18nKey}.confirm.syncContactRecords.${sandboxLangKey}`
           ),
         },
       ]);
@@ -191,7 +202,7 @@ exports.handler = async options => {
     }
 
     const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
-    if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
+    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
       highlightItems.push('projectDevCommand');
     } else {
       highlightItems.push('projectUploadCommand');

package/commands/sandbox/sync.js

@@ -15,18 +15,20 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { uiLine, uiAccountDescription } = require('../../lib/ui');
 const {
-  sandboxTypeMap,
   getAvailableSyncTypes,
   getSyncTypesWithContactRecordsPrompt,
+  isDevelopmentSandbox,
+  isStandardSandbox,
+  isSandbox,
 } = require('../../lib/sandboxes');
 const { syncSandbox } = require('../../lib/sandboxSync');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const {
-  DEVELOPER_SANDBOX_TYPE,
-  STANDARD_SANDBOX_TYPE,
-} = require('../../lib/constants');
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.sync';
 
@@ -43,17 +45,22 @@ exports.handler = async options => {
 
   trackCommandUsage(
     'sandbox-sync',
-    { type: accountConfig.sandboxAccountType },
+    { type: accountConfig.accountType },
     accountId
   );
 
   if (
     // Check if default account is a sandbox, otherwise exit
-    // sandboxAccountType is null for non-sandbox portals, and one of 'DEVELOPER' or 'STANDARD' for sandbox portals. Undefined is to handle older config entries.
-    accountConfig.sandboxAccountType === undefined ||
-    accountConfig.sandboxAccountType === null
+    !isSandbox(accountConfig)
   ) {
-    logger.error(i18n(`${i18nKey}.failure.notSandbox`));
+    logger.error(
+      i18n(`${i18nKey}.failure.invalidAccountType`, {
+        accountType:
+          HUBSPOT_ACCOUNT_TYPE_STRINGS[
+            HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]
+          ],
+      })
+    );
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -70,10 +77,6 @@ exports.handler = async options => {
   }
 
   const parentAccountConfig = getAccountConfig(parentAccountId);
-  const isDevelopmentSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX_TYPE;
-  const isStandardSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX_TYPE;
 
   let availableSyncTasks;
   try {
@@ -100,7 +103,7 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.ERROR);
   }
 
-  if (isDevelopmentSandbox) {
+  if (isDevelopmentSandbox(accountConfig)) {
     logger.log(i18n(`${i18nKey}.info.developmentSandbox`));
     logger.log(
       i18n(`${i18nKey}.info.sync`, {
@@ -129,7 +132,7 @@ exports.handler = async options => {
         process.exit(EXIT_CODES.SUCCESS);
       }
     }
-  } else if (isStandardSandbox) {
+  } else if (isStandardSandbox(accountConfig)) {
     const standardSyncUrl = `${getHubSpotWebsiteOrigin(
       env
     )}/sandboxes-developer/${parentAccountId}/sync?step=select_sync_path&id=${parentAccountId}_${accountId}`;

package/lang/en.lyaml

@@ -689,7 +689,7 @@ en:
               optionMissing:
                 type: "Invalid or missing sandbox --type option in command. Please try again."
                 name: "Invalid or missing sandbox --name option in command. Please try again."
-              creatingWithinSandbox: "Sandboxes must be created from a production account. Your current default account {{#bold}}{{ sandboxName }}{{/bold}} is a {{ sandboxType }} sandbox.
+              invalidAccountType: "Sandboxes must be created from a production account. Your current default account {{#bold}}{{ accountName }}{{/bold}} is a {{ accountType }}.
                 \n- Run {{#bold}}hs accounts use{{/bold}} to switch to your default account to your production account.
                 \n- Run {{#bold}}hs auth{{/bold}} to connect a production account to the HubSpot CLI.\n"
           delete:
@@ -737,7 +737,7 @@ en:
               developmentSandbox: "Sync CRM object definitions to {{#cyan}}{{#bold}}{{ sandboxName }}{{/bold}}{{/cyan}} from {{#bold}}{{ parentAccountName }}{{/bold}}?"
               standardSandbox: "Sync all supported assets to {{#cyan}}{{#bold}}{{ sandboxName }}{{/bold}}{{/cyan}} from {{#bold}}{{ parentAccountName }}{{/bold}}?"
             failure:
-              notSandbox: "Sync must be run in a sandbox account. Your default account is a production account. Run {{#bold}}hs auth{{/bold}} to connect your sandbox account to the CLI or {{#bold}}hs accounts use{{/bold}} to change your default account, then try again."
+              invalidAccountType: "Sync must be run in a sandbox account. Your default account is a {{ accountType }}. Run {{#bold}}hs auth{{/bold}} to connect your sandbox account to the CLI or {{#bold}}hs accounts use{{/bold}} to change your default account, then try again."
               missingParentPortal: "The production account associated to {{#bold}}{{ sandboxName }}{{/bold}} is not connected to your HubSpot CLI.
                 \n- Run {{#bold}}hs auth{{/bold}} to connect that account to your terminal, then try again.
                 \n- Run {{#bold}}hs accounts use{{/bold}} to change your default account, if you want to sync to a different sandbox. Then try again.\n"

package/lib/constants.js

@@ -2,18 +2,7 @@ const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH =
   'HubSpot/hubspot-project-components';
 const DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 
-// Sandboxes
-const STANDARD_SANDBOX_TYPE = 'standard';
-const DEVELOPER_SANDBOX_TYPE = 'developer';
-
-const STANDARD_SANDBOX = 'STANDARD';
-const DEVELOPER_SANDBOX = 'DEVELOPER';
-
 module.exports = {
   HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
   DEFAULT_PROJECT_TEMPLATE_BRANCH,
-  STANDARD_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX_TYPE,
-  STANDARD_SANDBOX,
-  DEVELOPER_SANDBOX,
 };

package/lib/developerTestAccounts.js

@@ -2,13 +2,10 @@ const {
   HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
 
-const DEV_TEST_ACCOUNT_STRING = 'developer test account';
-
 const isDeveloperTestAccount = config =>
   config.accountType &&
   config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
 
 module.exports = {
-  DEV_TEST_ACCOUNT_STRING,
   isDeveloperTestAccount,
 };

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -4,8 +4,10 @@ const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox } = require('../sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { DEVELOPER_SANDBOX, STANDARD_SANDBOX } = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
 
@@ -34,18 +36,15 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     );
   let disabledMessage = false;
 
-  if (
-    sandboxUsage[DEVELOPER_SANDBOX] &&
-    sandboxUsage[DEVELOPER_SANDBOX].available === 0
-  ) {
-    if (sandboxAccounts.length < sandboxUsage[DEVELOPER_SANDBOX].limit) {
+  if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
+    if (sandboxAccounts.length < sandboxUsage['DEVELOPER'].limit) {
       disabledMessage = i18n(`${i18nKey}.sandboxLimitWithSuggestion`, {
         authCommand: uiCommandReference('hs auth'),
-        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
+        limit: sandboxUsage['DEVELOPER'].limit,
       });
     } else {
       disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
-        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
+        limit: sandboxUsage['DEVELOPER'].limit,
       });
     }
   }
@@ -53,10 +52,10 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   // Order choices by Developer Sandbox -> Standard Sandbox
   const choices = [
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === DEVELOPER_SANDBOX)
+      .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX)
       .map(mapSandboxAccount),
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === STANDARD_SANDBOX)
+      .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX)
       .map(mapSandboxAccount),
     {
       name: i18n(`${i18nKey}.createNewSandboxOption`),

package/lib/prompts/sandboxesPrompt.js

@@ -3,17 +3,15 @@ const { i18n } = require('../lang');
 const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('../ui');
 const {
-  DEVELOPER_SANDBOX,
-  STANDARD_SANDBOX,
-  STANDARD_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX_TYPE,
-} = require('../constants');
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+const { isSandbox } = require('../sandboxes');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
 const mapSandboxAccountChoices = portals =>
   portals
-    .filter(p => p.sandboxAccountType && p.sandboxAccountType !== null)
+    .filter(p => isSandbox(p))
     .map(p => {
       return {
         name: uiAccountDescription(p.portalId, false),
@@ -23,9 +21,7 @@ const mapSandboxAccountChoices = portals =>
 
 const mapNonSandboxAccountChoices = portals =>
   portals
-    .filter(
-      p => p.sandboxAccountType === null || p.sandboxAccountType === undefined
-    )
+    .filter(p => !isSandbox(p))
     .map(p => {
       return {
         name: `${p.name} (${p.portalId})`,
@@ -33,9 +29,10 @@ const mapNonSandboxAccountChoices = portals =>
       };
     });
 
-const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
-  const isDeveloperSandbox = type === DEVELOPER_SANDBOX_TYPE;
-  const namePromptMessage = isDeveloperSandbox
+const sandboxNamePrompt = (type = HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) => {
+  const isDevelopmentSandbox =
+    type === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
+  const namePromptMessage = isDevelopmentSandbox
     ? `${i18nKey}.name.developmentSandboxMessage`
     : `${i18nKey}.name.message`;
   return promptUser([
@@ -52,7 +49,7 @@ const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
           ? i18n(`${i18nKey}.name.errors.accountNameExists`, { name: val })
           : true;
       },
-      default: `New ${isDeveloperSandbox ? 'development ' : ''}sandbox`,
+      default: `New ${isDevelopmentSandbox ? 'development ' : ''}sandbox`,
     },
   ]);
 };
@@ -60,11 +57,11 @@ const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
 const sandboxTypeChoices = [
   {
     name: i18n(`${i18nKey}.type.developer`),
-    value: DEVELOPER_SANDBOX,
+    value: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
   },
   {
     name: i18n(`${i18nKey}.type.standard`),
-    value: STANDARD_SANDBOX,
+    value: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
   },
 ];
 
@@ -76,7 +73,7 @@ const sandboxTypePrompt = () => {
       type: 'list',
       look: false,
       choices: sandboxTypeChoices,
-      default: DEVELOPER_SANDBOX,
+      default: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
     },
   ]);
 };

package/lib/sandboxCreate.js

@@ -23,10 +23,6 @@ const {
   updateConfigWithAccessToken,
 } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { uiAccountDescription } = require('./ui');
-const {
-  DEVELOPER_SANDBOX_TYPE,
-  STANDARD_SANDBOX_TYPE,
-} = require('./constants');
 const {
   personalAccessKeyPrompt,
 } = require('./prompts/personalAccessKeyPrompt');
@@ -36,6 +32,9 @@ const {
   writeConfig,
   updateAccountConfig,
 } = require('@hubspot/local-dev-lib/config');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.lib.sandbox.create';
 
@@ -113,7 +112,7 @@ const saveSandboxToConfig = async (env, result, force = false) => {
 
 /**
  * @param {String} name - Name of sandbox
- * @param {String} type - Sandbox type to be created (standard/developer)
+ * @param {String} type - Sandbox type to be created (STANDARD_SANDBOX/DEVELOPMENT_SANDBOX)
  * @param {Object} accountConfig - Account config of parent portal
  * @param {String} env - Environment (QA/Prod)
  * @returns {Object} Object containing sandboxConfigName string and sandbox instance from API
@@ -131,7 +130,11 @@ const buildSandbox = async ({
   const accountId = getAccountId(accountConfig.portalId);
 
   let result;
-  const spinniesI18nKey = `${i18nKey}.loading.${type}`;
+  const loadingLangKey =
+    type === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+      ? 'developer'
+      : 'standard';
+  const spinniesI18nKey = `${i18nKey}.loading.${loadingLangKey}`;
 
   try {
     logger.log('');
@@ -140,7 +143,6 @@ const buildSandbox = async ({
         sandboxName: name,
       }),
     });
-
     const sandboxApiType = sandboxApiTypeMap[type]; // API expects sandbox type as 1 or 2
     result = await createSandbox(accountId, name, sandboxApiType);
 
@@ -219,7 +221,7 @@ const buildSandbox = async ({
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
       );
       if (hasDevelopmentSandboxes) {
         logger.error(
@@ -262,7 +264,7 @@ const buildSandbox = async ({
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
       );
       if (hasStandardSandboxes) {
         logger.error(

package/lib/sandboxSync.js

@@ -5,8 +5,8 @@ const { i18n } = require('./lang');
 const {
   getAvailableSyncTypes,
   pollSyncTaskStatus,
-  sandboxTypeMap,
   syncTypes,
+  isDevelopmentSandbox,
 } = require('./sandboxes');
 const { initiateSync } = require('@hubspot/local-dev-lib/sandboxes');
 const {
@@ -20,7 +20,6 @@ const {
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');
-const { DEVELOPER_SANDBOX_TYPE } = require('./constants');
 
 const i18nKey = 'cli.lib.sandbox.sync';
 
@@ -51,7 +50,7 @@ const syncSandbox = async ({
 
   const baseUrl = getHubSpotWebsiteOrigin(env);
   const syncStatusUrl = `${baseUrl}/sandboxes-developer/${parentAccountId}/${getSandboxTypeAsString(
-    accountConfig.sandboxAccountType
+    accountConfig.accountType
   )}`;
 
   try {
@@ -86,11 +85,7 @@ const syncSandbox = async ({
         accountName: uiAccountDescription(accountId),
       }),
     });
-    if (
-      skipPolling &&
-      sandboxTypeMap[accountConfig.sandboxAccountType] ===
-        DEVELOPER_SANDBOX_TYPE
-    ) {
+    if (skipPolling && isDevelopmentSandbox(accountConfig)) {
       if (syncTasks.some(t => t.type === syncTypes.OBJECT_RECORDS)) {
         logger.log(i18n(`${i18nKey}.loading.skipPollingWithContacts`));
       } else {

package/lib/sandboxes.js

@@ -14,53 +14,45 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
-const {
-  STANDARD_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX,
-  STANDARD_SANDBOX,
-} = require('./constants');
 
 const syncTypes = {
   OBJECT_RECORDS: 'object-records',
 };
 
 const sandboxTypeMap = {
-  DEV: DEVELOPER_SANDBOX_TYPE,
-  dev: DEVELOPER_SANDBOX_TYPE,
-  DEVELOPER: DEVELOPER_SANDBOX_TYPE,
-  developer: DEVELOPER_SANDBOX_TYPE,
-  DEVELOPMENT: DEVELOPER_SANDBOX_TYPE,
-  development: DEVELOPER_SANDBOX_TYPE,
-  STANDARD: STANDARD_SANDBOX_TYPE,
-  standard: STANDARD_SANDBOX_TYPE,
+  dev: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+  developer: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+  development: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+  standard: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
 };
 
 const sandboxApiTypeMap = {
-  standard: 1,
-  developer: 2,
+  [HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX]: 1,
+  [HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX]: 2,
 };
 
 const getSandboxTypeAsString = accountType => {
-  if (
-    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX ||
-    accountType === DEVELOPER_SANDBOX // remove line once sandboxAccountType is removed
-  ) {
+  if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
     return 'development'; // Only place we're using this specific name
   }
-  return STANDARD_SANDBOX_TYPE;
+  return 'standard';
 };
 
 const getSandboxName = config =>
-  `[${getSandboxTypeAsString(
-    config.accountType || config.sandboxAccountType
-  )} sandbox] `;
+  `[${getSandboxTypeAsString(config.accountType)} sandbox] `;
 
 const isSandbox = config =>
-  config.accountType
-    ? config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
-      config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
-    : config.sandboxAccountType && config.sandboxAccountType !== null;
+  config.accountType &&
+  (config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+    config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
+
+const isStandardSandbox = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+
+const isDevelopmentSandbox = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
 
 function getHasSandboxesByType(parentAccountConfig, type) {
   const config = getConfig();
@@ -70,8 +62,8 @@ function getHasSandboxesByType(parentAccountConfig, type) {
       (portal.parentAccountId !== null ||
         portal.parentAccountId !== undefined) &&
       portal.parentAccountId === parentPortalId &&
-      portal.sandboxAccountType &&
-      sandboxTypeMap[portal.sandboxAccountType] === type
+      portal.accountType &&
+      portal.accountType === type
     ) {
       return true;
     }
@@ -116,14 +108,15 @@ const getSyncTypesWithContactRecordsPrompt = async (
     syncTasks.some(t => t.type === syncTypes.OBJECT_RECORDS) &&
     !skipPrompt
   ) {
+    const langKey = isDevelopmentSandbox(accountConfig)
+      ? 'developer'
+      : 'standard';
     const { contactRecordsSyncPrompt } = await promptUser([
       {
         name: 'contactRecordsSyncPrompt',
         type: 'confirm',
         message: i18n(
-          `cli.lib.sandbox.sync.confirm.syncContactRecords.${
-            sandboxTypeMap[accountConfig.sandboxAccountType]
-          }`
+          `cli.lib.sandbox.sync.confirm.syncContactRecords.${langKey}`
         ),
       },
     ]);
@@ -146,13 +139,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   if (!usage) {
     throw new Error('Unable to fetch sandbox usage limits. Please try again.');
   }
-  if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
-    if (usage[DEVELOPER_SANDBOX].available === 0) {
-      const devSandboxLimit = usage[DEVELOPER_SANDBOX].limit;
+  if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
+    if (usage['DEVELOPER'].available === 0) {
+      const devSandboxLimit = usage['DEVELOPER'].limit;
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
       );
       if (hasDevelopmentSandboxes) {
         throw new Error(
@@ -183,13 +176,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
       }
     }
   }
-  if (sandboxType === STANDARD_SANDBOX_TYPE) {
-    if (usage[STANDARD_SANDBOX].available === 0) {
-      const standardSandboxLimit = usage[STANDARD_SANDBOX].limit;
+  if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
+    if (usage['STANDARD'].available === 0) {
+      const standardSandboxLimit = usage['STANDARD'].limit;
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
       );
       if (hasStandardSandboxes) {
         throw new Error(
@@ -364,6 +357,8 @@ module.exports = {
   sandboxApiTypeMap,
   syncTypes,
   isSandbox,
+  isStandardSandbox,
+  isDevelopmentSandbox,
   getSandboxName,
   getSandboxTypeAsString,
   getHasSandboxesByType,

package/lib/ui.js

@@ -5,10 +5,11 @@ const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { isSandbox, getSandboxName } = require('./sandboxes');
+const { isDeveloperTestAccount } = require('./developerTestAccounts');
 const {
-  isDeveloperTestAccount,
-  DEV_TEST_ACCOUNT_STRING,
-} = require('./developerTestAccounts');
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const UI_COLORS = {
   SORBET: '#FF8F59',
@@ -82,7 +83,9 @@ const uiAccountDescription = (accountId, bold = true) => {
   if (isSandbox(account)) {
     accountTypeString = getSandboxName(account);
   } else if (isDeveloperTestAccount(account)) {
-    accountTypeString = `[${DEV_TEST_ACCOUNT_STRING}] `;
+    accountTypeString = `[${
+      HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
+    }] `;
   }
   const message = `${account.name} ${accountTypeString}(${account.portalId})`;
   return bold ? chalk.bold(message) : message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.4-beta.2",
+  "version": "5.1.4-beta.3",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -11,7 +11,7 @@
     "@hubspot/cli-lib": "^9.0.0",
     "@hubspot/local-dev-lib": "^0.3.5",
     "@hubspot/serverless-dev-runtime": "5.1.4-beta.2",
-    "@hubspot/theme-preview-dev-server": "0.0.2",
+    "@hubspot/theme-preview-dev-server": "0.0.3",
     "@hubspot/ui-extensions-dev-server": "0.8.9",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cebb71d06baf30086b1f20bb96e2eb508d242cac"
+  "gitHead": "9c4a1d3e530cbbe997db1beb3a1291546c6fa8b0"
 }