@hubspot/cli 6.2.2-experimental.1 → 6.3.0-experimental.0

package/lib/lang.js

@@ -1,55 +1,65 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const util = require('util');
-const path = require('path');
-const fs = require('fs-extra');
-const yaml = require('js-yaml');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { interpolate } = require('./interpolation');
-const MISSING_LANGUAGE_DATA_PREFIX = '[Missing language data]';
+exports.MISSING_LANGUAGE_DATA_PREFIX = void 0;
+exports.i18n = i18n;
+exports.setLangData = setLangData;
+const util_1 = __importDefault(require("util"));
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const interpolation_1 = require("./interpolation");
+exports.MISSING_LANGUAGE_DATA_PREFIX = '[Missing language data]';
 let locale;
 let languageObj;
-const loadLanguageFromYaml = () => {
+function loadLanguageFromYaml() {
     if (languageObj)
         return;
     try {
         const nodeLocale = Intl.DateTimeFormat()
             .resolvedOptions()
             .locale.split('-')[0];
-        const languageFilePath = path.join(__dirname, `../lang/${nodeLocale}.lyaml`);
-        const languageFileExists = fs.existsSync(languageFilePath);
+        const languageFilePath = path_1.default.join(__dirname, `../lang/${nodeLocale}.lyaml`);
+        const languageFileExists = fs_extra_1.default.existsSync(languageFilePath);
         // Fall back to using the default language file
         locale = languageFileExists ? nodeLocale : 'en';
-        languageObj = yaml.load(fs.readFileSync(path.join(__dirname, `../lang/${locale}.lyaml`), 'utf8'));
-        logger.debug('Loaded language data: ', util.inspect(languageObj, true, 999, true));
+        languageObj = js_yaml_1.default.load(fs_extra_1.default.readFileSync(path_1.default.join(__dirname, `../lang/${locale}.lyaml`), 'utf8'));
+        logger_1.logger.debug('Loaded language data: ', util_1.default.inspect(languageObj, true, 999, true));
     }
     catch (e) {
-        logger.error('Error loading language data: ', e);
+        logger_1.logger.error('Error loading language data: ', e);
     }
-};
-const getTextValue = lookupDotNotation => {
+}
+function getTextValue(lookupDotNotation) {
     const lookupProps = [locale, ...lookupDotNotation.split('.')];
-    const missingTextData = `${MISSING_LANGUAGE_DATA_PREFIX}: ${lookupProps.join('.')}`;
+    const missingTextData = `${exports.MISSING_LANGUAGE_DATA_PREFIX}: ${lookupProps.join('.')}`;
     let textValue = languageObj;
     let previouslyCheckedProp = lookupProps[0];
     try {
         lookupProps.forEach(prop => {
-            textValue = textValue[prop];
+            if (textValue && typeof textValue === 'object') {
+                textValue = textValue[prop];
+            }
             previouslyCheckedProp = prop;
         });
     }
     catch (e) {
-        logger.debug(`Unable to access language property: ${lookupProps.join('.')}. Failed to access prop "${previouslyCheckedProp}".`);
-        logger.error('Unable to access language property.');
+        logger_1.logger.debug(`Unable to access language property: ${lookupProps.join('.')}. Failed to access prop "${previouslyCheckedProp}".`);
+        logger_1.logger.error('Unable to access language property.');
         return missingTextData;
     }
     if (!textValue) {
         return missingTextData;
     }
+    if (typeof textValue !== 'string') {
+        return missingTextData;
+    }
     return textValue;
-};
-const i18n = (lookupDotNotation, options = {}) => {
+}
+function i18n(lookupDotNotation, options = {}) {
     if (!languageObj) {
         loadLanguageFromYaml();
     }
@@ -57,15 +67,10 @@ const i18n = (lookupDotNotation, options = {}) => {
         throw new Error(`i18n must be passed a string value for lookupDotNotation, received ${typeof lookupDotNotation}`);
     }
     const textValue = getTextValue(lookupDotNotation);
-    const shouldInterpolate = !textValue.startsWith(MISSING_LANGUAGE_DATA_PREFIX);
-    return shouldInterpolate ? interpolate(textValue, options) : textValue;
-};
-const setLangData = (newLocale, newLangObj) => {
+    const shouldInterpolate = !textValue.startsWith(exports.MISSING_LANGUAGE_DATA_PREFIX);
+    return shouldInterpolate ? (0, interpolation_1.interpolate)(textValue, options) : textValue;
+}
+function setLangData(newLocale, newLangObj) {
     locale = newLocale;
     languageObj = newLangObj;
-};
-module.exports = {
-    i18n,
-    setLangData,
-    MISSING_LANGUAGE_DATA_PREFIX,
-};
+}

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/process.d.ts

@@ -1 +1,12 @@
+interface KeyPress {
+    ctrl?: boolean;
+    shift?: boolean;
+    alt?: boolean;
+    meta?: boolean;
+    name?: string;
+}
+export declare function handleExit(callback: (onTerminate: {
+    isSIGHUP: boolean;
+}) => void): void;
+export declare function handleKeypress(callback: (onKeyPress: KeyPress) => void): void;
 export {};

package/lib/process.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const readline = require('readline');
-const { logger, setLogLevel, LOG_LEVEL, } = require('@hubspot/local-dev-lib/logger');
-const { i18n } = require('./lang');
+exports.handleExit = handleExit;
+exports.handleKeypress = handleKeypress;
+const readline_1 = __importDefault(require("readline"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const lang_1 = require("./lang");
 const i18nKey = 'lib.process';
-const handleExit = callback => {
+function handleExit(callback) {
     const terminationSignals = [
         'beforeExit',
         'SIGINT', // Terminal trying to interrupt (Ctrl + C)
@@ -25,17 +29,17 @@ const handleExit = callback => {
                 const isSIGHUP = signal === 'SIGHUP';
                 // Prevent logs when terminal closes
                 if (isSIGHUP) {
-                    setLogLevel(LOG_LEVEL.NONE);
+                    (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.NONE);
                 }
-                logger.debug(i18n(`${i18nKey}.exitDebug`, { signal }));
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.exitDebug`, { signal }));
                 await callback({ isSIGHUP });
             }
         });
     });
-};
-const handleKeypress = callback => {
-    readline.createInterface(process.stdin, process.stdout);
-    readline.emitKeypressEvents(process.stdin);
+}
+function handleKeypress(callback) {
+    readline_1.default.createInterface(process.stdin, process.stdout);
+    readline_1.default.emitKeypressEvents(process.stdin);
     if (process.stdin.isTTY) {
         process.stdin.setRawMode(true);
     }
@@ -45,8 +49,4 @@ const handleKeypress = callback => {
             callback(key);
         }
     });
-};
-module.exports = {
-    handleExit,
-    handleKeypress,
-};
+}

package/lib/projects.d.ts

@@ -1 +1,4 @@
-export {};
+export declare const getProjectConfig: (_dir: any) => Promise<{
+    projectDir: any;
+    projectConfig: any;
+} | undefined>;

package/lib/projects.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectConfig = void 0;
 // @ts-nocheck
 const fs = require('fs-extra');
 const path = require('path');
@@ -69,8 +70,9 @@ const getProjectConfig = async (_dir) => {
         logger.error('Could not read from project config');
     }
 };
+exports.getProjectConfig = getProjectConfig;
 const createProjectConfig = async (projectPath, projectName, template, templateSource, githubRef) => {
-    const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+    const { projectConfig, projectDir } = await (0, exports.getProjectConfig)(projectPath);
     if (projectConfig) {
         logger.warn(projectPath === projectDir
             ? 'A project already exists in that location.'
@@ -616,7 +618,7 @@ const logFeedbackMessage = buildId => {
 const createProjectComponent = async (component, name, projectComponentsVersion) => {
     const i18nKey = 'commands.project.subcommands.add';
     const componentName = name;
-    const configInfo = await getProjectConfig();
+    const configInfo = await (0, exports.getProjectConfig)();
     if (!configInfo.projectDir && !configInfo.projectConfig) {
         logger.error(i18n(`${i18nKey}.error.locationInProject`));
         process.exit(EXIT_CODES.ERROR);
@@ -660,7 +662,7 @@ const getProjectComponentsByVersion = async (projectComponentsVersion) => {
 };
 module.exports = {
     writeProjectConfig,
-    getProjectConfig,
+    getProjectConfig: exports.getProjectConfig,
     getIsInProject,
     pollProjectBuildAndDeploy,
     handleProjectUpload,

package/lib/prompts/accountNamePrompt.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
-const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
@@ -18,7 +17,7 @@ const getCliAccountNamePromptConfig = defaultName => ({
         else if (!val.length) {
             return i18n(`${i18nKey}.errors.nameRequired`);
         }
-        else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+        else if (val.indexOf(' ') >= 0) {
             return i18n(`${i18nKey}.errors.spacesInName`);
         }
         return accountNameExistsInConfig(val)

package/lib/prompts/accountsPrompt.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { updateDefaultAccount } = require('@hubspot/local-dev-lib/config');
+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 selectAccountFromConfig = async (config, prompt) => {
+    const accountsList = getConfigAccounts();
+    const defaultAccount = getConfigDefaultAccount(config);
     const { default: selectedDefault } = await promptUser([
         {
             type: 'list',
@@ -18,28 +21,12 @@ 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;
 };
-const selectAndSetAsDefaultAccountPrompt = async (config) => {
-    const { default: selectedDefault } = await promptUser([
-        {
-            type: 'list',
-            look: false,
-            name: 'default',
-            pageSize: 20,
-            message: i18n(`${i18nKey}.promptMessage`),
-            choices: mapAccountChoices(config.portals),
-            default: config.defaultPortal,
-        },
-    ]);
-    updateDefaultAccount(selectedDefault);
-};
 module.exports = {
-    selectAndSetAsDefaultAccountPrompt,
     selectAccountFromConfig,
-    mapAccountChoices,
 };

package/lib/prompts/createFunctionPrompt.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 const i18nKey = 'lib.prompts.createFunctionPrompt';
 const FUNCTIONS_FOLDER_PROMPT = {
     name: 'functionsFolder',
@@ -15,7 +14,7 @@ const FUNCTIONS_FOLDER_PROMPT = {
         else if (!val.length) {
             return i18n(`${i18nKey}.errors.blank`);
         }
-        else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+        else if (val.indexOf(' ') >= 0) {
             return i18n(`${i18nKey}.errors.space`);
         }
         return true;
@@ -31,7 +30,7 @@ const FUNCTION_FILENAME_PROMPT = {
         else if (!val.length) {
             return i18n(`${i18nKey}.errors.blank`);
         }
-        else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+        else if (val.indexOf(' ') >= 0) {
             return i18n(`${i18nKey}.errors.space`);
         }
         return true;
@@ -54,7 +53,7 @@ const ENDPOINT_PATH_PROMPT = {
         else if (!val.length) {
             return i18n(`${i18nKey}.errors.blank`);
         }
-        else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+        else if (val.indexOf(' ') >= 0) {
             return i18n(`${i18nKey}.errors.space`);
         }
         return true;

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

@@ -1 +1,12 @@
-export {};
+export declare const promptUser: any;
+export declare function confirmPrompt(message: string, options?: {
+    defaultAnswer?: boolean;
+    when?: boolean | (() => boolean);
+}): Promise<boolean>;
+export declare function listPrompt(message: string, { choices, when, }: {
+    choices: Array<{
+        name: string;
+        value: string;
+    }>;
+    when?: boolean | (() => boolean);
+}): Promise<string>;

package/lib/prompts/promptUtils.js

@@ -1,23 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
+exports.promptUser = void 0;
+exports.confirmPrompt = confirmPrompt;
+exports.listPrompt = listPrompt;
 const inquirer = require('inquirer');
-const promptUser = async (promptConfig) => {
-    const prompt = inquirer.createPromptModule();
-    return prompt(promptConfig);
-};
-const confirmPrompt = async (message, defaultAnswer = true) => {
-    const { choice } = await promptUser([
+// 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 { choice } = await (0, exports.promptUser)([
         {
             name: 'choice',
             type: 'confirm',
-            default: defaultAnswer,
             message,
+            default: defaultAnswer || true,
+            when,
         },
     ]);
     return choice;
-};
-module.exports = {
-    promptUser,
-    confirmPrompt,
-};
+}
+async function listPrompt(message, { choices, when, }) {
+    const { choice } = await (0, exports.promptUser)([
+        {
+            name: 'choice',
+            type: 'list',
+            message,
+            choices,
+            when,
+        },
+    ]);
+    return choice;
+}

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/setAsDefaultAccountPrompt.js

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { getConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { getConfig, updateDefaultAccount, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const i18nKey = 'lib.prompts.setAsDefaultAccountPrompt';
 const setAsDefaultAccountPrompt = async (accountName) => {
     const config = getConfig();
+    // Accounts for deprecated and new config
+    const defaultAccount = getConfigDefaultAccount(config);
     const { setAsDefault } = await promptUser([
         {
             name: 'setAsDefault',
             type: 'confirm',
-            when: config.defaultPortal !== accountName,
+            when: defaultAccount !== accountName,
             message: i18n(`${i18nKey}.setAsDefaultAccountMessage`),
         },
     ]);

package/lib/sandboxSync.js

@@ -11,6 +11,7 @@ const { debugError, logError, ApiErrorContext, } = require('./errorHandlers/inde
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { uiAccountDescription, uiLine, uiLink, uiCommandDisabledBanner, } = require('./ui');
 const { isDevelopmentSandbox } = require('./accountTypes');
 const i18nKey = 'lib.sandbox.sync';
@@ -22,8 +23,10 @@ const i18nKey = 'lib.sandbox.sync';
  * @returns
  */
 const syncSandbox = async ({ accountConfig, parentAccountConfig, env, syncTasks, slimInfoMessage = false, }) => {
-    const accountId = getAccountId(accountConfig.portalId);
-    const parentAccountId = getAccountId(parentAccountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
+    const parentId = getAccountIdentifier(parentAccountConfig);
+    const parentAccountId = getAccountId(parentId);
     const isDevSandbox = isDevelopmentSandbox(accountConfig);
     SpinniesManager.init({
         succeedColor: 'white',

package/lib/sandboxes.js

@@ -5,11 +5,12 @@ const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getSandboxUsageLimits, } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { fetchTypes } = require('@hubspot/local-dev-lib/api/sandboxSync');
-const { getConfig, getAccountId, getEnv, } = require('@hubspot/local-dev-lib/config');
+const { getAccountId, getEnv, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./prompts/promptUtils');
 const { isDevelopmentSandbox } = require('./accountTypes');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { uiAccountDescription } = require('./ui');
 const { isMissingScopeError, isSpecifiedError, } = require('@hubspot/local-dev-lib/errors/index');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
@@ -34,9 +35,10 @@ const getSandboxTypeAsString = accountType => {
     return 'standard';
 };
 function getHasSandboxesByType(parentAccountConfig, type) {
-    const config = getConfig();
-    const parentPortalId = getAccountId(parentAccountConfig.portalId);
-    for (const portal of config.portals) {
+    const id = getAccountIdentifier(parentAccountConfig);
+    const parentPortalId = getAccountId(id);
+    const accountsList = getConfigAccounts();
+    for (const portal of accountsList) {
         if ((portal.parentAccountId !== null ||
             portal.parentAccountId !== undefined) &&
             portal.parentAccountId === parentPortalId &&
@@ -54,8 +56,10 @@ function getSandboxLimit(error) {
 }
 // Fetches available sync types for a given sandbox portal
 async function getAvailableSyncTypes(parentAccountConfig, config) {
-    const parentPortalId = getAccountId(parentAccountConfig.portalId);
-    const portalId = getAccountId(config.portalId);
+    const parentId = getAccountIdentifier(parentAccountConfig);
+    const parentPortalId = getAccountId(parentId);
+    const id = getAccountIdentifier(config);
+    const portalId = getAccountId(id);
     const { data: { results: syncTypes }, } = await fetchTypes(parentPortalId, portalId);
     if (!syncTypes) {
         throw new Error('Unable to fetch available sandbox sync types. Please try again.');
@@ -98,7 +102,8 @@ const getSyncTypesWithContactRecordsPrompt = async (accountConfig, syncTasks, sk
  * @returns {null}
  */
 const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
-    const accountId = getAccountId(accountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
     const { data: { usage }, } = await getSandboxUsageLimits(accountId);
     if (!usage) {
         throw new Error('Unable to fetch sandbox usage limits. Please try again.');

package/lib/ui/SpinniesManager.d.ts

@@ -1 +1,39 @@
-export {};
+import { SpinnerOptions as BaseSpinnerOptions, VALID_STATUSES } from './spinniesUtils';
+interface SpinnerState extends BaseSpinnerOptions {
+    name?: string;
+}
+declare class SpinniesManager {
+    private options;
+    private spinners;
+    private isCursorHidden;
+    private currentInterval;
+    private stream;
+    private lineCount;
+    private currentFrameIndex;
+    private spin;
+    constructor();
+    init(options?: Partial<SpinnerState>): void;
+    private resetState;
+    pick(name: string): SpinnerState | undefined;
+    add(name: string, options?: Partial<SpinnerState>): SpinnerState & {
+        name: string;
+    };
+    update(name: string, options?: Partial<SpinnerState>): SpinnerState;
+    succeed(name: string, options?: Partial<SpinnerState>): SpinnerState;
+    fail(name: string, options?: Partial<SpinnerState>): SpinnerState;
+    remove(name: string): SpinnerState;
+    stopAll(newStatus?: typeof VALID_STATUSES[number]): {
+        [key: string]: SpinnerState;
+    };
+    private hasAnySpinners;
+    hasActiveSpinners(): boolean;
+    private setSpinnerProperties;
+    private updateSpinnerState;
+    private loopStream;
+    private setStreamOutput;
+    private setRawStreamOutput;
+    private checkIfActiveSpinners;
+    private bindSigint;
+}
+declare const toExport: SpinniesManager;
+export default toExport;