@hubspot/cli 3.0.12 → 3.0.13-beta.2

package/bin/cli.js

@@ -8,7 +8,9 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage } = require('../lib/usageTracking');
+const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
@@ -29,6 +31,7 @@ const openCommand = require('../commands/open');
 const mvCommand = require('../commands/mv');
 const projectCommands = require('../commands/project');
 const themeCommand = require('../commands/theme');
+const moduleCommand = require('../commands/module');
 const configCommand = require('../commands/config');
 const accountsCommand = require('../commands/accounts');
 const sandboxesCommand = require('../commands/sandbox');
@@ -36,6 +39,8 @@ const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const notifier = updateNotifier({ pkg: { ...pkg, name: '@hubspot/cli' } });
 
+const i18nKey = 'cli.commands.generalErrors';
+
 const CLI_UPGRADE_MESSAGE =
   chalk.bold('The CMS CLI is now the HubSpot CLI') +
   '\n\nTo upgrade, run:\n\nnpm uninstall -g @hubspot/cms-cli\nand npm install -g @hubspot/cli';
@@ -58,8 +63,11 @@ const argv = yargs
   .middleware([setLogLevel])
   .exitProcess(false)
   .fail((msg, err, yargs) => {
-    if (msg) logger.error(msg);
-    if (err) logErrorInstance(err);
+    if (msg) {
+      logger.error(msg);
+    } else if (err) {
+      logErrorInstance(err);
+    }
 
     if (msg === null) {
       yargs.showHelp();
@@ -74,6 +82,23 @@ const argv = yargs
     describe: 'set log level to debug',
     type: 'boolean',
   })
+  .check(argv => {
+    if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
+      if (getIsInProject(argv.src)) {
+        logger.error(
+          i18n(`${i18nKey}.srcIsProject`, {
+            src: argv.src,
+            command: argv._.join(' '),
+          })
+        );
+        process.exit(EXIT_CODES.ERROR);
+      } else {
+        return true;
+      }
+    } else {
+      return true;
+    }
+  })
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)
@@ -96,6 +121,7 @@ const argv = yargs
   .command(mvCommand)
   .command(projectCommands)
   .command(themeCommand)
+  .command(moduleCommand)
   .command(configCommand)
   .command(accountsCommand)
   .command(sandboxesCommand)

package/commands/accounts/use.js

@@ -0,0 +1,82 @@
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  getConfig,
+  getConfigPath,
+  updateDefaultAccount,
+  getAccountId: getAccountIdFromConfig,
+} = require('@hubspot/cli-lib/lib/config');
+const { loadAndValidateOptions } = require('../../lib/validation');
+
+const { getAccountId } = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.accounts.subcommands.use';
+
+const selectAccountFromConfig = async config => {
+  const { default: selectedDefault } = await promptUser([
+    {
+      type: 'list',
+      look: false,
+      name: 'default',
+      pageSize: 20,
+      message: i18n(`${i18nKey}.promptMessage`),
+      choices: config.portals.map(p => ({
+        name: `${p.name} (${p.portalId})`,
+        value: p.name || p.portalId,
+      })),
+      default: config.defaultPortal,
+    },
+  ]);
+
+  return selectedDefault;
+};
+
+exports.command = 'use [account]';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  await loadAndValidateOptions({ debug: options.debug });
+
+  const accountId = getAccountId(options);
+  const config = getConfig();
+
+  let newDefaultAccount = options.account;
+
+  trackCommandUsage('accounts-use', {}, accountId);
+
+  if (!newDefaultAccount) {
+    newDefaultAccount = await selectAccountFromConfig(config);
+  } else if (!getAccountIdFromConfig(newDefaultAccount)) {
+    logger.error(
+      i18n(`${i18nKey}.errors.accountNotFound`, {
+        specifiedAccount: newDefaultAccount,
+        configPath: getConfigPath(),
+      })
+    );
+    newDefaultAccount = await selectAccountFromConfig(config);
+  }
+
+  updateDefaultAccount(newDefaultAccount);
+
+  return logger.success(
+    i18n(`${i18nKey}.success.defaultAccountUpdated`, {
+      accountName: newDefaultAccount,
+    })
+  );
+};
+
+exports.builder = yargs => {
+  yargs.positional('account', {
+    describe: i18n(`${i18nKey}.positionals.account.describe`),
+    type: 'string',
+  });
+  yargs.example([
+    ['$0 accounts use', i18n(`${i18nKey}.examples.default`)],
+    ['$0 accounts use MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
+    ['$0 accounts use 1234567', i18n(`${i18nKey}.examples.idBased`)],
+  ]);
+
+  return yargs;
+};

package/commands/accounts.js

@@ -2,6 +2,7 @@ const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const list = require('./accounts/list');
 const rename = require('./accounts/rename');
+const use = require('./accounts/use');
 
 const i18nKey = 'cli.commands.accounts';
 
@@ -18,6 +19,7 @@ exports.builder = yargs => {
       aliases: 'ls',
     })
     .command(rename)
+    .command(use)
     .demandCommand(1, '');
 
   return yargs;

package/commands/config/set/allowUsageTracking.js

@@ -1,14 +1,11 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateAllowUsageTracking } = require('@hubspot/cli-lib/lib/config');
-
-const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey =
-  'cli.commands.config.subcommands.set.subcommands.allowUsageTracking';
+  'cli.commands.config.subcommands.set.options.allowUsageTracking';
 
 const enableOrDisableUsageTracking = async () => {
   const { isEnabled } = await promptUser([
@@ -35,26 +32,22 @@ const enableOrDisableUsageTracking = async () => {
   return isEnabled;
 };
 
-exports.command = 'allow-usage-tracking';
-exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
+const setAllowUsageTracking = async ({ accountId, allowUsageTracking }) => {
+  trackCommandUsage('config-set-allow-usage-tracking', {}, accountId);
 
-  const accountId = getAccountId(options);
+  let isEnabled;
 
-  trackCommandUsage('config-set-allow-usage-tracking', {}, accountId);
+  if (typeof allowUsageTracking === 'boolean') {
+    isEnabled = allowUsageTracking;
+  } else {
+    isEnabled = await enableOrDisableUsageTracking();
+  }
 
-  const isEnabled = await enableOrDisableUsageTracking();
   updateAllowUsageTracking(isEnabled);
 
-  return logger.log(i18n(`${i18nKey}.${isEnabled ? 'enabled' : 'disabled'}`));
+  return logger.log(i18n(`${i18nKey}.success`, { isEnabled }));
 };
 
-exports.builder = yargs => {
-  yargs.example([
-    ['$0 config set allow-usage-tracking', i18n(`${i18nKey}.examples.default`)],
-  ]);
-
-  return yargs;
+module.exports = {
+  setAllowUsageTracking,
 };

package/commands/config/set/defaultMode.js

@@ -2,14 +2,11 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const { updateDefaultMode } = require('@hubspot/cli-lib/lib/config');
 const { Mode } = require('@hubspot/cli-lib');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
-
-const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
-const i18nKey = 'cli.commands.config.subcommands.set.subcommands.defaultMode';
+const i18nKey = 'cli.commands.config.subcommands.set.options.defaultMode';
 
 const ALL_MODES = Object.values(Mode);
 
@@ -29,29 +26,19 @@ const selectMode = async () => {
   return mode;
 };
 
-exports.command = 'default-mode [newDefault]';
-exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
+const setDefaultMode = async ({ accountId, defaultMode }) => {
+  trackCommandUsage('config-set-default-mode', {}, accountId);
 
-  const accountId = getAccountId(options);
-  const { newMode: specifiedNewDefault } = options;
   let newDefault;
 
-  trackCommandUsage('config-set-default-mode', {}, accountId);
-
-  if (!specifiedNewDefault) {
+  if (!defaultMode) {
     newDefault = await selectMode();
-  } else if (
-    specifiedNewDefault &&
-    ALL_MODES.find(m => m === specifiedNewDefault)
-  ) {
-    newDefault = specifiedNewDefault;
+  } else if (defaultMode && ALL_MODES.find(m => m === defaultMode)) {
+    newDefault = defaultMode;
   } else {
     logger.error(
-      i18n(`${i18nKey}.errors.invalidMode`, {
-        mode: specifiedNewDefault,
+      i18n(`${i18nKey}.errors`, {
+        mode: newDefault,
         validModes: commaSeparatedValues(ALL_MODES),
       })
     );
@@ -61,23 +48,12 @@ exports.handler = async options => {
   updateDefaultMode(newDefault);
 
   return logger.success(
-    i18n(`${i18nKey}.success.modeUpdated`, {
+    i18n(`${i18nKey}.success`, {
       mode: newDefault,
     })
   );
 };
 
-exports.builder = yargs => {
-  yargs.positional('newMode', {
-    describe: i18n(`${i18nKey}.positionals.newMode.describe`),
-    type: 'string',
-  });
-
-  yargs.example([
-    ['$0 config set default-mode', i18n(`${i18nKey}.examples.default`)],
-    ['$0 config set default-mode publish', i18n(`${i18nKey}.examples.publish`)],
-    ['$0 config set default-mode draft', i18n(`${i18nKey}.examples.draft`)],
-  ]);
-
-  return yargs;
+module.exports = {
+  setDefaultMode,
 };

package/commands/config/set/httpTimeout.js

@@ -1,39 +1,42 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateHttpTimeout } = require('@hubspot/cli-lib/lib/config');
-
-const { getAccountId } = require('../../../lib/commonOpts');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
-const i18nKey = 'cli.commands.config.subcommands.set.subcommands.httpTimeout';
-
-exports.command = 'http-timeout [timeout]';
-exports.describe = i18n(`${i18nKey}.describe`);
+const i18nKey = 'cli.commands.config.subcommands.set.options.httpTimeout';
 
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
+const enterTimeout = async () => {
+  const { timeout } = await promptUser([
+    {
+      name: 'timeout',
+      message: i18n(`${i18nKey}.promptMessage`),
+      type: 'input',
+      default: 30000,
+    },
+  ]);
 
-  const accountId = getAccountId(options);
-  const { timeout } = options;
+  return timeout;
+};
 
+const setHttpTimeout = async ({ accountId, httpTimeout }) => {
   trackCommandUsage('config-set-http-timeout', {}, accountId);
 
-  updateHttpTimeout(timeout);
+  let newHttpTimeout;
 
-  return logger.success(i18n(`${i18nKey}.success.timeoutUpdated`, { timeout }));
-};
+  if (!httpTimeout) {
+    newHttpTimeout = await enterTimeout();
+  } else {
+    newHttpTimeout = httpTimeout;
+  }
 
-exports.builder = yargs => {
-  yargs.positional('timeout', {
-    describe: i18n(`${i18nKey}.positionals.timeout.describe`),
-    type: 'string',
-    default: 30000,
-  });
+  updateHttpTimeout(newHttpTimeout);
 
-  yargs.example([
-    ['$0 config set http-timeout 30000', i18n(`${i18nKey}.examples.default`)],
-  ]);
+  return logger.success(
+    i18n(`${i18nKey}.success`, { timeout: newHttpTimeout })
+  );
+};
 
-  return yargs;
+module.exports = {
+  setHttpTimeout,
 };

package/commands/config/set.js

@@ -1,25 +1,93 @@
-const { addConfigOptions, addAccountOptions } = require('../../lib/commonOpts');
-const defaultAccount = require('./set/defaultAccount');
-const defaultMode = require('./set/defaultMode');
-const httpTimeout = require('./set/httpTimeout');
-const allowUsageTracking = require('./set/allowUsageTracking');
+const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { getAccountId } = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { setDefaultMode } = require('./set/defaultMode');
+const { setHttpTimeout } = require('./set/httpTimeout');
+const { setAllowUsageTracking } = require('./set/allowUsageTracking');
 
 const i18nKey = 'cli.commands.config.subcommands.set';
 
 exports.command = 'set';
 exports.describe = i18n(`${i18nKey}.describe`);
 
-exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+const selectOptions = async () => {
+  const { mode } = await promptUser([
+    {
+      type: 'list',
+      look: false,
+      name: 'mode',
+      pageSize: 20,
+      message: i18n(`${i18nKey}.promptMessage`),
+      choices: [
+        { name: 'Default mode', value: { defaultMode: '' } },
+        { name: 'Allow usage tracking', value: { allowUsageTracking: '' } },
+        { name: 'HTTP timeout', value: { httpTimeout: '' } },
+      ],
+    },
+  ]);
+
+  return mode;
+};
+
+const handleConfigUpdate = async (accountId, options) => {
+  const { defaultMode, httpTimeout, allowUsageTracking } = options;
+
+  if (typeof defaultMode !== 'undefined') {
+    await setDefaultMode({ defaultMode, accountId });
+    return true;
+  } else if (typeof httpTimeout !== 'undefined') {
+    await setHttpTimeout({ httpTimeout, accountId });
+    return true;
+  } else if (typeof allowUsageTracking !== 'undefined') {
+    await setAllowUsageTracking({ allowUsageTracking, accountId });
+    return true;
+  }
+
+  return false;
+};
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  const accountId = getAccountId(options);
 
+  trackCommandUsage('config-set', {}, accountId);
+
+  const configUpdated = await handleConfigUpdate(accountId, options);
+
+  if (!configUpdated) {
+    const selectedOptions = await selectOptions();
+
+    await handleConfigUpdate(accountId, selectedOptions);
+  }
+
+  process.exit(EXIT_CODES.SUCCESS);
+};
+
+exports.builder = yargs => {
   yargs
-    .command(defaultAccount)
-    .command(defaultMode)
-    .command(httpTimeout)
-    .command(allowUsageTracking)
-    .demandCommand(1, '');
+    .options({
+      defaultMode: {
+        describe: i18n(`${i18nKey}.options.defaultMode.describe`),
+        type: 'string',
+      },
+      allowUsageTracking: {
+        describe: i18n(`${i18nKey}.options.allowUsageTracking.describe`),
+        type: 'boolean',
+      },
+      httpTimeout: {
+        describe: i18n(`${i18nKey}.options.httpTimeout.describe`),
+        type: 'string',
+      },
+    })
+    .conflicts('defaultMode', 'allowUsageTracking')
+    .conflicts('defaultMode', 'httpTimeout')
+    .conflicts('allowUsageTracking', 'httpTimeout');
+
+  yargs.example([['$0 config set', i18n(`${i18nKey}.examples.default`)]]);
 
   return yargs;
 };

package/commands/logs.js

@@ -1,4 +1,3 @@
-const Spinnies = require('spinnies');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -42,11 +41,6 @@ const endpointLog = async (accountId, options) => {
   let logsResp;
 
   if (follow) {
-    const spinnies = new Spinnies();
-
-    spinnies.add('tailLogs', {
-      text: i18n(`${i18nKey}.tailLogs`),
-    });
     const tailCall = after =>
       getFunctionLogs(accountId, functionPath, { after });
     const fetchLatest = () => {
@@ -60,9 +54,9 @@ const endpointLog = async (accountId, options) => {
     await tailLogs({
       accountId,
       compact,
-      spinnies,
       tailCall,
       fetchLatest,
+      name: functionPath,
     });
   } else if (latest) {
     try {

package/commands/module/marketplace-validate.js

@@ -0,0 +1,77 @@
+const { logger } = require('@hubspot/cli-lib/logger');
+
+const {
+  addConfigOptions,
+  addAccountOptions,
+  addUseEnvironmentOptions,
+  getAccountId,
+} = require('../../lib/commonOpts');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const {
+  logValidatorResults,
+} = require('../../lib/validators/logValidatorResults');
+const {
+  applyRelativeValidators,
+} = require('../../lib/validators/applyValidators');
+const MARKETPLACE_VALIDATORS = require('../../lib/validators');
+const { VALIDATION_RESULT } = require('../../lib/validators/constants');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.module.subcommands.marketplaceValidate';
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+exports.command = 'marketplace-validate <src>';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  const { src } = options;
+
+  await loadAndValidateOptions(options);
+
+  const accountId = getAccountId(options);
+
+  if (!options.json) {
+    logger.log(
+      i18n(`${i18nKey}.logs.validatingModule`, {
+        path: src,
+      })
+    );
+  }
+  trackCommandUsage('validate', {}, accountId);
+
+  applyRelativeValidators(
+    MARKETPLACE_VALIDATORS.module,
+    src,
+    src,
+    accountId
+  ).then(groupedResults => {
+    logValidatorResults(groupedResults, { logAsJson: options.json });
+
+    if (
+      groupedResults
+        .flat()
+        .some(result => result.result === VALIDATION_RESULT.FATAL)
+    ) {
+      process.exit(EXIT_CODES.WARNING);
+    }
+  });
+};
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+
+  yargs.options({
+    json: {
+      describe: i18n(`${i18nKey}.options.json.describe`),
+      type: 'boolean',
+    },
+  });
+  yargs.positional('src', {
+    describe: i18n(`${i18nKey}.positionals.src.describe`),
+    type: 'string',
+  });
+  return yargs;
+};

package/commands/module.js

@@ -0,0 +1,17 @@
+const marketplaceValidate = require('./module/marketplace-validate');
+const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+// const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+// const i18nKey = 'cli.commands.module';
+
+exports.command = 'module';
+exports.describe = false; //i18n(`${i18nKey}.describe`);
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+
+  yargs.command(marketplaceValidate).demandCommand(1, '');
+
+  return yargs;
+};