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

package/commands/accounts/clean.js

@@ -15,8 +15,8 @@ const {
 } = require('../../lib/commonOpts');
 const { getAccountName } = require('../../lib/sandboxes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
-const { getTableContents } = require('@hubspot/local-dev-lib/logging/table');
-const SpinniesManager = require('../../lib/SpinniesManager');
+const { getTableContents } = require('../../lib/ui/table');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const {
   isSpecifiedHubSpotAuthError,

package/commands/accounts/info.js

@@ -8,7 +8,7 @@ const {
 } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const { getTableContents } = require('@hubspot/local-dev-lib/logging/table');
+const { getTableContents } = require('../../lib/ui/table');
 
 const i18nKey = 'cli.commands.accounts.subcommands.info';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/accounts/list.js

@@ -1,9 +1,6 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
-const {
-  getTableContents,
-  getTableHeader,
-} = require('@hubspot/local-dev-lib/logging/table');
+const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 
 const {
   addConfigOptions,
@@ -13,13 +10,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 +26,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 +62,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/auth.js

@@ -1,11 +1,15 @@
-const { checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
+const { checkAndWarnGitInclusion } = require('../lib/ui/git');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
+} = require('@hubspot/local-dev-lib/constants/auth');
+const {
   ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
+const {
   DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-} = require('@hubspot/cli-lib/lib/constants');
+} = require('@hubspot/local-dev-lib/constants/config');
 const { i18n } = require('../lib/lang');
 const {
   getAccessToken,

package/commands/cms/convertFields.js

@@ -9,7 +9,7 @@ const { i18n } = require('../../lib/lang');
 const {
   FieldsJs,
   isConvertableFieldJs,
-} = require('@hubspot/cli-lib/lib/handleFieldsJs');
+} = require('@hubspot/local-dev-lib/cms/handleFieldsJs');
 
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
@@ -85,7 +85,7 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.positional('src', {
+  yargs.option('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),
     type: 'string',
   });

package/commands/cms/lighthouseScore.js

@@ -1,4 +1,4 @@
-const SpinniesManager = require('../../lib/SpinniesManager');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -6,10 +6,7 @@ const {
   getAccountId,
 } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  getTableContents,
-  getTableHeader,
-} = require('@hubspot/local-dev-lib/logging/table');
+const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('../../lib/lang');
@@ -19,10 +16,7 @@ const {
   getLighthouseScoreStatus,
   getLighthouseScore,
 } = require('@hubspot/local-dev-lib/api/lighthouseScore');
-const {
-  HUBSPOT_FOLDER,
-  MARKETPLACE_FOLDER,
-} = require('@hubspot/cli-lib/lib/constants');
+const { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } = require('../../lib/constants');
 const { uiLink } = require('../../lib/ui');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 

package/commands/config/set/defaultMode.js

@@ -1,6 +1,6 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { updateDefaultMode } = require('@hubspot/local-dev-lib/config');
-const { Mode } = require('@hubspot/cli-lib');
+const { MODE } = require('@hubspot/local-dev-lib/constants/files');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
@@ -8,7 +8,7 @@ const { i18n } = require('../../../lib/lang');
 
 const i18nKey = 'cli.commands.config.subcommands.set.options.defaultMode';
 
-const ALL_MODES = Object.values(Mode);
+const ALL_MODES = Object.values(MODE);
 
 const selectMode = async () => {
   const { mode } = await promptUser([
@@ -19,7 +19,7 @@ const selectMode = async () => {
       pageSize: 20,
       message: i18n(`${i18nKey}.promptMessage`),
       choices: ALL_MODES,
-      default: Mode.publish,
+      default: MODE.publish,
     },
   ]);
 

package/commands/create/api-sample.js

@@ -9,6 +9,7 @@ const path = require('path');
 const fs = require('fs-extra');
 const ora = require('ora');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
+// TODO: Swap to local-dev-lib after swapping github utils dep
 const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 const { i18n } = require('../../lib/lang');

package/commands/create/website-theme.js

@@ -1,4 +1,5 @@
 const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
+// TODO: Swap to local-dev-lib after swapping github utils dep
 const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const { getIsInProject } = require('../../lib/projects');
 

package/commands/customObject/schema/create.js

@@ -11,7 +11,10 @@ const {
   getEnv,
   isConfigFlagEnabled,
 } = require('@hubspot/local-dev-lib/config');
-const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
+const {
+  ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
+const { CONFIG_FLAGS } = require('../../../lib/constants');
 const {
   createObjectSchema,
 } = require('@hubspot/local-dev-lib/api/customObjects');
@@ -44,7 +47,7 @@ exports.handler = async options => {
   }
 
   try {
-    if (isConfigFlagEnabled(ConfigFlags.USE_CUSTOM_OBJECT_HUBFILE)) {
+    if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
       await createSchemaFromHubFile(accountId, filePath);
       logger.success(
         i18n(`${i18nKey}.success.schemaCreated`, {

package/commands/customObject/schema/fetch.js

@@ -4,7 +4,7 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   logErrorInstance,
 } = require('../../../lib/errorHandlers/standardErrors');
-const { ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
+const { CONFIG_FLAGS } = require('../../../lib/constants');
 const {
   downloadSchema,
   getResolvedPath,
@@ -33,7 +33,7 @@ exports.handler = async options => {
   trackCommandUsage('custom-object-schema-fetch', null, accountId);
 
   try {
-    if (isConfigFlagEnabled(ConfigFlags.USE_CUSTOM_OBJECT_HUBFILE)) {
+    if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
       const fullpath = path.resolve(getCwd(), dest);
       await fetchSchema(accountId, name, fullpath);
       logger.success(

package/commands/customObject/schema/update.js

@@ -1,13 +1,16 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logApiErrorInstance } = require('../../../lib/errorHandlers/apiErrors');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
+const {
+  ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
 const {
   checkAndConvertToJson,
   loadAndValidateOptions,
 } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
-const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
+const { CONFIG_FLAGS } = require('../../../lib/constants');
 const {
   getEnv,
   isConfigFlagEnabled,
@@ -44,7 +47,7 @@ exports.handler = async options => {
   }
 
   try {
-    if (isConfigFlagEnabled(ConfigFlags.USE_CUSTOM_OBJECT_HUBFILE)) {
+    if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
       await updateSchemaFromHubFile(accountId, filePath);
       logger.success(
         i18n(`${i18nKey}.success.update`, {

package/commands/feedback.js

@@ -1,10 +1,7 @@
 const open = require('open');
 
 const { i18n } = require('../lib/lang');
-const {
-  FEEDBACK_OPTIONS,
-  FEEDBACK_URLS,
-} = require('@hubspot/cli-lib/lib/constants');
+const { FEEDBACK_OPTIONS, FEEDBACK_URLS } = require('../lib/constants');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 
 const {

package/commands/functions/deploy.js

@@ -10,7 +10,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { POLLING_DELAY } = require('@hubspot/cli-lib/lib/constants');
+const { POLLING_DELAY } = require('../../lib/constants');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   buildPackage,

package/commands/functions/list.js

@@ -5,11 +5,7 @@ const {
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
 const { getFunctionArrays } = require('../../lib/getFunctionArrays');
-const {
-  getTableContents,
-  getTableHeader,
-} = require('@hubspot/local-dev-lib/logging/table');
-
+const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const {
   addConfigOptions,
   addAccountOptions,

package/commands/init.js

@@ -16,11 +16,15 @@ const {
   debugErrorAndContext,
 } = require('../lib/errorHandlers/standardErrors');
 const {
-  DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-  PERSONAL_ACCESS_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
+  PERSONAL_ACCESS_KEY_AUTH_METHOD,
+} = require('@hubspot/local-dev-lib/constants/auth');
+const {
   ENVIRONMENTS,
-} = require('@hubspot/cli-lib/lib/constants');
+} = 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 { logger } = require('@hubspot/local-dev-lib/logger');
 const {

package/commands/list.js

@@ -16,10 +16,7 @@ const {
 const {
   getDirectoryContentsByPath,
 } = require('@hubspot/local-dev-lib/api/fileMapper');
-const {
-  HUBSPOT_FOLDER,
-  MARKETPLACE_FOLDER,
-} = require('@hubspot/cli-lib/lib/constants');
+const { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } = require('../lib/constants');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
 

package/commands/logs.js

@@ -6,7 +6,7 @@ const {
 } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
+const { outputLogs } = require('../lib/ui/serverlessFunctionLogs');
 const {
   getFunctionLogs,
   getLatestFunctionLog,

package/commands/module/marketplace-validate.js

@@ -1,4 +1,4 @@
-const SpinniesManager = require('../../lib/SpinniesManager');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const {
   addConfigOptions,
   addAccountOptions,

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

@@ -42,7 +42,7 @@ const {
   selectTargetAccountPrompt,
   confirmDefaultAccountPrompt,
 } = require('../../lib/prompts/projectDevTargetAccountPrompt');
-const SpinniesManager = require('../../lib/SpinniesManager');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const { isSandbox, getSandboxTypeAsString } = require('../../lib/sandboxes');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
@@ -54,8 +54,8 @@ const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const {
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,
-  ERROR_TYPES,
-} = require('@hubspot/cli-lib/lib/constants');
+  PROJECT_ERROR_TYPES,
+} = require('../../lib/constants');
 
 const { buildSandbox } = require('../../lib/sandboxCreate');
 const { syncSandbox } = require('../../lib/sandboxSync');
@@ -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,
       });
@@ -308,7 +310,7 @@ exports.handler = async options => {
     if (initialUploadResult.uploadError) {
       if (
         isSpecifiedError(initialUploadResult.uploadError, {
-          subCategory: ERROR_TYPES.PROJECT_LOCKED,
+          subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
         })
       ) {
         logger.log();

package/commands/project/listBuilds.js

@@ -17,10 +17,7 @@ const {
   fetchProject,
   fetchProjectBuilds,
 } = require('@hubspot/local-dev-lib/api/projects');
-const {
-  getTableContents,
-  getTableHeader,
-} = require('@hubspot/local-dev-lib/logging/table');
+const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { uiBetaTag, uiLink } = require('../../lib/ui');
 const { loadAndValidateOptions } = require('../../lib/validation');

package/commands/project/logs.js

@@ -1,6 +1,8 @@
 const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
+const {
+  ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -9,15 +11,12 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-// const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
+// const { outputLogs } = require('../../lib/ui/serverlessFunctionLogs');
 const {
   fetchProject,
   fetchDeployComponentsMetadata,
 } = require('@hubspot/local-dev-lib/api/projects');
-const {
-  getTableContents,
-  getTableHeader,
-} = require('@hubspot/local-dev-lib/logging/table');
+const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 // const {
 //   logApiErrorInstance,
 //   ApiErrorContext,

package/commands/project/upload.js

@@ -20,7 +20,7 @@ const {
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const {
   logApiErrorInstance,
   ApiErrorContext,
@@ -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);
 
@@ -66,7 +66,7 @@ exports.handler = async options => {
     if (result.uploadError) {
       if (
         isSpecifiedError(result.uploadError, {
-          subCategory: ERROR_TYPES.PROJECT_LOCKED,
+          subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
         })
       ) {
         logger.log();

package/commands/project/watch.js

@@ -5,7 +5,7 @@ const {
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -67,7 +67,7 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
       } catch (err) {
         if (
           isSpecifiedError(err, {
-            subCategory: ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
+            subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
           })
         ) {
           process.exit(EXIT_CODES.SUCCESS);

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');