@hubspot/cli 7.9.0-experimental.0 → 7.9.1-experimental.0

package/commands/testAccount/create.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser, listPrompt } from '../../lib/prompts/promptUtils.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(getConfigAccountEnvironment(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/delete.js

@@ -4,7 +4,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
-import { deleteAccount, getAccountConfig, getAccountId, getConfigPath, loadConfig, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { removeAccountFromConfig, getConfigAccountById, getConfigAccountIfExists, setConfigAccountAsDefault, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { debugError } from '../../lib/errorHandlers/index.js';
 const command = 'delete [test-account]';
@@ -64,12 +64,12 @@ async function deleteTestAccountFromConfig(testAccountId, parentAccountName, acc
         // If the account isn't in the local config then it wasn't auth'd on the local machine
         if (account && account.name && account.accountType) {
             // If the deleted test account was the default account, replace the default account with the parent account
-            loadConfig(getConfigPath()); // Get updated version of the config
-            const defaultAccountId = getAccountId(); // We need to get the current default accountId before delete the test account
-            await deleteAccount(account.name);
+            const defaultAccount = getConfigDefaultAccountIfExists();
+            const defaultAccountId = defaultAccount?.accountId;
+            removeAccountFromConfig(account.accountId);
             uiLogger.success(commands.testAccount.delete.success.testAccountDeletedFromConfig(testAccountId));
             if (testAccountId === defaultAccountId) {
-                updateDefaultAccount(parentAccountName);
+                setConfigAccountAsDefault(parentAccountName);
                 uiLogger.info(commands.testAccount.delete.info.replaceDefaultAccount(testAccountId, parentAccountName));
             }
         }
@@ -84,12 +84,12 @@ async function validateTestAccountConfigs(testAccountId) {
         uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const testAccountConfig = getAccountConfig(testAccountId);
+    const testAccountConfig = getConfigAccountById(testAccountId);
     if (!testAccountConfig) {
         uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const parentAccountConfig = getAccountConfig(testAccountConfig.parentAccountId);
+    const parentAccountConfig = getConfigAccountById(testAccountConfig.parentAccountId);
     if (!parentAccountConfig) {
         uiLogger.error(commands.testAccount.delete.errors.parentAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
@@ -103,7 +103,8 @@ async function handler(args) {
     let testAccountIdToDelete = 0;
     // See if the account exists
     if (testAccount) {
-        const accountId = getAccountId(testAccount);
+        const account = getConfigAccountIfExists(testAccount);
+        const accountId = account?.accountId || null;
         await validateTestAccountConfigs(accountId);
         if (accountId) {
             testAccountIdToDelete = accountId;

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;