@hubspot/cli 7.6.0-beta.0 → 7.6.0-beta.2

package/commands/sandbox/delete.js

@@ -19,10 +19,10 @@ const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = 'delete';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.describe`), false);
 async function handler(args) {
-    const { providedAccountId, force } = args;
-    (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, providedAccountId);
+    const { userProvidedAccount, derivedAccountId, force } = args;
+    (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, derivedAccountId);
     let accountPrompt;
-    if (!providedAccountId) {
+    if (!userProvidedAccount) {
         if (!force) {
             accountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)();
         }
@@ -40,7 +40,7 @@ async function handler(args) {
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
-    const sandboxAccountId = (0, config_1.getAccountId)(providedAccountId || accountPrompt.account);
+    const sandboxAccountId = (0, config_1.getAccountId)(userProvidedAccount || accountPrompt.account);
     if (!sandboxAccountId) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -114,7 +114,7 @@ async function handler(args) {
             : `commands.sandbox.subcommands.delete.success.delete`;
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)(deleteKey, {
-            account: providedAccountId || accountPrompt.account,
+            account: userProvidedAccount || accountPrompt.account,
             sandboxHubId: sandboxAccountId || '',
         }));
         logger_1.logger.log('');

package/commands/testAccount/create.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, YargsCommandModule, EnvironmentArgs } from '../../types/Yargs';
-type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, YargsCommandModule, EnvironmentArgs, JSONOutputArgs } from '../../types/Yargs';
+type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & JSONOutputArgs & {
     configPath?: string;
 };
 declare const createTestAccountCommand: YargsCommandModule<unknown, CreateTestAccountArgs>;

package/commands/testAccount/create.js

@@ -15,10 +15,13 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const validation_1 = require("../../lib/validation");
 const en_1 = require("../../lang/en");
 const createDeveloperTestAccountConfigPrompt_1 = require("../../lib/prompts/createDeveloperTestAccountConfigPrompt");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const polling_1 = require("../../lib/polling");
+const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const command = 'create';
 const describe = en_1.commands.testAccount.create.describe;
 async function handler(args) {
-    const { derivedAccountId, configPath } = args;
+    const { derivedAccountId, configPath, formatOutputAsJson } = args;
     (0, usageTracking_1.trackCommandUsage)('test-account-create', {}, derivedAccountId);
     let accountConfigPath = configPath;
     let testAccountConfig;
@@ -61,14 +64,48 @@ async function handler(args) {
     else {
         testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)();
     }
+    const jsonOutput = {};
+    let testAccountId;
+    SpinniesManager_1.default.init({
+        succeedColor: 'white',
+    });
+    SpinniesManager_1.default.add('createTestAccount', {
+        text: en_1.commands.testAccount.create.polling.start(testAccountConfig.accountName),
+    });
     try {
         const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(derivedAccountId, testAccountConfig);
-        logger_1.uiLogger.success(en_1.commands.testAccount.create.success.configFileUpdated(testAccountConfig.accountName, data.id));
+        if (formatOutputAsJson) {
+            jsonOutput.accountName = data.accountName;
+            jsonOutput.accountId = data.id;
+            jsonOutput.personalAccessKey = data.personalAccessKey;
+        }
+        testAccountId = data.id;
     }
     catch (err) {
-        logger_1.uiLogger.error(en_1.commands.testAccount.create.errors.failedToCreate);
+        (0, errorHandlers_1.logError)(err);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    SpinniesManager_1.default.update('createTestAccount', {
+        text: en_1.commands.testAccount.create.polling.syncing,
+    });
+    try {
+        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountGateSyncStatus)(derivedAccountId, testAccountId), {
+            successStates: ['SUCCESS'],
+            errorStates: [],
+        });
+        SpinniesManager_1.default.succeed('createTestAccount', {
+            text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),
+        });
+    }
+    catch (err) {
+        (0, errorHandlers_1.debugError)(err);
+        SpinniesManager_1.default.fail('createTestAccount', {
+            text: en_1.commands.testAccount.create.polling.failure,
+        });
+    }
+    if (formatOutputAsJson) {
+        logger_1.uiLogger.json(jsonOutput);
+    }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 function createTestAccountBuilder(yargs) {
@@ -90,6 +127,7 @@ const builder = (0, yargsUtils_1.makeYargsBuilder)(createTestAccountBuilder, com
     useAccountOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,
+    useJSONOutputOptions: true,
 });
 const createTestAccountCommand = {
     command,

package/lang/en.d.ts

@@ -28,7 +28,7 @@ export declare const commands: {
         readonly openDesignManagerPrompt: "Open Design Manager in your browser?";
         readonly openedDesignManager: "Redirected to Design Manager!";
         readonly developerOverviewBrowserOpenPrep: "We'll take you to your HubSpot account and walk you through installing and previewing your new app.";
-        readonly openDeveloperOverviewPrompt: "Open HubSpot to go to your account?";
+        readonly openInstallUrl: "Open HubSpot to install your app in your account?";
         readonly openedDeveloperOverview: "HubSpot opened!";
         readonly prompts: {
             readonly selectOption: "Are you looking to build apps or CMS?";
@@ -36,17 +36,20 @@ export declare const commands: {
                 readonly app: "App";
                 readonly cms: "CMS";
             };
+            readonly installDependencies: "Would you like to install dependencies now?";
             readonly uploadProject: "Would you like to upload your project to HubSpot now?";
-            readonly appSelected: `We'll create a new project with a sample app for you.
-Projects are what you can use to create apps, themes, and more at HubSpot.
-Usually you'll use the ${string} command, but we'll go ahead and make one now.`;
             readonly projectCreated: {
                 readonly title: string;
-                readonly description: `Upload your project to HubSpot - typically, you'll use the command ${string} for this.
-We'll start the process now.`;
+                readonly description: `Let's prepare and upload your project to HubSpot.
+You can use ${string} to ${string} and ${string} to ${string} your project.`;
             };
         };
         readonly logs: {
+            readonly appSelected: `We'll create a new project with a sample app for you.
+Projects are what you can use to create apps, themes, and more at HubSpot.
+Usually you'll use the ${string} command, but we'll go ahead and make one now.`;
+            readonly dependenciesInstalled: "Dependencies installed successfully.";
+            readonly dependenciesNotInstalled: `Dependencies not installed. Remember to do this later with the command ${string} from the project directory.`;
             readonly uploadingProject: "Uploading your project to HubSpot...";
             readonly uploadSuccess: "Project uploaded successfully!";
             readonly developerOverviewLink: "Open this link to navigate to your HubSpot developer portal";
@@ -54,6 +57,7 @@ We'll start the process now.`;
         readonly errors: {
             readonly uploadFailed: "Failed to upload project to HubSpot.";
             readonly configFileNotFound: "Could not find project configuration for upload.";
+            readonly installDepsFailed: "Failed to install dependencies.";
         };
     };
     readonly completion: {
@@ -189,8 +193,11 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
     };
     readonly auth: {
-        readonly describe: (configName: string) => string;
+        readonly describe: "Configure authentication for your HubSpot account.";
+        readonly verboseDescribe: (configName: string, authMethod: string) => string;
         readonly errors: {
+            readonly invalidAccountIdProvided: "--account must be a number.";
+            readonly globalConfigFileExists: (accountAuthCommand: string) => string;
             readonly noConfigFileFound: "No config file was found. To create a new config file, use the \"hs init\" command.";
             readonly unsupportedAuthType: (type: string, supportedProtocols: string) => string;
         };
@@ -735,7 +742,8 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
     };
     readonly init: {
-        readonly describe: (configName: string) => string;
+        readonly describe: "Create a CLI config file and configure authentication for your HubSpot account.";
+        readonly verboseDescribe: (configName: string, command: string, authMethod: string) => string;
         readonly options: {
             readonly authType: {
                 readonly describe: "Authentication mechanism";
@@ -750,14 +758,16 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
         readonly success: {
             readonly configFileCreated: (configPath: string) => string;
-            readonly configFileUpdated: (account: string, authType: string) => string;
+            readonly configFileUpdated: (authType: string, account: string | number) => string;
         };
         readonly logs: {
             readonly updateConfig: "To update an existing config file, use the \"hs auth\" command.";
         };
         readonly errors: {
+            readonly invalidAccountIdProvided: "--account must be a number.";
             readonly configFileExists: (configPath: string) => string;
             readonly bothConfigFilesNotAllowed: (path: string) => string;
+            readonly globalConfigFileExists: `You are using our new global configuration for account management, which is not compatible with this command. Please use ${string} instead.`;
         };
     };
     readonly lint: {
@@ -1796,10 +1806,12 @@ ${string}`;
             readonly errors: {
                 readonly configFileNotFound: (configPath: string) => string;
                 readonly configFileParseFailed: (configPath: string) => string;
-                readonly failedToCreate: "Failed to create test account";
             };
-            readonly success: {
-                readonly configFileUpdated: (testAccountName: string, testAccountId: number) => string;
+            readonly polling: {
+                readonly start: (testAccountName: string) => string;
+                readonly syncing: "Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)";
+                readonly success: (testAccountName: string, testAccountId: number) => string;
+                readonly failure: "Failed to sync data into test account. The account may not be ready to use.";
             };
             readonly options: {
                 readonly configPath: "The path to the test account config";
@@ -2426,6 +2438,12 @@ ${string}`;
     };
 };
 export declare const lib: {
+    readonly parsing: {
+        readonly unableToParseStringToNumber: "Unable to parse string to number";
+    };
+    readonly configMiddleWare: {
+        readonly invalidAccountIdEnvironmentVariable: "Unable to parse `HUBSPOT_ACCOUNT_ID` environment variable into a number";
+    };
     readonly process: {
         readonly exitDebug: (signal: string) => string;
     };
@@ -2595,6 +2613,9 @@ Run ${string} to upgrade to version ${string}`;
                 readonly invalidAuthDistCombo: (authType: string, distribution: string) => string;
             };
         };
+        readonly add: {
+            readonly nothingAdded: "No features added.";
+        };
         readonly validateProjectConfig: {
             readonly configNotFound: `Unable to locate a project configuration file. Try running again from a project directory, or run ${string} to create a new project.`;
             readonly configMissingFields: "The project configuration file is missing required fields.";
@@ -2770,31 +2791,18 @@ Run ${string} to upgrade to version ${string}`;
     };
     readonly commonOpts: {
         readonly options: {
-            readonly account: {
-                readonly describe: "HubSpot account id or name from config";
-            };
-            readonly config: {
-                readonly describe: "Path to a config file";
-            };
-            readonly overwrite: {
-                readonly describe: "Overwrite existing files";
-            };
+            readonly account: "HubSpot account id or name from config";
+            readonly config: "Path to a config file";
+            readonly overwrite: "Overwrite existing files";
             readonly modes: {
-                readonly describe: {
-                    readonly default: (modes: string) => string;
-                    readonly read: (modes: string) => string;
-                    readonly write: (modes: string) => string;
-                };
-            };
-            readonly qa: {
-                readonly describe: "Run command in QA mode";
-            };
-            readonly useEnv: {
-                readonly describe: "Use environment variable config";
-            };
-            readonly debug: {
-                readonly describe: "Set log level to debug";
+                readonly default: (modes: string) => string;
+                readonly read: (modes: string) => string;
+                readonly write: (modes: string) => string;
             };
+            readonly qa: "Run command in QA mode";
+            readonly useEnv: "Use environment variable config";
+            readonly jsonOutput: "Format output as JSON";
+            readonly debug: "Set log level to debug";
         };
     };
     readonly configMigrate: {
@@ -2918,16 +2926,20 @@ Run ${string} to upgrade to version ${string}`;
                 readonly languageRequired: "Please select API sample app's language";
             };
         };
-        readonly createProjectPrompt: {
+        readonly projectNameAndDestPrompt: {
             readonly enterName: "[--name] Give your project a name: ";
             readonly enterDest: "[--dest] Enter the folder to create the project in:";
-            readonly selectTemplate: "[--template] Choose a project template: ";
-            readonly features: "[--features] Which features would you like your app to include?";
             readonly errors: {
                 readonly nameRequired: "A project name is required";
                 readonly destRequired: "A project dest is required";
                 readonly invalidDest: "There is an existing project at this destination. Please provide a new path for this project.";
                 readonly invalidCharacters: "The selected destination contains invalid characters. Please provide a new path and try again.";
+            };
+        };
+        readonly selectProjectTemplatePrompt: {
+            readonly selectTemplate: "[--template] Choose a project template: ";
+            readonly features: "[--features] Which features would you like your app to include?";
+            readonly errors: {
                 readonly invalidTemplate: (template: string) => string;
                 readonly projectTemplateRequired: "Project template is required when projectTemplates is provided";
             };
@@ -3032,6 +3044,9 @@ Run ${string} to upgrade to version ${string}`;
             };
         };
     };
+    readonly polling: {
+        readonly timeoutError: (timeoutMs: number) => string;
+    };
     readonly convertFields: {
         readonly positionals: {
             readonly src: {

package/lang/en.js

@@ -42,7 +42,7 @@ exports.commands = {
         openDesignManagerPrompt: 'Open Design Manager in your browser?',
         openedDesignManager: 'Redirected to Design Manager!',
         developerOverviewBrowserOpenPrep: "We'll take you to your HubSpot account and walk you through installing and previewing your new app.",
-        openDeveloperOverviewPrompt: 'Open HubSpot to go to your account?',
+        openInstallUrl: 'Open HubSpot to install your app in your account?',
         openedDeveloperOverview: 'HubSpot opened!',
         prompts: {
             selectOption: 'Are you looking to build apps or CMS?',
@@ -50,14 +50,17 @@ exports.commands = {
                 app: 'App',
                 cms: 'CMS',
             },
+            installDependencies: 'Would you like to install dependencies now?',
             uploadProject: 'Would you like to upload your project to HubSpot now?',
-            appSelected: `We'll create a new project with a sample app for you.\nProjects are what you can use to create apps, themes, and more at HubSpot.\nUsually you'll use the ${(0, ui_1.uiCommandReference)('hs project create')} command, but we'll go ahead and make one now.`,
             projectCreated: {
                 title: chalk_1.default.bold('Next steps:'),
-                description: `Upload your project to HubSpot - typically, you'll use the command ${(0, ui_1.uiCommandReference)('hs project upload')} for this.\nWe'll start the process now.`,
+                description: `Let's prepare and upload your project to HubSpot.\nYou can use ${(0, ui_1.uiCommandReference)('hs project install-deps')} to ${chalk_1.default.bold('install dependencies')} and ${(0, ui_1.uiCommandReference)('hs project upload')} to ${chalk_1.default.bold('upload')} your project.`,
             },
         },
         logs: {
+            appSelected: `We'll create a new project with a sample app for you.\nProjects are what you can use to create apps, themes, and more at HubSpot.\nUsually you'll use the ${(0, ui_1.uiCommandReference)('hs project create')} command, but we'll go ahead and make one now.`,
+            dependenciesInstalled: 'Dependencies installed successfully.',
+            dependenciesNotInstalled: `Dependencies not installed. Remember to do this later with the command ${(0, ui_1.uiCommandReference)('hs project install-deps')} from the project directory.`,
             uploadingProject: 'Uploading your project to HubSpot...',
             uploadSuccess: 'Project uploaded successfully!',
             developerOverviewLink: 'Open this link to navigate to your HubSpot developer portal',
@@ -65,6 +68,7 @@ exports.commands = {
         errors: {
             uploadFailed: 'Failed to upload project to HubSpot.',
             configFileNotFound: 'Could not find project configuration for upload.',
+            installDepsFailed: 'Failed to install dependencies.',
         },
     },
     completion: {
@@ -196,8 +200,11 @@ exports.commands = {
         },
     },
     auth: {
-        describe: (configName) => `Configure authentication for your HubSpot account. This will update the ${configName} file that stores your account information.`,
+        describe: 'Configure authentication for your HubSpot account.',
+        verboseDescribe: (configName, authMethod) => `Configure authentication for a HubSpot account. This will update the ${configName} file that stores your account information.\n\nThe recommended authentication method is ${chalk_1.default.bold(authMethod)}, which uses an access token tied to a specific user account.`,
         errors: {
+            invalidAccountIdProvided: `--account must be a number.`,
+            globalConfigFileExists: (accountAuthCommand) => `You are using our new global configuration for account management, which is not compatible with this command. Please use ${(0, ui_1.uiCommandReference)(accountAuthCommand)} instead.`,
             noConfigFileFound: 'No config file was found. To create a new config file, use the "hs init" command.',
             unsupportedAuthType: (type, supportedProtocols) => `Unsupported auth type: ${type}. The only supported authentication protocols are ${supportedProtocols}.`,
         },
@@ -744,7 +751,8 @@ exports.commands = {
         },
     },
     init: {
-        describe: (configName) => `Configure authentication for your HubSpot account. This will create a ${configName} file to store your account information.`,
+        describe: 'Create a CLI config file and configure authentication for your HubSpot account.',
+        verboseDescribe: (configName, command, authMethod) => `Configure authentication for a HubSpot account. This will create a ${configName} file to store your account information. To configure authentication for additional accounts, run ${command}.\n\nThe recommended authentication method is ${chalk_1.default.bold(authMethod)}, which uses an access token tied to a specific user account.`,
         options: {
             authType: {
                 describe: 'Authentication mechanism',
@@ -759,14 +767,16 @@ exports.commands = {
         },
         success: {
             configFileCreated: (configPath) => `Created config file "${configPath}"`,
-            configFileUpdated: (account, authType) => `Connected account "${account}" using "${authType}" and set it as the default account`,
+            configFileUpdated: (authType, account) => `Connected account "${account}" using "${authType}" and set it as the default account`,
         },
         logs: {
             updateConfig: 'To update an existing config file, use the "hs auth" command.',
         },
         errors: {
+            invalidAccountIdProvided: `--account must be a number.`,
             configFileExists: (configPath) => `The config file ${configPath} already exists.`,
             bothConfigFilesNotAllowed: (path) => `Unable to create config file, because there is an existing one at "${path}". To create a new config file, delete the existing one and try again.`,
+            globalConfigFileExists: `You are using our new global configuration for account management, which is not compatible with this command. Please use ${(0, ui_1.uiCommandReference)('hs account auth')} instead.`,
         },
     },
     lint: {
@@ -1794,10 +1804,12 @@ exports.commands = {
             errors: {
                 configFileNotFound: (configPath) => `No test account config file exists at ${configPath}. Create a test account config file with the ${(0, ui_1.uiCommandReference)('hs test-account create-config')} command.`,
                 configFileParseFailed: (configPath) => `Failed to parse test account config file at ${configPath}`,
-                failedToCreate: 'Failed to create test account',
             },
-            success: {
-                configFileUpdated: (testAccountName, testAccountId) => `Test account "${testAccountName}" successfully created with id ${testAccountId}`,
+            polling: {
+                start: (testAccountName) => `Creating test account "${chalk_1.default.bold(testAccountName)}"...`,
+                syncing: 'Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)',
+                success: (testAccountName, testAccountId) => `Test account "${chalk_1.default.bold(testAccountName)}" successfully created with id: ${chalk_1.default.bold(testAccountId)}`,
+                failure: 'Failed to sync data into test account. The account may not be ready to use.',
             },
             options: {
                 configPath: 'The path to the test account config',
@@ -2424,6 +2436,12 @@ exports.commands = {
     },
 };
 exports.lib = {
+    parsing: {
+        unableToParseStringToNumber: 'Unable to parse string to number',
+    },
+    configMiddleWare: {
+        invalidAccountIdEnvironmentVariable: 'Unable to parse `HUBSPOT_ACCOUNT_ID` environment variable into a number',
+    },
     process: {
         exitDebug: (signal) => `Attempting to gracefully exit. Triggered by ${signal}`,
     },
@@ -2592,6 +2610,9 @@ exports.lib = {
                 invalidAuthDistCombo: (authType, distribution) => `Invalid distribution and auth combination. Apps with distribution '${distribution}' must have auth '${authType}'`,
             },
         },
+        add: {
+            nothingAdded: 'No features added.',
+        },
         validateProjectConfig: {
             configNotFound: `Unable to locate a project configuration file. Try running again from a project directory, or run ${(0, ui_1.uiCommandReference)('hs project create')} to create a new project.`,
             configMissingFields: 'The project configuration file is missing required fields.',
@@ -2765,31 +2786,18 @@ exports.lib = {
     },
     commonOpts: {
         options: {
-            account: {
-                describe: 'HubSpot account id or name from config',
-            },
-            config: {
-                describe: 'Path to a config file',
-            },
-            overwrite: {
-                describe: 'Overwrite existing files',
-            },
+            account: 'HubSpot account id or name from config',
+            config: 'Path to a config file',
+            overwrite: 'Overwrite existing files',
             modes: {
-                describe: {
-                    default: (modes) => `${modes}`,
-                    read: (modes) => `Read from ${modes}`,
-                    write: (modes) => `Write to ${modes}`,
-                },
-            },
-            qa: {
-                describe: 'Run command in QA mode',
-            },
-            useEnv: {
-                describe: 'Use environment variable config',
-            },
-            debug: {
-                describe: 'Set log level to debug',
+                default: (modes) => `${modes}`,
+                read: (modes) => `Read from ${modes}`,
+                write: (modes) => `Write to ${modes}`,
             },
+            qa: 'Run command in QA mode',
+            useEnv: 'Use environment variable config',
+            jsonOutput: 'Format output as JSON',
+            debug: 'Set log level to debug',
         },
     },
     configMigrate: {
@@ -2913,16 +2921,20 @@ exports.lib = {
                 languageRequired: "Please select API sample app's language",
             },
         },
-        createProjectPrompt: {
+        projectNameAndDestPrompt: {
             enterName: '[--name] Give your project a name: ',
             enterDest: '[--dest] Enter the folder to create the project in:',
-            selectTemplate: '[--template] Choose a project template: ',
-            features: '[--features] Which features would you like your app to include?',
             errors: {
                 nameRequired: 'A project name is required',
                 destRequired: 'A project dest is required',
                 invalidDest: 'There is an existing project at this destination. Please provide a new path for this project.',
                 invalidCharacters: 'The selected destination contains invalid characters. Please provide a new path and try again.',
+            },
+        },
+        selectProjectTemplatePrompt: {
+            selectTemplate: '[--template] Choose a project template: ',
+            features: '[--features] Which features would you like your app to include?',
+            errors: {
                 invalidTemplate: (template) => `[--template] Could not find template "${template}". Please choose an available template:`,
                 projectTemplateRequired: 'Project template is required when projectTemplates is provided',
             },
@@ -3027,6 +3039,9 @@ exports.lib = {
             },
         },
     },
+    polling: {
+        timeoutError: (timeoutMs) => `Polling timed out after ${timeoutMs}ms.`,
+    },
     convertFields: {
         positionals: {
             src: {

package/lang/en.lyaml

@@ -1158,6 +1158,8 @@ en:
           describe: "Use environment variable config"
         debug:
           describe: "Set log level to debug"
+        jsonOutput:
+          describe: "Format output as JSON"
     prompts:
       projectDevTargetAccountPrompt:
         createNewSandboxOption: "<Test on a new development sandbox>"

package/lib/accountTypes.d.ts

@@ -5,4 +5,5 @@ export declare function isStandardSandbox(accountConfig: CLIAccount): boolean;
 export declare function isDevelopmentSandbox(accountConfig: CLIAccount): boolean;
 export declare function isDeveloperTestAccount(accountConfig: CLIAccount): boolean;
 export declare function isAppDeveloperAccount(accountConfig: CLIAccount): boolean;
+export declare function isTestAccountOrSandbox(accountConfig: CLIAccount): boolean;
 export declare function isUnifiedAccount(account: CLIAccount): Promise<boolean>;

package/lib/accountTypes.js

@@ -6,33 +6,44 @@ exports.isStandardSandbox = isStandardSandbox;
 exports.isDevelopmentSandbox = isDevelopmentSandbox;
 exports.isDeveloperTestAccount = isDeveloperTestAccount;
 exports.isAppDeveloperAccount = isAppDeveloperAccount;
+exports.isTestAccountOrSandbox = isTestAccountOrSandbox;
 exports.isUnifiedAccount = isUnifiedAccount;
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const hasFeature_1 = require("./hasFeature");
 const constants_1 = require("./constants");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 function isAccountType(accountConfig, accountType) {
-    return (Boolean(accountConfig.accountType) &&
-        accountConfig.accountType === accountType);
+    return Boolean(accountConfig.accountType && accountType.includes(accountConfig.accountType));
 }
 function isStandardAccount(accountConfig) {
-    return isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD);
+    return isAccountType(accountConfig, [config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD]);
 }
 function isSandbox(accountConfig) {
-    return (isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) ||
-        isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX));
+    return isAccountType(accountConfig, [
+        config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
+        config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    ]);
 }
 function isStandardSandbox(accountConfig) {
-    return isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX);
+    return isAccountType(accountConfig, [config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX]);
 }
 function isDevelopmentSandbox(accountConfig) {
-    return isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
+    return isAccountType(accountConfig, [
+        config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    ]);
 }
 function isDeveloperTestAccount(accountConfig) {
-    return isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST);
+    return isAccountType(accountConfig, [config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]);
 }
 function isAppDeveloperAccount(accountConfig) {
-    return isAccountType(accountConfig, config_1.HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER);
+    return isAccountType(accountConfig, [config_1.HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER]);
+}
+function isTestAccountOrSandbox(accountConfig) {
+    return isAccountType(accountConfig, [
+        config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
+        config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
+        config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    ]);
 }
 async function isUnifiedAccount(account) {
     const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(account);

package/lib/app/migrate_legacy.js

@@ -18,7 +18,7 @@ const ui_1 = require("../ui");
 const lang_1 = require("../lang");
 const accountTypes_1 = require("../accountTypes");
 const selectPublicAppForMigrationPrompt_1 = require("../prompts/selectPublicAppForMigrationPrompt");
-const createProjectPrompt_1 = require("../prompts/createProjectPrompt");
+const projectNameAndDestPrompt_1 = require("../prompts/projectNameAndDestPrompt");
 const ensureProjectExists_1 = require("../projects/ensureProjectExists");
 const usageTracking_1 = require("../usageTracking");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
@@ -58,8 +58,7 @@ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
         (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
-    const { name: projectName, dest: projectDest } = createProjectPromptResponse;
+    const { name: projectName, dest: projectDest } = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(options);
     const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectName, {
         allowCreate: false,
         noLogs: true,

package/lib/app/urls.d.ts

@@ -2,7 +2,7 @@ import { Environment } from '@hubspot/local-dev-lib/types/Config';
 type PrivateAppInstallUrlArgs = {
     targetAccountId: number;
     env: Environment;
-    appId: string;
+    appId: number;
 };
 type PublicAppInstallUrlArgs = {
     targetAccountId: number;

package/lib/commonOpts.d.ts

@@ -11,10 +11,12 @@ export declare function addCmsPublishModeOptions(yargs: Argv, { read, write }: {
 }): Argv;
 export declare function addTestingOptions(yargs: Argv): Argv;
 export declare function addUseEnvironmentOptions(yargs: Argv): Argv;
+export declare function addJSONOutputOptions(yargs: Argv): Argv;
 export declare function addCustomHelpOutput(yargs: Argv, command: string | string[], describe?: string): Promise<void>;
 export declare function setLogLevel(options: Arguments<{
     debug?: boolean;
     networkDebug?: boolean;
+    json?: boolean;
 }>): void;
 export declare function getCommandName(argv: Arguments): string;
 export declare function getCmsPublishMode(options: Arguments<{