@hubspot/cli 6.2.0 → 6.2.2-experimental.0

package/commands/secrets/listSecrets.js

@@ -1,55 +1,39 @@
+"use strict";
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { fetchSecrets } = require('@hubspot/local-dev-lib/api/secrets');
-
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addUseEnvironmentOptions,
-  getAccountId,
-} = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
-
 const i18nKey = 'commands.secrets.subcommands.list';
-
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-  trackCommandUsage('secrets-list', null, accountId);
-
-  try {
-    const {
-      data: { results },
-    } = await fetchSecrets(accountId);
-    const groupLabel = i18n(`${i18nKey}.groupLabel`, {
-      accountIdentifier: uiAccountDescription(accountId),
-    });
-    logger.group(groupLabel);
-    results.forEach(secret => logger.log(secret));
-    logger.groupEnd(groupLabel);
-  } catch (err) {
-    logger.error(i18n(`${i18nKey}.errors.list`));
-    logError(
-      err,
-      new ApiErrorContext({
-        request: 'add secret',
-        accountId,
-      })
-    );
-  }
+exports.handler = async (options) => {
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    trackCommandUsage('secrets-list', null, accountId);
+    try {
+        const { data: { results }, } = await fetchSecrets(accountId);
+        const groupLabel = i18n(`${i18nKey}.groupLabel`, {
+            accountIdentifier: uiAccountDescription(accountId),
+        });
+        logger.group(groupLabel);
+        results.forEach(secret => logger.log(secret));
+        logger.groupEnd(groupLabel);
+    }
+    catch (err) {
+        logger.error(i18n(`${i18nKey}.errors.list`));
+        logError(err, new ApiErrorContext({
+            request: 'add secret',
+            accountId,
+        }));
+    }
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    return yargs;
 };

package/commands/secrets/updateSecret.d.ts

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

package/commands/secrets/updateSecret.js

@@ -1,67 +1,47 @@
+"use strict";
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { updateSecret } = require('@hubspot/local-dev-lib/api/secrets');
-
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addUseEnvironmentOptions,
-  getAccountId,
-} = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
-
 const i18nKey = 'commands.secrets.subcommands.update';
-
 exports.command = 'update <name>';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  const { name: secretName } = options;
-
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-  trackCommandUsage('secrets-update', null, accountId);
-
-  try {
-    const { secretValue } = await secretValuePrompt();
-
-    await updateSecret(accountId, secretName, secretValue);
-    logger.success(
-      i18n(`${i18nKey}.success.update`, {
-        accountIdentifier: uiAccountDescription(accountId),
-        secretName,
-      })
-    );
-    logger.log(i18n(`${i18nKey}.success.updateExplanation`));
-  } catch (err) {
-    logger.error(
-      i18n(`${i18nKey}.errors.update`, {
-        secretName,
-      })
-    );
-    logError(
-      err,
-      new ApiErrorContext({
-        request: 'update secret',
-        accountId,
-      })
-    );
-  }
+exports.handler = async (options) => {
+    const { name: secretName } = options;
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    trackCommandUsage('secrets-update', null, accountId);
+    try {
+        const { secretValue } = await secretValuePrompt();
+        await updateSecret(accountId, secretName, secretValue);
+        logger.success(i18n(`${i18nKey}.success.update`, {
+            accountIdentifier: uiAccountDescription(accountId),
+            secretName,
+        }));
+        logger.log(i18n(`${i18nKey}.success.updateExplanation`));
+    }
+    catch (err) {
+        logger.error(i18n(`${i18nKey}.errors.update`, {
+            secretName,
+        }));
+        logError(err, new ApiErrorContext({
+            request: 'update secret',
+            accountId,
+        }));
+    }
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-  yargs.positional('name', {
-    describe: i18n(`${i18nKey}.positionals.name.describe`),
-    type: 'string',
-  });
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    yargs.positional('name', {
+        describe: i18n(`${i18nKey}.positionals.name.describe`),
+        type: 'string',
+    });
+    return yargs;
 };

package/commands/secrets.d.ts

@@ -0,0 +1,3 @@
+export const command: "secrets";
+export const describe: any;
+export function builder(yargs: any): any;

package/commands/secrets.js

@@ -1,24 +1,21 @@
+"use strict";
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-
 const addSecretCommand = require('./secrets/addSecret');
 const listSecretsCommand = require('./secrets/listSecrets');
 const deleteSecretCommand = require('./secrets/deleteSecret');
 const updateSecretCommand = require('./secrets/updateSecret');
 const { i18n } = require('../lib/lang');
-
 const i18nKey = 'commands.secrets';
-
 exports.command = 'secrets';
 exports.describe = i18n(`${i18nKey}.describe`);
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  yargs
-    .command(listSecretsCommand)
-    .command(addSecretCommand)
-    .command(updateSecretCommand)
-    .command(deleteSecretCommand)
-    .demandCommand(1, '');
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    yargs
+        .command(listSecretsCommand)
+        .command(addSecretCommand)
+        .command(updateSecretCommand)
+        .command(deleteSecretCommand)
+        .demandCommand(1, '');
+    return yargs;
 };

package/commands/theme/generate-selectors.d.ts

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

package/commands/theme/generate-selectors.js

@@ -1,214 +1,149 @@
+"use strict";
 const fs = require('fs');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  findFieldsJsonPath,
-  combineThemeCss,
-  setPreviewSelectors,
-  generateInheritedSelectors,
-  generateSelectorsMap,
-  getMaxFieldsDepth,
-} = require('../../lib/generate-selectors');
+const { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } = require('../../lib/generate-selectors');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-
 const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
 const HUBL_VARIABLE_NAME_REGEX = new RegExp(/{%\s*set\s*(\w*)/, 'i');
 const HUBL_STATEMENT_REGEX = new RegExp(/{{\s*[\w.(,\d\-\s)|/~]*.*}}/, 'g');
 const HUBL_STATEMENT_PLACEHOLDER_REGEX = new RegExp(/hubl_statement_\d*/, 'g');
-
 const CSS_VARS_REGEX = new RegExp(/--([\w.(,\d\-)]*):(.*);/, 'g');
 const CSS_VARS_NAME_REGEX = new RegExp(/(--[\w.(,\d\-)]*)/, 'g');
 const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
-
 const i18nKey = 'commands.theme.subcommands.generateSelectors';
-
 exports.command = 'generate-selectors <themePath>';
 exports.describe = i18n(`${i18nKey}.describe`);
-
 exports.handler = options => {
-  const { themePath } = options;
-
-  const fieldsJsonPath = findFieldsJsonPath(themePath);
-  if (!fieldsJsonPath) {
-    logger.error(i18n(`${i18nKey}.errors.fieldsNotFound`));
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  let fieldsJson = JSON.parse(fs.readFileSync(fieldsJsonPath));
-  let cssString = combineThemeCss(themePath);
-
-  /**
-   * Creates map of HubL variable names to theme field paths
-   */
-  const HubLExpressions = cssString.match(HUBL_EXPRESSION_REGEX) || [];
-  const hublVariableMap = HubLExpressions.reduce(
-    (_hublVariableMap, expression) => {
-      const variableName = expression.match(HUBL_VARIABLE_NAME_REGEX);
-      const themeFieldKey = expression.match(THEME_PATH_REGEX);
-
-      if (!themeFieldKey || !variableName) return _hublVariableMap;
-
-      _hublVariableMap[variableName[1]] = themeFieldKey[1];
-      return _hublVariableMap;
-    },
-    {}
-  );
-
-  /**
-   * Removes HubL variable expressions
-   */
-  cssString = cssString.replace(HUBL_EXPRESSION_REGEX, '');
-
-  /**
-   * Regex for HubL variable names
-   */
-  const HUBL_EXPRESSIONS = new RegExp(
-    `.*(${Object.keys(hublVariableMap).join('|')}).*`,
-    'g'
-  );
-
-  /**
-   * Matches all HubL statements in the CSS and replaces them with a placeholder string
-   * This is to prevent the the css expression regex from capturing all the HubL as well
-   */
-  const hublStatements = cssString.match(HUBL_STATEMENT_REGEX) || [];
-  const hublStatementsMap = {};
-  hublStatements.forEach((statement, index) => {
-    const statementKey = `hubl_statement_${index}`;
-    hublStatementsMap[statementKey] = statement;
-    cssString = cssString.replace(statement, statementKey);
-  });
-
-  /**
-   * Matchs all css variables and determines if there are hubl within those vars.
-   */
-  const cssVars = cssString.match(CSS_VARS_REGEX) || [];
-  const cssVarsMap = cssVars.reduce((acc, expression) => {
-    const cssVarName = expression.match(CSS_VARS_NAME_REGEX);
-    const hublVariables = expression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX);
-
-    if (!cssVarName || !hublVariables) return acc;
-
-    cssString = cssString.replace(expression, '');
-    return { ...acc, [cssVarName[0]]: hublVariables };
-  }, {});
-
-  // replace all css variable references with corresponding hubl placeholder
-  Object.keys(cssVarsMap).forEach(cssVarName => {
-    const hublPlaceholders = cssVarsMap[cssVarName];
-    cssString = cssString.replace(cssVarName, hublPlaceholders.join('  '));
-  });
-
-  /**
-   * Parses each css string for a HubL statement and tries to map theme field paths to CSS selectors
-   */
-  const cssExpressions = (
-    cssString.match(CSS_EXPRESSION_REGEX) || []
-  ).map(exp => exp.replace(/\r?\n/g, ' '));
-
-  const finalMap = cssExpressions.reduce(
-    (themeFieldsSelectorMap, cssExpression) => {
-      const hublStatementsPlaceholderKey =
-        cssExpression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX) || [];
-
-      hublStatementsPlaceholderKey.forEach(placeholderKey => {
-        const hublStatement = hublStatementsMap[placeholderKey].match(
-          HUBL_EXPRESSIONS
-        );
-        const themeFieldPath = hublStatementsMap[placeholderKey].match(
-          /theme\.[\w|.]*/,
-          'g'
-        );
-        const cssSelectors = cssExpression.match(CSS_SELECTORS_REGEX);
-
-        /**
-         * Try to match a HubL statement to any HubL Variables being used
-         */
-        if (cssSelectors && themeFieldPath) {
-          const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
-          const hublThemePath = themeFieldPath[0];
-
-          if (!themeFieldsSelectorMap[hublThemePath]) {
-            themeFieldsSelectorMap[hublThemePath] = [];
-          }
-
-          if (!themeFieldsSelectorMap[hublThemePath].includes(cssSelector)) {
-            themeFieldsSelectorMap[hublThemePath] = themeFieldsSelectorMap[
-              hublThemePath
-            ].concat(cssSelector);
-          }
-        }
-
-        if (cssSelectors && hublStatement) {
-          const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
-          const hublVariableName = Object.keys(hublVariableMap).find(_hubl => {
-            return hublStatement[0].includes(_hubl);
-          });
-
-          const themeFieldKey = hublVariableMap[hublVariableName];
-
-          /**
-           * If the theme path is referenced directly add selectors
-           */
-          if (themeFieldKey) {
-            if (!themeFieldsSelectorMap[themeFieldKey]) {
-              themeFieldsSelectorMap[themeFieldKey] = [];
+    const { themePath } = options;
+    const fieldsJsonPath = findFieldsJsonPath(themePath);
+    if (!fieldsJsonPath) {
+        logger.error(i18n(`${i18nKey}.errors.fieldsNotFound`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    let fieldsJson = JSON.parse(fs.readFileSync(fieldsJsonPath));
+    let cssString = combineThemeCss(themePath);
+    /**
+     * Creates map of HubL variable names to theme field paths
+     */
+    const HubLExpressions = cssString.match(HUBL_EXPRESSION_REGEX) || [];
+    const hublVariableMap = HubLExpressions.reduce((_hublVariableMap, expression) => {
+        const variableName = expression.match(HUBL_VARIABLE_NAME_REGEX);
+        const themeFieldKey = expression.match(THEME_PATH_REGEX);
+        if (!themeFieldKey || !variableName)
+            return _hublVariableMap;
+        _hublVariableMap[variableName[1]] = themeFieldKey[1];
+        return _hublVariableMap;
+    }, {});
+    /**
+     * Removes HubL variable expressions
+     */
+    cssString = cssString.replace(HUBL_EXPRESSION_REGEX, '');
+    /**
+     * Regex for HubL variable names
+     */
+    const HUBL_EXPRESSIONS = new RegExp(`.*(${Object.keys(hublVariableMap).join('|')}).*`, 'g');
+    /**
+     * Matches all HubL statements in the CSS and replaces them with a placeholder string
+     * This is to prevent the the css expression regex from capturing all the HubL as well
+     */
+    const hublStatements = cssString.match(HUBL_STATEMENT_REGEX) || [];
+    const hublStatementsMap = {};
+    hublStatements.forEach((statement, index) => {
+        const statementKey = `hubl_statement_${index}`;
+        hublStatementsMap[statementKey] = statement;
+        cssString = cssString.replace(statement, statementKey);
+    });
+    /**
+     * Matchs all css variables and determines if there are hubl within those vars.
+     */
+    const cssVars = cssString.match(CSS_VARS_REGEX) || [];
+    const cssVarsMap = cssVars.reduce((acc, expression) => {
+        const cssVarName = expression.match(CSS_VARS_NAME_REGEX);
+        const hublVariables = expression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX);
+        if (!cssVarName || !hublVariables)
+            return acc;
+        cssString = cssString.replace(expression, '');
+        return { ...acc, [cssVarName[0]]: hublVariables };
+    }, {});
+    // replace all css variable references with corresponding hubl placeholder
+    Object.keys(cssVarsMap).forEach(cssVarName => {
+        const hublPlaceholders = cssVarsMap[cssVarName];
+        cssString = cssString.replace(cssVarName, hublPlaceholders.join('  '));
+    });
+    /**
+     * Parses each css string for a HubL statement and tries to map theme field paths to CSS selectors
+     */
+    const cssExpressions = (cssString.match(CSS_EXPRESSION_REGEX) || []).map(exp => exp.replace(/\r?\n/g, ' '));
+    const finalMap = cssExpressions.reduce((themeFieldsSelectorMap, cssExpression) => {
+        const hublStatementsPlaceholderKey = cssExpression.match(HUBL_STATEMENT_PLACEHOLDER_REGEX) || [];
+        hublStatementsPlaceholderKey.forEach(placeholderKey => {
+            const hublStatement = hublStatementsMap[placeholderKey].match(HUBL_EXPRESSIONS);
+            const themeFieldPath = hublStatementsMap[placeholderKey].match(/theme\.[\w|.]*/, 'g');
+            const cssSelectors = cssExpression.match(CSS_SELECTORS_REGEX);
+            /**
+             * Try to match a HubL statement to any HubL Variables being used
+             */
+            if (cssSelectors && themeFieldPath) {
+                const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
+                const hublThemePath = themeFieldPath[0];
+                if (!themeFieldsSelectorMap[hublThemePath]) {
+                    themeFieldsSelectorMap[hublThemePath] = [];
+                }
+                if (!themeFieldsSelectorMap[hublThemePath].includes(cssSelector)) {
+                    themeFieldsSelectorMap[hublThemePath] = themeFieldsSelectorMap[hublThemePath].concat(cssSelector);
+                }
             }
-
-            if (!themeFieldsSelectorMap[themeFieldKey].includes(cssSelector)) {
-              themeFieldsSelectorMap[themeFieldKey] = themeFieldsSelectorMap[
-                themeFieldKey
-              ].concat(cssSelector);
+            if (cssSelectors && hublStatement) {
+                const cssSelector = cssSelectors[1].replace(/\n/g, ' ');
+                const hublVariableName = Object.keys(hublVariableMap).find(_hubl => {
+                    return hublStatement[0].includes(_hubl);
+                });
+                const themeFieldKey = hublVariableMap[hublVariableName];
+                /**
+                 * If the theme path is referenced directly add selectors
+                 */
+                if (themeFieldKey) {
+                    if (!themeFieldsSelectorMap[themeFieldKey]) {
+                        themeFieldsSelectorMap[themeFieldKey] = [];
+                    }
+                    if (!themeFieldsSelectorMap[themeFieldKey].includes(cssSelector)) {
+                        themeFieldsSelectorMap[themeFieldKey] = themeFieldsSelectorMap[themeFieldKey].concat(cssSelector);
+                    }
+                }
             }
-          }
-        }
-      });
-
-      return themeFieldsSelectorMap;
-    },
-    {}
-  );
-
-  if (!Object.keys(finalMap).length) {
-    logger.error(i18n(`${i18nKey}.errors.noSelectorsFound`));
-    process.exit(EXIT_CODES.ERROR);
-  }
-  Object.keys(finalMap).forEach(themeFieldKey => {
-    const fieldKey = themeFieldKey.split('.');
-    const selectors = finalMap[themeFieldKey];
-    fieldsJson = setPreviewSelectors(fieldsJson, fieldKey.splice(1), selectors);
-  });
-
-  // Because fields can have nested inheritance we generated inherited selectors
-  // multiple times to make sure all inherted selectors are bubbled up.
-  const maxFieldsDepth = getMaxFieldsDepth();
-  for (let i = 0; i < maxFieldsDepth; i += 1) {
-    fieldsJson = generateInheritedSelectors(fieldsJson, fieldsJson);
-  }
-
-  const selectorsMap = generateSelectorsMap(fieldsJson);
-  const selectorsPath = `${themePath}/editor-preview.json`;
-
-  fs.writeFileSync(
-    selectorsPath,
-    `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`
-  );
-
-  logger.success(
-    i18n(`${i18nKey}.success`, {
-      themePath,
-      selectorsPath,
-    })
-  );
+        });
+        return themeFieldsSelectorMap;
+    }, {});
+    if (!Object.keys(finalMap).length) {
+        logger.error(i18n(`${i18nKey}.errors.noSelectorsFound`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    Object.keys(finalMap).forEach(themeFieldKey => {
+        const fieldKey = themeFieldKey.split('.');
+        const selectors = finalMap[themeFieldKey];
+        fieldsJson = setPreviewSelectors(fieldsJson, fieldKey.splice(1), selectors);
+    });
+    // Because fields can have nested inheritance we generated inherited selectors
+    // multiple times to make sure all inherted selectors are bubbled up.
+    const maxFieldsDepth = getMaxFieldsDepth();
+    for (let i = 0; i < maxFieldsDepth; i += 1) {
+        fieldsJson = generateInheritedSelectors(fieldsJson, fieldsJson);
+    }
+    const selectorsMap = generateSelectorsMap(fieldsJson);
+    const selectorsPath = `${themePath}/editor-preview.json`;
+    fs.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
+    logger.success(i18n(`${i18nKey}.success`, {
+        themePath,
+        selectorsPath,
+    }));
 };
-
 exports.builder = yargs => {
-  yargs.positional('themePath', {
-    describe: i18n(`${i18nKey}.positionals.themePath.describe`),
-    type: 'string',
-  });
-
-  return yargs;
+    yargs.positional('themePath', {
+        describe: i18n(`${i18nKey}.positionals.themePath.describe`),
+        type: 'string',
+    });
+    return yargs;
 };

package/commands/theme/marketplace-validate.d.ts

@@ -0,0 +1,4 @@
+export const command: "marketplace-validate <src>";
+export const describe: any;
+export function handler(options: any): Promise<never>;
+export function builder(yargs: any): any;