@hubspot/cli 7.7.16-experimental.2 → 7.7.16-experimental.4

package/commands/testAccount/create.js

@@ -15,6 +15,9 @@ 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) {
@@ -62,6 +65,13 @@ async function handler(args) {
         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);
         if (formatOutputAsJson) {
@@ -69,12 +79,31 @@ async function handler(args) {
             jsonOutput.accountId = data.id;
             jsonOutput.personalAccessKey = data.personalAccessKey;
         }
-        logger_1.uiLogger.success(en_1.commands.testAccount.create.success.configFileUpdated(data.accountName, data.id));
+        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: [],
+        }, 5000 // 5 seconds
+        );
+        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);
     }

package/lang/en.d.ts

@@ -189,8 +189,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 +738,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 +754,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: {
@@ -1492,6 +1498,21 @@ ${string}`;
     readonly app: {
         readonly describe: "Commands for managing apps.";
         readonly subcommands: {
+            readonly install: {
+                readonly describe: "Install an app.";
+                readonly options: {
+                    readonly appUid: "The uid of the app to install";
+                    readonly projectName: "The name of the project to install the app to";
+                    readonly testAccountId: "The id of the test account to install the app into";
+                };
+                readonly polling: {
+                    readonly start: "Installing app...";
+                    readonly success: "App installed successfully";
+                    readonly failure: "App installation failed";
+                    readonly error: "Error installing app";
+                };
+                readonly example: "Install the app with uid 1234567890 from the project named \"my-project\" into the target account";
+            };
             readonly secret: {
                 readonly describe: "Commands for managing secrets.";
                 readonly subcommands: {
@@ -1796,10 +1817,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 +2449,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 +2624,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.";
@@ -2905,16 +2937,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";
             };
@@ -3019,6 +3055,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

@@ -196,8 +196,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 +747,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 +763,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: {
@@ -1490,6 +1496,21 @@ exports.commands = {
     app: {
         describe: 'Commands for managing apps.',
         subcommands: {
+            install: {
+                describe: 'Install an app.',
+                options: {
+                    appUid: 'The uid of the app to install',
+                    projectName: 'The name of the project to install the app to',
+                    testAccountId: 'The id of the test account to install the app into',
+                },
+                polling: {
+                    start: 'Installing app...',
+                    success: 'App installed successfully',
+                    failure: 'App installation failed',
+                    error: 'Error installing app',
+                },
+                example: 'Install the app with uid 1234567890 from the project named "my-project" into the target account',
+            },
             secret: {
                 describe: 'Commands for managing secrets.',
                 subcommands: {
@@ -1794,10 +1815,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 +2447,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 +2621,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.',
@@ -2900,16 +2932,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',
             },
@@ -3014,6 +3050,9 @@ exports.lib = {
             },
         },
     },
+    polling: {
+        timeoutError: (timeoutMs) => `Polling timed out after ${timeoutMs}ms.`,
+    },
     convertFields: {
         positionals: {
             src: {

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/middleware/__test__/configMiddleware.test.js

@@ -109,7 +109,7 @@ describe('lib/middleware/configMiddleware', () => {
                 $0: 'hs',
             };
             await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
-            expect(argv.providedAccountId).toBeUndefined();
+            expect(argv.userProvidedAccount).toBeUndefined();
             expect(argv.derivedAccountId).toBe(123);
             expect(getAccountIdSpy).not.toHaveBeenCalled();
             process.env = originalEnv;
@@ -123,7 +123,7 @@ describe('lib/middleware/configMiddleware', () => {
                 $0: 'hs',
             };
             await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
-            expect(argv.providedAccountId).toBe('test-account');
+            expect(argv.userProvidedAccount).toBe('test-account');
             expect(argv.derivedAccountId).toBe(456);
             expect(getAccountIdSpy).toHaveBeenCalledWith('test-account');
         });

package/lib/middleware/configMiddleware.js

@@ -11,6 +11,9 @@ const exitCodes_1 = require("../enums/exitCodes");
 const lang_1 = require("../lang");
 const ui_1 = require("../ui");
 const utils_1 = require("./utils");
+const parsing_1 = require("../parsing");
+const logger_2 = require("../ui/logger");
+const en_1 = require("../../lang/en");
 function handleDeprecatedEnvVariables(argv) {
     // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
     // The HubSpot GH Deploy Action still uses HUBSPOT_PORTAL_ID
@@ -29,9 +32,14 @@ function handleDeprecatedEnvVariables(argv) {
 async function injectAccountIdMiddleware(argv) {
     const { account } = argv;
     // Preserves the original --account flag for certain commands.
-    argv.providedAccountId = account;
+    argv.userProvidedAccount = account;
     if (argv.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
-        argv.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+        try {
+            argv.derivedAccountId = (0, parsing_1.parseStringToNumber)(process.env.HUBSPOT_ACCOUNT_ID);
+        }
+        catch (err) {
+            logger_2.uiLogger.error(en_1.lib.configMiddleWare.invalidAccountIdEnvironmentVariable);
+        }
     }
     else {
         argv.derivedAccountId = (0, config_1.getAccountId)(account);

package/lib/parsing.d.ts

@@ -0,0 +1 @@
+export declare function parseStringToNumber(maybeNumber: string): number;

package/lib/parsing.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStringToNumber = parseStringToNumber;
+const en_1 = require("../lang/en");
+function parseStringToNumber(maybeNumber) {
+    const result = parseInt(maybeNumber, 10);
+    if (Number.isNaN(result) || !/^-?\d+$/.test(maybeNumber)) {
+        throw new Error(en_1.lib.parsing.unableToParseStringToNumber);
+    }
+    return result;
+}

package/lib/polling.d.ts

@@ -17,5 +17,5 @@ type PollingCallback<T extends GenericPollingResponse> = () => HubSpotPromise<T>
 export declare function poll<T extends GenericPollingResponse>(callback: PollingCallback<T>, statusLookup?: {
     successStates: string[];
     errorStates: string[];
-}): Promise<T>;
+}, timeoutMs?: number): Promise<T>;
 export {};

package/lib/polling.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_POLLING_STATUS_LOOKUP = exports.DEFAULT_POLLING_STATES = void 0;
 exports.poll = poll;
 const constants_1 = require("./constants");
+const en_1 = require("../lang/en");
 exports.DEFAULT_POLLING_STATES = {
     STARTED: 'STARTED',
     SUCCESS: 'SUCCESS',
@@ -18,7 +19,8 @@ exports.DEFAULT_POLLING_STATUS_LOOKUP = {
         exports.DEFAULT_POLLING_STATES.FAILURE,
     ],
 };
-function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP) {
+function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP, timeoutMs = 60000 // Default 60 second timeout
+) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
             try {
@@ -26,17 +28,25 @@ function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP) {
                 const { status } = pollResp;
                 if (statusLookup.successStates.includes(status)) {
                     clearInterval(pollInterval);
+                    clearTimeout(timeoutId);
                     resolve(pollResp);
                 }
                 else if (statusLookup.errorStates.includes(status)) {
                     clearInterval(pollInterval);
+                    clearTimeout(timeoutId);
                     reject(pollResp);
                 }
             }
             catch (error) {
                 clearInterval(pollInterval);
+                clearTimeout(timeoutId);
                 reject(error);
             }
         }, constants_1.DEFAULT_POLLING_DELAY);
+        // Set a timeout to stop polling after specified duration
+        const timeoutId = setTimeout(() => {
+            clearInterval(pollInterval);
+            reject(new Error(en_1.lib.polling.timeoutError(timeoutMs)));
+        }, timeoutMs);
     });
 }

package/lib/projects/add/v3AddComponent.js

@@ -66,6 +66,10 @@ async function v3AddComponent(args, projectDir, projectConfig) {
                 components.push(path_1.default.join(projectConfig.platformVersion, parentComponent.path));
             }
         }
+        if (components.length === 0) {
+            logger_1.uiLogger.log(en_1.lib.projects.add.nothingAdded);
+            return;
+        }
         await (0, github_1.cloneGithubRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDir, {
             sourceDir: components,
             hideLogs: true,

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

@@ -1,6 +1,6 @@
 import { ArgumentsCamelCase } from 'yargs';
 import { ProjectTemplateRepoConfig } from '../../../types/Projects';
-import { CreateProjectPromptResponse } from '../../prompts/createProjectPrompt';
+import { SelectProjectTemplatePromptResponse, ProjectNameAndDestPromptResponse } from '../../prompts/selectProjectTemplatePrompt';
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../../types/Yargs';
 import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
 export type ProjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
@@ -19,5 +19,6 @@ export declare function handleProjectCreationFlow(args: ArgumentsCamelCase<Proje
     distribution?: string;
     repoConfig?: ProjectTemplateRepoConfig;
     projectContents?: string;
-    createProjectPromptResponse: CreateProjectPromptResponse;
+    selectProjectTemplatePromptResponse: SelectProjectTemplatePromptResponse;
+    projectNameAndDestPromptResponse: ProjectNameAndDestPromptResponse;
 }>;

package/lib/projects/create/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleProjectCreationFlow = handleProjectCreationFlow;
-const createProjectPrompt_1 = require("../../prompts/createProjectPrompt");
+const selectProjectTemplatePrompt_1 = require("../../prompts/selectProjectTemplatePrompt");
+const projectNameAndDestPrompt_1 = require("../../prompts/projectNameAndDestPrompt");
 const constants_1 = require("../../constants");
 const buildAndDeploy_1 = require("../buildAndDeploy");
 const v3_1 = require("./v3");
@@ -12,15 +13,17 @@ const exitCodes_1 = require("../../enums/exitCodes");
 async function handleProjectCreationFlow(args) {
     const { platformVersion, templateSource, projectBase, auth: providedAuth, distribution: providedDistribution, } = args;
     const repo = templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
+    const projectNameAndDestPromptResponse = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(args);
     if ((0, buildAndDeploy_1.useV3Api)(platformVersion)) {
         const { componentTemplateChoices, authType, distribution, repoConfig, projectContents, } = await (0, v3_1.v3ComponentFlow)(platformVersion, projectBase, providedAuth, providedDistribution);
-        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, undefined, projectContents !== v3_1.EMPTY_PROJECT ? componentTemplateChoices : undefined);
+        const selectProjectTemplatePromptResponse = await (0, selectProjectTemplatePrompt_1.selectProjectTemplatePrompt)(args, undefined, projectContents !== v3_1.EMPTY_PROJECT ? componentTemplateChoices : undefined);
         return {
             authType,
             distribution,
             repoConfig,
             projectContents,
-            createProjectPromptResponse,
+            selectProjectTemplatePromptResponse,
+            projectNameAndDestPromptResponse,
         };
     }
     const projectTemplates = await (0, legacy_1.getProjectTemplateListFromRepo)(repo, 'main');
@@ -28,6 +31,9 @@ async function handleProjectCreationFlow(args) {
         logger_1.uiLogger.error(en_1.commands.project.create.errors.failedToFetchProjectList);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, projectTemplates);
-    return { createProjectPromptResponse };
+    const selectProjectTemplatePromptResponse = await (0, selectProjectTemplatePrompt_1.selectProjectTemplatePrompt)(args, projectTemplates);
+    return {
+        selectProjectTemplatePromptResponse,
+        projectNameAndDestPromptResponse,
+    };
 }

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

@@ -1,6 +1,6 @@
 import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplateRepoConfig } from '../../../types/Projects';
 import { ProjectMetadata } from '@hubspot/project-parsing-lib/src/lib/project';
-import { CreateProjectPromptResponse } from '../../prompts/createProjectPrompt';
+import { SelectProjectTemplatePromptResponse } from '../../prompts/selectProjectTemplatePrompt';
 export declare const EMPTY_PROJECT = "empty";
 export declare const PROJECT_WITH_APP = "app";
 export declare function createV3App(providedAuth: string | undefined, providedDistribution: string | undefined): Promise<{
@@ -16,8 +16,8 @@ type V3ComponentInfo = {
     componentTemplateChoices?: ComponentTemplateChoice[];
 };
 export declare function v3ComponentFlow(platformVersion: string, projectBase: string | undefined, providedAuth: string | undefined, providedDistribution: string | undefined): Promise<V3ComponentInfo>;
-export declare function generateComponentPaths({ createProjectPromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }: {
-    createProjectPromptResponse: CreateProjectPromptResponse;
+export declare function generateComponentPaths({ selectProjectTemplatePromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }: {
+    selectProjectTemplatePromptResponse: SelectProjectTemplatePromptResponse;
     platformVersion: string;
     repoConfig?: ProjectTemplateRepoConfig;
     projectContents?: string;

package/lib/projects/create/v3.js

@@ -134,11 +134,11 @@ async function v3ComponentFlow(platformVersion, projectBase, providedAuth, provi
         repoConfig,
     };
 }
-function generateComponentPaths({ createProjectPromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }) {
+function generateComponentPaths({ selectProjectTemplatePromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }) {
     if (!(0, buildAndDeploy_1.useV3Api)(platformVersion)) {
         return [];
     }
-    const components = createProjectPromptResponse.componentTemplates?.map((componentTemplate) => {
+    const components = selectProjectTemplatePromptResponse.componentTemplates?.map((componentTemplate) => {
         return path_1.default.join(platformVersion, componentTemplate.path);
     }) || [];
     if (projectContents && projectContents !== exports.EMPTY_PROJECT) {

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

@@ -16,15 +16,16 @@ declare class LocalDevProcess {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     };
     get logger(): LocalDevLogger;
-    get configFilesUpdatedSinceLastUpload(): Set<string>;
     private setupDevServers;
     private startDevServers;
     private cleanupDevServers;
     private compareLocalProjectToDeployed;
     private projectConfigValidForUpload;
+    private getIntermediateRepresentation;
     private updateProjectNodes;
+    private updateProjectNodesAfterUpload;
     handleFileChange(filePath: string, event: string): Promise<void>;
-    handleConfigFileChange(filePath: string, event: string): Promise<void>;
+    handleConfigFileChange(): Promise<void>;
     start(): Promise<void>;
     stop(showProgress?: boolean): Promise<void>;
     uploadProject(): Promise<boolean>;