@hubspot/cli 7.4.5-beta.0 → 7.4.6-beta.0

package/commands/project/watch.js

@@ -1,105 +1,106 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { uiLink } = require('../../lib/ui');
-const { useV3Api } = require('../../lib/projects/buildAndDeploy');
-const { uiCommandReference } = require('../../lib/ui');
-const { i18n } = require('../../lib/lang');
-const { createWatcher } = require('../../lib/projects/watch');
-const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { uiBetaTag } = require('../../lib/ui');
-const { getProjectConfig, validateProjectConfig, } = require('../../lib/projects/config');
-const { ensureProjectExists, } = require('../../lib/projects/ensureProjectExists');
-const { logFeedbackMessage } = require('../../lib/projects/ui');
-const { handleProjectUpload } = require('../../lib/projects/upload');
-const { pollBuildStatus, pollDeployStatus, } = require('../../lib/projects/buildAndDeploy');
-const { cancelStagedBuild, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { handleKeypress, handleExit } = require('../../lib/process');
-exports.command = 'watch';
-exports.describe = uiBetaTag(i18n(`commands.project.subcommands.watch.describe`), false);
-const handleBuildStatus = async (accountId, projectName, buildId) => {
-    const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId);
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const ui_1 = require("../../lib/ui");
+const lang_1 = require("../../lib/lang");
+const watch_1 = require("../../lib/projects/watch");
+const index_2 = require("../../lib/errorHandlers/index");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const constants_1 = require("../../lib/constants");
+const usageTracking_1 = require("../../lib/usageTracking");
+const config_1 = require("../../lib/projects/config");
+const ui_2 = require("../../lib/projects/ui");
+const ensureProjectExists_1 = require("../../lib/projects/ensureProjectExists");
+const upload_1 = require("../../lib/projects/upload");
+const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const process_1 = require("../../lib/process");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'watch';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.watch.describe`), false);
+async function handleBuildStatus(accountId, projectName, buildId) {
+    const { isAutoDeployEnabled, deployStatusTaskLocator } = await (0, buildAndDeploy_2.pollBuildStatus)(accountId, projectName, buildId, null);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
-        await pollDeployStatus(accountId, projectName, deployStatusTaskLocator.id, buildId);
+        await (0, buildAndDeploy_2.pollDeployStatus)(accountId, projectName, Number(deployStatusTaskLocator.id), buildId);
     }
-    logFeedbackMessage(buildId);
-};
-const handleUserInput = (accountId, projectName, currentBuildId) => {
+    (0, ui_2.logFeedbackMessage)(buildId);
+}
+function handleUserInput(accountId, projectName, currentBuildId) {
     const onTerminate = async () => {
-        logger.log(i18n(`commands.project.subcommands.watch.logs.processExited`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.watch.logs.processExited`));
         if (currentBuildId) {
             try {
-                await cancelStagedBuild(accountId, projectName);
-                process.exit(EXIT_CODES.SUCCESS);
+                await (0, projects_1.cancelStagedBuild)(accountId, projectName);
+                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
             }
             catch (err) {
-                if (isSpecifiedError(err, {
-                    subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
+                if ((0, index_1.isSpecifiedError)(err, {
+                    subCategory: constants_1.PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
                 })) {
-                    process.exit(EXIT_CODES.SUCCESS);
+                    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
                 }
                 else {
-                    logError(err, new ApiErrorContext({ accountId }));
-                    process.exit(EXIT_CODES.ERROR);
+                    (0, index_2.logError)(err, new index_2.ApiErrorContext({ accountId }));
+                    process.exit(exitCodes_1.EXIT_CODES.ERROR);
                 }
             }
         }
         else {
-            process.exit(EXIT_CODES.SUCCESS);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
     };
-    handleExit(onTerminate);
-    handleKeypress(key => {
+    (0, process_1.handleExit)(onTerminate);
+    (0, process_1.handleKeypress)(key => {
         if ((key.ctrl && key.name === 'c') || key.name === 'q') {
             onTerminate();
         }
     });
-};
-exports.handler = async (options) => {
-    const { initialUpload, derivedAccountId } = options;
-    trackCommandUsage('project-watch', null, derivedAccountId);
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (useV3Api(projectConfig?.platformVersion)) {
-        logger.error(i18n(`commands.project.subcommands.watch.errors.v3ApiError`, {
-            command: uiCommandReference('hs project watch'),
-            newCommand: uiCommandReference('hs project dev'),
+}
+async function handler(args) {
+    const { initialUpload, derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('project-watch', undefined, derivedAccountId);
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+    (0, config_1.validateProjectConfig)(projectConfig, projectDir);
+    if (!projectConfig || !projectDir) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.watch.errors.projectConfigNotFound`));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.watch.errors.v3ApiError`, {
+            command: (0, ui_1.uiCommandReference)('hs project watch'),
+            newCommand: (0, ui_1.uiCommandReference)('hs project dev'),
             platformVersion: projectConfig.platformVersion,
-            linkToDocs: uiLink('How to develop locally.', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development'),
+            linkToDocs: (0, ui_1.uiLink)('How to develop locally.', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development'),
         }));
-        return process.exit(EXIT_CODES.ERROR);
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(derivedAccountId, projectConfig.name);
+    await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectConfig.name);
     try {
-        const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name, options);
+        const { data: { results: builds }, } = await (0, projects_1.fetchProjectBuilds)(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;
         const startWatching = async () => {
-            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+            await (0, watch_1.createWatcher)(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const { uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, startWatching);
+            const { uploadError } = await (0, upload_1.handleProjectUpload)(derivedAccountId, projectConfig, projectDir, startWatching);
             if (uploadError) {
-                if (isSpecifiedError(uploadError, {
-                    subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
+                if ((0, index_1.isSpecifiedError)(uploadError, {
+                    subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED,
                 })) {
-                    logger.log();
-                    logger.error(i18n(`commands.project.subcommands.watch.errors.projectLockedError`));
-                    logger.log();
+                    logger_1.logger.log();
+                    logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.watch.errors.projectLockedError`));
+                    logger_1.logger.log();
                 }
                 else {
-                    logError(uploadError, new ApiErrorContext({
+                    (0, index_2.logError)(uploadError, new index_2.ApiErrorContext({
                         accountId: derivedAccountId,
                         request: 'project upload',
                     }));
                 }
-                process.exit(EXIT_CODES.ERROR);
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
         else {
@@ -107,23 +108,33 @@ exports.handler = async (options) => {
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
+        (0, index_2.logError)(e, new index_2.ApiErrorContext({ accountId: derivedAccountId }));
     }
-};
-exports.builder = yargs => {
+}
+function projectWatchBuilder(yargs) {
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: i18n(`commands.project.subcommands.watch.options.initialUpload.describe`),
+        describe: (0, lang_1.i18n)(`commands.project.subcommands.watch.options.initialUpload.describe`),
         type: 'boolean',
     });
     yargs.example([
         [
             '$0 project watch',
-            i18n(`commands.project.subcommands.watch.examples.default`),
+            (0, lang_1.i18n)(`commands.project.subcommands.watch.examples.default`),
         ],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectWatchBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectWatchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = projectWatchCommand;

package/commands/project.d.ts

@@ -1 +1,3 @@
-export {};
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const projectCommand: YargsCommandModuleBucket;
+export default projectCommand;

package/commands/project.js

@@ -1,42 +1,53 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addGlobalOptions } = require('../lib/commonOpts');
-const { i18n } = require('../lib/lang');
-const { uiBetaTag } = require('../lib/ui');
-const deploy = require('./project/deploy');
-const create = require('./project/create');
-const upload = require('./project/upload');
-const listBuilds = require('./project/listBuilds');
-const logs = require('./project/logs');
-const watch = require('./project/watch');
-const download = require('./project/download');
-const open = require('./project/open');
-const dev = require('./project/dev');
-const add = require('./project/add');
-const migrateApp = require('./project/migrateApp');
-const migrate = require('./project/migrate');
-const cloneApp = require('./project/cloneApp');
-const installDeps = require('./project/installDeps');
-exports.command = ['project', 'projects'];
-exports.describe = uiBetaTag(i18n(`commands.project.describe`), false);
-exports.builder = yargs => {
-    addGlobalOptions(yargs);
+const lang_1 = require("../lib/lang");
+const ui_1 = require("../lib/ui");
+const deploy_1 = __importDefault(require("./project/deploy"));
+const create_1 = __importDefault(require("./project/create"));
+const upload_1 = __importDefault(require("./project/upload"));
+const listBuilds_1 = __importDefault(require("./project/listBuilds"));
+const logs_1 = __importDefault(require("./project/logs"));
+const watch_1 = __importDefault(require("./project/watch"));
+const download_1 = __importDefault(require("./project/download"));
+const open_1 = __importDefault(require("./project/open"));
+const dev_1 = __importDefault(require("./project/dev"));
+const add_1 = __importDefault(require("./project/add"));
+const migrate_1 = __importDefault(require("./project/migrate"));
+const migrateApp_1 = __importDefault(require("./project/migrateApp"));
+const cloneApp_1 = __importDefault(require("./project/cloneApp"));
+const installDeps_1 = __importDefault(require("./project/installDeps"));
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['project', 'projects'];
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.describe`), false);
+function projectBuilder(yargs) {
     yargs
-        .command(create)
-        .command(add)
-        .command(watch)
-        .command(dev)
-        .command(upload)
-        .command(deploy)
-        .command(logs)
-        .command(listBuilds)
-        .command(download)
-        .command(open)
-        .command(migrateApp)
-        .command(migrate)
-        .command(cloneApp)
-        .command(installDeps)
+        .command(create_1.default)
+        .command(add_1.default)
+        .command(watch_1.default)
+        .command(dev_1.default)
+        .command(upload_1.default)
+        .command(deploy_1.default)
+        .command(logs_1.default)
+        .command(listBuilds_1.default)
+        .command(download_1.default)
+        .command(open_1.default)
+        .command(migrateApp_1.default)
+        .command(migrate_1.default)
+        .command(cloneApp_1.default)
+        .command(installDeps_1.default)
         .demandCommand(1, '');
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectBuilder, command, describe);
+const projectCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
 };
+exports.default = projectCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = projectCommand;

package/lang/en.d.ts

@@ -768,6 +768,7 @@ export declare const commands: {
             readonly describe: "Create a new project.";
             readonly errors: {
                 readonly failedToDownloadProject: "Failed to download project. Please try again later.";
+                readonly invalidTemplateSource: "Invalid template source provided. Use the format <Owner>/<Repo> and try again.";
                 readonly failedToFetchProjectList: "Failed to fetch the list of available project templates. Please try again later.";
                 readonly cannotNestProjects: (projectDir: string | number) => string;
             };
@@ -1043,6 +1044,8 @@ export declare const commands: {
                 readonly fileAlreadyQueued: (filePath: string | number) => string;
             };
             readonly errors: {
+                readonly projectConfigNotFound: "No project config found. Please ensure that you are in a project directory.";
+                readonly projectLockedError: `Your project is locked. This may mean that another user is running the ${string} command for this project. If this is you, unlock the project in Projects UI.`;
                 readonly uploadFailed: (remotePath: string | number, filePath: string | number) => string;
                 readonly deleteFileFailed: (remotePath: string | number) => string;
                 readonly deleteFolderFailed: (remotePath: string | number) => string;
@@ -2457,6 +2460,7 @@ export declare const lib: {
                 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 invalidTemplate: (template: string | number) => string;
+                readonly projectTemplateRequired: "Project template is required when projectTemplates is provided";
             };
         };
         readonly selectPublicAppPrompt: {

package/lang/en.js

@@ -778,6 +778,7 @@ exports.commands = {
             describe: 'Create a new project.',
             errors: {
                 failedToDownloadProject: 'Failed to download project. Please try again later.',
+                invalidTemplateSource: 'Invalid template source provided. Use the format <Owner>/<Repo> and try again.',
                 failedToFetchProjectList: 'Failed to fetch the list of available project templates. Please try again later.',
                 cannotNestProjects: projectDir => `A project already exists at ${projectDir}. Projects cannot be nested within other projects. Please choose a different destination and try again.`,
             },
@@ -1051,6 +1052,8 @@ exports.commands = {
                 fileAlreadyQueued: filePath => `File "${filePath}" is already queued for upload`,
             },
             errors: {
+                projectConfigNotFound: 'No project config found. Please ensure that you are in a project directory.',
+                projectLockedError: `Your project is locked. This may mean that another user is running the ${chalk_1.default.bold(`hs project dev`)} command for this project. If this is you, unlock the project in Projects UI.`,
                 uploadFailed: (remotePath, filePath) => `Failed to upload file "${filePath}" to "${remotePath}"`,
                 deleteFileFailed: remotePath => `Failed to delete file "${remotePath}"`,
                 deleteFolderFailed: remotePath => `Failed to delete folder "${remotePath}"`,
@@ -2465,6 +2468,7 @@ exports.lib = {
                 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.',
                 invalidTemplate: template => `[--template] Could not find template "${template}". Please choose an available template:`,
+                projectTemplateRequired: 'Project template is required when projectTemplates is provided',
             },
         },
         selectPublicAppPrompt: {

package/lang/en.lyaml

@@ -601,6 +601,7 @@ en:
           describe: "Create a new project."
           errors:
             failedToDownloadProject: "Failed to download project. Please try again later."
+            invalidTemplateSource: "Invalid template source provided. Use the format <Owner>/<Repo> and try again."
             failedToFetchProjectList: "Failed to fetch the list of available project templates. Please try again later."
             cannotNestProjects: "A project already exists at {{ projectDir }}. Projects cannot be nested within other projects. Please choose a different destination and try again."
           logs:
@@ -806,6 +807,8 @@ en:
             attemptNewBuild: "Attempting to create a new build"
             fileAlreadyQueued: "File \"{{ filePath }}\" is already queued for upload"
           errors:
+            projectConfigNotFound: "No project config found. Please ensure that you are in a project directory."
+            projectLockedError: "Your project is locked. This may mean that another user is running the {{#bold}}`hs project dev`{{/bold}} command for this project. If this is you, unlock the project in Projects UI."
             uploadFailed: "Failed to upload file \"{{ filePath }}\" to \"{{ remotePath }}\""
             deleteFileFailed: "Failed to delete file \"{{ remotePath }}\""
             deleteFolderFailed: "Failed to delete folder \"{{ remotePath }}\""
@@ -1422,6 +1425,7 @@ en:
           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."
           invalidTemplate: "[--template] Could not find template \"{{ template }}\". Please choose an available template:"
+          projectTemplateRequired: "Project template is required when projectTemplates is provided"
       selectPublicAppPrompt:
         selectAppIdMigrate: "[--appId] Choose an app under {{ accountName }} to migrate:"
         selectAppIdClone: "[--appId] Choose an app under {{ accountName }} to clone:"

package/lib/app/migrate.js

@@ -51,6 +51,18 @@ function filterAppsByProjectName(projectConfig) {
         return true;
     };
 }
+function buildErrorMessageFromMigrationStatus(error) {
+    const { componentErrors, projectErrorDetail } = error;
+    if (!componentErrors || !componentErrors.length) {
+        return projectErrorDetail;
+    }
+    return `${projectErrorDetail}: \n\t- ${componentErrors
+        .map(componentError => {
+        const { componentType, errorMessage, developerSymbol: uid, } = componentError;
+        return `${componentType}${uid ? ` (${uid})` : ''}: ${errorMessage}`;
+    })
+        .join('\n\t- ')}`;
+}
 async function fetchMigrationApps(appId, derivedAccountId, platformVersion, projectConfig) {
     const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId, platformVersion);
     const filteredMigratableApps = migratableApps.filter(filterAppsByProjectName(projectConfig));
@@ -186,7 +198,23 @@ async function beginMigration(derivedAccountId, appId, platformVersion) {
     const uidMap = {};
     const { data } = await (0, migrate_1.initializeMigration)(derivedAccountId, appId, platformVersion);
     const { migrationId } = data;
-    const pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [Migration_1.MIGRATION_STATUS.INPUT_REQUIRED]);
+    let pollResponse;
+    try {
+        pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [
+            Migration_1.MIGRATION_STATUS.INPUT_REQUIRED,
+        ]);
+    }
+    catch (error) {
+        SpinniesManager_1.default.fail('beginningMigration', {
+            text: en_1.lib.migrate.spinners.unableToStartMigration,
+        });
+        if ((0, migrate_1.isMigrationStatus)(error) && error.status === Migration_1.MIGRATION_STATUS.FAILURE) {
+            throw new Error(buildErrorMessageFromMigrationStatus(error));
+        }
+        throw new Error(en_1.lib.migrate.errors.migrationFailed, {
+            cause: error,
+        });
+    }
     if (pollResponse.status !== Migration_1.MIGRATION_STATUS.INPUT_REQUIRED) {
         SpinniesManager_1.default.fail('beginningMigration', {
             text: en_1.lib.migrate.spinners.unableToStartMigration,
@@ -235,17 +263,7 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
             text: en_1.lib.migrate.spinners.migrationFailed,
         });
         if ((0, migrate_1.isMigrationStatus)(error) && error.status === Migration_1.MIGRATION_STATUS.FAILURE) {
-            const { componentErrors, projectErrorDetail } = error;
-            if (!componentErrors || !componentErrors.length) {
-                throw new Error(projectErrorDetail);
-            }
-            const errorMessage = `${projectErrorDetail}: \n\t- ${componentErrors
-                .map(componentError => {
-                const { componentType, errorMessage, developerSymbol: uid, } = componentError;
-                return `${componentType}${uid ? ` (${uid})` : ''}: ${errorMessage}`;
-            })
-                .join('\n\t- ')}`;
-            throw new Error(errorMessage);
+            throw new Error(buildErrorMessageFromMigrationStatus(error));
         }
         throw new Error(en_1.lib.migrate.errors.migrationFailed, {
             cause: error,

package/lib/commonOpts.d.ts

@@ -11,7 +11,7 @@ export declare function addCmsPublishModeOptions(yargs: Argv, { read, write }: {
 }): Argv;
 export declare function addTestingOptions(yargs: Argv): Argv;
 export declare function addUseEnvironmentOptions(yargs: Argv): Argv;
-export declare function addCustomHelpOutput(yargs: Argv, command: string, describe: string): Promise<void>;
+export declare function addCustomHelpOutput(yargs: Argv, command: string | string[], describe?: string): Promise<void>;
 export declare function setLogLevel(options: Arguments<{
     debug?: boolean;
     networkDebug?: boolean;

package/lib/commonOpts.js

@@ -78,26 +78,45 @@ function addTestingOptions(yargs) {
     });
 }
 function addUseEnvironmentOptions(yargs) {
-    return yargs
-        .option('use-env', {
+    yargs.option('use-env', {
         describe: (0, lang_1.i18n)(`${i18nKey}.options.useEnv.describe`),
         type: 'boolean',
-    })
-        .conflicts('use-env', 'account');
+    });
+    yargs.conflicts('use-env', 'account');
+    return yargs;
 }
 async function addCustomHelpOutput(yargs, command, describe) {
     try {
         const parsedArgv = (0, yargs_parser_1.default)(process.argv.slice(2));
         if (parsedArgv && parsedArgv.help) {
-            // Construct the full command, including positional arguments
             const commandBase = `hs ${parsedArgv._.slice(0, -1).join(' ')}`;
-            const fullCommand = `${commandBase.trim()} ${command}`;
+            // Make sure we are targeting the correct command by confirming that
+            // "command" matches the last part of the user's input command
+            const checkIsTargetCommand = (command) => {
+                const targetBaseCommand = command.split(' ')[0];
+                return targetBaseCommand === parsedArgv._[parsedArgv._.length - 1];
+            };
+            const isTargetedCommand = Array.isArray(command)
+                ? command.some(checkIsTargetCommand)
+                : checkIsTargetCommand(command);
+            if (!isTargetedCommand) {
+                return;
+            }
+            // Construct the full command, including positional arguments
+            const commandString = Array.isArray(command) ? command[0] : command;
+            const fullCommand = `${commandBase.trim()} ${commandString}`;
             // Format the original help output to be more readable
             let commandHelp = await yargs.getHelp();
-            ['Options:', 'Examples:', 'Positionals:'].forEach(header => {
+            ['Options:', 'Commands:', 'Examples:', 'Positionals:'].forEach(header => {
                 commandHelp = commandHelp.replace(header, chalk_1.default.bold(header));
             });
-            logger_1.logger.log(`${(0, ui_1.uiCommandReference)(fullCommand, false)}\n\n${describe}\n\n${commandHelp}`);
+            // Remove "hs <command>" from the help output (this shows up for command buckets)
+            commandHelp = commandHelp.replace('hs <command>\n', '');
+            // Remove the first line of the help output if it's empty
+            if (commandHelp.startsWith('\n')) {
+                commandHelp = commandHelp.slice(1);
+            }
+            logger_1.logger.log(`${(0, ui_1.uiCommandReference)(fullCommand, false)}\n\n${describe ? `${describe}\n\n` : ''}${commandHelp}`);
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
     }

package/lib/middleware/configMiddleware.js

@@ -43,7 +43,7 @@ const SKIP_CONFIG_VALIDATION = {
 };
 async function loadConfigMiddleware(argv) {
     // Skip this when no command is provided
-    if (!argv._.length) {
+    if (!argv._.length || argv.help) {
         return;
     }
     const maybeValidateConfig = () => {
@@ -104,7 +104,7 @@ const SKIP_ACCOUNT_VALIDATION = {
 };
 async function validateAccountOptions(argv) {
     // Skip this when no command is provided
-    if (argv._.length) {
+    if (argv._.length && !argv.help) {
         let validAccount = true;
         if (!(0, utils_1.isTargetedCommand)(argv._, SKIP_ACCOUNT_VALIDATION)) {
             validAccount = await (0, validation_1.validateAccount)(argv);

package/lib/projects/upload.d.ts

@@ -5,5 +5,5 @@ type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean, skipValidation?: boolean): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage?: string, sendIR?: boolean, skipValidation?: boolean): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -45,7 +45,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false, skipValidation = false) {
+async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage = '', sendIR = false, skipValidation = false) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {

package/lib/projects/watch.d.ts

@@ -1,4 +1,4 @@
 import { ProjectConfig } from '../../types/Projects';
-type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void>;
+type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void> | void;
 export declare function createWatcher(accountId: number, projectConfig: ProjectConfig, projectDir: string, handleBuildStatusFn: ProjectWatchHandlerFunction, handleUserInputFn: ProjectWatchHandlerFunction): Promise<void>;
 export {};

package/lib/prompts/createProjectPrompt.d.ts

@@ -1,12 +1,19 @@
 import { ProjectTemplate } from '../../types/Projects';
-type CreateProjectPromptResponse = {
+type CreateProjectPromptResponseWithTemplate = {
     name: string;
     dest: string;
-    projectTemplate?: ProjectTemplate;
+    projectTemplate: ProjectTemplate;
 };
-export declare function createProjectPrompt(promptOptions: {
+type CreateProjectPromptResponseWithoutTemplate = {
+    name: string;
+    dest: string;
+    projectTemplate?: undefined;
+};
+type PromptOptionsArg = {
     name?: string;
     dest?: string;
     template?: string;
-}, projectTemplates?: ProjectTemplate[]): Promise<CreateProjectPromptResponse>;
+};
+export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates: ProjectTemplate[]): Promise<CreateProjectPromptResponseWithTemplate>;
+export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates?: undefined): Promise<CreateProjectPromptResponseWithoutTemplate>;
 export {};

package/lib/prompts/createProjectPrompt.js

@@ -86,5 +86,11 @@ async function createProjectPrompt(promptOptions, projectTemplates) {
     if (providedTemplateIsValid) {
         result.projectTemplate = findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     }
+    if (projectTemplates && projectTemplates.length > 0) {
+        if (!result.projectTemplate) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.projectTemplateRequired`));
+        }
+        return result;
+    }
     return result;
 }

package/lib/ui/index.d.ts

@@ -11,8 +11,9 @@ export declare function uiCommandReference(command: string, withQuotes?: boolean
 export declare function uiFeatureHighlight(features: string[], title?: string): void;
 export declare function uiBetaTag(message: string, log?: true): undefined;
 export declare function uiBetaTag(message: string, log: false): string;
-export declare function uiDeprecatedTag(message: string, log?: boolean): string | undefined;
+export declare function uiDeprecatedTag(message: string, log?: true): undefined;
+export declare function uiDeprecatedTag(message: string, log: false): string;
 export declare function uiCommandDisabledBanner(command: string, url?: string, message?: string): void;
-export declare function uiDeprecatedDescription(message: string, command: string, url?: string): string | undefined;
+export declare function uiDeprecatedDescription(message: string, command: string, url?: string): undefined;
 export declare function uiDeprecatedMessage(command: string, url?: string, message?: string): void;
 export declare function indent(level: number): string;

package/lib/ui/index.js

@@ -112,6 +112,7 @@ function uiDeprecatedTag(message, log = true) {
     const result = `${terminalUISupport.color ? chalk_1.default.yellow(tag) : tag} ${message}`;
     if (log) {
         logger_1.logger.log(result);
+        return;
     }
     return result;
 }