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

package/commands/account/__tests__/rename.test.js

@@ -1,13 +1,20 @@
 import yargs from 'yargs';
 import { addConfigOptions, addAccountOptions, } from '../../../lib/commonOpts.js';
 import accountRenameCommand from '../rename.js';
+import * as config from '@hubspot/local-dev-lib/config';
+import { logError } from '../../../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 vi.mock('../../../lib/commonOpts');
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../../lib/errorHandlers/index.js');
 const positionalSpy = vi
     .spyOn(yargs, 'positional')
     .mockReturnValue(yargs);
 const exampleSpy = vi
     .spyOn(yargs, 'example')
     .mockReturnValue(yargs);
+const renameAccountSpy = vi.spyOn(config, 'renameAccount');
+const processExitSpy = vi.spyOn(process, 'exit');
 describe('commands/account/rename', () => {
     const yargsMock = yargs;
     describe('command', () => {
@@ -20,6 +27,34 @@ describe('commands/account/rename', () => {
             expect(accountRenameCommand.describe).toBeDefined();
         });
     });
+    describe('handler', () => {
+        let args;
+        beforeEach(() => {
+            vi.clearAllMocks();
+            renameAccountSpy.mockResolvedValue(undefined);
+            processExitSpy.mockImplementation(() => {
+                throw new Error('process.exit called');
+            });
+            args = {
+                accountName: 'myExistingAccountName',
+                newName: 'myNewAccountName',
+            };
+        });
+        it('should rename the account', async () => {
+            await expect(accountRenameCommand.handler(args)).rejects.toThrow('process.exit called');
+            expect(renameAccountSpy).toHaveBeenCalledWith('myExistingAccountName', 'my-new-account-name');
+            expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
+        });
+        it('should handle errors when renameAccount throws', async () => {
+            const error = new Error('Failed to rename account');
+            renameAccountSpy.mockRejectedValue(error);
+            await expect(accountRenameCommand.handler(args)).rejects.toThrow('process.exit called');
+            expect(renameAccountSpy).toHaveBeenCalledWith('myExistingAccountName', 'my-new-account-name');
+            expect(logError).toHaveBeenCalledTimes(1);
+            expect(logError).toHaveBeenCalledWith(error);
+            expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+        });
+    });
     describe('builder', () => {
         it('should support the correct options', () => {
             accountRenameCommand.builder(yargsMock);

package/commands/account/rename.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
-type AccountRenameArgs = CommonArgs & ConfigArgs & {
+export type AccountRenameArgs = CommonArgs & ConfigArgs & {
     accountName: string;
     newName: string;
 };

package/commands/account/rename.js

@@ -5,19 +5,22 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { toKebabCase } from '@hubspot/local-dev-lib/text';
 const command = 'rename <account-name> <new-name>';
 const describe = commands.account.subcommands.rename.describe;
 async function handler(args) {
     const { accountName, newName, derivedAccountId } = args;
     trackCommandUsage('accounts-rename', undefined, derivedAccountId);
+    const newNameKebabCase = toKebabCase(newName);
+    const nameWasSanitized = newNameKebabCase !== newName;
     try {
-        await renameAccount(accountName, newName);
+        await renameAccount(accountName, newNameKebabCase);
     }
     catch (error) {
         logError(error);
         process.exit(EXIT_CODES.ERROR);
     }
-    uiLogger.log(commands.account.subcommands.rename.success.renamed(accountName, newName));
+    uiLogger.success(commands.account.subcommands.rename.success.renamed(accountName, newNameKebabCase, nameWasSanitized));
     process.exit(EXIT_CODES.SUCCESS);
 }
 function accountRenameBuilder(yargs) {

package/commands/config/set.js

@@ -22,7 +22,7 @@ async function selectOptions() {
                 },
                 { name: 'Allow usage tracking', value: { allowUsageTracking: '' } },
                 { name: 'HTTP timeout', value: { httpTimeout: '' } },
-                // TODO enable when we unhide this option { name: 'Allow auto updates', value: { allowAutoUpdates: '' } },
+                { name: 'Allow auto updates', value: { allowAutoUpdates: '' } },
             ],
         },
     ]);
@@ -94,7 +94,6 @@ function configSetBuilder(yargs) {
         'allow-auto-updates': {
             describe: commands.config.subcommands.set.options.allowAutoUpdates.describe,
             type: 'boolean',
-            hidden: true,
         },
         'auto-open-browser': {
             describe: commands.config.subcommands.set.options.autoOpenBrowser.describe,

package/commands/getStarted.js

@@ -11,7 +11,7 @@ import { promptUser } from '../lib/prompts/promptUtils.js';
 import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPrompt.js';
 import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib/ui/index.js';
 import { uiLogger } from '../lib/ui/logger.js';
-import { debugError } from '../lib/errorHandlers/index.js';
+import { debugError, logError } from '../lib/errorHandlers/index.js';
 import { handleProjectUpload } from '../lib/projects/upload.js';
 import { PROJECT_CONFIG_FILE, GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../lib/constants.js';
 import { writeProjectConfig, getProjectConfig, validateProjectConfig, } from '../lib/projects/config.js';
@@ -162,7 +162,13 @@ async function handler(args) {
                     uiLogger.error(commands.getStarted.errors.configFileNotFound);
                     process.exit(EXIT_CODES.ERROR);
                 }
-                validateProjectConfig(newProjectConfig, newProjectDir);
+                try {
+                    validateProjectConfig(newProjectConfig, newProjectDir);
+                }
+                catch (error) {
+                    logError(error);
+                    process.exit(EXIT_CODES.ERROR);
+                }
                 uiLogger.log(' ');
                 uiLogger.log(commands.getStarted.logs.uploadingProject);
                 uiLogger.log(' ');

package/commands/hubdb.d.ts

@@ -1,5 +1,5 @@
 import { YargsCommandModuleBucket } from '../types/Yargs.js';
 export declare const command = "hubdb";
-export declare const describe: "Commands for managing HubDB tables.";
+export declare const describe: string;
 declare const hubdbCommand: YargsCommandModuleBucket;
 export default hubdbCommand;

package/commands/project/dev/index.js

@@ -10,6 +10,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { loadProfile, exitIfUsingProfiles, } from '../../../lib/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'dev';
 const describe = commands.project.dev.describe;
 function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
@@ -26,7 +27,13 @@ function validateAccountFlags(testingAccount, projectAccount, userProvidedAccoun
 async function handler(args) {
     const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     const useV2Projects = isV2Project(projectConfig.platformVersion);
     if (!projectDir) {
         uiLogger.error(commands.project.dev.errors.noProjectConfig);

package/commands/project/listBuilds.js

@@ -68,7 +68,13 @@ async function handler(args) {
     let projectName = projectFlagValue;
     if (!projectName) {
         const { projectConfig, projectDir } = await getProjectConfig();
-        validateProjectConfig(projectConfig, projectDir);
+        try {
+            validateProjectConfig(projectConfig, projectDir);
+        }
+        catch (error) {
+            logError(error);
+            process.exit(EXIT_CODES.ERROR);
+        }
         projectName = projectConfig.name;
     }
     try {

package/commands/project/upload.js

@@ -20,7 +20,13 @@ async function handler(args) {
     const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     let targetAccountId;
     if (isV2Project(projectConfig.platformVersion)) {
         targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);

package/commands/project/validate.js

@@ -23,7 +23,13 @@ async function handler(args) {
         uiLogger.error(commands.project.validate.badVersion);
         process.exit(EXIT_CODES.ERROR);
     }
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     let targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = getAccountConfig(targetAccountId);

package/commands/project/watch.js

@@ -58,7 +58,13 @@ async function handler(args) {
     const { initialUpload, derivedAccountId } = args;
     trackCommandUsage('project-watch', undefined, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
         return process.exit(EXIT_CODES.ERROR);
@@ -67,7 +73,6 @@ async function handler(args) {
         uiLogger.error(projectConfig.platformVersion);
         return process.exit(EXIT_CODES.ERROR);
     }
-    validateProjectConfig(projectConfig, projectDir);
     try {
         const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;

package/commands/testAccount/__tests__/create.test.js

@@ -1,6 +1,7 @@
 import yargs from 'yargs';
 import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, addJSONOutputOptions, } from '../../../lib/commonOpts.js';
 import testAccountCreateCommand from '../create.js';
+import { ACCOUNT_LEVEL_CHOICES } from '../../../lib/constants.js';
 vi.mock('../../../lib/commonOpts');
 describe('commands/testAccount/create', () => {
     const yargsMock = yargs;
@@ -29,5 +30,72 @@ describe('commands/testAccount/create', () => {
             expect(addJSONOutputOptions).toHaveBeenCalledTimes(1);
             expect(addJSONOutputOptions).toHaveBeenCalledWith(yargsMock);
         });
+        it('should add account-name option', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.option).toHaveBeenCalledWith('name', {
+                type: 'string',
+                description: 'Name for the test account',
+            });
+        });
+        it('should add description option', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.option).toHaveBeenCalledWith('description', {
+                type: 'string',
+                description: 'Description for the test account',
+            });
+        });
+        it('should add hub level options', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.option).toHaveBeenCalledWith('marketing-level', {
+                type: 'string',
+                description: 'Marketing Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('ops-level', {
+                type: 'string',
+                description: 'Operations Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('service-level', {
+                type: 'string',
+                description: 'Service Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('sales-level', {
+                type: 'string',
+                description: 'Sales Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('content-level', {
+                type: 'string',
+                description: 'CMS Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+        });
+        it('should add examples for all usage scenarios', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.example).toHaveBeenCalledWith([
+                [
+                    '$0 test-account create',
+                    'Interactive mode - prompts for all options',
+                ],
+                [
+                    '$0 test-account create --name "MyTestAccount"',
+                    'Provide name via flag, prompt for description and tier selection',
+                ],
+                [
+                    '$0 test-account create --name "MyTestAccount" --description "Test account"',
+                    'Provide name and description, prompt for tier selection',
+                ],
+                [
+                    '$0 test-account create --name "MyTestAccount" --marketing-level PROFESSIONAL',
+                    'Specify marketing tier, other tiers default to ENTERPRISE',
+                ],
+                [
+                    '$0 test-account create --config-path ./test-account-config.json',
+                    'Create from config file (mutually exclusive with other flags)',
+                ],
+            ]);
+        });
     });
 });

package/commands/testAccount/create.d.ts

@@ -1,6 +1,14 @@
+import { AccountLevel } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
 import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, YargsCommandModule, EnvironmentArgs, JSONOutputArgs } from '../../types/Yargs.js';
 type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & JSONOutputArgs & {
     configPath?: string;
+    name?: string;
+    description?: string;
+    marketingLevel?: AccountLevel;
+    opsLevel?: AccountLevel;
+    serviceLevel?: AccountLevel;
+    salesLevel?: AccountLevel;
+    contentLevel?: AccountLevel;
 };
 declare const createTestAccountCommand: YargsCommandModule<unknown, CreateTestAccountArgs>;
 export default createTestAccountCommand;

package/commands/testAccount/create.js

@@ -14,53 +14,83 @@ import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/create
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { createDeveloperTestAccountV2, saveAccountToConfig, } from '../../lib/buildAccount.js';
+import { ACCOUNT_LEVEL_CHOICES } from '../../lib/constants.js';
 const command = 'create';
 const describe = commands.testAccount.create.describe;
-async function handler(args) {
-    const { derivedAccountId, configPath, formatOutputAsJson } = args;
-    trackCommandUsage('test-account-create', {}, derivedAccountId);
-    const env = getValidEnv(getEnv(derivedAccountId));
-    let accountConfigPath = configPath;
-    let testAccountConfig;
-    if (!accountConfigPath) {
-        const createTestAccountFromConfig = await listPrompt(commands.testAccount.create.createTestAccountFromConfigPrompt, {
-            choices: [
-                {
-                    name: commands.testAccount.create.createFromConfigOption,
-                    value: true,
-                },
-                {
-                    name: commands.testAccount.create.createFromScratchOption,
-                    value: false,
-                },
-            ],
+function hasAnyFlags(args) {
+    const { name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, } = args;
+    return !!(name ||
+        description ||
+        marketingLevel ||
+        opsLevel ||
+        serviceLevel ||
+        salesLevel ||
+        contentLevel);
+}
+async function readConfigFile(configPath) {
+    const absoluteConfigPath = path.resolve(getCwd(), configPath);
+    if (!fileExists(absoluteConfigPath)) {
+        uiLogger.error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    try {
+        return JSON.parse(fs.readFileSync(absoluteConfigPath, 'utf8'));
+    }
+    catch (err) {
+        uiLogger.error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
+        process.exit(EXIT_CODES.ERROR);
+    }
+}
+async function promptForConfigPath() {
+    const createTestAccountFromConfig = await listPrompt(commands.testAccount.create.createTestAccountFromConfigPrompt, {
+        choices: [
+            {
+                name: commands.testAccount.create.createFromConfigOption,
+                value: true,
+            },
+            {
+                name: commands.testAccount.create.createFromScratchOption,
+                value: false,
+            },
+        ],
+    });
+    if (createTestAccountFromConfig) {
+        const configPathPromptResult = await promptUser({
+            name: 'configPath',
+            message: commands.testAccount.create.configPathPrompt,
+            type: 'input',
         });
-        if (createTestAccountFromConfig) {
-            const configPathPromptResult = await promptUser({
-                name: 'configPath',
-                message: commands.testAccount.create.configPathPrompt,
-                type: 'input',
-            });
-            accountConfigPath = configPathPromptResult.configPath;
-        }
+        return configPathPromptResult.configPath;
     }
-    if (accountConfigPath) {
-        const absoluteConfigPath = path.resolve(getCwd(), accountConfigPath);
-        if (!fileExists(absoluteConfigPath)) {
-            uiLogger.error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
-            process.exit(EXIT_CODES.ERROR);
-        }
-        try {
-            testAccountConfig = JSON.parse(fs.readFileSync(absoluteConfigPath, 'utf8'));
-        }
-        catch (err) {
-            uiLogger.error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
-            process.exit(EXIT_CODES.ERROR);
-        }
+    return undefined;
+}
+async function buildTestAccountConfig(args) {
+    const { configPath, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, } = args;
+    if (configPath) {
+        return readConfigFile(configPath);
     }
-    else {
-        testAccountConfig = await createDeveloperTestAccountConfigPrompt();
+    let accountConfigPath;
+    if (!hasAnyFlags(args)) {
+        accountConfigPath = await promptForConfigPath();
+    }
+    if (accountConfigPath) {
+        return readConfigFile(accountConfigPath);
     }
+    return createDeveloperTestAccountConfigPrompt({
+        name,
+        description,
+        marketingLevel,
+        opsLevel,
+        serviceLevel,
+        salesLevel,
+        contentLevel,
+    });
+}
+async function handler(args) {
+    const { derivedAccountId, formatOutputAsJson } = args;
+    trackCommandUsage('test-account-create', {}, derivedAccountId);
+    const env = getValidEnv(getEnv(derivedAccountId));
+    const testAccountConfig = await buildTestAccountConfig(args);
     const resultJson = {};
     SpinniesManager.init({
         succeedColor: 'white',
@@ -90,7 +120,12 @@ async function handler(args) {
     else {
         // Only save to config if not using json output
         try {
-            await saveAccountToConfig(resultJson.accountId, testAccountConfig.accountName, env, resultJson.personalAccessKey);
+            const savedAccountName = await saveAccountToConfig(resultJson.accountId, testAccountConfig.accountName, env, resultJson.personalAccessKey);
+            // Inform user if the account name was normalized
+            if (savedAccountName !== testAccountConfig.accountName) {
+                uiLogger.log('');
+                uiLogger.info(commands.testAccount.create.savedAccountNameDiffers(testAccountConfig.accountName, savedAccountName));
+            }
         }
         catch (e) {
             debugError(e);
@@ -105,10 +140,65 @@ function createTestAccountBuilder(yargs) {
         type: 'string',
         description: commands.testAccount.create.options.configPath,
     });
+    yargs.option('name', {
+        type: 'string',
+        description: commands.testAccount.create.options.accountName,
+    });
+    yargs.option('description', {
+        type: 'string',
+        description: commands.testAccount.create.options.description,
+    });
+    yargs.option('marketing-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.marketingLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('ops-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.opsLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('service-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.serviceLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('sales-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.salesLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('content-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.contentLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.conflicts('config-path', [
+        'name',
+        'description',
+        'marketing-level',
+        'ops-level',
+        'service-level',
+        'sales-level',
+        'content-level',
+    ]);
     yargs.example([
+        ['$0 test-account create', 'Interactive mode - prompts for all options'],
+        [
+            '$0 test-account create --name "MyTestAccount"',
+            'Provide name via flag, prompt for description and tier selection',
+        ],
+        [
+            '$0 test-account create --name "MyTestAccount" --description "Test account"',
+            'Provide name and description, prompt for tier selection',
+        ],
+        [
+            '$0 test-account create --name "MyTestAccount" --marketing-level PROFESSIONAL',
+            'Specify marketing tier, other tiers default to ENTERPRISE',
+        ],
         [
             '$0 test-account create --config-path ./test-account-config.json',
-            commands.testAccount.create.example('./test-account-config.json'),
+            'Create from config file (mutually exclusive with other flags)',
         ],
     ]);
     return yargs;

package/commands/testAccount/importData.d.ts

@@ -1,6 +1,6 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 export declare const command = "import-data";
-export declare const describe: "Import data into the CRM";
+export declare const describe: string;
 type CrmImportDataArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     filePath: string | undefined;
     skipConfirm: boolean | undefined;