@hubspot/cli 6.2.1 → 6.2.2-experimental.0

package/commands/init.js

@@ -1,195 +1,136 @@
+"use strict";
 const path = require('path');
 const fs = require('fs-extra');
-const {
-  getConfigPath,
-  createEmptyConfigFile,
-  deleteEmptyConfigFile,
-  updateDefaultAccount,
-} = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { addConfigOptions } = require('../lib/commonOpts');
 const { handleExit } = require('../lib/process');
-const {
-  checkAndAddConfigToGitignore,
-} = require('@hubspot/local-dev-lib/gitignore');
+const { checkAndAddConfigToGitignore, } = require('@hubspot/local-dev-lib/gitignore');
 const { debugError, logError } = require('../lib/errorHandlers/index');
-const {
-  OAUTH_AUTH_METHOD,
-  PERSONAL_ACCESS_KEY_AUTH_METHOD,
-} = require('@hubspot/local-dev-lib/constants/auth');
-const {
-  ENVIRONMENTS,
-} = require('@hubspot/local-dev-lib/constants/environments');
-const {
-  DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-} = require('@hubspot/local-dev-lib/constants/config');
+const { OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } = require('@hubspot/local-dev-lib/constants/auth');
+const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
+const { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, } = require('@hubspot/local-dev-lib/constants/config');
 const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  getAccessToken,
-  updateConfigWithAccessToken,
-} = require('@hubspot/local-dev-lib/personalAccessKey');
+const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { toKebabCase } = require('@hubspot/local-dev-lib/text');
 const { trackCommandUsage, trackAuthAction } = require('../lib/usageTracking');
 const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
 const { promptUser } = require('../lib/prompts/promptUtils');
-const {
-  OAUTH_FLOW,
-  personalAccessKeyPrompt,
-} = require('../lib/prompts/personalAccessKeyPrompt');
+const { OAUTH_FLOW, personalAccessKeyPrompt, } = require('../lib/prompts/personalAccessKeyPrompt');
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const { logDebugInfo } = require('../lib/debugInfo');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
-
 const i18nKey = 'commands.init';
-
 const TRACKING_STATUS = {
-  STARTED: 'started',
-  ERROR: 'error',
-  COMPLETE: 'complete',
+    STARTED: 'started',
+    ERROR: 'error',
+    COMPLETE: 'complete',
 };
-
 const personalAccessKeyConfigCreationFlow = async (env, account) => {
-  const { personalAccessKey } = await personalAccessKeyPrompt({ env, account });
-  let updatedConfig;
-
-  try {
-    const token = await getAccessToken(personalAccessKey, env);
-    const defaultName = token.hubName ? toKebabCase(token.hubName) : null;
-    const { name } = await cliAccountNamePrompt(defaultName);
-
-    updatedConfig = updateConfigWithAccessToken(
-      token,
-      personalAccessKey,
-      env,
-      name,
-      true
-    );
-  } catch (e) {
-    logError(e);
-  }
-  return updatedConfig;
+    const { personalAccessKey } = await personalAccessKeyPrompt({ env, account });
+    let updatedConfig;
+    try {
+        const token = await getAccessToken(personalAccessKey, env);
+        const defaultName = token.hubName ? toKebabCase(token.hubName) : null;
+        const { name } = await cliAccountNamePrompt(defaultName);
+        updatedConfig = updateConfigWithAccessToken(token, personalAccessKey, env, name, true);
+    }
+    catch (e) {
+        logError(e);
+    }
+    return updatedConfig;
 };
-
-const oauthConfigCreationFlow = async env => {
-  const configData = await promptUser(OAUTH_FLOW);
-  const accountConfig = {
-    ...configData,
-    env,
-  };
-  await authenticateWithOauth(accountConfig);
-  updateDefaultAccount(accountConfig.name);
-  return accountConfig;
+const oauthConfigCreationFlow = async (env) => {
+    const configData = await promptUser(OAUTH_FLOW);
+    const accountConfig = {
+        ...configData,
+        env,
+    };
+    await authenticateWithOauth(accountConfig);
+    updateDefaultAccount(accountConfig.name);
+    return accountConfig;
 };
-
 const CONFIG_CREATION_FLOWS = {
-  [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: personalAccessKeyConfigCreationFlow,
-  [OAUTH_AUTH_METHOD.value]: oauthConfigCreationFlow,
+    [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: personalAccessKeyConfigCreationFlow,
+    [OAUTH_AUTH_METHOD.value]: oauthConfigCreationFlow,
 };
-
 const AUTH_TYPE_NAMES = {
-  [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
-  [OAUTH_AUTH_METHOD.value]: OAUTH_AUTH_METHOD.name,
+    [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
+    [OAUTH_AUTH_METHOD.value]: OAUTH_AUTH_METHOD.name,
 };
-
 exports.command = 'init [--account]';
 exports.describe = i18n(`${i18nKey}.describe`, {
-  configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+    configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 });
-
-exports.handler = async options => {
-  const {
-    auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    c,
-    account: optionalAccount,
-  } = options;
-  const configPath = (c && path.join(getCwd(), c)) || getConfigPath();
-  setLogLevel(options);
-  logDebugInfo(options);
-  trackCommandUsage('init', {
-    authType,
-  });
-  const env = options.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-
-  if (fs.existsSync(configPath)) {
-    logger.error(
-      i18n(`${i18nKey}.errors.configFileExists`, {
-        configPath,
-      })
-    );
-    logger.info(i18n(`${i18nKey}.logs.updateConfig`));
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
-  createEmptyConfigFile({ path: configPath });
-  handleExit(deleteEmptyConfigFile);
-
-  try {
-    const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](
-      env,
-      optionalAccount
-    );
-    const configPath = getConfigPath();
-
+exports.handler = async (options) => {
+    const { auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value, c, account: optionalAccount, } = options;
+    const configPath = (c && path.join(getCwd(), c)) || getConfigPath();
+    setLogLevel(options);
+    logDebugInfo(options);
+    trackCommandUsage('init', {
+        authType,
+    });
+    const env = options.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    if (fs.existsSync(configPath)) {
+        logger.error(i18n(`${i18nKey}.errors.configFileExists`, {
+            configPath,
+        }));
+        logger.info(i18n(`${i18nKey}.logs.updateConfig`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
+    createEmptyConfigFile({ path: configPath });
+    handleExit(deleteEmptyConfigFile);
     try {
-      checkAndAddConfigToGitignore(configPath);
-    } catch (e) {
-      debugError(e);
+        const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](env, optionalAccount);
+        const configPath = getConfigPath();
+        try {
+            checkAndAddConfigToGitignore(configPath);
+        }
+        catch (e) {
+            debugError(e);
+        }
+        logger.log('');
+        logger.success(i18n(`${i18nKey}.success.configFileCreated`, {
+            configPath,
+        }));
+        logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {
+            authType: AUTH_TYPE_NAMES[authType],
+            account: name || accountId,
+        }));
+        uiFeatureHighlight(['helpCommand', 'authCommand', 'accountsListCommand']);
+        await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
+        process.exit(EXIT_CODES.SUCCESS);
+    }
+    catch (err) {
+        logError(err);
+        await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
-
-    logger.log('');
-    logger.success(
-      i18n(`${i18nKey}.success.configFileCreated`, {
-        configPath,
-      })
-    );
-    logger.success(
-      i18n(`${i18nKey}.success.configFileUpdated`, {
-        authType: AUTH_TYPE_NAMES[authType],
-        account: name || accountId,
-      })
-    );
-    uiFeatureHighlight(['helpCommand', 'authCommand', 'accountsListCommand']);
-
-    await trackAuthAction(
-      'init',
-      authType,
-      TRACKING_STATUS.COMPLETE,
-      accountId
-    );
-    process.exit(EXIT_CODES.SUCCESS);
-  } catch (err) {
-    logError(err);
-    await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
-    process.exit(EXIT_CODES.ERROR);
-  }
 };
-
 exports.builder = yargs => {
-  yargs.options({
-    auth: {
-      describe: i18n(`${i18nKey}.options.auth.describe`),
-      type: 'string',
-      choices: [
-        `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
-        `${OAUTH_AUTH_METHOD.value}`,
-      ],
-      default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-      defaultDescription: i18n(`${i18nKey}.options.auth.defaultDescription`, {
-        defaultType: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-      }),
-    },
-    account: {
-      describe: i18n(`${i18nKey}.options.account.describe`),
-      type: 'string',
-    },
-  });
-
-  addConfigOptions(yargs);
-  addTestingOptions(yargs);
-
-  return yargs;
+    yargs.options({
+        auth: {
+            describe: i18n(`${i18nKey}.options.auth.describe`),
+            type: 'string',
+            choices: [
+                `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
+                `${OAUTH_AUTH_METHOD.value}`,
+            ],
+            default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+            defaultDescription: i18n(`${i18nKey}.options.auth.defaultDescription`, {
+                defaultType: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+            }),
+        },
+        account: {
+            describe: i18n(`${i18nKey}.options.account.describe`),
+            type: 'string',
+        },
+    });
+    addConfigOptions(yargs);
+    addTestingOptions(yargs);
+    return yargs;
 };

package/commands/lint.d.ts

@@ -0,0 +1,4 @@
+export const command: "lint <path>";
+export const describe: any;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;

package/commands/lint.js

@@ -1,63 +1,50 @@
+"use strict";
 const { lint } = require('@hubspot/local-dev-lib/cms/validate');
 const { printHublValidationResult } = require('../lib/hublValidate');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../lib/errorHandlers/index');
-
-const {
-  addConfigOptions,
-  addAccountOptions,
-  getAccountId,
-} = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, getAccountId, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
-
 const i18nKey = 'commands.lint';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-
 exports.command = 'lint <path>';
 // Hiding since this command is still experimental
 exports.describe = null; //'Lint a file or folder for HubL syntax';
-
-exports.handler = async options => {
-  const { path: lintPath } = options;
-
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-  const localPath = resolveLocalPath(lintPath);
-  const groupName = i18n(`${i18nKey}.groupName`, {
-    path: localPath,
-  });
-
-  trackCommandUsage('lint', null, accountId);
-
-  logger.group(groupName);
-  let count = 0;
-  try {
-    await lint(accountId, localPath, result => {
-      count += printHublValidationResult(result);
+exports.handler = async (options) => {
+    const { path: lintPath } = options;
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    const localPath = resolveLocalPath(lintPath);
+    const groupName = i18n(`${i18nKey}.groupName`, {
+        path: localPath,
     });
-  } catch (err) {
+    trackCommandUsage('lint', null, accountId);
+    logger.group(groupName);
+    let count = 0;
+    try {
+        await lint(accountId, localPath, result => {
+            count += printHublValidationResult(result);
+        });
+    }
+    catch (err) {
+        logger.groupEnd(groupName);
+        logError(err, { accountId });
+        process.exit(EXIT_CODES.ERROR);
+    }
     logger.groupEnd(groupName);
-    logError(err, { accountId });
-    process.exit(EXIT_CODES.ERROR);
-  }
-  logger.groupEnd(groupName);
-  logger.log(
-    i18n(`${i18nKey}.issuesFound`, {
-      count,
-    })
-  );
+    logger.log(i18n(`${i18nKey}.issuesFound`, {
+        count,
+    }));
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        type: 'string',
+    });
+    return yargs;
 };

package/commands/list.d.ts

@@ -0,0 +1,4 @@
+export const command: "list [path]";
+export const describe: any;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;

package/commands/list.js

@@ -1,121 +1,92 @@
+"use strict";
 const chalk = require('chalk');
-const {
-  addAccountOptions,
-  addConfigOptions,
-  getAccountId,
-  addUseEnvironmentOptions,
-} = require('../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { isPathFolder } = require('../lib/filesystem');
-
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../lib/errorHandlers/index');
-const {
-  getDirectoryContentsByPath,
-} = require('@hubspot/local-dev-lib/api/fileMapper');
+const { getDirectoryContentsByPath, } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } = require('../lib/constants');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
-
 const i18nKey = 'commands.list';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-
 exports.command = 'list [path]';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  const { path } = options;
-  const directoryPath = path || '/';
-  const accountId = getAccountId(options);
-  let contentsResp;
-
-  trackCommandUsage('list', null, accountId);
-
-  logger.debug(
-    i18n(`${i18nKey}.gettingPathContents`, {
-      path: directoryPath,
-    })
-  );
-
-  try {
-    const { data } = await getDirectoryContentsByPath(accountId, directoryPath);
-    contentsResp = data;
-  } catch (e) {
-    logError(e);
-    process.exit(EXIT_CODES.SUCCESS);
-  }
-
-  if (!contentsResp.folder) {
-    logger.info(
-      i18n(`${i18nKey}.noFilesFoundAtPath`, {
+exports.handler = async (options) => {
+    await loadAndValidateOptions(options);
+    const { path } = options;
+    const directoryPath = path || '/';
+    const accountId = getAccountId(options);
+    let contentsResp;
+    trackCommandUsage('list', null, accountId);
+    logger.debug(i18n(`${i18nKey}.gettingPathContents`, {
         path: directoryPath,
-      })
-    );
-    return;
-  }
-  // getDirectoryContentsByPath omits @hubspot
-  const contents =
-    directoryPath === '/'
-      ? ['@hubspot', ...contentsResp.children]
-      : contentsResp.children;
-
-  if (contents.length === 0) {
-    logger.info(
-      i18n(`${i18nKey}.noFilesFoundAtPath`, {
-        path: directoryPath,
-      })
-    );
-    return;
-  }
-
-  const folderContentsOutput = contents
-    .map(addColorToContents)
-    .sort(sortContents)
-    .join('\n');
-
-  logger.log(folderContentsOutput);
+    }));
+    try {
+        const { data } = await getDirectoryContentsByPath(accountId, directoryPath);
+        contentsResp = data;
+    }
+    catch (e) {
+        logError(e);
+        process.exit(EXIT_CODES.SUCCESS);
+    }
+    if (!contentsResp.folder) {
+        logger.info(i18n(`${i18nKey}.noFilesFoundAtPath`, {
+            path: directoryPath,
+        }));
+        return;
+    }
+    // getDirectoryContentsByPath omits @hubspot
+    const contents = directoryPath === '/'
+        ? ['@hubspot', ...contentsResp.children]
+        : contentsResp.children;
+    if (contents.length === 0) {
+        logger.info(i18n(`${i18nKey}.noFilesFoundAtPath`, {
+            path: directoryPath,
+        }));
+        return;
+    }
+    const folderContentsOutput = contents
+        .map(addColorToContents)
+        .sort(sortContents)
+        .join('\n');
+    logger.log(folderContentsOutput);
 };
-
 exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-  yargs.example([['$0 list'], ['$0 list /'], ['$0 list serverless']]);
-
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  return yargs;
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        type: 'string',
+    });
+    yargs.example([['$0 list'], ['$0 list /'], ['$0 list serverless']]);
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    return yargs;
 };
-
 const addColorToContents = fileOrFolder => {
-  if (!isPathFolder(fileOrFolder)) {
-    return chalk.reset.cyan(fileOrFolder);
-  }
-  if (fileOrFolder === HUBSPOT_FOLDER || fileOrFolder === MARKETPLACE_FOLDER) {
-    return chalk.reset.bold.blue(fileOrFolder);
-  }
-  return chalk.reset.blue(fileOrFolder);
+    if (!isPathFolder(fileOrFolder)) {
+        return chalk.reset.cyan(fileOrFolder);
+    }
+    if (fileOrFolder === HUBSPOT_FOLDER || fileOrFolder === MARKETPLACE_FOLDER) {
+        return chalk.reset.bold.blue(fileOrFolder);
+    }
+    return chalk.reset.blue(fileOrFolder);
 };
-
 const sortContents = (a, b) => {
-  // Pin @hubspot folder to top
-  if (a === HUBSPOT_FOLDER) {
-    return -1;
-  } else if (b === HUBSPOT_FOLDER) {
-    return 1;
-  }
-
-  // Pin @marketplace folder to top
-  if (a === MARKETPLACE_FOLDER) {
-    return -1;
-  } else if (b === MARKETPLACE_FOLDER) {
-    return 1;
-  }
-
-  return a.localeCompare(b);
+    // Pin @hubspot folder to top
+    if (a === HUBSPOT_FOLDER) {
+        return -1;
+    }
+    else if (b === HUBSPOT_FOLDER) {
+        return 1;
+    }
+    // Pin @marketplace folder to top
+    if (a === MARKETPLACE_FOLDER) {
+        return -1;
+    }
+    else if (b === MARKETPLACE_FOLDER) {
+        return 1;
+    }
+    return a.localeCompare(b);
 };

package/commands/logs.d.ts

@@ -0,0 +1,4 @@
+export const command: "logs [endpoint]";
+export const describe: any;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;