@hubspot/cli 6.2.1 → 6.2.2-experimental.0

package/commands/project/upload.js

@@ -1,135 +1,89 @@
-const {
-  addAccountOptions,
-  addConfigOptions,
-  getAccountId,
-  addUseEnvironmentOptions,
-} = require('../../lib/commonOpts');
+"use strict";
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiBetaTag, uiCommandReference } = require('../../lib/ui');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const {
-  ensureProjectExists,
-  getProjectConfig,
-  handleProjectUpload,
-  logFeedbackMessage,
-  validateProjectConfig,
-  pollProjectBuildAndDeploy,
-  displayWarnLogs,
-} = require('../../lib/projects');
+const { ensureProjectExists, getProjectConfig, handleProjectUpload, logFeedbackMessage, validateProjectConfig, pollProjectBuildAndDeploy, displayWarnLogs, } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-
 const i18nKey = 'commands.project.subcommands.upload';
-
 exports.command = 'upload [path] [--forceCreate] [--message]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  const { forceCreate, path: projectPath, message } = options;
-  const accountId = getAccountId(options);
-  const accountConfig = getAccountConfig(accountId);
-  const accountType = accountConfig && accountConfig.accountType;
-
-  trackCommandUsage('project-upload', { type: accountType }, accountId);
-
-  const { projectConfig, projectDir } = await getProjectConfig(projectPath);
-
-  validateProjectConfig(projectConfig, projectDir);
-
-  await ensureProjectExists(accountId, projectConfig.name, {
-    forceCreate,
-    uploadCommand: true,
-  });
-
-  try {
-    const result = await handleProjectUpload(
-      accountId,
-      projectConfig,
-      projectDir,
-      pollProjectBuildAndDeploy,
-      message
-    );
-
-    if (result.uploadError) {
-      if (
-        isSpecifiedError(result.uploadError, {
-          subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
-        })
-      ) {
-        logger.log();
-        logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
-        logger.log();
-      } else {
-        logError(
-          result.uploadError,
-          new ApiErrorContext({
-            accountId,
-            request: 'project upload',
-          })
-        );
-      }
-      process.exit(EXIT_CODES.ERROR);
+exports.handler = async (options) => {
+    await loadAndValidateOptions(options);
+    const { forceCreate, path: projectPath, message } = options;
+    const accountId = getAccountId(options);
+    const accountConfig = getAccountConfig(accountId);
+    const accountType = accountConfig && accountConfig.accountType;
+    trackCommandUsage('project-upload', { type: accountType }, accountId);
+    const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+    validateProjectConfig(projectConfig, projectDir);
+    await ensureProjectExists(accountId, projectConfig.name, {
+        forceCreate,
+        uploadCommand: true,
+    });
+    try {
+        const result = await handleProjectUpload(accountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        if (result.uploadError) {
+            if (isSpecifiedError(result.uploadError, {
+                subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
+            })) {
+                logger.log();
+                logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+                logger.log();
+            }
+            else {
+                logError(result.uploadError, new ApiErrorContext({
+                    accountId,
+                    request: 'project upload',
+                }));
+            }
+            process.exit(EXIT_CODES.ERROR);
+        }
+        if (result.succeeded && !result.buildResult.isAutoDeployEnabled) {
+            logger.log(chalk.bold(i18n(`${i18nKey}.logs.buildSucceeded`, {
+                buildId: result.buildId,
+            })));
+            logger.log(i18n(`${i18nKey}.logs.autoDeployDisabled`, {
+                deployCommand: uiCommandReference(`hs project deploy --build=${result.buildId}`),
+            }));
+            logFeedbackMessage(result.buildId);
+            await displayWarnLogs(accountId, projectConfig.name, result.buildId);
+            process.exit(EXIT_CODES.SUCCESS);
+        }
     }
-    if (result.succeeded && !result.buildResult.isAutoDeployEnabled) {
-      logger.log(
-        chalk.bold(
-          i18n(`${i18nKey}.logs.buildSucceeded`, {
-            buildId: result.buildId,
-          })
-        )
-      );
-      logger.log(
-        i18n(`${i18nKey}.logs.autoDeployDisabled`, {
-          deployCommand: uiCommandReference(
-            `hs project deploy --build=${result.buildId}`
-          ),
-        })
-      );
-      logFeedbackMessage(result.buildId);
-
-      await displayWarnLogs(accountId, projectConfig.name, result.buildId);
-      process.exit(EXIT_CODES.SUCCESS);
+    catch (e) {
+        logError(e, new ApiErrorContext({ accountId, request: 'project upload' }));
+        process.exit(EXIT_CODES.ERROR);
     }
-  } catch (e) {
-    logError(e, new ApiErrorContext({ accountId, request: 'project upload' }));
-    process.exit(EXIT_CODES.ERROR);
-  }
 };
-
 exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-
-  yargs.option('forceCreate', {
-    describe: i18n(`${i18nKey}.options.forceCreate.describe`),
-    type: 'boolean',
-    default: false,
-  });
-
-  yargs.option('message', {
-    alias: 'm',
-    describe: i18n(`${i18nKey}.options.message.describe`),
-    type: 'string',
-    default: '',
-  });
-
-  yargs.example([
-    ['$0 project upload myProjectFolder', i18n(`${i18nKey}.examples.default`)],
-  ]);
-
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  return yargs;
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        type: 'string',
+    });
+    yargs.option('forceCreate', {
+        describe: i18n(`${i18nKey}.options.forceCreate.describe`),
+        type: 'boolean',
+        default: false,
+    });
+    yargs.option('message', {
+        alias: 'm',
+        describe: i18n(`${i18nKey}.options.message.describe`),
+        type: 'string',
+        default: '',
+    });
+    yargs.example([
+        ['$0 project upload myProjectFolder', i18n(`${i18nKey}.examples.default`)],
+    ]);
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    return yargs;
 };

package/commands/project/watch.d.ts

@@ -0,0 +1,4 @@
+export const command: "watch [path]";
+export const describe: string | undefined;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;

package/commands/project/watch.js

@@ -1,176 +1,116 @@
+"use strict";
 const { i18n } = require('../../lib/lang');
 const { createWatcher } = require('../../lib/projectsWatch');
 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,
-  getAccountId,
-  addUseEnvironmentOptions,
-} = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiBetaTag } = require('../../lib/ui');
-const {
-  ensureProjectExists,
-  getProjectConfig,
-  handleProjectUpload,
-  pollBuildStatus,
-  pollDeployStatus,
-  validateProjectConfig,
-  logFeedbackMessage,
-} = require('../../lib/projects');
-const {
-  cancelStagedBuild,
-  fetchProjectBuilds,
-} = require('@hubspot/local-dev-lib/api/projects');
+const { ensureProjectExists, getProjectConfig, handleProjectUpload, pollBuildStatus, pollDeployStatus, validateProjectConfig, logFeedbackMessage, } = require('../../lib/projects');
+const { cancelStagedBuild, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { handleKeypress, handleExit } = require('../../lib/process');
-
 const i18nKey = 'commands.project.subcommands.watch';
-
 exports.command = 'watch [path]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-
 const handleBuildStatus = async (accountId, projectName, buildId) => {
-  const {
-    isAutoDeployEnabled,
-    deployStatusTaskLocator,
-  } = await pollBuildStatus(accountId, projectName, buildId);
-
-  if (isAutoDeployEnabled && deployStatusTaskLocator) {
-    await pollDeployStatus(
-      accountId,
-      projectName,
-      deployStatusTaskLocator.id,
-      buildId
-    );
-  }
-
-  logFeedbackMessage(buildId);
+    const { isAutoDeployEnabled, deployStatusTaskLocator, } = await pollBuildStatus(accountId, projectName, buildId);
+    if (isAutoDeployEnabled && deployStatusTaskLocator) {
+        await pollDeployStatus(accountId, projectName, deployStatusTaskLocator.id, buildId);
+    }
+    logFeedbackMessage(buildId);
 };
-
 const handleUserInput = (accountId, projectName, currentBuildId) => {
-  const onTerminate = async () => {
-    logger.log(i18n(`${i18nKey}.logs.processExited`));
-
-    if (currentBuildId) {
-      try {
-        await cancelStagedBuild(accountId, projectName);
-        process.exit(EXIT_CODES.SUCCESS);
-      } catch (err) {
-        if (
-          isSpecifiedError(err, {
-            subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
-          })
-        ) {
-          process.exit(EXIT_CODES.SUCCESS);
-        } else {
-          logError(err, new ApiErrorContext({ accountId }));
-          process.exit(EXIT_CODES.ERROR);
+    const onTerminate = async () => {
+        logger.log(i18n(`${i18nKey}.logs.processExited`));
+        if (currentBuildId) {
+            try {
+                await cancelStagedBuild(accountId, projectName);
+                process.exit(EXIT_CODES.SUCCESS);
+            }
+            catch (err) {
+                if (isSpecifiedError(err, {
+                    subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
+                })) {
+                    process.exit(EXIT_CODES.SUCCESS);
+                }
+                else {
+                    logError(err, new ApiErrorContext({ accountId }));
+                    process.exit(EXIT_CODES.ERROR);
+                }
+            }
+        }
+        else {
+            process.exit(EXIT_CODES.SUCCESS);
         }
-      }
-    } else {
-      process.exit(EXIT_CODES.SUCCESS);
-    }
-  };
-
-  handleExit(onTerminate);
-  handleKeypress(key => {
-    if ((key.ctrl && key.name === 'c') || key.name === 'q') {
-      onTerminate();
-    }
-  });
-};
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  const { initialUpload, path: projectPath } = options;
-  const accountId = getAccountId(options);
-
-  trackCommandUsage('project-watch', null, accountId);
-
-  const { projectConfig, projectDir } = await getProjectConfig(projectPath);
-
-  validateProjectConfig(projectConfig, projectDir);
-
-  await ensureProjectExists(accountId, projectConfig.name);
-
-  try {
-    const {
-      data: { results: builds },
-    } = await fetchProjectBuilds(accountId, projectConfig.name, options);
-    const hasNoBuilds = !builds || !builds.length;
-
-    const startWatching = async () => {
-      await createWatcher(
-        accountId,
-        projectConfig,
-        projectDir,
-        handleBuildStatus,
-        handleUserInput
-      );
     };
-
-    // Upload all files if no build exists for this project yet
-    if (initialUpload || hasNoBuilds) {
-      const result = await handleProjectUpload(
-        accountId,
-        projectConfig,
-        projectDir,
-        startWatching
-      );
-
-      if (result.uploadError) {
-        if (
-          isSpecifiedError(result.uploadError, {
-            subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
-          })
-        ) {
-          logger.log();
-          logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
-          logger.log();
-        } else {
-          logError(
-            result.uploadError,
-            new ApiErrorContext({
-              accountId,
-              request: 'project upload',
-            })
-          );
+    handleExit(onTerminate);
+    handleKeypress(key => {
+        if ((key.ctrl && key.name === 'c') || key.name === 'q') {
+            onTerminate();
         }
-        process.exit(EXIT_CODES.ERROR);
-      }
-    } else {
-      await startWatching();
+    });
+};
+exports.handler = async (options) => {
+    await loadAndValidateOptions(options);
+    const { initialUpload, path: projectPath } = options;
+    const accountId = getAccountId(options);
+    trackCommandUsage('project-watch', null, accountId);
+    const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+    validateProjectConfig(projectConfig, projectDir);
+    await ensureProjectExists(accountId, projectConfig.name);
+    try {
+        const { data: { results: builds }, } = await fetchProjectBuilds(accountId, projectConfig.name, options);
+        const hasNoBuilds = !builds || !builds.length;
+        const startWatching = async () => {
+            await createWatcher(accountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+        };
+        // Upload all files if no build exists for this project yet
+        if (initialUpload || hasNoBuilds) {
+            const result = await handleProjectUpload(accountId, projectConfig, projectDir, startWatching);
+            if (result.uploadError) {
+                if (isSpecifiedError(result.uploadError, {
+                    subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
+                })) {
+                    logger.log();
+                    logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+                    logger.log();
+                }
+                else {
+                    logError(result.uploadError, new ApiErrorContext({
+                        accountId,
+                        request: 'project upload',
+                    }));
+                }
+                process.exit(EXIT_CODES.ERROR);
+            }
+        }
+        else {
+            await startWatching();
+        }
+    }
+    catch (e) {
+        logError(e, new ApiErrorContext({ accountId }));
     }
-  } catch (e) {
-    logError(e, new ApiErrorContext({ accountId }));
-  }
 };
-
 exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-
-  yargs.option('initial-upload', {
-    alias: 'i',
-    describe: i18n(`${i18nKey}.options.initialUpload.describe`),
-    type: 'boolean',
-  });
-
-  yargs.example([
-    ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
-  ]);
-
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  return yargs;
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        type: 'string',
+    });
+    yargs.option('initial-upload', {
+        alias: 'i',
+        describe: i18n(`${i18nKey}.options.initialUpload.describe`),
+        type: 'boolean',
+    });
+    yargs.example([
+        ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
+    ]);
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    return yargs;
 };

package/commands/project.d.ts

@@ -0,0 +1,3 @@
+export const command: "project";
+export const describe: string | undefined;
+export function builder(yargs: any): any;

package/commands/project.js

@@ -1,3 +1,4 @@
+"use strict";
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
 const { uiBetaTag } = require('../lib/ui');
@@ -14,31 +15,26 @@ const add = require('./project/add');
 const migrateApp = require('./project/migrateApp');
 const cloneApp = require('./project/cloneApp');
 const installDeps = require('./project/installDeps');
-
 const i18nKey = 'commands.project';
-
 exports.command = 'project';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(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(cloneApp)
-    .command(installDeps)
-    .demandCommand(1, '');
-
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(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(cloneApp)
+        .command(installDeps)
+        .demandCommand(1, '');
+    return yargs;
 };

package/commands/remove.d.ts

@@ -0,0 +1,4 @@
+export const command: "remove <path>";
+export const describe: any;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;

package/commands/remove.js

@@ -1,55 +1,38 @@
+"use strict";
 const { deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
-
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addUseEnvironmentOptions,
-  getAccountId,
-} = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../lib/commonOpts');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
-
 const i18nKey = 'commands.remove';
-
 exports.command = 'remove <path>';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  const { path: hsPath } = options;
-
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-
-  trackCommandUsage('remove', null, accountId);
-
-  try {
-    await deleteFile(accountId, hsPath);
-    logger.log(i18n(`${i18nKey}.deleted`, { accountId, path: hsPath }));
-  } catch (error) {
-    logger.error(
-      i18n(`${i18nKey}.errors.deleteFailed`, { accountId, path: hsPath })
-    );
-    logError(
-      error,
-      new ApiErrorContext({
-        accountId,
-        request: hsPath,
-      })
-    );
-  }
+exports.handler = async (options) => {
+    const { path: hsPath } = options;
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    trackCommandUsage('remove', null, accountId);
+    try {
+        await deleteFile(accountId, hsPath);
+        logger.log(i18n(`${i18nKey}.deleted`, { accountId, path: hsPath }));
+    }
+    catch (error) {
+        logger.error(i18n(`${i18nKey}.errors.deleteFailed`, { accountId, path: hsPath }));
+        logError(error, new ApiErrorContext({
+            accountId,
+            request: hsPath,
+        }));
+    }
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        type: 'string',
+    });
+    return yargs;
 };

package/commands/sandbox/create.d.ts

@@ -0,0 +1,4 @@
+export const command: "create [--name] [--type]";
+export const describe: string | undefined;
+export function handler(options: any): Promise<never>;
+export function builder(yargs: any): any;