@hubspot/cli 6.1.1 → 6.2.1

package/lib/upload.js

@@ -6,7 +6,7 @@ const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const {
   isConvertableFieldJs,
 } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 /*
  * Walks the src folder for files, filters them based on ignore filter.
@@ -17,7 +17,7 @@ const getUploadableFileList = async (src, convertFields) => {
   try {
     filePaths = await walk(src);
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
   }
   const allowedFiles = filePaths
     .filter(file => {

package/lib/validation.js

@@ -28,7 +28,7 @@ const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { checkAndWarnGitInclusion } = require('./ui/git');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 async function loadAndValidateOptions(options, shouldValidateAccount = true) {
   setLogLevel(options);
@@ -156,7 +156,7 @@ async function validateAccount(options) {
         return false;
       }
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
       return false;
     }
   } else if (!apiKey) {

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@hubspot/cli",
-  "version": "6.1.1",
+  "version": "6.2.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/HubSpot/hubspot-cms-tools"
+    "url": "https://github.com/HubSpot/hubspot-cli"
   },
   "dependencies": {
-    "@hubspot/local-dev-lib": "1.13.1",
-    "@hubspot/serverless-dev-runtime": "6.1.1",
-    "@hubspot/theme-preview-dev-server": "0.0.7",
+    "@hubspot/local-dev-lib": "^2.0.1",
+    "@hubspot/serverless-dev-runtime": "6.2.0",
+    "@hubspot/theme-preview-dev-server": "0.0.8",
     "@hubspot/ui-extensions-dev-server": "0.8.33",
-    "archiver": "^5.3.0",
+    "archiver": "^7.0.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
     "cli-cursor": "^3.1.0",
@@ -24,13 +24,12 @@
     "js-yaml": "^4.1.0",
     "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"
+    "yargs": "17.7.2"
   },
   "devDependencies": {
     "axios": "^1.7.2",
@@ -46,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f60d56f9f54ed272d48dea96a72278649ab9f8b5"
+  "gitHead": "bca108b05c57cfb6984cda5c09740760855c70d8"
 }

package/lib/errorHandlers/apiErrors.js

@@ -1,145 +0,0 @@
-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/local-dev-lib/api/localDevAuth');
-const {
-  debugErrorAndContext,
-  logErrorInstance,
-  ErrorContext,
-} = require('./standardErrors');
-const { overrideErrors } = require('./overrideErrors');
-const { i18n } = require('../lang');
-
-const i18nKey = 'lib.errorHandlers.apiErrors';
-
-class ApiErrorContext extends ErrorContext {
-  constructor(props = {}) {
-    super(props);
-    /** @type {string} */
-    this.request = props.request || '';
-    /** @type {string} */
-    this.payload = props.payload || '';
-  }
-}
-
-/**
- * @param {Error}           error
- * @param {ApiErrorContext} context
- */
-function logValidationErrors(error, context) {
-  const { response = {} } = error;
-  const validationErrors = parseValidationErrors(response.data);
-  if (validationErrors.length) {
-    logger.error(validationErrors.join('\n- '));
-  }
-  debugErrorAndContext(error, context);
-}
-
-/**
- * Logs a message for an error instance resulting from API interaction.
- *
- * @param {Error|SystemError|Object} error
- * @param {ApiErrorContext}          context
- */
-function logApiErrorInstance(error, context) {
-  if (error.isAxiosError) {
-    if (overrideErrors(error, context)) return;
-    const errorWithContext = getAxiosErrorWithContext(error, context);
-    logger.error(errorWithContext.message);
-    return;
-  }
-  logErrorInstance(error, context);
-}
-
-/**
- * Logs a message for an error instance resulting from filemapper API upload.
- *
- * @param {Error|SystemError|Object} error
- * @param {ApiErrorContext}          context
- */
-function logApiUploadErrorInstance(error, context) {
-  if (isApiUploadValidationError(error)) {
-    logValidationErrors(error, context);
-    return;
-  }
-  logApiErrorInstance(error, context);
-}
-
-async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-  const accountConfig = getAccountConfig(accountId);
-  const { authType } = accountConfig;
-  if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-    return;
-  }
-
-  let scopesData;
-  try {
-    scopesData = await fetchScopeData(accountId, scopeGroup);
-  } catch (e) {
-    logger.debug(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
-        scopeGroup,
-        error: e,
-      })
-    );
-    return;
-  }
-  const { portalScopesInGroup, userScopesInGroup } = scopesData;
-
-  if (!portalScopesInGroup.length) {
-    logger.error(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`)
-    );
-    return;
-  }
-
-  if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
-    logger.error(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`)
-    );
-    return;
-  } else {
-    logger.error(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`)
-    );
-    return;
-  }
-}
-
-/**
- * Logs a message for an error instance resulting from API interaction
- * related to serverless function.
- *
- * @param {int} accountId
- * @param {Error|SystemError|Object} error
- * @param {ApiErrorContext}          context
- */
-async function logServerlessFunctionApiErrorInstance(
-  accountId,
-  error,
-  context
-) {
-  if (isMissingScopeError(error)) {
-    await verifyAccessKeyAndUserAccess(accountId, SCOPE_GROUPS.CMS_FUNCTIONS);
-    return;
-  }
-
-  logApiErrorInstance(error, context);
-}
-
-module.exports = {
-  ApiErrorContext,
-  parseValidationErrors,
-  logApiErrorInstance,
-  logApiUploadErrorInstance,
-  logServerlessFunctionApiErrorInstance,
-};

package/lib/errorHandlers/fileSystemErrors.js

@@ -1,20 +0,0 @@
-const {
-  getFileSystemError,
-} = require('@hubspot/local-dev-lib/errors/fileSystemErrors');
-const { debugErrorAndContext, logErrorInstance } = require('./standardErrors');
-
-/**
- * Logs a message for an error instance resulting from filesystem interaction.
- *
- * @param {Error|SystemError|Object} error
- * @param {FileSystemErrorContext}   context
- */
-function logFileSystemErrorInstance(error, context) {
-  const fileSystemError = getFileSystemError(error, context);
-  logErrorInstance(fileSystemError.message, context);
-  debugErrorAndContext(error, context);
-}
-
-module.exports = {
-  logFileSystemErrorInstance,
-};

package/lib/errorHandlers/standardErrors.js

@@ -1,103 +0,0 @@
-const util = require('util');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  isSystemError,
-} = require('@hubspot/local-dev-lib/errors/standardErrors');
-const { i18n } = require('../lang');
-
-const i18nKey = 'lib.errorHandlers.standardErrors';
-
-// TODO: Make these TS interfaces
-class ErrorContext {
-  constructor(props = {}) {
-    /** @type {number} */
-    this.accountId = props.accountId;
-  }
-}
-
-/**
- * Logs (debug) the error and context objects.
- *
- * @param {SystemError}  error
- * @param {ErrorContext} context
- */
-function debugErrorAndContext(error, context) {
-  if (error.name === 'StatusCodeError') {
-    const { statusCode, message, response } = error;
-    logger.debug(
-      i18n(`${i18nKey}.errorOccurred`, {
-        error: {
-          statusCode,
-          message,
-          url: response.request.href,
-          method: response.request.method,
-          response: response.body,
-          headers: response.headers,
-        },
-      })
-    );
-  } else {
-    logger.debug(i18n(`${i18nKey}.errorOccurred`, { error }));
-  }
-  if (error.cause) {
-    logger.debug(
-      i18n(`${i18nKey}.errorCause`, {
-        cause: util.inspect(error.cause, false, null, true),
-      })
-    );
-  }
-  logger.debug(
-    i18n(`${i18nKey}.errorContext`, {
-      context: util.inspect(context, false, null, true),
-    })
-  );
-}
-
-/**
- * Logs a SystemError
- * @see {@link https://nodejs.org/api/errors.html#errors_class_systemerror}
- *
- * @param {SystemError}  error
- * @param {ErrorContext} context
- */
-function logSystemError(error, context) {
-  logger.error(
-    i18n(`${i18nKey}.systemErrorOccurred`, { error: error.message })
-  );
-  debugErrorAndContext(error, context);
-}
-
-/**
- * Logs a message for an error instance of type not asserted.
- *
- * @param {Error|SystemError|Object} error
- * @param {ErrorContext}             context
- */
-function logErrorInstance(error, context) {
-  // SystemError
-  if (isSystemError(error)) {
-    logSystemError(error, context);
-    return;
-  }
-  if (error instanceof Error || error.message || error.reason) {
-    // Error or Error subclass
-    const name = error.name || 'Error';
-    const message = [i18n(`${i18nKey}.genericErrorOccurred`, { name })];
-    [error.message, error.reason].forEach(msg => {
-      if (msg) {
-        message.push(msg);
-      }
-    });
-    logger.error(message.join(' '));
-  } else {
-    // Unknown errors
-    logger.error(i18n(`${i18nKey}.unknownErrorOccurred`));
-  }
-  debugErrorAndContext(error, context);
-}
-
-module.exports = {
-  debugErrorAndContext,
-  ErrorContext,
-  logErrorInstance,
-};