@hubspot/cli 5.1.4-beta.2 → 5.1.4-beta.4

package/lib/sandboxes.js

@@ -8,59 +8,51 @@ const {
   getSandboxUsageLimits,
 } = require('@hubspot/local-dev-lib/sandboxes');
 const { getConfig, getAccountId } = require('@hubspot/local-dev-lib/config');
-const CliProgressMultibarManager = require('./CliProgressMultibarManager');
+const CliProgressMultibarManager = require('./ui/CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
-const {
-  STANDARD_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX,
-  STANDARD_SANDBOX,
-} = require('./constants');
 
 const syncTypes = {
   OBJECT_RECORDS: 'object-records',
 };
 
 const sandboxTypeMap = {
-  DEV: DEVELOPER_SANDBOX_TYPE,
-  dev: DEVELOPER_SANDBOX_TYPE,
-  DEVELOPER: DEVELOPER_SANDBOX_TYPE,
-  developer: DEVELOPER_SANDBOX_TYPE,
-  DEVELOPMENT: DEVELOPER_SANDBOX_TYPE,
-  development: DEVELOPER_SANDBOX_TYPE,
-  STANDARD: STANDARD_SANDBOX_TYPE,
-  standard: STANDARD_SANDBOX_TYPE,
+  dev: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+  developer: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+  development: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+  standard: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
 };
 
 const sandboxApiTypeMap = {
-  standard: 1,
-  developer: 2,
+  [HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX]: 1,
+  [HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX]: 2,
 };
 
 const getSandboxTypeAsString = accountType => {
-  if (
-    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX ||
-    accountType === DEVELOPER_SANDBOX // remove line once sandboxAccountType is removed
-  ) {
+  if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
     return 'development'; // Only place we're using this specific name
   }
-  return STANDARD_SANDBOX_TYPE;
+  return 'standard';
 };
 
 const getSandboxName = config =>
-  `[${getSandboxTypeAsString(
-    config.accountType || config.sandboxAccountType
-  )} sandbox] `;
+  `[${getSandboxTypeAsString(config.accountType)} sandbox] `;
 
 const isSandbox = config =>
-  config.accountType
-    ? config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
-      config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
-    : config.sandboxAccountType && config.sandboxAccountType !== null;
+  config.accountType &&
+  (config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+    config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
+
+const isStandardSandbox = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+
+const isDevelopmentSandbox = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
 
 function getHasSandboxesByType(parentAccountConfig, type) {
   const config = getConfig();
@@ -70,8 +62,8 @@ function getHasSandboxesByType(parentAccountConfig, type) {
       (portal.parentAccountId !== null ||
         portal.parentAccountId !== undefined) &&
       portal.parentAccountId === parentPortalId &&
-      portal.sandboxAccountType &&
-      sandboxTypeMap[portal.sandboxAccountType] === type
+      portal.accountType &&
+      portal.accountType === type
     ) {
       return true;
     }
@@ -116,14 +108,15 @@ const getSyncTypesWithContactRecordsPrompt = async (
     syncTasks.some(t => t.type === syncTypes.OBJECT_RECORDS) &&
     !skipPrompt
   ) {
+    const langKey = isDevelopmentSandbox(accountConfig)
+      ? 'developer'
+      : 'standard';
     const { contactRecordsSyncPrompt } = await promptUser([
       {
         name: 'contactRecordsSyncPrompt',
         type: 'confirm',
         message: i18n(
-          `cli.lib.sandbox.sync.confirm.syncContactRecords.${
-            sandboxTypeMap[accountConfig.sandboxAccountType]
-          }`
+          `cli.lib.sandbox.sync.confirm.syncContactRecords.${langKey}`
         ),
       },
     ]);
@@ -146,13 +139,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   if (!usage) {
     throw new Error('Unable to fetch sandbox usage limits. Please try again.');
   }
-  if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
-    if (usage[DEVELOPER_SANDBOX].available === 0) {
-      const devSandboxLimit = usage[DEVELOPER_SANDBOX].limit;
+  if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
+    if (usage['DEVELOPER'].available === 0) {
+      const devSandboxLimit = usage['DEVELOPER'].limit;
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
       );
       if (hasDevelopmentSandboxes) {
         throw new Error(
@@ -183,13 +176,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
       }
     }
   }
-  if (sandboxType === STANDARD_SANDBOX_TYPE) {
-    if (usage[STANDARD_SANDBOX].available === 0) {
-      const standardSandboxLimit = usage[STANDARD_SANDBOX].limit;
+  if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
+    if (usage['STANDARD'].available === 0) {
+      const standardSandboxLimit = usage['STANDARD'].limit;
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
       );
       if (hasStandardSandboxes) {
         throw new Error(
@@ -364,6 +357,8 @@ module.exports = {
   sandboxApiTypeMap,
   syncTypes,
   isSandbox,
+  isStandardSandbox,
+  isDevelopmentSandbox,
   getSandboxName,
   getSandboxTypeAsString,
   getHasSandboxesByType,

package/lib/serverlessLogs.js

@@ -1,9 +1,9 @@
 const https = require('https');
-const SpinniesManager = require('./SpinniesManager');
+const SpinniesManager = require('./ui/SpinniesManager');
 const { handleExit, handleKeypress } = require('./process');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
+const { outputLogs } = require('./ui/serverlessFunctionLogs');
 const {
   logServerlessFunctionApiErrorInstance,
   logApiErrorInstance,

package/lib/ui/git.js

@@ -0,0 +1,28 @@
+const os = require('os');
+const { checkGitInclusion } = require('@hubspot/local-dev-lib/gitignore');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { i18n } = require('../lang');
+
+const i18nKey = 'cli.lib.ui.git';
+
+function checkAndWarnGitInclusion(configPath) {
+  try {
+    const { inGit, configIgnored } = checkGitInclusion(configPath);
+
+    if (!inGit || configIgnored) return;
+    logger.warn(i18n(`${i18nKey}.securityIssue`));
+    logger.warn(i18n(`${i18nKey}.configFileTracked`));
+    logger.warn(i18n(`${i18nKey}.fileName`, { configPath }));
+    logger.warn(i18n(`${i18nKey}.remediate`));
+    logger.warn(i18n(`${i18nKey}.moveConfig`, { homeDir: os.homedir() }));
+    logger.warn(i18n(`${i18nKey}.addGitignore`, { configPath }));
+    logger.warn(i18n(`${i18nKey}.noRemote`));
+  } catch (e) {
+    // fail silently
+    logger.debug(i18n(`${i18nKey}.checkFailed`));
+  }
+}
+
+module.exports = {
+  checkAndWarnGitInclusion,
+};

package/lib/{ui.js → ui/index.js}

@@ -1,14 +1,16 @@
 const chalk = require('chalk');
-const supportsHyperlinks = require('../lib/supportHyperlinks');
-const supportsColor = require('../lib/supportsColor');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { isSandbox, getSandboxName } = require('./sandboxes');
+const supportsHyperlinks = require('./supportHyperlinks');
+const supportsColor = require('./supportsColor');
+const { isSandbox, getSandboxName } = require('../sandboxes');
+const { isDeveloperTestAccount } = require('../developerTestAccounts');
+const { i18n } = require('../lang');
+
 const {
-  isDeveloperTestAccount,
-  DEV_TEST_ACCOUNT_STRING,
-} = require('./developerTestAccounts');
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const UI_COLORS = {
   SORBET: '#FF8F59',
@@ -82,7 +84,9 @@ const uiAccountDescription = (accountId, bold = true) => {
   if (isSandbox(account)) {
     accountTypeString = getSandboxName(account);
   } else if (isDeveloperTestAccount(account)) {
-    accountTypeString = `[${DEV_TEST_ACCOUNT_STRING}] `;
+    accountTypeString = `[${
+      HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
+    }] `;
   }
   const message = `${account.name} ${accountTypeString}(${account.portalId})`;
   return bold ? chalk.bold(message) : message;

package/lib/ui/serverlessFunctionLogs.js

@@ -0,0 +1,103 @@
+const moment = require('moment');
+const chalk = require('chalk');
+const { logger, Styles } = require('@hubspot/local-dev-lib/logger');
+const { i18n } = require('../lang');
+
+const i18nKey = 'cli.lib.ui.serverlessFunctionLogs';
+
+const SEPARATOR = ' - ';
+const LOG_STATUS_COLORS = {
+  SUCCESS: Styles.success,
+  ERROR: Styles.error,
+  UNHANDLED_ERROR: Styles.error,
+  HANDLED_ERROR: Styles.error,
+};
+
+function errorHandler(log, options) {
+  return `${formatLogHeader(log, options)}${formatError(log, options)}`;
+}
+
+const logHandler = {
+  ERROR: errorHandler,
+  UNHANDLED_ERROR: errorHandler,
+  HANDLED_ERROR: errorHandler,
+  SUCCESS: (log, options) => {
+    return `${formatLogHeader(log, options)}${formatSuccess(log, options)}`;
+  },
+};
+
+function formatSuccess(log, options) {
+  if (!log.log || options.compact) {
+    return '';
+  }
+
+  return `\n${log.log}`;
+}
+
+function formatError(log, options) {
+  if (!log.error || options.compact) {
+    return '';
+  }
+
+  return `${log.error.type}: ${log.error.message}\n${formatStackTrace(log)}`;
+}
+
+function formatLogHeader(log, options) {
+  const color = LOG_STATUS_COLORS[log.status];
+  const headerInsertion =
+    options && options.insertions && options.insertions.header;
+
+  return `${formatTimestamp(log)}${SEPARATOR}${color(log.status)}${
+    headerInsertion ? `${SEPARATOR}${headerInsertion}` : ''
+  }${SEPARATOR}${formatExecutionTime(log)}`;
+}
+
+function formatStackTrace(log) {
+  const stackTrace = (log.error.stackTrace && log.error.stackTrace[0]) || [];
+  return stackTrace
+    .map(trace => {
+      return `  at ${trace}\n`;
+    })
+    .join('');
+}
+
+function formatTimestamp(log) {
+  return `${chalk.whiteBright(moment(log.createdAt).toISOString())}`;
+}
+
+function formatExecutionTime(log) {
+  return `${chalk.whiteBright('Execution Time:')} ${log.executionTime}ms`;
+}
+
+function processLog(log, options) {
+  try {
+    return logHandler[log.status](log, options);
+  } catch (e) {
+    logger.error(
+      i18n(`${i18nKey}.unableToProcessLog`, {
+        log: JSON.stringify(log),
+      })
+    );
+  }
+}
+
+function processLogs(logsResp, options) {
+  if (!logsResp || (logsResp.results && !logsResp.results.length)) {
+    return 'No logs found.';
+  } else if (logsResp.results && logsResp.results.length) {
+    return logsResp.results
+      .map(log => {
+        return processLog(log, options);
+      })
+      .join('\n');
+  }
+  return processLog(logsResp, options);
+}
+
+function outputLogs(logsResp, options) {
+  logger.log(processLogs(logsResp, options));
+}
+
+module.exports = {
+  outputLogs,
+};

package/lib/{supportHyperlinks.js → ui/supportHyperlinks.js}

@@ -1,5 +1,5 @@
 'use strict';
-const hasFlag = require('./hasFlag');
+const hasFlag = require('../hasFlag');
 
 //See https://github.com/jamestalmage/supports-hyperlinks (License: https://github.com/jamestalmage/supports-hyperlinks/blob/master/license)
 

package/lib/{supportsColor.js → ui/supportsColor.js}

@@ -1,7 +1,7 @@
 const process = require('process');
 const os = require('os');
 const tty = require('tty');
-const hasFlag = require('./hasFlag');
+const hasFlag = require('../hasFlag');
 
 const { env } = process;
 

package/lib/ui/table.js

@@ -0,0 +1,70 @@
+const chalk = require('chalk');
+const { table } = require('table');
+
+function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
+
+function mergeDeep(target, ...sources) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && source && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return mergeDeep(target, ...sources);
+}
+
+const tableConfigDefaults = {
+  singleLine: true,
+  border: {
+    topBody: '',
+    topJoin: '',
+    topLeft: '',
+    topRight: '',
+
+    bottomBody: '',
+    bottomJoin: '',
+    bottomLeft: '',
+    bottomRight: '',
+
+    bodyLeft: '',
+    bodyRight: '',
+    bodyJoin: '',
+
+    joinBody: '',
+    joinLeft: '',
+    joinRight: '',
+    joinJoin: '',
+  },
+  columnDefault: {
+    paddingLeft: 0,
+    paddingRight: 1,
+  },
+  drawHorizontalLine: () => {
+    return false;
+  },
+};
+
+function getTableContents(tableData = [], tableConfig = {}) {
+  const mergedConfig = mergeDeep({}, tableConfigDefaults, tableConfig);
+
+  return table(tableData, mergedConfig);
+}
+
+function getTableHeader(headerItems) {
+  return headerItems.map(headerItem => chalk.bold(headerItem));
+}
+
+module.exports = {
+  getTableContents,
+  getTableHeader,
+};

package/lib/upload.js

@@ -3,7 +3,9 @@ const { walk } = require('@hubspot/local-dev-lib/fs');
 const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
 const { fieldsJsPrompt } = require('../lib/prompts/cmsFieldPrompt');
 const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
-const { isConvertableFieldJs } = require('@hubspot/cli-lib/lib/handleFieldsJs');
+const {
+  isConvertableFieldJs,
+} = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
 const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 /*

package/lib/usageTracking.js

@@ -3,7 +3,9 @@ const {
   isTrackingAllowed,
   getAccountConfig,
 } = require('@hubspot/local-dev-lib/config');
-const { API_KEY_AUTH_METHOD } = require('@hubspot/cli-lib/lib/constants');
+const {
+  API_KEY_AUTH_METHOD,
+} = require('@hubspot/local-dev-lib/constants/auth');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { version } = require('../package.json');
 const { getPlatform } = require('./environment');

package/lib/validation.js

@@ -1,10 +1,12 @@
+const fs = require('fs');
+const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { Mode, checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
+const { Mode } = require('@hubspot/cli-lib');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
-} = require('@hubspot/cli-lib/lib/constants');
+} = require('@hubspot/local-dev-lib/constants/auth');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const {
   loadConfig,
@@ -13,17 +15,19 @@ const {
   getAccountConfig,
   loadConfigFromEnvironment,
 } = require('@hubspot/local-dev-lib/config');
-const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { getOauthManager } = require('@hubspot/local-dev-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
 } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { getCwd, getExt } = require('@hubspot/local-dev-lib/path');
+const {
+  getAbsoluteFilePath,
+  getCwd,
+  getExt,
+} = require('@hubspot/local-dev-lib/path');
 const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
-const fs = require('fs');
-const path = require('path');
 const { EXIT_CODES } = require('./enums/exitCodes');
+const { checkAndWarnGitInclusion } = require('./ui/git');
 const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 async function loadAndValidateOptions(options, shouldValidateAccount = true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.4-beta.2",
+  "version": "5.1.4-beta.4",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@hubspot/cli-lib": "^9.0.0",
-    "@hubspot/local-dev-lib": "^0.3.5",
-    "@hubspot/serverless-dev-runtime": "5.1.4-beta.2",
-    "@hubspot/theme-preview-dev-server": "0.0.2",
-    "@hubspot/ui-extensions-dev-server": "0.8.9",
+    "@hubspot/local-dev-lib": "^0.3.9",
+    "@hubspot/serverless-dev-runtime": "5.1.4-beta.4",
+    "@hubspot/theme-preview-dev-server": "0.0.4",
+    "@hubspot/ui-extensions-dev-server": "0.8.11",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cebb71d06baf30086b1f20bb96e2eb508d242cac"
+  "gitHead": "ae2685fbfe44d8f2570787b9e1f818202c98f70a"
 }