@hubspot/cli 7.0.2-experimental.0 → 7.0.2

package/lib/buildAccount.js

@@ -1,42 +1,47 @@
 "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 { 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');
-const SpinniesManager = require('./ui/SpinniesManager');
-const { debugError, logError } = require('./errorHandlers/index');
-const { createDeveloperTestAccount, } = require('@hubspot/local-dev-lib/api/developerTestAccounts');
-const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
-const { createSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
-const { SANDBOX_API_TYPE_MAP, handleSandboxCreateError, } = require('./sandboxes');
-const { handleDeveloperTestAccountCreateError, } = require('./developerTestAccounts');
-async function saveAccountToConfig({ env, personalAccessKey, accountName, accountId, force = false, }) {
+exports.saveAccountToConfig = saveAccountToConfig;
+exports.buildDeveloperTestAccount = buildDeveloperTestAccount;
+exports.buildSandbox = buildSandbox;
+const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
+const config_2 = require("@hubspot/local-dev-lib/constants/config");
+const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
+const personalAccessKeyPrompt_1 = require("./prompts/personalAccessKeyPrompt");
+const lang_1 = require("./lang");
+const accountNamePrompt_1 = require("./prompts/accountNamePrompt");
+const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
+const index_1 = require("./errorHandlers/index");
+const sandboxes_1 = require("./sandboxes");
+const developerTestAccounts_2 = require("./developerTestAccounts");
+async function saveAccountToConfig(accountId, accountName, env, personalAccessKey, force = false) {
     if (!personalAccessKey) {
-        const configData = await personalAccessKeyPrompt({
+        const configData = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
             env,
             account: accountId,
         });
         personalAccessKey = configData.personalAccessKey;
     }
-    const token = await getAccessToken(personalAccessKey, env);
-    const updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env);
-    let validName = updatedConfig.name;
-    if (!updatedConfig.name) {
+    const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
+    const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env);
+    let validName = updatedConfig?.name || '';
+    if (!updatedConfig?.name) {
         const nameForConfig = accountName.toLowerCase().split(' ').join('-');
         validName = nameForConfig;
-        const invalidAccountName = accountNameExistsInConfig(nameForConfig);
+        const invalidAccountName = (0, config_1.accountNameExistsInConfig)(nameForConfig);
         if (invalidAccountName) {
             if (!force) {
-                logger.log('');
-                logger.warn(i18n(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
+                logger_1.logger.log('');
+                logger_1.logger.warn((0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
                     name: nameForConfig,
                 }));
-                const { name: promptName } = await cliAccountNamePrompt(nameForConfig + `_${accountId}`);
+                const { name: promptName } = await (0, accountNamePrompt_1.cliAccountNamePrompt)(nameForConfig + `_${accountId}`);
                 validName = promptName;
             }
             else {
@@ -45,100 +50,110 @@ async function saveAccountToConfig({ env, personalAccessKey, accountName, accoun
             }
         }
     }
-    updateAccountConfig({
+    (0, config_1.updateAccountConfig)({
         ...updatedConfig,
-        environment: updatedConfig.env,
-        tokenInfo: updatedConfig.auth.tokenInfo,
+        env: updatedConfig?.env,
+        tokenInfo: updatedConfig?.auth?.tokenInfo,
         name: validName,
     });
-    writeConfig();
-    logger.log('');
+    (0, config_1.writeConfig)();
+    logger_1.logger.log('');
     return validName;
 }
-async function buildNewAccount({ name, accountType, accountConfig, env, portalLimit, // Used only for developer test accounts
-force = false, }) {
-    SpinniesManager.init({
+async function buildDeveloperTestAccount(name, accountConfig, env, portalLimit) {
+    const i18nKey = 'lib.developerTestAccount.create.loading';
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
+    const accountId = (0, config_1.getAccountId)(id);
+    if (!accountId) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.fail`));
+    }
+    SpinniesManager_1.default.init({
         succeedColor: 'white',
     });
-    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;
-    let result;
-    let spinniesI18nKey;
-    if (isSandbox) {
-        if (accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
-            spinniesI18nKey = 'lib.sandbox.create.loading.standard';
-        }
-        if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
-            spinniesI18nKey = 'lib.sandbox.create.loading.developer';
-        }
-    }
-    else if (isDeveloperTestAccount) {
-        spinniesI18nKey = 'lib.developerTestAccount.create.loading';
-    }
-    logger.log('');
-    SpinniesManager.add('buildNewAccount', {
-        text: i18n(`${spinniesI18nKey}.add`, {
+    logger_1.logger.log('');
+    SpinniesManager_1.default.add('buildDeveloperTestAccount', {
+        text: (0, lang_1.i18n)(`${i18nKey}.add`, {
             accountName: name,
         }),
     });
-    let resultAccountId;
+    let developerTestAccount;
     try {
-        if (isSandbox) {
-            const sandboxApiType = SANDBOX_API_TYPE_MAP[accountType]; // API expects sandbox type as 1 or 2.
-            const { data } = await createSandbox(accountId, name, sandboxApiType);
-            result = { name, ...data };
-            resultAccountId = result.sandbox.sandboxHubId;
-        }
-        else if (isDeveloperTestAccount) {
-            const { data } = await createDeveloperTestAccount(accountId, name);
-            result = data;
-            resultAccountId = result.id;
-        }
-        SpinniesManager.succeed('buildNewAccount', {
-            text: i18n(`${spinniesI18nKey}.succeed`, {
+        const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(accountId, name);
+        developerTestAccount = data;
+        SpinniesManager_1.default.succeed('buildDeveloperTestAccount', {
+            text: (0, lang_1.i18n)(`${i18nKey}.succeed`, {
                 accountName: name,
-                accountId: resultAccountId,
+                accountId: developerTestAccount.id,
             }),
         });
     }
-    catch (err) {
-        debugError(err);
-        SpinniesManager.fail('buildNewAccount', {
-            text: i18n(`${spinniesI18nKey}.fail`, {
+    catch (e) {
+        (0, index_1.debugError)(e);
+        SpinniesManager_1.default.fail('buildDeveloperTestAccount', {
+            text: (0, lang_1.i18n)(`${i18nKey}.fail`, {
                 accountName: name,
             }),
         });
-        if (isSandbox) {
-            handleSandboxCreateError(err, env, name, accountId);
-        }
-        if (isDeveloperTestAccount) {
-            handleDeveloperTestAccountCreateError(err, env, accountId, portalLimit);
-        }
+        (0, developerTestAccounts_2.handleDeveloperTestAccountCreateError)(e, accountId, env, portalLimit);
     }
-    let configAccountName;
     try {
-        // Response contains PAK, save to config here
-        configAccountName = await saveAccountToConfig({
-            env,
-            personalAccessKey: result.personalAccessKey,
+        await saveAccountToConfig(accountId, name, env);
+    }
+    catch (err) {
+        (0, index_1.logError)(err);
+        throw err;
+    }
+    return developerTestAccount;
+}
+async function buildSandbox(name, accountConfig, sandboxType, env, force = false) {
+    let i18nKey;
+    if (sandboxType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
+        i18nKey = 'lib.sandbox.create.loading.standard';
+    }
+    else {
+        i18nKey = 'lib.sandbox.create.loading.developer';
+    }
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
+    const accountId = (0, config_1.getAccountId)(id);
+    if (!accountId) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.fail`));
+    }
+    SpinniesManager_1.default.init({
+        succeedColor: 'white',
+    });
+    logger_1.logger.log('');
+    SpinniesManager_1.default.add('buildSandbox', {
+        text: (0, lang_1.i18n)(`${i18nKey}.add`, {
             accountName: name,
-            accountId: resultAccountId,
-            force,
+        }),
+    });
+    let sandbox;
+    try {
+        const sandboxApiType = sandboxes_1.SANDBOX_API_TYPE_MAP[sandboxType];
+        const { data } = await (0, sandboxHubs_1.createSandbox)(accountId, name, sandboxApiType);
+        sandbox = { name, ...data };
+        SpinniesManager_1.default.succeed('buildSandbox', {
+            text: (0, lang_1.i18n)(`${i18nKey}.succeed`, {
+                accountName: name,
+                accountId: sandbox.sandbox.sandboxHubId,
+            }),
+        });
+    }
+    catch (e) {
+        (0, index_1.debugError)(e);
+        SpinniesManager_1.default.fail('buildSandbox', {
+            text: (0, lang_1.i18n)(`${i18nKey}.fail`, {
+                accountName: name,
+            }),
         });
+        (0, sandboxes_1.handleSandboxCreateError)(e, env, name, accountId);
+    }
+    try {
+        await saveAccountToConfig(accountId, name, env, sandbox.personalAccessKey, force);
     }
     catch (err) {
-        logError(err);
+        (0, index_1.logError)(err);
         throw err;
     }
-    return {
-        configAccountName,
-        result,
-    };
+    return sandbox;
 }
-module.exports = {
-    buildNewAccount,
-    saveAccountToConfig,
-};

package/lib/commonOpts.d.ts

@@ -1,10 +1,11 @@
-import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 import { Argv, Arguments } from 'yargs';
+import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
+import { ConfigArgs } from '../types/Yargs';
 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 addConfigOptions(yargs: Argv): Argv<ConfigArgs>;
 export declare function addOverwriteOptions(yargs: Argv): Argv;
 export declare function addCmsPublishModeOptions(yargs: Argv, { read, write }: {
     read?: boolean;
@@ -18,12 +19,7 @@ export declare function setLogLevel(options: Arguments<{
 export declare function getCommandName(argv: Arguments<{
     _?: string[];
 }>): string;
-/**
- * Obtains accountId using supplied --account flag or from environment variables
- */
-export declare function getAccountId(options: Arguments<{
-    account?: number | string;
-}>): number | null;
 export declare function getCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;
+    derivedAccountId?: number;
 }>): CmsPublishMode;

package/lib/commonOpts.js

@@ -9,7 +9,6 @@ exports.addTestingOptions = addTestingOptions;
 exports.addUseEnvironmentOptions = addUseEnvironmentOptions;
 exports.setLogLevel = setLogLevel;
 exports.getCommandName = getCommandName;
-exports.getAccountId = getAccountId;
 exports.getCmsPublishMode = getCmsPublishMode;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
@@ -83,16 +82,6 @@ function setLogLevel(options) {
 function getCommandName(argv) {
     return (argv && argv._ && argv._[0]) || '';
 }
-/**
- * Obtains accountId using supplied --account flag or from environment variables
- */
-function getAccountId(options) {
-    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);
-}
 function getCmsPublishMode(options) {
     // 1. --cmsPublishMode
     const { cmsPublishMode } = options;
@@ -100,9 +89,8 @@ function getCmsPublishMode(options) {
         return cmsPublishMode.toLowerCase();
     }
     // 2. config[account].defaultCmsPublishMode
-    const accountId = getAccountId(options);
-    if (accountId) {
-        const accountConfig = (0, config_1.getAccountConfig)(accountId);
+    if (options.derivedAccountId) {
+        const accountConfig = (0, config_1.getAccountConfig)(options.derivedAccountId);
         if (accountConfig && accountConfig.defaultCmsPublishMode) {
             return accountConfig.defaultCmsPublishMode;
         }

package/lib/constants.d.ts

@@ -6,13 +6,7 @@ export declare const MARKETPLACE_FOLDER: "@marketplace";
 export declare const CONFIG_FLAGS: {
     readonly USE_CUSTOM_OBJECT_HUBFILE: "useCustomObjectHubfile";
 };
-export declare const POLLING_DELAY = 2000;
-export declare const POLLING_STATUS: {
-    readonly SUCCESS: "SUCCESS";
-    readonly ERROR: "ERROR";
-    readonly REVERTED: "REVERTED";
-    readonly FAILURE: "FAILURE";
-};
+export declare const DEFAULT_POLLING_DELAY = 2000;
 export declare const PROJECT_CONFIG_FILE: "hsproject.json";
 export declare const PROJECT_BUILD_STATES: {
     readonly BUILDING: "BUILDING";

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.POLLING_STATUS = exports.POLLING_DELAY = exports.CONFIG_FLAGS = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
+exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.CONFIG_FLAGS = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
 exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
 exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 exports.FEEDBACK_INTERVAL = 10;
@@ -9,13 +9,7 @@ exports.MARKETPLACE_FOLDER = '@marketplace';
 exports.CONFIG_FLAGS = {
     USE_CUSTOM_OBJECT_HUBFILE: 'useCustomObjectHubfile',
 };
-exports.POLLING_DELAY = 2000;
-exports.POLLING_STATUS = {
-    SUCCESS: 'SUCCESS',
-    ERROR: 'ERROR',
-    REVERTED: 'REVERTED',
-    FAILURE: 'FAILURE',
-};
+exports.DEFAULT_POLLING_DELAY = 2000;
 exports.PROJECT_CONFIG_FILE = 'hsproject.json';
 exports.PROJECT_BUILD_STATES = {
     BUILDING: 'BUILDING',

package/lib/developerTestAccounts.d.ts

@@ -1,5 +1,6 @@
 import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { FetchDeveloperTestAccountsResponse } from '@hubspot/local-dev-lib/types/developerTestAccounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
+export declare function getHasDevTestAccounts(appDeveloperAccountConfig: CLIAccount): boolean;
 export declare function validateDevTestAccountUsageLimits(accountConfig: CLIAccount): Promise<FetchDeveloperTestAccountsResponse | null>;
 export declare function handleDeveloperTestAccountCreateError(err: unknown, accountId: number, env: Environment, portalLimit: number): never;

package/lib/developerTestAccounts.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHasDevTestAccounts = getHasDevTestAccounts;
 exports.validateDevTestAccountUsageLimits = validateDevTestAccountUsageLimits;
 exports.handleDeveloperTestAccountCreateError = handleDeveloperTestAccountCreateError;
 const config_1 = require("@hubspot/local-dev-lib/constants/config");

package/lib/localDev.d.ts

@@ -1 +1,17 @@
-export {};
+import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { Environment } from '@hubspot/local-dev-lib/types/Config';
+import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts';
+import { Project } from '@hubspot/local-dev-lib/types/Project';
+import { ProjectConfig } from '../types/Projects';
+import { Build } from '@hubspot/local-dev-lib/types/Build';
+export declare function confirmDefaultAccountIsTarget(accountConfig: CLIAccount): Promise<void>;
+export declare function checkIfDefaultAccountIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): void;
+export declare function checkIfParentAccountIsAuthed(accountConfig: CLIAccount): void;
+export declare function checkIfAccountFlagIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): void;
+export declare function suggestRecommendedNestedAccount(accounts: CLIAccount[], accountConfig: CLIAccount, hasPublicApps: boolean): Promise<CLIAccount | DeveloperTestAccount>;
+export declare function createSandboxForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment): Promise<number>;
+export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment): Promise<number>;
+export declare function useExistingDevTestAccount(env: Environment, account: DeveloperTestAccount): Promise<void>;
+export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig, targetAccountId: number, shouldCreateWithoutConfirmation: boolean, hasPublicApps: boolean): Promise<Project>;
+export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number): Promise<Build>;
+export declare function getAccountHomeUrl(accountId: number): string;