@hubspot/cli 4.0.2-beta.2 → 4.0.2-beta.4

package/bin/cli.js

@@ -7,7 +7,10 @@ const chalk = require('chalk');
 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 {
+  trackHelpUsage,
+  trackProcessFieldsUsage,
+} = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -166,3 +169,7 @@ const argv = yargs
 if (argv.help) {
   trackHelpUsage(getCommandName(argv));
 }
+
+if (argv.processFieldsJs) {
+  trackProcessFieldsUsage(getCommandName(argv));
+}

package/commands/accounts/list.js

@@ -72,7 +72,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('accounts-list', {}, accountId);
+  trackCommandUsage('accounts-list', null, accountId);
 
   const config = getConfig();
   const configPath = getConfigPath();

package/commands/accounts/rename.js

@@ -21,7 +21,7 @@ exports.handler = async options => {
   const { accountName, newName } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('accounts-rename', {}, accountId);
+  trackCommandUsage('accounts-rename', null, accountId);
 
   await renameAccount(accountName, newName);
 

package/commands/accounts/use.js

@@ -37,7 +37,7 @@ exports.handler = async options => {
 
   trackCommandUsage(
     'accounts-use',
-    {},
+    null,
     getAccountIdFromConfig(newDefaultAccount)
   );
 

package/commands/config/set/allowUsageTracking.js

@@ -33,7 +33,7 @@ const enableOrDisableUsageTracking = async () => {
 };
 
 const setAllowUsageTracking = async ({ accountId, allowUsageTracking }) => {
-  trackCommandUsage('config-set-allow-usage-tracking', {}, accountId);
+  trackCommandUsage('config-set-allow-usage-tracking', null, accountId);
 
   let isEnabled;
 

package/commands/config/set/defaultMode.js

@@ -27,7 +27,7 @@ const selectMode = async () => {
 };
 
 const setDefaultMode = async ({ accountId, defaultMode }) => {
-  trackCommandUsage('config-set-default-mode', {}, accountId);
+  trackCommandUsage('config-set-default-mode', null, accountId);
 
   let newDefault;
 

package/commands/config/set/httpTimeout.js

@@ -20,7 +20,7 @@ const enterTimeout = async () => {
 };
 
 const setHttpTimeout = async ({ accountId, httpTimeout }) => {
-  trackCommandUsage('config-set-http-timeout', {}, accountId);
+  trackCommandUsage('config-set-http-timeout', null, accountId);
 
   let newHttpTimeout;
 

package/commands/config/set.js

@@ -54,7 +54,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('config-set', {}, accountId);
+  trackCommandUsage('config-set', null, accountId);
 
   const configUpdated = await handleConfigUpdate(accountId, options);
 

package/commands/create.js

@@ -93,13 +93,9 @@ exports.handler = async options => {
 
   if (asset.validate && !asset.validate(argsToPass)) return;
 
-  const additionalTracking = (await asset.execute(argsToPass)) || {};
+  await asset.execute(argsToPass);
 
-  trackCommandUsage(
-    'create',
-    { assetType, ...additionalTracking },
-    getAccountId(options)
-  );
+  trackCommandUsage('create', { assetType }, getAccountId(options));
 };
 
 exports.builder = yargs => {

package/commands/filemanager/fetch.js

@@ -32,7 +32,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('filemanager-fetch', {}, accountId);
+  trackCommandUsage('filemanager-fetch', null, accountId);
 
   // Fetch and write file/folder.
   await downloadFileOrFolder(accountId, src, dest, options);

package/commands/functions/deploy.js

@@ -50,7 +50,7 @@ exports.handler = async options => {
   const splitFunctionPath = functionPath.split('.');
   let spinner;
 
-  trackCommandUsage('functions-deploy', { functionPath }, accountId);
+  trackCommandUsage('functions-deploy', null, accountId);
 
   if (
     !splitFunctionPath.length ||

package/commands/functions/list.js

@@ -29,10 +29,9 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async options => {
   loadAndValidateOptions(options);
 
-  const { json, compact } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('functions-list', { json, compact }, accountId);
+  trackCommandUsage('functions-list', null, accountId);
 
   logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
 

package/commands/functions/server.js

@@ -21,7 +21,7 @@ exports.handler = async options => {
   const { path: functionPath } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('functions-server', { functionPath }, accountId);
+  trackCommandUsage('functions-server', null, accountId);
 
   logger.debug(
     i18n(`${i18nKey}.debug.startingServer`, {

package/commands/hubdb/clear.js

@@ -26,7 +26,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-clear', {}, accountId);
+  trackCommandUsage('hubdb-clear', null, accountId);
 
   try {
     const { deletedRowCount } = await clearHubDbTableRows(accountId, tableId);

package/commands/hubdb/create.js

@@ -31,7 +31,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-create', {}, accountId);
+  trackCommandUsage('hubdb-create', null, accountId);
 
   try {
     const filePath = path.resolve(getCwd(), src);

package/commands/hubdb/delete.js

@@ -24,7 +24,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-delete', {}, accountId);
+  trackCommandUsage('hubdb-delete', null, accountId);
 
   try {
     await deleteTable(accountId, tableId);

package/commands/hubdb/fetch.js

@@ -25,7 +25,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-fetch', {}, accountId);
+  trackCommandUsage('hubdb-fetch', null, accountId);
 
   try {
     const { filePath } = await downloadHubDbTable(accountId, tableId, dest);

package/commands/lint.js

@@ -33,7 +33,7 @@ exports.handler = async options => {
     path: localPath,
   });
 
-  trackCommandUsage('lint', {}, accountId);
+  trackCommandUsage('lint', null, accountId);
 
   logger.group(groupName);
   let count = 0;

package/commands/list.js

@@ -37,7 +37,7 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   let contentsResp;
 
-  trackCommandUsage('list', {}, accountId);
+  trackCommandUsage('list', null, accountId);
 
   logger.debug(
     i18n(`${i18nKey}.gettingPathContents`, {

package/commands/module/marketplace-validate.js

@@ -38,7 +38,7 @@ exports.handler = async options => {
       })
     );
   }
-  trackCommandUsage('validate', {}, accountId);
+  trackCommandUsage('validate', null, accountId);
 
   applyRelativeValidators(
     MARKETPLACE_VALIDATORS.module,

package/commands/mv.js

@@ -36,7 +36,7 @@ exports.handler = async options => {
   const { srcPath, destPath } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('mv', {}, accountId);
+  trackCommandUsage('mv', null, accountId);
 
   try {
     await moveFile(accountId, srcPath, getCorrectedDestPath(srcPath, destPath));

package/commands/open.js

@@ -34,7 +34,7 @@ exports.handler = async options => {
   const { shortcut, list } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('open', { shortcut }, accountId);
+  trackCommandUsage('open', null, accountId);
 
   if (shortcut === undefined && !list) {
     const choice = await createListPrompt(accountId);

package/commands/process.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
-const { isAllowedExtension } = require('@hubspot/cli-lib//path');
+const { isAllowedExtension, getCwd } = require('@hubspot/cli-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { walk } = require('@hubspot/cli-lib/lib/walk');
 const { getThemeJSONPath } = require('@hubspot/cli-lib/lib/files');
@@ -10,6 +10,8 @@ const {
   FieldsJs,
   isProcessableFieldsJs,
 } = require('@hubspot/cli-lib/lib/handleFieldsJs');
+
+const { trackProcessFieldsUsage } = require('../lib/usageTracking');
 const i18nKey = 'cli.commands.process';
 
 exports.command = 'process';
@@ -24,7 +26,7 @@ const invalidPath = src => {
 };
 
 exports.handler = async options => {
-  const src = options.src;
+  const src = path.resolve(getCwd(), options.src);
   const projectRoot = path.dirname(getThemeJSONPath(src));
   let stats;
   try {
@@ -37,6 +39,8 @@ exports.handler = async options => {
     invalidPath(src);
   }
 
+  trackProcessFieldsUsage('process');
+
   if (stats.isFile()) {
     const fieldsJs = await new FieldsJs(
       projectRoot,

package/commands/project/create.js

@@ -14,6 +14,7 @@ const {
 } = require('../../lib/prompts/createProjectPrompt');
 const { createProjectConfig } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { PROJECT_TEMPLATES } = require('@hubspot/cli-lib/lib/constants');
 const { uiFeatureHighlight } = require('../../lib/ui');
 const { logger } = require('@hubspot/cli-lib/logger');
 
@@ -29,7 +30,7 @@ exports.handler = async options => {
 
   const { name, template, location } = await createProjectPrompt(options);
 
-  trackCommandUsage('project-create', { projectName: name }, accountId);
+  trackCommandUsage('project-create', null, accountId);
 
   await createProjectConfig(
     path.resolve(getCwd(), options.location || location),
@@ -60,6 +61,7 @@ exports.builder = yargs => {
     template: {
       describe: i18n(`${i18nKey}.options.template.describe`),
       type: 'string',
+      choices: PROJECT_TEMPLATES.map(template => template.name),
     },
   });
 

package/commands/project/deploy.js

@@ -15,6 +15,7 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { getProjectConfig, pollDeployStatus } = require('../../lib/projects');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+// const { getAccountConfig } = require('@hubspot/cli-lib');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -26,9 +27,11 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
+  // const accountConfig = getAccountConfig(accountId);
   const { project, buildId } = options;
+  // const sandboxType = accountConfig && accountConfig.sandboxAccountType;
 
-  trackCommandUsage('project-deploy', { project }, accountId);
+  trackCommandUsage('project-deploy', null, accountId);
 
   const { projectConfig } = await getProjectConfig();
 

package/commands/project/download.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const chalk = require('chalk');
 
 const {
   getAccountId,
@@ -35,9 +36,22 @@ exports.handler = async options => {
   const { name: projectName, dest, buildNumber } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('project-download', { projectName }, accountId);
+  trackCommandUsage('project-download', null, accountId);
 
-  await ensureProjectExists(accountId, projectName, { allowCreate: false });
+  const projectExists = await ensureProjectExists(accountId, projectName, {
+    allowCreate: false,
+    noLogs: true,
+  });
+
+  if (!projectExists) {
+    logger.error(
+      i18n(`${i18nKey}.errors.projectNotFound`, {
+        projectName: chalk.bold(projectName),
+        accountId: chalk.bold(accountId),
+      })
+    );
+    process.exit(EXIT_CODES.ERROR);
+  }
 
   const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
 

package/commands/project/listBuilds.js

@@ -40,7 +40,7 @@ exports.handler = async options => {
   const { path: projectPath, limit } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('project-list-builds', { projectPath }, accountId);
+  trackCommandUsage('project-list-builds', null, accountId);
 
   const cwd = projectPath ? path.resolve(getCwd(), projectPath) : getCwd();
   const { projectConfig, projectDir } = await getProjectConfig(cwd);

package/commands/project/logs.js

@@ -188,7 +188,7 @@ exports.handler = async options => {
     }
   }
 
-  trackCommandUsage('project-logs', { latest: options.latest }, accountId);
+  trackCommandUsage('project-logs', null, accountId);
 
   const logsInfo = [accountId, `"${projectName}"`];
   let tableHeader;
@@ -276,18 +276,18 @@ exports.builder = yargs => {
         describe: i18n(`${i18nKey}.options.compact.describe`),
         type: 'boolean',
       },
-      follow: {
-        alias: ['t', 'tail', 'f'],
-        describe: i18n(`${i18nKey}.options.follow.describe`),
+      tail: {
+        alias: ['t', 'follow'],
+        describe: i18n(`${i18nKey}.options.tail.describe`),
         type: 'boolean',
       },
       limit: {
-        alias: ['limit', 'n', 'max-count'],
         describe: i18n(`${i18nKey}.options.limit.describe`),
         type: 'number',
+        default: 10,
       },
     })
-    .conflicts('follow', 'limit');
+    .conflicts('tail', 'limit');
 
   yargs.example([['$0 project logs', i18n(`${i18nKey}.examples.default`)]]);
   yargs.example([

package/commands/project/open.js

@@ -29,7 +29,7 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const { project } = options;
 
-  trackCommandUsage('project-open', { project }, accountId);
+  trackCommandUsage('project-open', null, accountId);
 
   const { projectConfig } = await getProjectConfig();
 

package/commands/project/upload.js

@@ -18,6 +18,7 @@ const {
   validateProjectConfig,
 } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+// const { getAccountConfig } = require('@hubspot/cli-lib');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
@@ -30,8 +31,10 @@ exports.handler = async options => {
 
   const { forceCreate, path: projectPath } = options;
   const accountId = getAccountId(options);
+  // const accountConfig = getAccountConfig(accountId);
+  // const sandboxType = accountConfig && accountConfig.sandboxAccountType;
 
-  trackCommandUsage('project-upload', { projectPath }, accountId);
+  trackCommandUsage('project-upload', null, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 

package/commands/project/watch.js

@@ -83,7 +83,7 @@ exports.handler = async options => {
   const { initialUpload, path: projectPath } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('project-watch', { projectPath }, accountId);
+  trackCommandUsage('project-watch', null, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 

package/commands/remove.js

@@ -27,7 +27,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('remove', {}, accountId);
+  trackCommandUsage('remove', null, accountId);
 
   try {
     await deleteFile(accountId, hsPath);

package/commands/sandbox/create.js

@@ -120,7 +120,7 @@ exports.handler = async options => {
     succeedColor: 'white',
   });
 
-  trackCommandUsage('sandbox-create', {}, accountId);
+  trackCommandUsage('sandbox-create', null, accountId);
 
   let namePrompt;
 
@@ -151,8 +151,6 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
-    trackCommandUsage('sandbox-create', { success: false }, accountId);
-
     spinnies.fail('sandboxCreate', {
       text: i18n(`${i18nKey}.loading.fail`, {
         sandboxName,

package/commands/sandbox/delete.js

@@ -49,7 +49,7 @@ exports.handler = async options => {
     account: account || accountPrompt.account,
   });
 
-  trackCommandUsage('sandbox-delete', {}, sandboxAccountId);
+  trackCommandUsage('sandbox-delete', null, sandboxAccountId);
 
   let parentAccountId;
   for (const portal of config.portals) {
@@ -126,8 +126,6 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
-    trackCommandUsage('sandbox-delete', { success: false }, sandboxAccountId);
-
     if (
       err.error &&
       err.error.category === OBJECT_NOT_FOUND &&

package/commands/secrets/addSecret.js

@@ -28,7 +28,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-add', {}, accountId);
+  trackCommandUsage('secrets-add', null, accountId);
 
   try {
     const { secretValue } = await secretValuePrompt();

package/commands/secrets/deleteSecret.js

@@ -27,7 +27,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-delete', {}, accountId);
+  trackCommandUsage('secrets-delete', null, accountId);
 
   try {
     await deleteSecret(accountId, secretName);

package/commands/secrets/listSecrets.js

@@ -25,7 +25,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-list', {}, accountId);
+  trackCommandUsage('secrets-list', null, accountId);
 
   try {
     const { results } = await fetchSecrets(accountId);

package/commands/secrets/updateSecret.js

@@ -28,7 +28,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-update', {}, accountId);
+  trackCommandUsage('secrets-update', null, accountId);
 
   try {
     const { secretValue } = await secretValuePrompt();

package/commands/theme/marketplace-validate.js

@@ -63,7 +63,7 @@ exports.handler = async options => {
       })
     );
   }
-  trackCommandUsage('validate', {}, accountId);
+  trackCommandUsage('validate', null, accountId);
 
   const themeFiles = await walk(absoluteSrcPath);
 

package/lib/projects.js

@@ -115,7 +115,7 @@ const createProjectConfig = async (projectPath, projectName, template) => {
     }`
   );
 
-  if (template === 'none') {
+  if (template === 'no-template') {
     fs.ensureDirSync(path.join(projectPath, 'src'));
 
     writeProjectConfig(projectConfigPath, {

package/lib/prompts/createProjectPrompt.js

@@ -47,18 +47,12 @@ const createProjectPrompt = (promptOptions = {}) => {
         !promptOptions.template ||
         !PROJECT_TEMPLATES.find(t => t.name === promptOptions.template),
       type: 'list',
-      choices: [
-        {
-          name: i18n(`${i18nKey}.templateOptions.noTemplate`),
-          value: 'none',
-        },
-        ...PROJECT_TEMPLATES.map(template => {
-          return {
-            name: template.label,
-            value: template.name,
-          };
-        }),
-      ],
+      choices: PROJECT_TEMPLATES.map(template => {
+        return {
+          name: template.label,
+          value: template.name,
+        };
+      }),
     },
   ]);
 };

package/lib/ui.js

@@ -37,10 +37,11 @@ const getTerminalUISupport = () => {
  */
 const uiLink = (linkText, url) => {
   const terminalUISupport = getTerminalUISupport();
+  const encodedUrl = encodeURI(url);
   if (terminalUISupport.hyperlinks) {
     const result = [
       '\u001B]8;;',
-      url,
+      encodedUrl,
       '\u0007',
       linkText,
       '\u001B]8;;\u0007',
@@ -48,8 +49,8 @@ const uiLink = (linkText, url) => {
     return terminalUISupport.color ? chalk.cyan(result) : result;
   } else {
     return terminalUISupport.color
-      ? `${linkText}: ${chalk.cyan(url)}`
-      : `${linkText}: ${url}`;
+      ? `${linkText}: ${chalk.cyan(encodedUrl)}`
+      : `${linkText}: ${encodedUrl}`;
   }
 };
 

package/lib/usageTracking.js

@@ -78,6 +78,24 @@ async function trackHelpUsage(command) {
   }
 }
 
+async function trackProcessFieldsUsage(command) {
+  if (!isTrackingAllowed()) {
+    return;
+  }
+  try {
+    logger.debug('Attempting to track usage of "%s" command', command);
+    await trackUsage('cli-interaction', EventClass.INTERACTION, {
+      action: 'cli-process-fields',
+      os: getPlatform(),
+      ...getNodeVersionData(),
+      version,
+      command,
+    });
+  } catch (e) {
+    logger.debug('Usage tracking failed: %s', e.message);
+  }
+}
+
 const addHelpUsageTracking = (program, command) => {
   program.on('--help', () => {
     setLogLevel(program);
@@ -118,5 +136,6 @@ module.exports = {
   trackCommandUsage,
   trackHelpUsage,
   addHelpUsageTracking,
+  trackProcessFieldsUsage,
   trackAuthAction,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.2-beta.2",
+  "version": "4.0.2-beta.4",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.0.2-beta.2",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.2",
+    "@hubspot/cli-lib": "4.0.2-beta.4",
+    "@hubspot/serverless-dev-runtime": "4.0.2-beta.4",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e934f0fea1842d1f28df725c425308327f449f6a"
+  "gitHead": "56347c4026ac958b9a721ed0057b68c7c4c4918d"
 }