@hubspot/cli 6.2.0 → 6.2.2-experimental.0

package/commands/auth.js

@@ -1,223 +1,154 @@
+"use strict";
 const { checkAndWarnGitInclusion } = require('../lib/ui/git');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-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 {
-  getAccessToken,
-  updateConfigWithAccessToken,
-} = require('@hubspot/local-dev-lib/personalAccessKey');
-const {
-  updateAccountConfig,
-  writeConfig,
-  getConfig,
-  getConfigPath,
-  loadConfig,
-} = require('@hubspot/local-dev-lib/config');
-const {
-  commaSeparatedValues,
-  toKebabCase,
-} = require('@hubspot/local-dev-lib/text');
+const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
+const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, } = require('@hubspot/local-dev-lib/config');
+const { commaSeparatedValues, toKebabCase, } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
-const {
-  personalAccessKeyPrompt,
-  OAUTH_FLOW,
-} = require('../lib/prompts/personalAccessKeyPrompt');
+const { personalAccessKeyPrompt, OAUTH_FLOW, } = require('../lib/prompts/personalAccessKeyPrompt');
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
-const {
-  setAsDefaultAccountPrompt,
-} = require('../lib/prompts/setAsDefaultAccountPrompt');
-const {
-  addConfigOptions,
-  setLogLevel,
-  getAccountId,
-  addTestingOptions,
-} = require('../lib/commonOpts');
+const { setAsDefaultAccountPrompt, } = require('../lib/prompts/setAsDefaultAccountPrompt');
+const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, } = require('../lib/commonOpts');
 const { logDebugInfo } = require('../lib/debugInfo');
 const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
 const { logError } = require('../lib/errorHandlers/index');
-
 const i18nKey = 'commands.auth';
-
 const TRACKING_STATUS = {
-  STARTED: 'started',
-  ERROR: 'error',
-  COMPLETE: 'complete',
+    STARTED: 'started',
+    ERROR: 'error',
+    COMPLETE: 'complete',
 };
-
 const ALLOWED_AUTH_METHODS = [
-  OAUTH_AUTH_METHOD.value,
-  PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+    OAUTH_AUTH_METHOD.value,
+    PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
 ];
-const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(
-  ALLOWED_AUTH_METHODS
-);
-
+const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(ALLOWED_AUTH_METHODS);
 exports.command = 'auth [type] [--account]';
 exports.describe = i18n(`${i18nKey}.describe`, {
-  supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
+    supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
 });
-
-exports.handler = async options => {
-  const { type, config: c, qa, account } = options;
-  const authType =
-    (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-  setLogLevel(options);
-  logDebugInfo(options);
-
-  if (!getConfigPath(c)) {
-    logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-  loadConfig(c);
-  checkAndWarnGitInclusion(getConfigPath());
-
-  trackCommandUsage('auth');
-  trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
-
-  let configData;
-  let updatedConfig;
-  let validName;
-  let successAuthMethod;
-  let token;
-  let defaultName;
-
-  switch (authType) {
-    case OAUTH_AUTH_METHOD.value:
-      configData = await promptUser(OAUTH_FLOW);
-      await authenticateWithOauth({
-        ...configData,
-        env,
-      });
-      successAuthMethod = OAUTH_AUTH_METHOD.name;
-      break;
-    case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-      configData = await personalAccessKeyPrompt({ env, account });
-
-      try {
-        token = await getAccessToken(configData.personalAccessKey, env);
-        defaultName = toKebabCase(token.hubName);
-
-        updatedConfig = await updateConfigWithAccessToken(
-          token,
-          configData.personalAccessKey,
-          env
-        );
-      } catch (e) {
-        logError(e);
-      }
-
-      if (!updatedConfig) {
-        break;
-      }
-
-      validName = updatedConfig.name;
-
-      if (!validName) {
-        const { name: namePrompt } = await cliAccountNamePrompt(defaultName);
-        validName = namePrompt;
-      }
-
-      updateAccountConfig({
-        ...updatedConfig,
-        environment: updatedConfig.env,
-        tokenInfo: updatedConfig.auth.tokenInfo,
-        name: validName,
-      });
-      writeConfig();
-
-      successAuthMethod = PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
-      break;
-    default:
-      logger.error(
-        i18n(`${i18nKey}.errors.unsupportedAuthType`, {
-          supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
-          type,
-        })
-      );
-      break;
-  }
-
-  if (!successAuthMethod) {
-    await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR);
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  const accountName =
-    (updatedConfig && updatedConfig.name) || validName || configData.name;
-
-  const setAsDefault = await setAsDefaultAccountPrompt(accountName);
-
-  logger.log('');
-  if (setAsDefault) {
-    logger.success(
-      i18n(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+exports.handler = async (options) => {
+    const { type, config: c, qa, account } = options;
+    const authType = (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    setLogLevel(options);
+    logDebugInfo(options);
+    if (!getConfigPath(c)) {
+        logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    loadConfig(c);
+    checkAndWarnGitInclusion(getConfigPath());
+    trackCommandUsage('auth');
+    trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
+    let configData;
+    let updatedConfig;
+    let validName;
+    let successAuthMethod;
+    let token;
+    let defaultName;
+    switch (authType) {
+        case OAUTH_AUTH_METHOD.value:
+            configData = await promptUser(OAUTH_FLOW);
+            await authenticateWithOauth({
+                ...configData,
+                env,
+            });
+            successAuthMethod = OAUTH_AUTH_METHOD.name;
+            break;
+        case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
+            configData = await personalAccessKeyPrompt({ env, account });
+            try {
+                token = await getAccessToken(configData.personalAccessKey, env);
+                defaultName = toKebabCase(token.hubName);
+                updatedConfig = await updateConfigWithAccessToken(token, configData.personalAccessKey, env);
+            }
+            catch (e) {
+                logError(e);
+            }
+            if (!updatedConfig) {
+                break;
+            }
+            validName = updatedConfig.name;
+            if (!validName) {
+                const { name: namePrompt } = await cliAccountNamePrompt(defaultName);
+                validName = namePrompt;
+            }
+            updateAccountConfig({
+                ...updatedConfig,
+                environment: updatedConfig.env,
+                tokenInfo: updatedConfig.auth.tokenInfo,
+                name: validName,
+            });
+            writeConfig();
+            successAuthMethod = PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
+            break;
+        default:
+            logger.error(i18n(`${i18nKey}.errors.unsupportedAuthType`, {
+                supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
+                type,
+            }));
+            break;
+    }
+    if (!successAuthMethod) {
+        await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const accountName = (updatedConfig && updatedConfig.name) || validName || configData.name;
+    const setAsDefault = await setAsDefaultAccountPrompt(accountName);
+    logger.log('');
+    if (setAsDefault) {
+        logger.success(i18n(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+            accountName,
+        }));
+    }
+    else {
+        const config = getConfig();
+        logger.info(i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+            accountName: config.defaultPortal,
+        }));
+    }
+    logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {
+        configFilename: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+        authType: successAuthMethod,
         accountName,
-      })
-    );
-  } else {
-    const config = getConfig();
-    logger.info(
-      i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-        accountName: config.defaultPortal,
-      })
-    );
-  }
-  logger.success(
-    i18n(`${i18nKey}.success.configFileUpdated`, {
-      configFilename: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-      authType: successAuthMethod,
-      accountName,
-    })
-  );
-  uiFeatureHighlight([
-    'accountsUseCommand',
-    'accountOption',
-    'accountsListCommand',
-  ]);
-
-  const accountId = getAccountId({ account: accountName });
-  await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
-
-  process.exit(EXIT_CODES.SUCCESS);
+    }));
+    uiFeatureHighlight([
+        'accountsUseCommand',
+        'accountOption',
+        'accountsListCommand',
+    ]);
+    const accountId = getAccountId({ account: accountName });
+    await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+    process.exit(EXIT_CODES.SUCCESS);
 };
-
 exports.builder = yargs => {
-  yargs.positional('type', {
-    describe: i18n(`${i18nKey}.positionals.type.describe`),
-    type: 'string',
-    choices: [
-      `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
-      `${OAUTH_AUTH_METHOD.value}`,
-    ],
-    default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    defaultDescription: i18n(`${i18nKey}.positionals.type.defaultDescription`, {
-      authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    }),
-  });
-
-  yargs.options({
-    account: {
-      describe: i18n(`${i18nKey}.options.account.describe`),
-      type: 'string',
-    },
-  });
-
-  addConfigOptions(yargs);
-  addTestingOptions(yargs);
-
-  return yargs;
+    yargs.positional('type', {
+        describe: i18n(`${i18nKey}.positionals.type.describe`),
+        type: 'string',
+        choices: [
+            `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
+            `${OAUTH_AUTH_METHOD.value}`,
+        ],
+        default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+        defaultDescription: i18n(`${i18nKey}.positionals.type.defaultDescription`, {
+            authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+        }),
+    });
+    yargs.options({
+        account: {
+            describe: i18n(`${i18nKey}.options.account.describe`),
+            type: 'string',
+        },
+    });
+    addConfigOptions(yargs);
+    addTestingOptions(yargs);
+    return yargs;
 };

package/commands/cms/convertFields.d.ts

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

package/commands/cms/convertFields.js

@@ -1,3 +1,4 @@
+"use strict";
 const path = require('path');
 const fs = require('fs');
 const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
@@ -6,99 +7,81 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { walk } = require('@hubspot/local-dev-lib/fs');
 const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
 const { i18n } = require('../../lib/lang');
-const {
-  FieldsJs,
-  isConvertableFieldJs,
-} = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-
+const { FieldsJs, isConvertableFieldJs, } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
 const { logError } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'commands.convertFields';
-
 exports.command = 'convert-fields';
 exports.describe = i18n(`${i18nKey}.describe`);
-
 const invalidPath = src => {
-  logger.error(
-    i18n(`${i18nKey}.errors.invalidPath`, {
-      path: src,
-    })
-  );
-  process.exit(EXIT_CODES.ERROR);
+    logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+        path: src,
+    }));
+    process.exit(EXIT_CODES.ERROR);
 };
-
-exports.handler = async options => {
-  let stats;
-  let projectRoot;
-  let src;
-
-  try {
-    src = path.resolve(getCwd(), options.src);
-    const themeJSONPath = getThemeJSONPath(options.src);
-    projectRoot = themeJSONPath
-      ? path.dirname(themeJSONPath)
-      : path.dirname(getCwd());
-    stats = fs.statSync(src);
-    if (!stats.isFile() && !stats.isDirectory()) {
-      invalidPath(options.src);
-      return;
-    }
-  } catch (e) {
-    invalidPath(options.src);
-  }
-
-  trackConvertFieldsUsage('process');
-
-  if (stats.isFile()) {
-    const fieldsJs = await new FieldsJs(
-      projectRoot,
-      src,
-      undefined,
-      options.fieldOptions
-    ).init();
-    if (fieldsJs.rejected) return;
-    fieldsJs.saveOutput();
-  } else if (stats.isDirectory()) {
-    let filePaths = [];
+exports.handler = async (options) => {
+    let stats;
+    let projectRoot;
+    let src;
     try {
-      filePaths = await walk(src);
-    } catch (e) {
-      logError(e);
-    }
-    const allowedFilePaths = filePaths
-      .filter(file => {
-        if (!isAllowedExtension(file)) {
-          return false;
+        src = path.resolve(getCwd(), options.src);
+        const themeJSONPath = getThemeJSONPath(options.src);
+        projectRoot = themeJSONPath
+            ? path.dirname(themeJSONPath)
+            : path.dirname(getCwd());
+        stats = fs.statSync(src);
+        if (!stats.isFile() && !stats.isDirectory()) {
+            invalidPath(options.src);
+            return;
         }
-        return true;
-      })
-      .filter(createIgnoreFilter());
-    for (const filePath of allowedFilePaths) {
-      if (isConvertableFieldJs(projectRoot, filePath, true)) {
-        const fieldsJs = await new FieldsJs(
-          projectRoot,
-          filePath,
-          undefined,
-          options.fieldOptions
-        ).init();
-        if (fieldsJs.rejected) return;
+    }
+    catch (e) {
+        invalidPath(options.src);
+    }
+    trackConvertFieldsUsage('process');
+    if (stats.isFile()) {
+        const fieldsJs = await new FieldsJs(projectRoot, src, undefined, options.fieldOptions).init();
+        if (fieldsJs.rejected)
+            return;
         fieldsJs.saveOutput();
-      }
     }
-  }
+    else if (stats.isDirectory()) {
+        let filePaths = [];
+        try {
+            filePaths = await walk(src);
+        }
+        catch (e) {
+            logError(e);
+        }
+        const allowedFilePaths = filePaths
+            .filter(file => {
+            if (!isAllowedExtension(file)) {
+                return false;
+            }
+            return true;
+        })
+            .filter(createIgnoreFilter());
+        for (const filePath of allowedFilePaths) {
+            if (isConvertableFieldJs(projectRoot, filePath, true)) {
+                const fieldsJs = await new FieldsJs(projectRoot, filePath, undefined, options.fieldOptions).init();
+                if (fieldsJs.rejected)
+                    return;
+                fieldsJs.saveOutput();
+            }
+        }
+    }
 };
-
 exports.builder = yargs => {
-  yargs.option('src', {
-    describe: i18n(`${i18nKey}.positionals.src.describe`),
-    type: 'string',
-    demandOption: i18n(`${i18nKey}.errors.missingSrc`),
-  });
-  yargs.option('fieldOptions', {
-    describe: i18n(`${i18nKey}.options.options.describe`),
-    type: 'array',
-    default: [''],
-  });
-  return yargs;
+    yargs.option('src', {
+        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        type: 'string',
+        demandOption: i18n(`${i18nKey}.errors.missingSrc`),
+    });
+    yargs.option('fieldOptions', {
+        describe: i18n(`${i18nKey}.options.options.describe`),
+        type: 'array',
+        default: [''],
+    });
+    return yargs;
 };

package/commands/cms/lighthouseScore.d.ts

@@ -0,0 +1,4 @@
+export const command: "lighthouse-score [--theme]";
+export const describe: false;
+export function handler(options: any): Promise<never>;
+export function builder(yargs: any): any;