@hubspot/cli 7.6.0-beta.3 → 7.6.0-beta.5

package/lib/projects/create/__tests__/legacy.test.js

@@ -0,0 +1,126 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const github = __importStar(require("@hubspot/local-dev-lib/api/github"));
+const exitCodes_1 = require("../../../enums/exitCodes");
+const legacy_1 = require("../legacy");
+const constants_1 = require("../../../constants");
+vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('@hubspot/local-dev-lib/api/github');
+const mockedFetchRepoFile = vi.mocked(github.fetchRepoFile);
+const repoConfig = {
+    [constants_1.PROJECT_COMPONENT_TYPES.COMPONENTS]: [
+        {
+            label: 'Component 1',
+            path: 'component1',
+            type: 'Component',
+        },
+    ],
+    [constants_1.PROJECT_COMPONENT_TYPES.PROJECTS]: [
+        {
+            name: 'project1',
+            label: 'Project 1',
+            path: 'project1',
+        },
+    ],
+};
+describe('lib/projects/create/legacy', () => {
+    describe('getProjectComponentListFromRepo()', () => {
+        it('returns a list of components', async () => {
+            // @ts-expect-error - Mocking AxiosResponse
+            mockedFetchRepoFile.mockResolvedValue({
+                data: repoConfig,
+            });
+            const components = await (0, legacy_1.getProjectComponentListFromRepo)('gh-ref');
+            expect(components).toEqual(repoConfig[constants_1.PROJECT_COMPONENT_TYPES.COMPONENTS]);
+        });
+        it('returns an empty list if no components are found', async () => {
+            mockedFetchRepoFile.mockRejectedValue(new Error('Not found'));
+            const components = await (0, legacy_1.getProjectComponentListFromRepo)('gh-ref');
+            expect(components).toEqual([]);
+        });
+    });
+    describe('getProjectTemplateListFromRepo()', () => {
+        let exitMock;
+        beforeEach(() => {
+            // @ts-expect-error - Mocking process.exit
+            exitMock = vi
+                .spyOn(process, 'exit')
+                .mockImplementation(() => undefined);
+        });
+        afterEach(() => {
+            exitMock.mockRestore();
+        });
+        it('returns a list of project templates', async () => {
+            // @ts-expect-error - Mocking AxiosResponse
+            mockedFetchRepoFile.mockResolvedValue({
+                data: repoConfig,
+            });
+            const templates = await (0, legacy_1.getProjectTemplateListFromRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
+            expect(templates).toEqual(repoConfig[constants_1.PROJECT_COMPONENT_TYPES.PROJECTS]);
+        });
+        it('Logs an error and exits the process if the request for the template list fails', async () => {
+            mockedFetchRepoFile.mockRejectedValue(new Error('Not found'));
+            await (0, legacy_1.getProjectTemplateListFromRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
+            expect(logger_1.logger.error).toHaveBeenCalledWith(expect.stringMatching(/Failed to fetch the config.json file from the target repository/));
+            expect(exitMock).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
+        });
+        it('Logs an error and exits the process if there are no projects listed in the repo config', async () => {
+            // @ts-expect-error - Mocking AxiosResponse
+            mockedFetchRepoFile.mockResolvedValue({});
+            await (0, legacy_1.getProjectTemplateListFromRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
+            expect(logger_1.logger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to find any projects in the target repository's config.json file/));
+            expect(exitMock).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
+        });
+        it('Logs an error and exits the process if any of the projects in the repo config are missing required properties', async () => {
+            // @ts-expect-error - Mocking AxiosResponse
+            mockedFetchRepoFile.mockResolvedValue({
+                data: {
+                    ...repoConfig,
+                    [constants_1.PROJECT_COMPONENT_TYPES.PROJECTS]: [
+                        {
+                            name: 'project1',
+                            label: 'Project 1',
+                        },
+                    ],
+                },
+            });
+            await (0, legacy_1.getProjectTemplateListFromRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
+            expect(logger_1.logger.error).toHaveBeenCalledWith(expect.stringMatching(/Found misconfigured projects in the target repository's config.json file/));
+            expect(exitMock).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
+        });
+    });
+});

package/lib/projects/create/__tests__/v3.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/projects/create/__tests__/v3.test.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const v3_1 = require("../v3");
+vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('@hubspot/local-dev-lib/api/github');
+describe('lib/projects/create/v3', () => {
+    describe('calculateComponentTemplateChoices()', () => {
+        const mockComponents = [
+            {
+                label: 'Module Component',
+                path: 'module',
+                type: 'module',
+                supportedAuthTypes: ['oauth'],
+                supportedDistributions: ['private'],
+            },
+            {
+                label: 'Card Component',
+                path: 'card',
+                type: 'card',
+                supportedAuthTypes: ['oauth', 'static'],
+                supportedDistributions: ['private', 'marketplace'],
+            },
+        ];
+        const mockProjectMetadataForChoices = {
+            hsMetaFiles: [],
+            components: {
+                module: { count: 0, maxCount: 5, hsMetaFiles: [] },
+                card: { count: 3, maxCount: 3, hsMetaFiles: [] },
+            },
+        };
+        it('returns enabled components when they meet all requirements', () => {
+            const choices = (0, v3_1.calculateComponentTemplateChoices)(mockComponents, 'oauth', 'private', mockProjectMetadataForChoices);
+            expect(choices).toHaveLength(3); // includes separator
+            expect(choices[0]).toEqual({
+                name: 'Module Component',
+                value: mockComponents[0],
+            });
+            expect(choices[2]).toEqual({
+                name: expect.stringContaining('Card Component'),
+                value: mockComponents[1],
+                disabled: expect.stringContaining('maximum'),
+            });
+        });
+        it('disables components when auth type is not supported', () => {
+            const choices = (0, v3_1.calculateComponentTemplateChoices)(mockComponents, 'privatekey', 'private', mockProjectMetadataForChoices);
+            // All components should be disabled, so they come after the separator
+            expect(choices[1]).toEqual({
+                name: expect.stringContaining('Module Component'),
+                value: mockComponents[0],
+                disabled: expect.stringContaining('privatekey'),
+            });
+        });
+        it('disables components when distribution is not supported', () => {
+            const choices = (0, v3_1.calculateComponentTemplateChoices)(mockComponents, 'oauth', 'enterprise', mockProjectMetadataForChoices);
+            // All components should be disabled, so they come after the separator
+            expect(choices[1]).toEqual({
+                name: expect.stringContaining('Module Component'),
+                value: mockComponents[0],
+                disabled: expect.stringContaining('enterprise'),
+            });
+        });
+        it('handles components without auth type or distribution restrictions', () => {
+            const componentsWithoutRestrictions = [
+                {
+                    label: 'Unrestricted Component',
+                    path: 'unrestricted',
+                    type: 'module',
+                },
+            ];
+            const choices = (0, v3_1.calculateComponentTemplateChoices)(componentsWithoutRestrictions, 'oauth', 'private', {
+                hsMetaFiles: [],
+                components: { module: { count: 0, maxCount: 5, hsMetaFiles: [] } },
+            });
+            expect(choices[0]).toEqual({
+                name: 'Unrestricted Component',
+                value: componentsWithoutRestrictions[0],
+            });
+        });
+    });
+});

package/lib/projects/create/v3.d.ts

@@ -1,3 +1,4 @@
+import { Separator } from '@inquirer/prompts';
 import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplateRepoConfig } from '../../../types/Projects';
 import { ProjectMetadata } from '@hubspot/project-parsing-lib/src/lib/project';
 import { SelectProjectTemplatePromptResponse } from '../../prompts/selectProjectTemplatePrompt';
@@ -7,13 +8,13 @@ export declare function createV3App(providedAuth: string | undefined, providedDi
     authType: string;
     distribution: string;
 }>;
-export declare function calculateComponentTemplateChoices(components: ComponentTemplate[], authType: string | undefined, distribution: string | undefined, projectMetadata?: ProjectMetadata): ComponentTemplateChoice[];
+export declare function calculateComponentTemplateChoices(components: ComponentTemplate[], authType: string | undefined, distribution: string | undefined, projectMetadata?: ProjectMetadata): (ComponentTemplateChoice | Separator)[];
 type V3ComponentInfo = {
     authType?: string;
     distribution?: string;
     repoConfig?: ProjectTemplateRepoConfig;
     projectContents?: string;
-    componentTemplateChoices?: ComponentTemplateChoice[];
+    componentTemplateChoices?: (ComponentTemplateChoice | Separator)[];
 };
 export declare function v3ComponentFlow(platformVersion: string, projectBase: string | undefined, providedAuth: string | undefined, providedDistribution: string | undefined): Promise<V3ComponentInfo>;
 export declare function generateComponentPaths({ selectProjectTemplatePromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }: {

package/lib/projects/create/v3.js

@@ -8,6 +8,7 @@ exports.createV3App = createV3App;
 exports.calculateComponentTemplateChoices = calculateComponentTemplateChoices;
 exports.v3ComponentFlow = v3ComponentFlow;
 exports.generateComponentPaths = generateComponentPaths;
+const prompts_1 = require("@inquirer/prompts");
 const constants_1 = require("../../constants");
 const en_1 = require("../../../lang/en");
 const promptUtils_1 = require("../../prompts/promptUtils");
@@ -17,7 +18,6 @@ const path_1 = __importDefault(require("path"));
 const legacy_1 = require("./legacy");
 const errorHandlers_1 = require("../../errorHandlers");
 const exitCodes_1 = require("../../enums/exitCodes");
-const inquirer = require('inquirer');
 exports.EMPTY_PROJECT = 'empty';
 exports.PROJECT_WITH_APP = 'app';
 async function createV3App(providedAuth, providedDistribution) {
@@ -96,7 +96,7 @@ function calculateComponentTemplateChoices(components, authType, distribution, p
         }
     });
     return disabledComponents.length
-        ? [...enabledComponents, new inquirer.Separator(), ...disabledComponents]
+        ? [...enabledComponents, new prompts_1.Separator(), ...disabledComponents]
         : [...enabledComponents];
 }
 async function v3ComponentFlow(platformVersion, projectBase, providedAuth, providedDistribution) {

package/lib/projects/localDev/DevServerManager.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const promptUtils_1 = require("../../prompts/promptUtils");
 const ui_extensions_dev_server_1 = require("@hubspot/ui-extensions-dev-server");
 const portManager_1 = require("@hubspot/local-dev-lib/portManager");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
@@ -71,7 +70,6 @@ class DevServerManager {
                 await serverInterface.setup({
                     components: compatibleComponents,
                     onUploadRequired,
-                    promptUser: promptUtils_1.promptUser,
                     logger: logger_1.logger,
                     urls: {
                         api: (0, urls_1.getHubSpotApiOrigin)(env),
@@ -122,4 +120,3 @@ class DevServerManager {
 }
 const Manager = new DevServerManager();
 exports.default = Manager;
-module.exports = Manager;

package/lib/projects/localDev/DevServerManagerV2.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const promptUtils_1 = require("../../prompts/promptUtils");
 const portManager_1 = require("@hubspot/local-dev-lib/portManager");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -40,7 +39,6 @@ class DevServerManagerV2 {
                 // @TODO: In the future, update UIE Dev Server to use LocalDevState
                 await serverInterface.setup({
                     components: this.localDevState.projectNodes,
-                    promptUser: promptUtils_1.promptUser,
                     logger: logger_1.logger,
                     urls: {
                         api: (0, urls_1.getHubSpotApiOrigin)(env),

package/lib/projects/localDev/helpers.d.ts

@@ -11,7 +11,7 @@ export declare function checkIfParentAccountIsAuthed(accountConfig: CLIAccount):
 export declare function checkIfAccountFlagIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): void;
 export declare function suggestRecommendedNestedAccount(accounts: CLIAccount[], accountConfig: CLIAccount, hasPublicApps: boolean): Promise<ProjectDevTargetAccountPromptResponse>;
 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 createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment, useV3?: boolean): 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, sendIR?: boolean, profile?: string): Promise<Build>;

package/lib/projects/localDev/helpers.js

@@ -152,7 +152,7 @@ async function createSandboxForLocalDev(accountId, accountConfig, env) {
     }
 }
 // Create a developer test account and return its accountId
-async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, env) {
+async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, env, useV3 = false) {
     let currentPortalCount = 0;
     let maxTestPortals = 10;
     try {
@@ -182,7 +182,7 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
             accountType: config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
         });
         (0, usageTracking_1.trackCommandMetadataUsage)('developer-test-account-create', { step: 'project-dev' }, accountId);
-        const result = await (0, buildAccount_1.buildDeveloperTestAccount)(name, accountConfig, env, maxTestPortals);
+        const result = await (0, buildAccount_1.buildDeveloperTestAccount)(name, accountConfig, env, maxTestPortals, useV3);
         return result;
     }
     catch (err) {

package/lib/projects/upload.js

@@ -25,7 +25,7 @@ const buildAndDeploy_1 = require("./buildAndDeploy");
 const exitCodes_1 = require("../enums/exitCodes");
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
-    const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
+    const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId) || `${accountId}`;
     SpinniesManager_1.default.add('upload', {
         text: en_1.lib.projectUpload.uploadProjectFiles.add(projectName, accountIdentifier),
         succeedColor: 'white',

package/lib/prompts/__tests__/downloadProjectPrompt.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/prompts/__tests__/downloadProjectPrompt.test.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("@hubspot/local-dev-lib/config");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
+const downloadProjectPrompt_1 = require("../downloadProjectPrompt");
+vi.mock('../promptUtils', () => ({
+    promptUser: vi.fn().mockResolvedValue({ project: 'test-project' }),
+}));
+vi.mock('@hubspot/local-dev-lib/api/projects', () => ({
+    fetchProjects: vi.fn().mockResolvedValue({
+        data: { results: [] },
+    }),
+}));
+vi.mock('@hubspot/local-dev-lib/config', () => ({
+    getAccountId: vi.fn().mockImplementation(() => 123456789),
+}));
+describe('lib/prompts/downloadProjectPrompt', () => {
+    it('should honor the account passed as an option', async () => {
+        const account = 'Prod';
+        await (0, downloadProjectPrompt_1.downloadProjectPrompt)({ account });
+        expect(config_1.getAccountId).toHaveBeenCalledTimes(1);
+        expect(config_1.getAccountId).toHaveBeenCalledWith(account);
+    });
+    it('should fetch the projects for the correct accountId', async () => {
+        const account = 'Prod';
+        await (0, downloadProjectPrompt_1.downloadProjectPrompt)({ account });
+        expect(projects_1.fetchProjects).toHaveBeenCalledTimes(1);
+        expect(projects_1.fetchProjects).toHaveBeenCalledWith(123456789);
+    });
+});

package/lib/prompts/__tests__/projectsLogsPrompt.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/prompts/__tests__/projectsLogsPrompt.test.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const projectsLogsPrompt_1 = require("../projectsLogsPrompt");
+const promptUtils_1 = require("../promptUtils");
+const chalk_1 = __importDefault(require("chalk"));
+vi.mock('../promptUtils');
+describe('lib/prompts/projectsLogsPrompt', () => {
+    it('should return undefined functionName when functionChoices is undefined', async () => {
+        const actual = await (0, projectsLogsPrompt_1.projectLogsPrompt)({ functionChoices: undefined });
+        expect(actual).toEqual({});
+        expect(promptUtils_1.promptUser).not.toHaveBeenCalled();
+    });
+    it('should return the functionName without prompting when there is only one functionChoice', async () => {
+        const functionChoice = 'this-is-the-only-function';
+        const { functionName } = await (0, projectsLogsPrompt_1.projectLogsPrompt)({
+            functionChoices: [functionChoice],
+        });
+        expect(functionName).toEqual(functionChoice);
+        expect(promptUtils_1.promptUser).not.toHaveBeenCalled();
+    });
+    it('should prompt the user if there is more than one choice', async () => {
+        const functionChoices = ['choice 1', 'choice 2'];
+        const projectName = 'my cool project';
+        await (0, projectsLogsPrompt_1.projectLogsPrompt)({
+            functionChoices,
+            projectName,
+        });
+        expect(promptUtils_1.promptUser).toHaveBeenCalledTimes(1);
+        expect(promptUtils_1.promptUser).toHaveBeenLastCalledWith(expect.arrayContaining([
+            expect.objectContaining({
+                name: 'functionName',
+                type: 'list',
+                message: `[--function] Select function in ${chalk_1.default.bold(projectName)} project`,
+                when: expect.any(Function),
+                choices: functionChoices,
+            }),
+        ]));
+    });
+});

package/lib/prompts/createDeveloperTestAccountConfigPrompt.d.ts

@@ -1,17 +1,18 @@
-import { DeveloperTestAccountConfig } from '@hubspot/local-dev-lib/types/developerTestAccounts';
+import { AccountLevel, DeveloperTestAccountConfig } from '@hubspot/local-dev-lib/types/developerTestAccounts';
 declare const hubs: {
-    readonly MARKETING: "marketingLevel";
-    readonly OPS: "opsLevel";
-    readonly SERVICE: "serviceLevel";
-    readonly SALES: "salesLevel";
-    readonly CONTENT: "contentLevel";
+    MARKETING: string;
+    OPS: string;
+    SERVICE: string;
+    SALES: string;
+    CONTENT: string;
 };
 type HubName = keyof typeof hubs;
-type HubTier = 'STARTER' | 'PROFESSIONAL' | 'ENTERPRISE';
-export type HubConfig = `${HubName}:${HubTier}`;
+export type HubConfig = {
+    hub: HubName;
+    tier: AccountLevel;
+};
 export declare function createDeveloperTestAccountConfigPrompt(args?: {
     name?: string;
     description?: string;
-    tiers?: HubConfig[];
-}): Promise<DeveloperTestAccountConfig>;
+}, supportFlags?: boolean): Promise<DeveloperTestAccountConfig>;
 export {};

package/lib/prompts/createDeveloperTestAccountConfigPrompt.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeveloperTestAccountConfigPrompt = createDeveloperTestAccountConfigPrompt;
+const prompts_1 = require("@inquirer/prompts");
 const en_1 = require("../../lang/en");
 const promptUtils_1 = require("./promptUtils");
 const hubs = {
@@ -10,63 +11,108 @@ const hubs = {
     SALES: 'salesLevel',
     CONTENT: 'contentLevel',
 };
+const AccountTiers = {
+    FREE: 'FREE',
+    STARTER: 'STARTER',
+    PROFESSIONAL: 'PROFESSIONAL',
+    ENTERPRISE: 'ENTERPRISE',
+};
+const makeHubTiers = (hubKey) => {
+    const hubTypeKey = hubKey.toLowerCase();
+    const hubName = en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.hubTypes[hubTypeKey];
+    return [
+        {
+            name: `${hubName} [${AccountTiers.FREE}]`,
+            value: { hub: hubKey, tier: AccountTiers.FREE },
+        },
+        {
+            name: `${hubName} [${AccountTiers.STARTER}]`,
+            value: { hub: hubKey, tier: AccountTiers.STARTER },
+        },
+        {
+            name: `${hubName} [${AccountTiers.PROFESSIONAL}]`,
+            value: { hub: hubKey, tier: AccountTiers.PROFESSIONAL },
+        },
+        {
+            name: `${hubName} [${AccountTiers.ENTERPRISE}]`,
+            value: { hub: hubKey, tier: AccountTiers.ENTERPRISE },
+        },
+    ];
+};
 const TEST_ACCOUNT_TIERS = [
-    { name: 'Marketing STARTER', value: 'MARKETING:STARTER' },
-    {
-        name: 'Marketing PROFESSIONAL',
-        value: 'MARKETING:PROFESSIONAL',
-    },
-    { name: 'Marketing ENTERPRISE', value: 'MARKETING:ENTERPRISE' },
-    promptUtils_1.Separator,
-    { name: 'Ops STARTER', value: 'OPS:STARTER' },
-    { name: 'Ops PROFESSIONAL', value: 'OPS:PROFESSIONAL' },
-    { name: 'Ops ENTERPRISE', value: 'OPS:ENTERPRISE' },
-    promptUtils_1.Separator,
-    { name: 'Service STARTER', value: 'SERVICE:STARTER' },
-    { name: 'Service PROFESSIONAL', value: 'SERVICE:PROFESSIONAL' },
-    { name: 'Service ENTERPRISE', value: 'SERVICE:ENTERPRISE' },
-    promptUtils_1.Separator,
-    { name: 'Sales STARTER', value: 'SALES:STARTER' },
-    { name: 'Sales PROFESSIONAL', value: 'SALES:PROFESSIONAL' },
-    { name: 'Sales ENTERPRISE', value: 'SALES:ENTERPRISE' },
-    promptUtils_1.Separator,
-    { name: 'Content STARTER', value: 'CONTENT:STARTER' },
-    { name: 'Content PROFESSIONAL', value: 'CONTENT:PROFESSIONAL' },
-    { name: 'Content ENTERPRISE', value: 'CONTENT:ENTERPRISE' },
-    promptUtils_1.Separator,
+    ...makeHubTiers('MARKETING'),
+    new prompts_1.Separator(),
+    ...makeHubTiers('OPS'),
+    new prompts_1.Separator(),
+    ...makeHubTiers('SERVICE'),
+    new prompts_1.Separator(),
+    ...makeHubTiers('SALES'),
+    new prompts_1.Separator(),
+    ...makeHubTiers('CONTENT'),
+    new prompts_1.Separator(),
 ];
-async function createDeveloperTestAccountConfigPrompt(args = {}) {
-    const { name, description, tiers } = args;
+async function createDeveloperTestAccountConfigPrompt(args = {}, supportFlags = true) {
+    const { name, description } = args;
     let accountName = name;
     let accountDescription = description;
-    let accountLevelsArray = tiers;
+    let accountLevelsArray = [];
     if (!accountName) {
         const namePromptResult = await (0, promptUtils_1.promptUser)({
             name: 'accountName',
-            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.namePrompt,
+            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.namePrompt(supportFlags),
             type: 'input',
+            validate: value => {
+                if (!value) {
+                    return en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.errors
+                        .nameRequired;
+                }
+                return true;
+            },
         });
         accountName = namePromptResult.accountName;
     }
     if (!accountDescription) {
         const descriptionPromptResult = await (0, promptUtils_1.promptUser)({
             name: 'description',
-            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.descriptionPrompt,
+            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.descriptionPrompt(supportFlags),
             type: 'input',
         });
         accountDescription = descriptionPromptResult.description;
     }
-    if (!accountLevelsArray) {
+    const useDefaultAccountLevelsPromptResult = await (0, promptUtils_1.promptUser)({
+        name: 'useDefaultAccountLevels',
+        message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt
+            .useDefaultAccountLevelsPrompt.message,
+        type: 'list',
+        choices: [
+            {
+                name: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt
+                    .useDefaultAccountLevelsPrompt.default,
+                value: 'default',
+            },
+            {
+                name: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt
+                    .useDefaultAccountLevelsPrompt.manual,
+                value: 'manual',
+            },
+        ],
+    });
+    if (useDefaultAccountLevelsPromptResult.useDefaultAccountLevels === 'manual') {
         const accountLevelsPromptResult = await (0, promptUtils_1.promptUser)({
             name: 'testAccountLevels',
             message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.tiersPrompt,
             type: 'checkbox',
+            pageSize: 13,
             choices: TEST_ACCOUNT_TIERS,
             validate: choices => {
-                if (choices?.length > 1) {
+                if (choices?.length < Object.keys(hubs).length) {
+                    return en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.errors
+                        .allHubsRequired;
+                }
+                else {
                     const hubMap = {};
                     for (const choice of choices) {
-                        const hub = choice.split(':')[0];
+                        const { hub } = choice.value;
                         if (hubMap[hub]) {
                             return en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.errors
                                 .tiersError;
@@ -79,11 +125,8 @@ async function createDeveloperTestAccountConfigPrompt(args = {}) {
         });
         accountLevelsArray = accountLevelsPromptResult.testAccountLevels;
     }
-    if (!accountLevelsArray) {
-        accountLevelsArray = [];
-    }
     const accountLevels = accountLevelsArray.reduce((acc, level) => {
-        const [hubName, hubTier] = level.split(':');
+        const { hub: hubName, tier: hubTier } = level;
         const hubLevel = hubs[hubName];
         acc[hubLevel] = hubTier;
         return acc;

package/lib/prompts/createModulePrompt.js

@@ -26,9 +26,8 @@ const CONTENT_TYPES_PROMPT = {
     type: 'checkbox',
     name: 'contentTypes',
     message: (0, lang_1.i18n)(`lib.prompts.createModulePrompt.selectContentType`),
-    default: ['ANY'],
     choices: [
-        { name: 'Any', value: 'ANY' },
+        { name: 'Any', value: 'ANY', checked: true },
         { name: 'Landing page', value: 'LANDING_PAGE' },
         { name: 'Site page', value: 'SITE_PAGE' },
         { name: 'Blog post', value: 'BLOG_POST' },

package/lib/prompts/projectAddPrompt.d.ts

@@ -1,3 +1,4 @@
+import { Separator } from '@inquirer/prompts';
 import { ComponentTemplate, ComponentTemplateChoice } from '../../types/Projects';
 type ProjectAddPromptResponse = {
     componentTemplate: ComponentTemplate;
@@ -10,5 +11,5 @@ export declare function projectAddPrompt(components: ComponentTemplate[], prompt
     name?: string;
     type?: string;
 }): Promise<ProjectAddPromptResponse>;
-export declare function projectAddPromptV3(components: ComponentTemplateChoice[], selectedFeatures: string[] | undefined): Promise<ProjectAddPromptResponseV3>;
+export declare function projectAddPromptV3(components: (ComponentTemplateChoice | Separator)[], selectedFeatures: string[] | undefined): Promise<ProjectAddPromptResponseV3>;
 export {};

package/lib/prompts/projectAddPrompt.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectAddPrompt = projectAddPrompt;
 exports.projectAddPromptV3 = projectAddPromptV3;
+const prompts_1 = require("@inquirer/prompts");
 const promptUtils_1 = require("./promptUtils");
 const en_1 = require("../../lang/en");
 function findComponentByPathOrLabel(components, componentPathOrLabel) {
@@ -51,7 +52,7 @@ async function projectAddPromptV3(components, selectedFeatures) {
     const selectedComponents = [];
     if (selectedFeatures) {
         components.forEach(template => {
-            if (!template.value) {
+            if (template instanceof prompts_1.Separator || !template.value) {
                 return;
             }
             if (selectedFeatures?.includes(template.value.type)) {