@hubspot/cli 4.0.2-beta.0 → 4.0.2-beta.3

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/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');
 
@@ -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/download.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const chalk = require('chalk');
 
 const {
   getAccountId,
@@ -37,7 +38,20 @@ exports.handler = async options => {
 
   trackCommandUsage('project-download', { projectName }, 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/logs.js

@@ -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/upload.js

@@ -1,5 +1,7 @@
 const fs = require('fs');
 const path = require('path');
+const { walk } = require('@hubspot/cli-lib/lib/walk');
+const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
 const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
 const { getFileMapperQueryValues } = require('@hubspot/cli-lib/fileMapper');
 const { upload } = require('@hubspot/cli-lib/api/fileMapper');
@@ -26,6 +28,7 @@ const {
   getMode,
 } = require('../lib/commonOpts');
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
+const { fieldsJsPrompt } = require('../lib/prompts/cmsFieldPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const {
@@ -196,6 +199,12 @@ exports.handler = async options => {
         src,
       })
     );
+
+    // Generate the first-pass file list in here, and pass to uploadFolder.
+    const filePaths = await getUploadableFileList(
+      absoluteSrcPath,
+      options.processFieldsJs
+    );
     uploadFolder(
       accountId,
       absoluteSrcPath,
@@ -203,7 +212,8 @@ exports.handler = async options => {
       {
         mode,
       },
-      options
+      options,
+      filePaths
     )
       .then(results => {
         if (!hasUploadErrors(results)) {
@@ -237,6 +247,46 @@ exports.handler = async options => {
   }
 };
 
+/*
+ * Walks the src folder for files, filters them based on ignore filter.
+ * If processFieldsJs is true then will check for any JS fields conflicts (i.e., JS fields file and fields.json file) and prompt to resolve
+ */
+const getUploadableFileList = async (src, processFieldsJs) => {
+  const filePaths = await walk(src);
+  const allowedFiles = filePaths
+    .filter(file => {
+      if (!isAllowedExtension(file)) {
+        return false;
+      }
+      return true;
+    })
+    .filter(createIgnoreFilter());
+  if (!processFieldsJs) {
+    return allowedFiles;
+  }
+
+  let uploadableFiles = [];
+  let skipFiles = [];
+  for (const filePath of allowedFiles) {
+    const fileName = path.basename(filePath);
+    if (skipFiles.includes(filePath)) continue;
+    const isProcessable = isProcessableFieldsJs(src, filePath, processFieldsJs);
+    if (isProcessable || fileName == 'fields.json') {
+      // This prompt checks if there are multiple field files in the folder and gets user to choose.
+      const [choice, updatedSkipFiles] = await fieldsJsPrompt(
+        filePath,
+        src,
+        skipFiles
+      );
+      skipFiles = updatedSkipFiles;
+      // If they chose something other than the current file, move on.
+      if (choice !== filePath) continue;
+    }
+    uploadableFiles.push(filePath);
+  }
+  return uploadableFiles;
+};
+
 exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);

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.0",
+  "version": "4.0.2-beta.3",
   "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.0",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.0",
+    "@hubspot/cli-lib": "4.0.2-beta.3",
+    "@hubspot/serverless-dev-runtime": "4.0.2-beta.3",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "861cd70866ca2e8f803d5b61c73fccd04f3d6c75"
+  "gitHead": "8d7d59214871eb34d2e9061e253c8d5d39ae0d9a"
 }