@hubspot/cli 5.0.2-beta.0 → 5.0.2

package/lib/projectsWatch.js

@@ -0,0 +1,225 @@
+const chokidar = require('chokidar');
+const path = require('path');
+const chalk = require('chalk');
+const { default: PQueue } = require('p-queue');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('./errorHandlers/apiErrors');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { isAllowedExtension } = require('@hubspot/cli-lib/path');
+const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
+const {
+  cancelStagedBuild,
+  provisionBuild,
+  uploadFileToBuild,
+  deleteFileFromBuild,
+  queueBuild,
+} = require('@hubspot/cli-lib/api/dfs');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+
+const i18nKey = 'cli.commands.project.subcommands.watch';
+
+const queue = new PQueue({
+  concurrency: 10,
+});
+const standbyeQueue = [];
+let currentBuildId = null;
+let handleBuildStatus, handleUserInput;
+let timer;
+
+const processStandByQueue = async (accountId, projectName) => {
+  queue.addAll(
+    standbyeQueue.map(({ filePath, remotePath, action }) => {
+      return async () => {
+        queueFileOrFolder(accountId, projectName, filePath, remotePath, action);
+      };
+    })
+  );
+  standbyeQueue.length = 0;
+  debounceQueueBuild(accountId, projectName);
+};
+
+const createNewStagingBuild = async (accountId, projectName) => {
+  currentBuildId = await createNewBuild(accountId, projectName);
+
+  handleUserInput(accountId, projectName, currentBuildId);
+};
+
+const debounceQueueBuild = (accountId, projectName) => {
+  if (timer) {
+    clearTimeout(timer);
+  }
+
+  timer = setTimeout(async () => {
+    logger.debug(i18n(`${i18nKey}.debug.pause`, { projectName }));
+    queue.pause();
+    await queue.onIdle();
+
+    try {
+      await queueBuild(accountId, projectName);
+      logger.debug(i18n(`${i18nKey}.debug.buildStarted`, { projectName }));
+    } catch (err) {
+      if (
+        err.error &&
+        err.error.subCategory === ERROR_TYPES.MISSING_PROJECT_PROVISION
+      ) {
+        logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
+        process.exit(0);
+      } else {
+        logApiErrorInstance(
+          err,
+          new ApiErrorContext({ accountId, projectName })
+        );
+      }
+
+      return;
+    }
+
+    await handleBuildStatus(accountId, projectName, currentBuildId);
+
+    await createNewStagingBuild(accountId, projectName);
+
+    if (standbyeQueue.length > 0) {
+      await processStandByQueue(accountId, projectName);
+    }
+
+    queue.start();
+    logger.log(i18n(`${i18nKey}.logs.resuming`));
+    logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
+  }, 2000);
+};
+
+const queueFileOrFolder = async (
+  accountId,
+  projectName,
+  filePath,
+  remotePath,
+  action
+) => {
+  if (action === 'upload' && !isAllowedExtension(filePath)) {
+    logger.debug(i18n(`${i18nKey}.debug.extensionNotAllowed`, { filePath }));
+    return;
+  }
+  if (shouldIgnoreFile(filePath, true)) {
+    logger.debug(i18n(`${i18nKey}.debug.ignored`, { filePath }));
+    return;
+  }
+  if (!queue.isPaused) {
+    debounceQueueBuild(accountId, projectName);
+  }
+
+  logger.debug(i18n(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
+
+  return queue.add(async () => {
+    try {
+      if (action === 'upload') {
+        await uploadFileToBuild(accountId, projectName, filePath, remotePath);
+      } else if (action === 'deleteFile' || action === 'deleteFolder') {
+        await deleteFileFromBuild(accountId, projectName, remotePath);
+      }
+      logger.log(
+        i18n(`${i18nKey}.logs.${action}Succeeded`, { filePath, remotePath })
+      );
+    } catch (err) {
+      logger.debug(
+        i18n(`${i18nKey}.errors.${action}Failed`, { filePath, remotePath })
+      );
+    }
+  });
+};
+
+const createNewBuild = async (accountId, projectName) => {
+  try {
+    logger.debug(i18n(`${i18nKey}.debug.attemptNewBuild`));
+    const { buildId } = await provisionBuild(accountId, projectName);
+    return buildId;
+  } catch (err) {
+    logApiErrorInstance(err, new ApiErrorContext({ accountId, projectName }));
+    if (err.error.subCategory !== ERROR_TYPES.PROJECT_LOCKED) {
+      await cancelStagedBuild(accountId, projectName);
+      logger.log(i18n(`${i18nKey}.logs.previousStagingBuildCancelled`));
+    }
+    process.exit(1);
+  }
+};
+
+const handleWatchEvent = async (
+  accountId,
+  projectName,
+  projectSourceDir,
+  filePath,
+  action = 'upload'
+) => {
+  const remotePath = path.relative(projectSourceDir, filePath);
+  if (queue.isPaused) {
+    standbyeQueue.find(file => file.filePath === filePath)
+      ? logger.debug(i18n(`${i18nKey}.debug.fileAlreadyQueued`, { filePath }))
+      : standbyeQueue.push({
+          filePath,
+          remotePath,
+          action,
+        });
+  } else {
+    await queueFileOrFolder(
+      accountId,
+      projectName,
+      filePath,
+      remotePath,
+      action
+    );
+  }
+};
+
+const createWatcher = async (
+  accountId,
+  projectConfig,
+  projectDir,
+  handleBuildStatusFn,
+  handleUserInputFn
+) => {
+  const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
+
+  handleBuildStatus = handleBuildStatusFn;
+  handleUserInput = handleUserInputFn;
+
+  await createNewStagingBuild(accountId, projectConfig.name);
+
+  const watcher = chokidar.watch(projectSourceDir, {
+    ignoreInitial: true,
+    ignored: file => shouldIgnoreFile(file),
+  });
+  watcher.on('ready', async () => {
+    logger.log(i18n(`${i18nKey}.logs.watching`, { projectDir }));
+    logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
+  });
+  watcher.on('add', async path => {
+    handleWatchEvent(accountId, projectConfig.name, projectSourceDir, path);
+  });
+  watcher.on('change', async path => {
+    handleWatchEvent(accountId, projectConfig.name, projectSourceDir, path);
+  });
+  watcher.on('unlink', async path => {
+    handleWatchEvent(
+      accountId,
+      projectConfig.name,
+      projectSourceDir,
+      path,
+      'deleteFile'
+    );
+  });
+  watcher.on('unlinkDir', async path => {
+    handleWatchEvent(
+      accountId,
+      projectConfig.name,
+      projectSourceDir,
+      path,
+      'deleteFolder'
+    );
+  });
+};
+
+module.exports = {
+  createWatcher,
+};

package/lib/prompts/downloadProjectPrompt.js

@@ -4,7 +4,7 @@ const { fetchProjects } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
+} = require('../../lib/errorHandlers/apiErrors');
 const { EXIT_CODES } = require('../enums/exitCodes');
 const { i18n } = require('../lang');
 

package/lib/prompts/projectsLogsPrompt.js

@@ -6,7 +6,7 @@ const { getProjectConfig, ensureProjectExists } = require('../projects');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
+} = require('../../lib/errorHandlers/apiErrors');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { EXIT_CODES } = require('../enums/exitCodes');
 

package/lib/sandbox-create.js

@@ -12,11 +12,11 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   debugErrorAndContext,
   logErrorInstance,
-} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
+} = require('./errorHandlers/standardErrors');
 const {
   isMissingScopeError,
   isSpecifiedError,
-} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+} = require('./errorHandlers/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { getEnv, getAccountId } = require('@hubspot/cli-lib');
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');

package/lib/sandbox-sync.js

@@ -11,17 +11,17 @@ const {
   syncTypes,
 } = require('./sandboxes');
 const { initiateSync } = require('@hubspot/cli-lib/sandboxes');
-const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const {
+  debugErrorAndContext,
+  logErrorInstance,
+} = require('./errorHandlers/standardErrors');
 const {
   isSpecifiedError,
   isMissingScopeError,
-} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+} = require('./errorHandlers/apiErrors');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/cli-lib');
 const { uiAccountDescription } = require('./ui');
-const {
-  debugErrorAndContext,
-} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
 
 const i18nKey = 'cli.lib.sandbox.sync';
 

package/lib/sandboxes.js

@@ -6,6 +6,7 @@ const {
 } = require('@hubspot/cli-lib');
 const chalk = require('chalk');
 const { i18n } = require('./lang');
+const { handleExit, handleKeypress } = require('./process');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   updateConfigWithPersonalAccessKey,
@@ -17,7 +18,6 @@ const {
   fetchTypes,
   getSandboxUsageLimits,
 } = require('@hubspot/cli-lib/sandboxes');
-const { handleExit, handleKeypress } = require('@hubspot/cli-lib/lib/process');
 const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
 const CliProgressMultibarManager = require('./CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');

package/lib/schema.js

@@ -0,0 +1,31 @@
+const chalk = require('chalk');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { table, getBorderCharacters } = require('table');
+const { fetchSchemas } = require('@hubspot/cli-lib/api/schema');
+
+const logSchemas = schemas => {
+  const data = schemas
+    .map(r => [r.labels.singular, r.name, r.objectTypeId || ''])
+    .sort((a, b) => (a[1] > b[1] ? 1 : -1));
+  data.unshift([
+    chalk.bold('Label'),
+    chalk.bold('Name'),
+    chalk.bold('objectTypeId'),
+  ]);
+
+  const tableConfig = {
+    singleLine: true,
+    border: getBorderCharacters('honeywell'),
+  };
+
+  logger.log(data.length ? table(data, tableConfig) : 'No Schemas were found');
+};
+
+const listSchemas = async accountId => {
+  const response = await fetchSchemas(accountId);
+  logSchemas(response.results);
+};
+
+module.exports = {
+  listSchemas,
+};

package/lib/serverlessLogs.js

@@ -1,5 +1,6 @@
 const https = require('https');
 const SpinniesManager = require('./SpinniesManager');
+const { handleExit, handleKeypress } = require('./process');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
@@ -7,9 +8,8 @@ const {
   logServerlessFunctionApiErrorInstance,
   logApiErrorInstance,
   ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
+} = require('./errorHandlers/apiErrors');
 const { base64EncodeString } = require('@hubspot/cli-lib/lib/encoding');
-const { handleExit, handleKeypress } = require('@hubspot/cli-lib/lib/process');
 
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 

package/lib/ui.js

@@ -106,6 +106,7 @@ const uiFeatureHighlight = (commands, title) => {
       const commandKey = `${i18nKey}.commandKeys.${c}`;
       const message = i18n(`${commandKey}.message`, {
         command: uiCommandReference(i18n(`${commandKey}.command`)),
+        link: uiLink(i18n(`${commandKey}.linkText`), i18n(`${commandKey}.url`)),
       });
       if (i !== 0) {
         logger.log('');

package/lib/validation.js

@@ -13,7 +13,7 @@ const {
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/cli-lib/lib/constants');
-const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
+const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.0.2-beta.0",
+  "version": "5.0.2",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -9,8 +9,9 @@
   },
   "dependencies": {
     "@hubspot/cli-lib": "^5.0.1",
-    "@hubspot/serverless-dev-runtime": "4.2.1-beta.3",
-    "@hubspot/ui-extensions-dev-server": "^0.7.2",
+    "@hubspot/local-dev-lib": "^0.0.7",
+    "@hubspot/serverless-dev-runtime": "5.0.2",
+    "@hubspot/ui-extensions-dev-server": "^0.8.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -24,7 +25,9 @@
     "moment": "^2.29.1",
     "open": "^7.0.3",
     "ora": "^4.0.3",
+    "p-queue": "^6.0.2",
     "strip-ansi": "^5.2.0",
+    "table": "^6.6.0",
     "tmp": "^0.2.1",
     "update-notifier": "^5.1.0",
     "yargs": "15.4.1"
@@ -42,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "539e279526f9554f840b857bf4873a3b856684a3"
+  "gitHead": "44cbdf6dae130e268015d3e9afb612729b539915"
 }