@hubspot/cli 5.1.4-beta.7 → 5.2.1-beta.0

package/commands/accounts/use.js

@@ -4,7 +4,7 @@ const {
   getConfigPath,
   updateDefaultAccount,
   getAccountId: getAccountIdFromConfig,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');

package/commands/cms/convertFields.js

@@ -9,7 +9,7 @@ const { i18n } = require('../../lib/lang');
 const {
   FieldsJs,
   isConvertableFieldJs,
-} = require('@hubspot/local-dev-lib/cms/handleFieldsJs');
+} = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
 
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');

package/commands/project/dev.js

@@ -62,10 +62,10 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  isSpecifiedError, // Migrate isSpecifiedError to local-dev-lib version only after uploadProject is migrated to local-dev-lib
 } = require('../../lib/errorHandlers/apiErrors');
 const {
   isMissingScopeError,
+  isSpecifiedError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const { isDeveloperTestAccount } = require('../../lib/developerTestAccounts');

package/commands/project/upload.js

@@ -19,11 +19,11 @@ const {
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  isSpecifiedError,
 } = require('../../lib/errorHandlers/apiErrors');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 

package/commands/theme/preview.js

@@ -14,7 +14,9 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { previewPrompt } = require('../../lib/prompts/previewPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { FileUploadResultType } = require('@hubspot/cli-lib/lib/uploadFolder');
+const {
+  FILE_UPLOAD_RESULT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/files');
 const i18nKey = 'cli.commands.preview';
 const cliProgress = require('cli-progress');
 const {
@@ -121,7 +123,7 @@ exports.handler = async options => {
       });
       initialUploadProgressBar.stop();
       results.forEach(result => {
-        if (result.resultType == FileUploadResultType.FAILURE) {
+        if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
           logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
           logApiUploadErrorInstance(
             result.error,

package/lib/commonOpts.js

@@ -2,9 +2,6 @@ const {
   LOG_LEVEL,
   setLogLevel: setLoggerLogLevel,
 } = require('@hubspot/local-dev-lib/logger');
-const {
-  setLogLevel: setCliLibLoggerLogLevel,
-} = require('@hubspot/cli-lib/logger');
 const {
   DEFAULT_MODE,
   MODE,
@@ -74,14 +71,8 @@ const setLogLevel = (options = {}) => {
   const { debug } = options;
   if (debug) {
     setLoggerLogLevel(LOG_LEVEL.DEBUG);
-
-    // TODO remove this when we remove cli-lib as a dep
-    setCliLibLoggerLogLevel(LOG_LEVEL.DEBUG);
   } else {
     setLoggerLogLevel(LOG_LEVEL.LOG);
-
-    // TODO remove this when we remove cli-lib as a dep
-    setCliLibLoggerLogLevel(LOG_LEVEL.LOG);
   }
 };
 

package/lib/errorHandlers/apiErrors.js

@@ -1,15 +1,16 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const {
+  isMissingScopeError,
+  isApiUploadValidationError,
   getAxiosErrorWithContext,
+  parseValidationErrors,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const {
   SCOPE_GROUPS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/local-dev-lib/constants/auth');
-const {
-  fetchScopeData,
-} = require('@hubspot/cli-lib/api/localDevAuth/authenticated');
+const { fetchScopeData } = require('@hubspot/local-dev-lib/api/localDevAuth');
 const {
   debugErrorAndContext,
   logErrorInstance,
@@ -20,80 +21,6 @@ const { i18n } = require('../lang');
 
 const i18nKey = 'cli.lib.errorHandlers.apiErrors';
 
-const isApiStatusCodeError = err =>
-  err.name === 'StatusCodeError' ||
-  (err.statusCode >= 100 && err.statusCode < 600);
-
-const isApiUploadValidationError = err =>
-  !!(
-    err.statusCode === 400 &&
-    err.response &&
-    err.response.body &&
-    (err.response.body.message || err.response.body.errors)
-  );
-
-const isMissingScopeError = err =>
-  err.name === 'StatusCodeError' &&
-  err.statusCode === 403 &&
-  err.error &&
-  err.error.category === 'MISSING_SCOPES';
-
-const isGatingError = err =>
-  isSpecifiedError(err, { statusCode: 403, category: 'GATED' });
-
-const isSpecifiedError = (err, { statusCode, category, subCategory } = {}) => {
-  const statusCodeErr = !statusCode || err.statusCode === statusCode;
-  const categoryErr =
-    !category || (err.error && err.error.category === category);
-  const subCategoryErr =
-    !subCategory || (err.error && err.error.subCategory === subCategory);
-
-  return (
-    err.name === 'StatusCodeError' &&
-    statusCodeErr &&
-    categoryErr &&
-    subCategoryErr
-  );
-};
-
-const isSpecifiedHubSpotAuthError = (
-  err,
-  { statusCode, category, subCategory }
-) => {
-  const statusCodeErr = !statusCode || err.statusCode === statusCode;
-  const categoryErr = !category || err.category === category;
-  const subCategoryErr = !subCategory || err.subCategory === subCategory;
-  return (
-    err.name === 'HubSpotAuthError' &&
-    statusCodeErr &&
-    categoryErr &&
-    subCategoryErr
-  );
-};
-
-const parseValidationErrors = (responseBody = {}) => {
-  const errorMessages = [];
-
-  const { errors, message } = responseBody;
-
-  if (message) {
-    errorMessages.push(message);
-  }
-
-  if (errors) {
-    const specificErrors = errors.map(error => {
-      let errorMessage = error.message;
-      if (error.errorTokens && error.errorTokens.line) {
-        errorMessage = `line ${error.errorTokens.line}: ${errorMessage}`;
-      }
-      return errorMessage;
-    });
-    errorMessages.push(...specificErrors);
-  }
-
-  return errorMessages;
-};
-
 class ApiErrorContext extends ErrorContext {
   constructor(props = {}) {
     super(props);
@@ -112,142 +39,13 @@ class ApiErrorContext extends ErrorContext {
  */
 function logValidationErrors(error, context) {
   const { response = {} } = error;
-  const validationErrors = parseValidationErrors(response.body);
+  const validationErrors = parseValidationErrors(response.data);
   if (validationErrors.length) {
-    validationErrors.forEach(err => {
-      logger.error(err);
-    });
+    logger.error(validationErrors.join('\n- '));
   }
   debugErrorAndContext(error, context);
 }
 
-/**
- * Message segments for API messages.
- *
- * @enum {string}
- */
-const ApiMethodVerbs = {
-  DEFAULT: 'request',
-  DELETE: 'delete',
-  GET: 'request',
-  PATCH: 'update',
-  POST: 'post',
-  PUT: 'update',
-};
-
-/**
- * Message segments for API messages.
- *
- * @enum {string}
- */
-const ApiMethodPrepositions = {
-  DEFAULT: 'for',
-  DELETE: 'of',
-  GET: 'for',
-  PATCH: 'to',
-  POST: 'to',
-  PUT: 'to',
-};
-
-/**
- * Logs messages for an error instance resulting from API interaction.
- *
- * @param {StatusCodeError} error
- * @param {ApiErrorContext} context
- */
-function logApiStatusCodeError(error, context) {
-  const { statusCode } = error;
-  const { method } = error.options || {};
-  const { projectName } = context;
-  const isPutOrPost = method === 'PUT' || method === 'POST';
-  const action = ApiMethodVerbs[method] || ApiMethodVerbs.DEFAULT;
-  const preposition =
-    ApiMethodPrepositions[method] || ApiMethodPrepositions.DEFAULT;
-  let messageDetail = '';
-  {
-    const request = context.request
-      ? `${action} ${preposition} "${context.request}"`
-      : action;
-    messageDetail = `${request} in account ${context.accountId}`;
-  }
-  const errorMessage = [];
-  if (isPutOrPost && context.payload) {
-    errorMessage.push(`Unable to upload "${context.payload}".`);
-  }
-  const isProjectMissingScopeError = isMissingScopeError(error) && projectName;
-  const isProjectGatingError = isGatingError(error) && projectName;
-  switch (statusCode) {
-    case 400:
-      errorMessage.push(i18n(`${i18nKey}.codes.400`, { messageDetail }));
-      break;
-    case 401:
-      errorMessage.push(i18n(`${i18nKey}.codes.401`, { messageDetail }));
-      break;
-    case 403:
-      if (isProjectMissingScopeError) {
-        errorMessage.push(
-          i18n(`${i18nKey}.codes.403MissingScope`, {
-            accountId: context.accountId || '',
-          })
-        );
-      } else if (isProjectGatingError) {
-        errorMessage.push(
-          i18n(`${i18nKey}.codes.403Gating`, {
-            accountId: context.accountId || '',
-          })
-        );
-      } else {
-        errorMessage.push(i18n(`${i18nKey}.codes.403`, { messageDetail }));
-      }
-      break;
-    case 404:
-      if (context.request) {
-        errorMessage.push(
-          i18n(`${i18nKey}.codes.404Request`, {
-            action: action || 'request',
-            request: context.request,
-            account: context.accountId || '',
-          })
-        );
-      } else {
-        errorMessage.push(i18n(`${i18nKey}.codes.404`, { messageDetail }));
-      }
-      break;
-    case 429:
-      errorMessage.push(i18n(`${i18nKey}.codes.429`, { messageDetail }));
-      break;
-    case 503:
-      errorMessage.push(i18n(`${i18nKey}.codes.503`, { messageDetail }));
-      break;
-    default:
-      if (statusCode >= 500 && statusCode < 600) {
-        errorMessage.push(
-          i18n(`${i18nKey}.codes.500Generic`, { messageDetail })
-        );
-      } else if (statusCode >= 400 && statusCode < 500) {
-        i18n(`${i18nKey}.codes.400Generic`, { messageDetail });
-      } else {
-        errorMessage.push(i18n(`${i18nKey}.codes.generic`, { messageDetail }));
-      }
-      break;
-  }
-  if (
-    error.error &&
-    error.error.message &&
-    !isProjectMissingScopeError &&
-    !isProjectGatingError
-  ) {
-    errorMessage.push(error.error.message);
-  }
-  if (error.error && error.error.errors) {
-    error.error.errors.forEach(err => {
-      errorMessage.push('\n- ' + err.message);
-    });
-  }
-  logger.error(errorMessage.join(' '));
-  debugErrorAndContext(error, context);
-}
-
 /**
  * Logs a message for an error instance resulting from API interaction.
  *
@@ -255,19 +53,12 @@ function logApiStatusCodeError(error, context) {
  * @param {ApiErrorContext}          context
  */
 function logApiErrorInstance(error, context) {
-  // Use the new local-dev-lib error handler
-  // NOTE: This will eventually replace the logic in logApiStatusCodeError
   if (error.isAxiosError) {
     if (overrideErrors(error)) return;
     const errorWithContext = getAxiosErrorWithContext(error, context);
     logger.error(errorWithContext.message);
     return;
   }
-  // StatusCodeError
-  if (isApiStatusCodeError(error)) {
-    logApiStatusCodeError(error, context);
-    return;
-  }
   logErrorInstance(error, context);
 }
 
@@ -344,12 +135,7 @@ async function logServerlessFunctionApiErrorInstance(
     return;
   }
 
-  // StatusCodeError
-  if (isApiStatusCodeError(error)) {
-    logApiStatusCodeError(error, context);
-    return;
-  }
-  logErrorInstance(error, context);
+  logApiErrorInstance(error, context);
 }
 
 module.exports = {
@@ -358,7 +144,4 @@ module.exports = {
   logApiErrorInstance,
   logApiUploadErrorInstance,
   logServerlessFunctionApiErrorInstance,
-  isMissingScopeError,
-  isSpecifiedError,
-  isSpecifiedHubSpotAuthError,
 };

package/lib/errorHandlers/fileSystemErrors.js

@@ -1,24 +1,7 @@
-const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
-  ErrorContext,
-  isSystemError,
-  debugErrorAndContext,
-} = require('./standardErrors');
-const { i18n } = require('../lang');
-
-const i18nKey = 'cli.lib.errorHandlers.fileSystemErrors';
-
-class FileSystemErrorContext extends ErrorContext {
-  constructor(props = {}) {
-    super(props);
-    /** @type {string} */
-    this.filepath = props.filepath || '';
-    /** @type {boolean} */
-    this.read = !!props.read;
-    /** @type {boolean} */
-    this.write = !!props.write;
-  }
-}
+  getFileSystemError,
+} = require('@hubspot/local-dev-lib/errors/fileSystemErrors');
+const { debugErrorAndContext, logErrorInstance } = require('./standardErrors');
 
 /**
  * Logs a message for an error instance resulting from filesystem interaction.
@@ -27,29 +10,11 @@ class FileSystemErrorContext extends ErrorContext {
  * @param {FileSystemErrorContext}   context
  */
 function logFileSystemErrorInstance(error, context) {
-  let fileAction = '';
-  if (context.read) {
-    fileAction = 'reading from';
-  } else if (context.write) {
-    fileAction = 'writing to';
-  } else {
-    fileAction = 'accessing';
-  }
-  const filepath = context.filepath
-    ? `"${context.filepath}"`
-    : 'a file or folder';
-  const message = [i18n(`${i18nKey}.errorOccurred`, { fileAction, filepath })];
-  // Many `fs` errors will be `SystemError`s
-  if (isSystemError(error)) {
-    message.push(
-      i18n(`${i18nKey}.errorExplanation`, { errorMessage: error.message })
-    );
-  }
-  logger.error(message.join(' '));
+  const fileSystemError = getFileSystemError(error, context);
+  logErrorInstance(fileSystemError.message, context);
   debugErrorAndContext(error, context);
 }
 
 module.exports = {
-  FileSystemErrorContext,
   logFileSystemErrorInstance,
 };

package/lib/errorHandlers/standardErrors.js

@@ -1,16 +1,12 @@
 const util = require('util');
-const {
-  HubSpotAuthError,
-} = require('@hubspot/local-dev-lib/models/HubSpotAuthError');
 const { logger } = require('@hubspot/local-dev-lib/logger');
+const {
+  isSystemError,
+} = require('@hubspot/local-dev-lib/errors/standardErrors');
 const { i18n } = require('../lang');
 
 const i18nKey = 'cli.lib.errorHandlers.standardErrors';
 
-const isSystemError = err =>
-  err.errno != null && err.code != null && err.syscall != null;
-const isFatalError = err => err instanceof HubSpotAuthError;
-
 // TODO: Make these TS interfaces
 class ErrorContext {
   constructor(props = {}) {
@@ -103,7 +99,5 @@ function logErrorInstance(error, context) {
 module.exports = {
   debugErrorAndContext,
   ErrorContext,
-  isFatalError,
-  isSystemError,
   logErrorInstance,
 };

package/lib/process.js

@@ -4,7 +4,6 @@ const {
   setLogLevel,
   LOG_LEVEL,
 } = require('@hubspot/local-dev-lib/logger');
-const { setLogLevel: setCliLibLogLevel } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.process';
@@ -33,10 +32,6 @@ const handleExit = callback => {
         // Prevent logs when terminal closes
         if (isSIGHUP) {
           setLogLevel(LOG_LEVEL.NONE);
-
-          // Update the log level in cli-lib's instance of the logger
-          // We can remove this when we remove cli-lib as a dep
-          setCliLibLogLevel(LOG_LEVEL.NONE);
         }
 
         logger.debug(i18n(`${i18nKey}.exitDebug`, { signal }));

package/lib/projects.js

@@ -27,7 +27,10 @@ const {
   fetchProject,
   uploadProject,
 } = require('@hubspot/local-dev-lib/api/projects');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
+const {
+  isSpecifiedError,
+  isSpecifiedHubSpotAuthError,
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getCwd, getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { downloadGithubRepoContents } = require('@hubspot/local-dev-lib/github');
@@ -39,7 +42,6 @@ const SpinniesManager = require('./ui/SpinniesManager');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  isSpecifiedHubSpotAuthError,
 } = require('./errorHandlers/apiErrors');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('./constants');
 

package/lib/projectsWatch.js

@@ -6,7 +6,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('./errorHandlers/apiErrors');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');

package/lib/prompts/cmsFieldPrompt.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const escapeRegExp = require('@hubspot/cli-lib/lib/escapeRegExp');
+const escapeRegExp = require('@hubspot/local-dev-lib/escapeRegExp');
 const i18nKey = 'cli.lib.prompts.uploadPrompt';
 const FIELDS_FILES = ['fields.json', 'fields.js', 'fields.cjs', 'fields.mjs'];
 

package/lib/serverlessLogs.js

@@ -9,12 +9,20 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('./errorHandlers/apiErrors');
-const { base64EncodeString } = require('@hubspot/cli-lib/lib/encoding');
 
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const TAIL_DELAY = 5000;
 
+const base64EncodeString = valueToEncode => {
+  if (typeof valueToEncode !== 'string') {
+    return valueToEncode;
+  }
+
+  const stringBuffer = Buffer.from(valueToEncode);
+  return encodeURIComponent(stringBuffer.toString('base64'));
+};
+
 const handleUserInput = () => {
   const onTerminate = async () => {
     SpinniesManager.remove('tailLogs');

package/lib/validation.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { Mode } = require('@hubspot/cli-lib');
+const { MODE } = require('@hubspot/local-dev-lib/constants/files');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
@@ -175,10 +175,10 @@ async function validateAccount(options) {
  */
 function validateMode(options) {
   const mode = getMode(options);
-  if (Mode[mode]) {
+  if (MODE[mode]) {
     return true;
   }
-  const modesMessage = `Available modes are: ${Object.values(Mode).join(
+  const modesMessage = `Available modes are: ${Object.values(MODE).join(
     ', '
   )}.`;
   if (mode != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.4-beta.7",
+  "version": "5.2.1-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,11 +8,10 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^9.0.0",
-    "@hubspot/local-dev-lib": "^0.3.10",
-    "@hubspot/serverless-dev-runtime": "5.1.4-beta.6",
+    "@hubspot/local-dev-lib": "^0.3.13",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.0",
     "@hubspot/theme-preview-dev-server": "0.0.4",
-    "@hubspot/ui-extensions-dev-server": "0.8.11",
+    "@hubspot/ui-extensions-dev-server": "0.8.12",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -46,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8e157c07923d5efa727a44f7ac542e9d13eac113"
+  "gitHead": "ce6013a55ac84a69335200abbcbc6fc8080585b7"
 }