@hubspot/cli 7.9.0 → 7.10.0-beta.1

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. Unprovided tiers default to ENTERPRISE. Choices: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('ops-level', {
+                type: 'string',
+                description: 'Operations Hub tier. Unprovided tiers default to ENTERPRISE. Choices: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('service-level', {
+                type: 'string',
+                description: 'Service Hub tier. Unprovided tiers default to ENTERPRISE. Choices: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('sales-level', {
+                type: 'string',
+                description: 'Sales Hub tier. Unprovided tiers default to ENTERPRISE. Choices: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('content-level', {
+                type: 'string',
+                description: 'CMS Hub tier. Unprovided tiers default to ENTERPRISE. Choices: 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 create --config-path ./test-account-config.json',
-            commands.testAccount.create.example('./test-account-config.json'),
+            '$0 test-account create --config-path ./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;