@hubspot/cli 4.2.0 → 4.2.1-beta.1

package/lib/projects.js

@@ -179,15 +179,15 @@ const pollFetchProject = async (accountId, projectName) => {
   // Temporary solution for gating slowness. Retry on 403 statusCode
   return new Promise((resolve, reject) => {
     let pollCount = 0;
-    const spinnies = SpinniesManager.init();
-    spinnies.add('pollFetchProject', {
+    SpinniesManager.init();
+    SpinniesManager.add('pollFetchProject', {
       text: 'Fetching project status',
     });
     const pollInterval = setInterval(async () => {
       try {
         const project = await fetchProject(accountId, projectName);
         if (project) {
-          spinnies.remove('pollFetchProject');
+          SpinniesManager.remove('pollFetchProject');
           clearInterval(pollInterval);
           resolve(project);
         }
@@ -202,11 +202,11 @@ const pollFetchProject = async (accountId, projectName) => {
           pollCount += 1;
         } else if (pollCount >= 15) {
           // Poll up to max 30s
-          spinnies.remove('pollFetchProject');
+          SpinniesManager.remove('pollFetchProject');
           clearInterval(pollInterval);
           reject(err);
         } else {
-          spinnies.remove('pollFetchProject');
+          SpinniesManager.remove('pollFetchProject');
           clearInterval(pollInterval);
           reject(err);
         }
@@ -314,10 +314,10 @@ const uploadProjectFiles = async (
   filePath,
   uploadMessage
 ) => {
-  const spinnies = SpinniesManager.init({});
+  SpinniesManager.init({});
   const accountIdentifier = uiAccountDescription(accountId);
 
-  spinnies.add('upload', {
+  SpinniesManager.add('upload', {
     text: i18n(`${i18nKey}.uploadProjectFiles.add`, {
       accountIdentifier,
       projectName,
@@ -338,7 +338,7 @@ const uploadProjectFiles = async (
 
     buildId = upload.buildId;
 
-    spinnies.succeed('upload', {
+    SpinniesManager.succeed('upload', {
       text: i18n(`${i18nKey}.uploadProjectFiles.succeed`, {
         accountIdentifier,
         projectName,
@@ -352,7 +352,7 @@ const uploadProjectFiles = async (
       })
     );
   } catch (err) {
-    spinnies.fail('upload', {
+    SpinniesManager.fail('upload', {
       text: i18n(`${i18nKey}.uploadProjectFiles.fail`, {
         accountIdentifier,
         projectName,
@@ -372,18 +372,20 @@ const pollProjectBuildAndDeploy = async (
   buildId,
   silenceLogs = false
 ) => {
-  const {
-    autoDeployId,
-    isAutoDeployEnabled,
-    deployStatusTaskLocator,
-    status,
-  } = await pollBuildStatus(
+  const buildStatus = await pollBuildStatus(
     accountId,
     projectConfig.name,
     buildId,
     null,
     silenceLogs
   );
+
+  const {
+    autoDeployId,
+    isAutoDeployEnabled,
+    deployStatusTaskLocator,
+  } = buildStatus;
+
   // autoDeployId of 0 indicates a skipped deploy
   const isDeploying =
     isAutoDeployEnabled && autoDeployId > 0 && deployStatusTaskLocator;
@@ -395,12 +397,11 @@ const pollProjectBuildAndDeploy = async (
   const result = {
     succeeded: true,
     buildId,
-    buildSucceeded: true,
-    autodeployEnabled: isAutoDeployEnabled,
+    buildResult: buildStatus,
+    deployResult: null,
   };
 
-  if (status === 'FAILURE') {
-    result.buildSucceeded = false;
+  if (buildStatus.status === 'FAILURE') {
     result.succeeded = false;
     return result;
   } else if (isDeploying) {
@@ -415,14 +416,16 @@ const pollProjectBuildAndDeploy = async (
         )
       );
     }
-    const { status } = await pollDeployStatus(
+    const deployStatus = await pollDeployStatus(
       accountId,
       projectConfig.name,
       deployStatusTaskLocator.id,
       buildId,
       silenceLogs
     );
-    if (status === 'FAILURE') {
+    result.deployResult = deployStatus;
+
+    if (deployStatus.status === 'FAILURE') {
       result.succeeded = false;
     }
   }
@@ -491,7 +494,7 @@ const handleProjectUpload = async (
       );
 
       if (error) {
-        uploadResult.error = error;
+        uploadResult.uploadError = error;
       } else if (callbackFunc) {
         uploadResult = await callbackFunc(
           accountId,
@@ -548,11 +551,11 @@ const makePollTaskStatusFunc = ({
       );
     }
 
-    const spinnies = SpinniesManager.init();
+    SpinniesManager.init();
 
     const overallTaskSpinniesKey = `overallTaskStatus-${statusText.STATUS_TEXT}`;
 
-    spinnies.add(overallTaskSpinniesKey, {
+    SpinniesManager.add(overallTaskSpinniesKey, {
       text: 'Beginning',
       succeedColor: 'white',
       failColor: 'white',
@@ -598,7 +601,7 @@ const makePollTaskStatusFunc = ({
           { numComponents }
         ) + '\n';
 
-    spinnies.update(overallTaskSpinniesKey, {
+    SpinniesManager.update(overallTaskSpinniesKey, {
       text: `${statusStrings.INITIALIZE(taskName)}\n${componentCountText}`,
     });
 
@@ -613,7 +616,7 @@ const makePollTaskStatusFunc = ({
           taskName
         )} ${formattedTaskType} ...${newline ? '\n' : ''}`;
 
-        spinnies.add(task.id, {
+        SpinniesManager.add(task.id, {
           text,
           indent,
           succeedColor: 'white',
@@ -638,10 +641,10 @@ const makePollTaskStatusFunc = ({
 
         const { status, [statusText.SUBTASK_KEY]: subTaskStatus } = taskStatus;
 
-        if (spinnies.hasActiveSpinners()) {
+        if (SpinniesManager.hasActiveSpinners()) {
           subTaskStatus.forEach(subTask => {
             const { id, status } = subTask;
-            const spinner = spinnies.pick(id);
+            const spinner = SpinniesManager.pick(id);
 
             if (!spinner || spinner.status !== SPINNER_STATUS.SPINNING) {
               return;
@@ -665,12 +668,12 @@ const makePollTaskStatusFunc = ({
               )} ${taskStatusText}${hasNewline ? '\n' : ''}`;
 
               status === statusText.STATES.SUCCESS
-                ? spinnies.succeed(id, { text: updatedText })
-                : spinnies.fail(id, { text: updatedText });
+                ? SpinniesManager.succeed(id, { text: updatedText })
+                : SpinniesManager.fail(id, { text: updatedText });
 
               if (topLevelTask) {
                 topLevelTask.subtasks.forEach(currentSubtask =>
-                  spinnies.remove(currentSubtask.id)
+                  SpinniesManager.remove(currentSubtask.id)
                 );
               }
             }
@@ -678,11 +681,11 @@ const makePollTaskStatusFunc = ({
 
           if (isTaskComplete(taskStatus)) {
             if (status === statusText.STATES.SUCCESS) {
-              spinnies.succeed(overallTaskSpinniesKey, {
+              SpinniesManager.succeed(overallTaskSpinniesKey, {
                 text: statusStrings.SUCCESS(taskName),
               });
             } else if (status === statusText.STATES.FAILURE) {
-              spinnies.fail(overallTaskSpinniesKey, {
+              SpinniesManager.fail(overallTaskSpinniesKey, {
                 text: statusStrings.FAIL(taskName),
               });
 

package/lib/sandbox-create.js

@@ -1,4 +1,4 @@
-const Spinnies = require('spinnies');
+const SpinniesManager = require('./SpinniesManager');
 const {
   getSandboxLimit,
   getHasSandboxesByType,
@@ -38,7 +38,7 @@ const buildSandbox = async ({
   env,
   force = false,
 }) => {
-  const spinnies = new Spinnies({
+  SpinniesManager.init({
     succeedColor: 'white',
   });
   const accountId = getAccountId(accountConfig.portalId);
@@ -48,7 +48,7 @@ const buildSandbox = async ({
 
   try {
     logger.log('');
-    spinnies.add('sandboxCreate', {
+    SpinniesManager.add('sandboxCreate', {
       text: i18n(`${spinniesI18nKey}.add`, {
         sandboxName: name,
       }),
@@ -57,7 +57,7 @@ const buildSandbox = async ({
     const sandboxApiType = sandboxApiTypeMap[type]; // API expects sandbox type as 1 or 2
     result = await createSandbox(accountId, name, sandboxApiType);
 
-    spinnies.succeed('sandboxCreate', {
+    SpinniesManager.succeed('sandboxCreate', {
       text: i18n(`${spinniesI18nKey}.succeed`, {
         name: result.sandbox.name,
         sandboxHubId: result.sandbox.sandboxHubId,
@@ -66,7 +66,7 @@ const buildSandbox = async ({
   } catch (err) {
     debugErrorAndContext(err);
 
-    spinnies.fail('sandboxCreate', {
+    SpinniesManager.fail('sandboxCreate', {
       text: i18n(`${spinniesI18nKey}.fail`, {
         sandboxName: name,
       }),

package/lib/sandbox-sync.js

@@ -1,4 +1,4 @@
-const Spinnies = require('spinnies');
+const SpinniesManager = require('./SpinniesManager');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('./lang');
@@ -44,7 +44,7 @@ const syncSandbox = async ({
 }) => {
   const accountId = getAccountId(accountConfig.portalId);
   const parentAccountId = getAccountId(parentAccountConfig.portalId);
-  const spinnies = new Spinnies({
+  SpinniesManager.init({
     succeedColor: 'white',
   });
   let initiateSyncResponse;
@@ -68,7 +68,7 @@ const syncSandbox = async ({
       );
     }
 
-    spinnies.add('sandboxSync', {
+    SpinniesManager.add('sandboxSync', {
       text: i18n(`${i18nKey}.loading.startSync`),
     });
 
@@ -82,7 +82,7 @@ const syncSandbox = async ({
     if (allowEarlyTermination) {
       logger.log(i18n(`${i18nKey}.info.earlyExit`));
     }
-    spinnies.succeed('sandboxSync', {
+    SpinniesManager.succeed('sandboxSync', {
       text: i18n(`${i18nKey}.loading.succeed`, {
         accountName: uiAccountDescription(accountId),
       }),
@@ -101,7 +101,7 @@ const syncSandbox = async ({
   } catch (err) {
     debugErrorAndContext(err);
 
-    spinnies.fail('sandboxSync', {
+    SpinniesManager.fail('sandboxSync', {
       text: i18n(`${i18nKey}.loading.fail`),
     });
 
@@ -182,10 +182,10 @@ const syncSandbox = async ({
       );
 
       logger.log('');
-      spinnies.add('syncComplete', {
+      SpinniesManager.add('syncComplete', {
         text: i18n(`${i18nKey}.polling.syncing`),
       });
-      spinnies.succeed('syncComplete', {
+      SpinniesManager.succeed('syncComplete', {
         text: i18n(`${i18nKey}.polling.succeed`),
       });
       logger.log('');
@@ -198,10 +198,10 @@ const syncSandbox = async ({
       // If polling fails at this point, we do not track a failed sync since it is running in the background.
       logErrorInstance(err);
 
-      spinnies.add('syncComplete', {
+      SpinniesManager.add('syncComplete', {
         text: i18n(`${i18nKey}.polling.syncing`),
       });
-      spinnies.fail('syncComplete', {
+      SpinniesManager.fail('syncComplete', {
         text: i18n(`${i18nKey}.polling.fail`, {
           url: syncStatusUrl,
         }),

package/lib/serverlessLogs.js

@@ -1,5 +1,5 @@
 const https = require('https');
-const Spinnies = require('spinnies');
+const SpinniesManager = require('./SpinniesManager');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
@@ -15,10 +15,10 @@ const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const TAIL_DELAY = 5000;
 
-const handleUserInput = spinnies => {
+const handleUserInput = () => {
   const onTerminate = async () => {
-    spinnies.remove('tailLogs');
-    spinnies.remove('stopMessage');
+    SpinniesManager.remove('tailLogs');
+    SpinniesManager.remove('stopMessage');
     process.exit(EXIT_CODES.SUCCESS);
   };
 
@@ -82,17 +82,17 @@ const tailLogs = async ({
     }, TAIL_DELAY);
   };
 
-  const spinnies = new Spinnies();
+  SpinniesManager.init();
 
-  spinnies.add('tailLogs', {
+  SpinniesManager.add('tailLogs', {
     text: `Following logs for ${name}`,
   });
-  spinnies.add('stopMessage', {
+  SpinniesManager.add('stopMessage', {
     text: `> Press ${chalk.bold('q')} to stop following`,
     status: 'non-spinnable',
   });
 
-  handleUserInput(spinnies);
+  handleUserInput();
 
   await tail(initialAfter);
 };

package/lib/spinniesUtils.js

@@ -0,0 +1,174 @@
+/*
+https://github.com/jbcarpanelli/spinnies
+
+Copyright 2019 Juan Bautista Carpanelli (jcarpanelli)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+**/
+const readline = require('readline');
+const stripAnsi = require('strip-ansi');
+
+const VALID_STATUSES = [
+  'succeed',
+  'fail',
+  'spinning',
+  'non-spinnable',
+  'stopped',
+];
+const VALID_COLORS = [
+  'black',
+  'red',
+  'green',
+  'yellow',
+  'blue',
+  'magenta',
+  'cyan',
+  'white',
+  'gray',
+  'redBright',
+  'greenBright',
+  'yellowBright',
+  'blueBright',
+  'magentaBright',
+  'cyanBright',
+  'whiteBright',
+];
+const SPINNERS = {
+  dots: {
+    interval: 50,
+    frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],
+  },
+  dashes: {
+    interval: 80,
+    frames: ['-', '_'],
+  },
+};
+
+function purgeSpinnerOptions(options) {
+  const { text, status, indent } = options;
+  const opts = { text, status, indent };
+  const colors = colorOptions(options);
+
+  if (!VALID_STATUSES.includes(status)) delete opts.status;
+  if (typeof text !== 'string') delete opts.text;
+  if (typeof indent !== 'number') delete opts.indent;
+
+  return { ...colors, ...opts };
+}
+
+function purgeSpinnersOptions({ spinner, disableSpins, ...others }) {
+  const colors = colorOptions(others);
+  const prefixes = prefixOptions(others);
+  const disableSpinsOption =
+    typeof disableSpins === 'boolean' ? { disableSpins } : {};
+  spinner = turnToValidSpinner(spinner);
+
+  return { ...colors, ...prefixes, ...disableSpinsOption, spinner };
+}
+
+function turnToValidSpinner(spinner = {}) {
+  const platformSpinner = terminalSupportsUnicode()
+    ? SPINNERS.dots
+    : SPINNERS.dashes;
+  if (typeof spinner !== 'object') {
+    return platformSpinner;
+  }
+  let { interval, frames } = spinner;
+  if (!Array.isArray(frames) || frames.length < 1)
+    frames = platformSpinner.frames;
+  if (typeof interval !== 'number') {
+    interval = platformSpinner.interval;
+  }
+
+  return { interval, frames };
+}
+
+function colorOptions({ color, succeedColor, failColor, spinnerColor }) {
+  const colors = { color, succeedColor, failColor, spinnerColor };
+  Object.keys(colors).forEach(key => {
+    if (!VALID_COLORS.includes(colors[key])) {
+      delete colors[key];
+    }
+  });
+
+  return colors;
+}
+
+function prefixOptions({ succeedPrefix, failPrefix }) {
+  if (terminalSupportsUnicode()) {
+    succeedPrefix = succeedPrefix || '✓';
+    failPrefix = failPrefix || '✖';
+  } else {
+    succeedPrefix = succeedPrefix || '√';
+    failPrefix = failPrefix || '×';
+  }
+
+  return { succeedPrefix, failPrefix };
+}
+
+function breakText(text, prefixLength) {
+  return text
+    .split('\n')
+    .map((line, index) =>
+      index === 0 ? breakLine(line, prefixLength) : breakLine(line, 0)
+    )
+    .join('\n');
+}
+
+function breakLine(line, prefixLength) {
+  const columns = process.stderr.columns || 95;
+  return line.length >= columns - prefixLength
+    ? `${line.substring(0, columns - prefixLength - 1)}\n${breakLine(
+        line.substring(columns - prefixLength - 1, line.length),
+        0
+      )}`
+    : line;
+}
+
+function getLinesLength(text, prefixLength) {
+  return stripAnsi(text)
+    .split('\n')
+    .map((line, index) =>
+      index === 0 ? line.length + prefixLength : line.length
+    );
+}
+
+function writeStream(stream, output, rawLines) {
+  stream.write(output);
+  readline.moveCursor(stream, 0, -rawLines.length);
+}
+
+function cleanStream(stream, rawLines) {
+  rawLines.forEach((lineLength, index) => {
+    readline.moveCursor(stream, lineLength, index);
+    readline.clearLine(stream, 1);
+    readline.moveCursor(stream, -lineLength, -index);
+  });
+  readline.moveCursor(stream, 0, rawLines.length);
+  readline.clearScreenDown(stream);
+  readline.moveCursor(stream, 0, -rawLines.length);
+}
+
+function terminalSupportsUnicode() {
+  // The default command prompt and powershell in Windows do not support Unicode characters.
+  // However, the VSCode integrated terminal and the Windows Terminal both do.
+  return (
+    process.platform !== 'win32' ||
+    process.env.TERM_PROGRAM === 'vscode' ||
+    !!process.env.WT_SESSION
+  );
+}
+
+module.exports = {
+  breakText,
+  cleanStream,
+  colorOptions,
+  getLinesLength,
+  purgeSpinnerOptions,
+  purgeSpinnersOptions,
+  SPINNERS,
+  terminalSupportsUnicode,
+  writeStream,
+};

package/lib/ui.js

@@ -105,6 +105,12 @@ const uiFeatureHighlight = (commands, title) => {
   });
 };
 
+const uiBetaMessage = message => {
+  const i18nKey = 'cli.lib.ui';
+
+  logger.log(chalk.hex('#bda9ea')(i18n(`${i18nKey}.betaTag`)), message);
+};
+
 const uiBetaWarning = logMessage => {
   const i18nKey = 'cli.lib.ui.betaWarning';
 
@@ -115,6 +121,7 @@ const uiBetaWarning = logMessage => {
 
 module.exports = {
   uiAccountDescription,
+  uiBetaMessage,
   uiBetaWarning,
   uiFeatureHighlight,
   uiInfoSection,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.2.0",
+  "version": "4.2.1-beta.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -10,10 +10,12 @@
   "dependencies": {
     "@hubspot/cli-lib": "^4.1.14",
     "@hubspot/serverless-dev-runtime": "4.1.8-beta.6",
+    "@hubspot/ui-extensions-dev-server": "^0.4.0",
     "archiver": "^5.3.0",
     "body-parser": "^1.19.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
+    "cli-cursor": "^3.1.0",
     "cli-progress": "^3.11.2",
     "cors": "^2.8.5",
     "express": "^4.17.1",
@@ -25,7 +27,7 @@
     "open": "^7.0.3",
     "ora": "^4.0.3",
     "p-queue": "^6.0.2",
-    "spinnies": "^0.5.1",
+    "strip-ansi": "^5.2.0",
     "tmp": "^0.2.1",
     "update-notifier": "^5.1.0",
     "yargs": "15.4.1"
@@ -34,7 +36,7 @@
     "mock-stdin": "^1.0.0"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "bin": {
     "hs": "./bin/hs",
@@ -43,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a60ba8c2375e1102cfc98826147dbadaa94e8f31"
+  "gitHead": "a79d4a4d6c61971986a7df3aaa8374cbe2405a0b"
 }