@hubspot/cli 6.4.0 → 7.0.0-experimental.0

package/lib/buildAccount.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { personalAccessKeyPrompt, } = require('./prompts/personalAccessKeyPrompt');
 const { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
 const { cliAccountNamePrompt } = require('./prompts/accountNamePrompt');
@@ -62,7 +63,8 @@ force = false, }) {
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    const accountId = getAccountId(accountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
     const isSandbox = accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
         accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
     const isDeveloperTestAccount = accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;

package/lib/commonOpts.d.ts

@@ -1,9 +1,12 @@
+import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 import { Argv, Arguments } from 'yargs';
-import { Mode } from '@hubspot/local-dev-lib/types/Files';
+export declare function addGlobalOptions(yargs: Argv): Argv<{
+    debug: boolean;
+}>;
 export declare function addAccountOptions(yargs: Argv): Argv;
 export declare function addConfigOptions(yargs: Argv): Argv;
 export declare function addOverwriteOptions(yargs: Argv): Argv;
-export declare function addModeOptions(yargs: Argv, { read, write }: {
+export declare function addCmsPublishModeOptions(yargs: Argv, { read, write }: {
     read?: boolean;
     write?: boolean;
 }): Argv;
@@ -19,9 +22,15 @@ export declare function getCommandName(argv: Arguments<{
  * Obtains accountId using supplied --account flag or from environment variables
  */
 export declare function getAccountId(options: Arguments<{
-    portal?: number | string;
     account?: number | string;
 }>): number | null;
-export declare function getMode(options: Arguments<{
-    mode?: Mode;
-}>): Mode;
+/**
+ * Auto-injects the derivedAccountId flag into all commands
+ */
+export declare function injectAccountIdMiddleware(options: Arguments<{
+    derivedAccountId?: number | null;
+    account?: number | string;
+}>): Promise<void>;
+export declare function getCmsPublishMode(options: Arguments<{
+    cmsPublishMode?: CmsPublishMode;
+}>): CmsPublishMode;

package/lib/commonOpts.js

@@ -1,24 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addGlobalOptions = addGlobalOptions;
 exports.addAccountOptions = addAccountOptions;
 exports.addConfigOptions = addConfigOptions;
 exports.addOverwriteOptions = addOverwriteOptions;
-exports.addModeOptions = addModeOptions;
+exports.addCmsPublishModeOptions = addCmsPublishModeOptions;
 exports.addTestingOptions = addTestingOptions;
 exports.addUseEnvironmentOptions = addUseEnvironmentOptions;
 exports.setLogLevel = setLogLevel;
 exports.getCommandName = getCommandName;
 exports.getAccountId = getAccountId;
-exports.getMode = getMode;
+exports.injectAccountIdMiddleware = injectAccountIdMiddleware;
+exports.getCmsPublishMode = getCmsPublishMode;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const lang_1 = require("./lang");
 const i18nKey = 'lib.commonOpts';
+function addGlobalOptions(yargs) {
+    yargs.version(false);
+    return yargs.option('debug', {
+        alias: 'd',
+        default: false,
+        describe: (0, lang_1.i18n)(`${i18nKey}.options.debug.describe`),
+        type: 'boolean',
+    });
+}
 function addAccountOptions(yargs) {
-    return yargs.option('portal', {
-        alias: ['p', 'account', 'a'],
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.portal.describe`),
+    return yargs.option('account', {
+        alias: 'a',
+        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
 }
@@ -37,11 +48,11 @@ function addOverwriteOptions(yargs) {
         default: false,
     });
 }
-function addModeOptions(yargs, { read, write }) {
-    const modes = `<${Object.values(files_1.MODE).join(' | ')}>`;
-    return yargs.option('mode', {
+function addCmsPublishModeOptions(yargs, { read, write }) {
+    const cmsPublishModes = `<${Object.values(files_1.CMS_PUBLISH_MODE).join(' | ')}>`;
+    return yargs.option('cms-publish-mode', {
         alias: 'm',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes }),
+        describe: (0, lang_1.i18n)(`${i18nKey}.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes: cmsPublishModes }),
         type: 'string',
     });
 }
@@ -54,11 +65,13 @@ function addTestingOptions(yargs) {
     });
 }
 function addUseEnvironmentOptions(yargs) {
-    return yargs.option('use-env', {
+    return yargs
+        .option('use-env', {
         describe: (0, lang_1.i18n)(`${i18nKey}.options.useEnv.describe`),
         type: 'boolean',
         default: false,
-    });
+    })
+        .conflicts('use-env', 'account');
 }
 function setLogLevel(options) {
     const { debug } = options;
@@ -76,40 +89,42 @@ function getCommandName(argv) {
  * Obtains accountId using supplied --account flag or from environment variables
  */
 function getAccountId(options) {
-    const { portal, account } = options || {};
-    if (options?.useEnv && process.env.HUBSPOT_PORTAL_ID) {
-        return parseInt(process.env.HUBSPOT_PORTAL_ID, 10);
+    const { account } = options || {};
+    if (options?.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
+        return parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+    }
+    return (0, config_1.getAccountId)(account);
+}
+/**
+ * Auto-injects the derivedAccountId flag into all commands
+ */
+async function injectAccountIdMiddleware(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);
+        return;
     }
-    return (0, config_1.getAccountId)(portal || account);
+    options.derivedAccountId = (0, config_1.getAccountId)(account);
 }
-function getMode(options) {
-    // 1. --mode
-    const { mode } = options;
-    if (mode && typeof mode === 'string') {
-        return mode.toLowerCase();
+function getCmsPublishMode(options) {
+    // 1. --cmsPublishMode
+    const { cmsPublishMode } = options;
+    if (cmsPublishMode && typeof cmsPublishMode === 'string') {
+        return cmsPublishMode.toLowerCase();
     }
-    // 2. config[portal].defaultMode
+    // 2. config[account].defaultCmsPublishMode
     const accountId = getAccountId(options);
     if (accountId) {
         const accountConfig = (0, config_1.getAccountConfig)(accountId);
-        if (accountConfig && accountConfig.defaultMode) {
-            return accountConfig.defaultMode;
+        if (accountConfig && accountConfig.defaultCmsPublishMode) {
+            return accountConfig.defaultCmsPublishMode;
         }
     }
-    // 3. config.defaultMode
-    // 4. DEFAULT_MODE
+    // 3. config.defaultCmsPublishMode
+    // 4. DEFAULT_CMS_PUBLISH_MODE
     const config = (0, config_1.getAndLoadConfigIfNeeded)();
-    return (config && config.defaultMode) || files_1.DEFAULT_MODE;
+    return ((config && config.defaultCmsPublishMode) ||
+        files_1.DEFAULT_CMS_PUBLISH_MODE);
 }
-module.exports = {
-    addAccountOptions,
-    addConfigOptions,
-    addOverwriteOptions,
-    addModeOptions,
-    addTestingOptions,
-    addUseEnvironmentOptions,
-    getCommandName,
-    getMode,
-    getAccountId,
-    setLogLevel,
-};

package/lib/configOptions.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { updateAllowUsageTracking, updateDefaultMode, updateHttpTimeout, } = require('@hubspot/local-dev-lib/config');
-const { MODE } = require('@hubspot/local-dev-lib/constants/files');
+const { updateAllowUsageTracking, updateDefaultCmsPublishMode, updateHttpTimeout, } = require('@hubspot/local-dev-lib/config');
+const { CMS_PUBLISH_MODE } = require('@hubspot/local-dev-lib/constants/files');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { trackCommandUsage } = require('./usageTracking');
 const { promptUser } = require('./prompts/promptUtils');
@@ -44,38 +44,39 @@ const setAllowUsageTracking = async ({ accountId, allowUsageTracking }) => {
     updateAllowUsageTracking(isEnabled);
     return logger.log(i18n(`${i18nKey}.allowUsageTracking.success`, { isEnabled }));
 };
-const ALL_MODES = Object.values(MODE);
-const selectMode = async () => {
-    const { mode } = await promptUser([
+const ALL_CMS_PUBLISH_MODES = Object.values(CMS_PUBLISH_MODE);
+const selectCmsPublishMode = async () => {
+    const { cmsPublishMode } = await promptUser([
         {
             type: 'list',
             look: false,
-            name: 'mode',
+            name: 'cmsPublishMode',
             pageSize: 20,
             message: i18n(`${i18nKey}.defaultMode.promptMessage`),
-            choices: ALL_MODES,
-            default: MODE.publish,
+            choices: ALL_CMS_PUBLISH_MODES,
+            default: CMS_PUBLISH_MODE.publish,
         },
     ]);
-    return mode;
+    return cmsPublishMode;
 };
-const setDefaultMode = async ({ accountId, defaultMode }) => {
+const setDefaultCmsPublishMode = async ({ accountId, defaultCmsPublishMode, }) => {
     trackCommandUsage('config-set-default-mode', null, accountId);
     let newDefault;
-    if (!defaultMode) {
-        newDefault = await selectMode();
+    if (!defaultCmsPublishMode) {
+        newDefault = await selectCmsPublishMode();
     }
-    else if (defaultMode && ALL_MODES.find(m => m === defaultMode)) {
-        newDefault = defaultMode;
+    else if (defaultCmsPublishMode &&
+        ALL_CMS_PUBLISH_MODES.find(m => m === defaultCmsPublishMode)) {
+        newDefault = defaultCmsPublishMode;
     }
     else {
         logger.error(i18n(`${i18nKey}.defaultMode.errors`, {
             mode: newDefault,
-            validModes: commaSeparatedValues(ALL_MODES),
+            validModes: commaSeparatedValues(ALL_CMS_PUBLISH_MODES),
         }));
-        newDefault = await selectMode();
+        newDefault = await selectCMsPublishMode();
     }
-    updateDefaultMode(newDefault);
+    updateDefaultCmsPublishMode(newDefault);
     return logger.success(i18n(`${i18nKey}.defaultMode.success`, {
         mode: newDefault,
     }));
@@ -105,6 +106,6 @@ const setHttpTimeout = async ({ accountId, httpTimeout }) => {
 };
 module.exports = {
     setAllowUsageTracking,
-    setDefaultMode,
+    setDefaultCmsPublishMode,
     setHttpTimeout,
 };

package/lib/developerTestAccounts.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
-const { getAccountId, getConfig } = require('@hubspot/local-dev-lib/config');
+const { getAccountId, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { i18n } = require('./lang');
 const { fetchDeveloperTestAccounts, } = require('@hubspot/local-dev-lib/api/developerTestAccounts');
 const { isMissingScopeError, isSpecifiedError, } = require('@hubspot/local-dev-lib/errors/index');
@@ -11,9 +12,10 @@ const { uiAccountDescription } = require('./ui');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logError } = require('./errorHandlers/index');
 const getHasDevTestAccounts = appDeveloperAccountConfig => {
-    const config = getConfig();
-    const parentPortalId = getAccountId(appDeveloperAccountConfig.portalId);
-    for (const portal of config.portals) {
+    const id = getAccountIdentifier(appDeveloperAccountConfig);
+    const parentPortalId = getAccountId(id);
+    const accountsList = getConfigAccounts();
+    for (const portal of accountsList) {
         if (Boolean(portal.parentAccountId) &&
             portal.parentAccountId === parentPortalId &&
             portal.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
@@ -23,7 +25,8 @@ const getHasDevTestAccounts = appDeveloperAccountConfig => {
     return false;
 };
 const validateDevTestAccountUsageLimits = async (accountConfig) => {
-    const accountId = getAccountId(accountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
     const { data } = await fetchDeveloperTestAccounts(accountId);
     if (!data) {
         return null;

package/lib/oauth.js

@@ -5,6 +5,7 @@ const express = require('express');
 const open = require('open');
 const { OAuth2Manager, } = require('@hubspot/local-dev-lib/models/OAuth2Manager');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { addOauthToAccountConfig } = require('@hubspot/local-dev-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
@@ -74,7 +75,8 @@ const authorize = async (oauthManager) => {
     });
 };
 const setupOauth = accountConfig => {
-    const accountId = parseInt(accountConfig.portalId, 10);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = parseInt(id, 10);
     const config = getAccountConfig(accountId) || {};
     return new OAuth2Manager({
         ...accountConfig,

package/lib/projects.js

@@ -21,7 +21,7 @@ const { getCwd, getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { downloadGithubRepoContents } = require('@hubspot/local-dev-lib/github');
 const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const { uiLine, uiLink, uiAccountDescription } = require('./ui');
+const { uiLine, uiLink, uiAccountDescription, uiCommandReference, } = require('./ui');
 const { i18n } = require('./lang');
 const SpinniesManager = require('./ui/SpinniesManager');
 const { logError, ApiErrorContext } = require('./errorHandlers/index');
@@ -109,24 +109,29 @@ const createProjectConfig = async (projectPath, projectName, template, templateS
 };
 const validateProjectConfig = (projectConfig, projectDir) => {
     if (!projectConfig) {
-        logger.error(`Project config not found. Try running 'hs project create' first.`);
+        logger.error(i18n(`${i18nKey}.validateProjectConfig.configNotFound`, {
+            createCommand: uiCommandReference('hs project create'),
+        }));
         return process.exit(EXIT_CODES.ERROR);
     }
     if (!projectConfig.name || !projectConfig.srcDir) {
-        logger.error('Project config is missing required fields. Try running `hs project create`.');
+        logger.error(i18n(`${i18nKey}.validateProjectConfig.configMissingFields`));
         return process.exit(EXIT_CODES.ERROR);
     }
     const resolvedPath = path.resolve(projectDir, projectConfig.srcDir);
     if (!resolvedPath.startsWith(projectDir)) {
         const projectConfigFile = path.relative('.', path.join(projectDir, PROJECT_CONFIG_FILE));
-        logger.error(i18n(`${i18nKey}.config.srcOutsideProjectDir`, {
+        logger.error(i18n(`${i18nKey}.validateProjectConfig.srcOutsideProjectDir`, {
             srcDir: projectConfig.srcDir,
             projectConfig: projectConfigFile,
         }));
         return process.exit(EXIT_CODES.ERROR);
     }
     if (!fs.existsSync(resolvedPath)) {
-        logger.error(`Project source directory '${projectConfig.srcDir}' could not be found in ${projectDir}.`);
+        logger.error(i18n(`${i18nKey}.validateProjectConfig.srcDirNotFound`, {
+            srcDir: projectConfig.srcDir,
+            projectDir: projectDir,
+        }));
         return process.exit(EXIT_CODES.ERROR);
     }
 };

package/lib/prompts/accountsPrompt.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const { getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription } = require('../ui');
 const mapAccountChoices = portals => portals.map(p => ({
-    name: uiAccountDescription(p.portalId, false),
-    value: p.name || p.portalId,
+    name: uiAccountDescription(getAccountIdentifier(p), false),
+    value: p.name || getAccountIdentifier(p),
 }));
-const i18nKey = 'commands.accounts.subcommands.use';
+const i18nKey = 'commands.account.subcommands.use';
 const selectAccountFromConfig = async (config, prompt) => {
+    const accountsList = getConfigAccounts();
+    const defaultAccount = getConfigDefaultAccount(config);
     const { default: selectedDefault } = await promptUser([
         {
             type: 'list',
@@ -17,8 +21,8 @@ const selectAccountFromConfig = async (config, prompt) => {
             name: 'default',
             pageSize: 20,
             message: prompt || i18n(`${i18nKey}.promptMessage`),
-            choices: mapAccountChoices(config.portals),
-            default: config.defaultPortal,
+            choices: mapAccountChoices(accountsList),
+            default: defaultAccount,
         },
     ]);
     return selectedDefault;

package/lib/prompts/createModulePrompt.js

@@ -27,12 +27,20 @@ const CONTENT_TYPES_PROMPT = {
     type: 'checkbox',
     name: 'contentTypes',
     message: i18n(`${i18nKey}.selectContentType`),
-    default: ['PAGE'],
+    default: ['ANY'],
     choices: [
-        { name: 'Page', value: 'PAGE' },
+        { name: 'Any', value: 'ANY' },
+        { name: 'Landing page', value: 'LANDING_PAGE' },
+        { name: 'Site page', value: 'SITE_PAGE' },
         { name: 'Blog post', value: 'BLOG_POST' },
         { name: 'Blog listing', value: 'BLOG_LISTING' },
         { name: 'Email', value: 'EMAIL' },
+        { name: 'Knowledge base', value: 'KNOWLEDGE_BASE' },
+        { name: 'Quote template', value: 'QUOTE_TEMPLATE' },
+        { name: 'Customer portal', value: 'CUSTOMER_PORTAL' },
+        { name: 'Web interactive', value: 'WEB_INTERACTIVE' },
+        { name: 'Subscription', value: 'SUBSCRIPTION' },
+        { name: 'Membership', value: 'MEMBERSHIP' },
     ],
     validate: input => {
         return new Promise(function (resolve, reject) {
@@ -49,12 +57,19 @@ const GLOBAL_PROMPT = {
     message: i18n(`${i18nKey}.confirmGlobal`),
     default: false,
 };
+const AVAILABLE_FOR_NEW_CONTENT = {
+    type: 'confirm',
+    name: 'availableForNewContent',
+    message: i18n(`${i18nKey}.availableForNewContent`),
+    default: true,
+};
 function createModulePrompt() {
     return promptUser([
         MODULE_LABEL_PROMPT,
         REACT_TYPE_PROMPT,
         CONTENT_TYPES_PROMPT,
         GLOBAL_PROMPT,
+        AVAILABLE_FOR_NEW_CONTENT,
     ]);
 }
 module.exports = {

package/lib/prompts/createProjectPrompt.js

@@ -57,19 +57,19 @@ const createProjectPrompt = async (githubRef, promptOptions = {}, skipTemplatePr
             },
         },
         {
-            name: 'location',
-            message: i18n(`${i18nKey}.enterLocation`),
-            when: !promptOptions.location,
+            name: 'dest',
+            message: i18n(`${i18nKey}.enterDest`),
+            when: !promptOptions.dest,
             default: answers => {
                 const projectName = sanitizeFileName(answers.name || promptOptions.name);
                 return path.resolve(getCwd(), projectName);
             },
             validate: input => {
                 if (!input) {
-                    return i18n(`${i18nKey}.errors.locationRequired`);
+                    return i18n(`${i18nKey}.errors.destRequired`);
                 }
                 if (fs.existsSync(input)) {
-                    return i18n(`${i18nKey}.errors.invalidLocation`);
+                    return i18n(`${i18nKey}.errors.invalidDest`);
                 }
                 if (!isValidPath(input)) {
                     return i18n(`${i18nKey}.errors.invalidCharacters`);

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -8,11 +8,12 @@ const { isSandbox } = require('../accountTypes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits, } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubspot/local-dev-lib/constants/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { fetchDeveloperTestAccounts, } = require('@hubspot/local-dev-lib/api/developerTestAccounts');
 const i18nKey = 'lib.prompts.projectDevTargetAccountPrompt';
 const mapNestedAccount = accountConfig => ({
-    name: uiAccountDescription(accountConfig.portalId, false),
+    name: uiAccountDescription(getAccountIdentifier(accountConfig), false),
     value: {
         targetAccountId: getAccountId(accountConfig.name),
         createNestedAccount: false,
@@ -97,7 +98,7 @@ const selectDeveloperTestTargetAccountPrompt = async (accounts, defaultAccountCo
     }
     const devTestAccounts = [];
     if (devTestAccountsResponse && devTestAccountsResponse.results) {
-        const accountIds = accounts.map(account => account.portalId);
+        const accountIds = accounts.map(account => getAccountIdentifier(account));
         devTestAccountsResponse.results.forEach(acct => {
             const inConfig = accountIds.includes(acct.id);
             devTestAccounts.push({

package/lib/prompts/promptUtils.d.ts

@@ -10,3 +10,6 @@ export declare function listPrompt(message: string, { choices, when, }: {
     }>;
     when?: boolean | (() => boolean);
 }): Promise<string>;
+export declare function inputPrompt(message: string, { when, }?: {
+    when?: boolean | (() => boolean);
+}): Promise<string>;

package/lib/prompts/promptUtils.js

@@ -3,18 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptUser = void 0;
 exports.confirmPrompt = confirmPrompt;
 exports.listPrompt = listPrompt;
+exports.inputPrompt = inputPrompt;
 const inquirer = require('inquirer');
 // NOTE: we can eventually delete this and directly use inquirer.prompt when the files support imports
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.promptUser = inquirer.createPromptModule();
 async function confirmPrompt(message, options = {}) {
-    const { defaultAnswer, when } = options;
+    const { defaultAnswer = true, when } = options;
     const { choice } = await (0, exports.promptUser)([
         {
             name: 'choice',
             type: 'confirm',
             message,
-            default: defaultAnswer || true,
+            default: defaultAnswer,
             when,
         },
     ]);
@@ -32,3 +33,14 @@ async function listPrompt(message, { choices, when, }) {
     ]);
     return choice;
 }
+async function inputPrompt(message, { when, } = {}) {
+    const { input } = await (0, exports.promptUser)([
+        {
+            name: 'input',
+            type: 'input',
+            message,
+            when,
+        },
+    ]);
+    return input;
+}

package/lib/prompts/sandboxesPrompt.js

@@ -5,22 +5,24 @@ const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription } = require('../ui');
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { isSandbox } = require('../accountTypes');
+const { getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const i18nKey = 'lib.prompts.sandboxesPrompt';
 const mapSandboxAccountChoices = portals => portals
     .filter(p => isSandbox(p))
     .map(p => {
     return {
-        name: uiAccountDescription(p.portalId, false),
-        value: p.name || p.portalId,
+        name: uiAccountDescription(getAccountIdentifier(p), false),
+        value: p.name || getAccountIdentifier(p),
     };
 });
 const mapNonSandboxAccountChoices = portals => portals
     .filter(p => !isSandbox(p))
     .map(p => {
     return {
-        name: `${p.name} (${p.portalId})`,
-        value: p.name || p.portalId,
+        name: `${p.name} (${getAccountIdentifier(p)})`,
+        value: p.name || getAccountIdentifier(p),
     };
 });
 const sandboxTypePrompt = () => {
@@ -45,9 +47,10 @@ const sandboxTypePrompt = () => {
     ]);
 };
 const deleteSandboxPrompt = (config, promptParentAccount = false) => {
+    const accountsList = getConfigAccounts();
     const choices = promptParentAccount
-        ? mapNonSandboxAccountChoices(config.portals)
-        : mapSandboxAccountChoices(config.portals);
+        ? mapNonSandboxAccountChoices(accountsList)
+        : mapSandboxAccountChoices(accountsList);
     if (!choices.length) {
         return undefined;
     }
@@ -61,7 +64,7 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
             look: false,
             pageSize: 20,
             choices,
-            default: config.defaultPortal,
+            default: getConfigDefaultAccount(config),
         },
     ]);
 };

package/lib/prompts/secretPrompt.d.ts

@@ -1 +1,3 @@
-export {};
+export declare function secretValuePrompt(): any;
+export declare function secretNamePrompt(): any;
+export declare function secretListPrompt(secrets: string, message: string): any;

package/lib/prompts/secretPrompt.js

@@ -1,24 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { promptUser } = require('./promptUtils');
-const { i18n } = require('../lang');
+exports.secretValuePrompt = secretValuePrompt;
+exports.secretNamePrompt = secretNamePrompt;
+exports.secretListPrompt = secretListPrompt;
+const promptUtils_1 = require("./promptUtils");
+const lang_1 = require("../lang");
 const i18nKey = 'lib.prompts.secretPrompt';
-const SECRET_VALUE_PROMPT = {
-    name: 'secretValue',
-    type: 'password',
-    mask: '*',
-    message: i18n(`${i18nKey}.enterValue`),
-    validate(val) {
-        if (typeof val !== 'string') {
-            return i18n(`${i18nKey}.errors.invalidValue`);
-        }
-        return true;
-    },
-};
 function secretValuePrompt() {
-    return promptUser([SECRET_VALUE_PROMPT]);
+    return (0, promptUtils_1.promptUser)([
+        {
+            name: 'secretValue',
+            type: 'password',
+            mask: '*',
+            message: (0, lang_1.i18n)(`${i18nKey}.enterValue`),
+        },
+    ]);
+}
+function secretNamePrompt() {
+    return (0, promptUtils_1.promptUser)([
+        {
+            name: 'secretName',
+            type: 'input',
+            message: (0, lang_1.i18n)(`${i18nKey}.enterName`),
+        },
+    ]);
+}
+function secretListPrompt(secrets, message) {
+    return (0, promptUtils_1.promptUser)([
+        {
+            name: 'secretToModify',
+            type: 'list',
+            choices: secrets,
+            message,
+        },
+    ]);
 }
-module.exports = {
-    secretValuePrompt,
-};