@hubspot/cli 6.2.0 → 6.2.2-experimental.0

package/commands/theme/marketplace-validate.js

@@ -1,67 +1,40 @@
+"use strict";
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addUseEnvironmentOptions,
-  getAccountId,
-} = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const {
-  kickOffValidation,
-  pollForValidationFinish,
-  fetchValidationResults,
-  processValidationErrors,
-  displayValidationResults,
-} = require('../../lib/marketplace-validate');
+const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplace-validate');
 const { i18n } = require('../../lib/lang');
-
 const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
-
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  const { src } = options;
-
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-
-  trackCommandUsage('validate', null, accountId);
-
-  SpinniesManager.init();
-
-  SpinniesManager.add('marketplaceValidation', {
-    text: i18n(`${i18nKey}.logs.validatingTheme`, {
-      path: src,
-    }),
-  });
-
-  const assetType = 'THEME';
-  const validationId = await kickOffValidation(accountId, assetType, src);
-  await pollForValidationFinish(accountId, validationId);
-
-  SpinniesManager.remove('marketplaceValidation');
-
-  const validationResults = await fetchValidationResults(
-    accountId,
-    validationId
-  );
-  processValidationErrors(i18nKey, validationResults);
-  displayValidationResults(i18nKey, validationResults);
-
-  process.exit();
+exports.handler = async (options) => {
+    const { src } = options;
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    trackCommandUsage('validate', null, accountId);
+    SpinniesManager.init();
+    SpinniesManager.add('marketplaceValidation', {
+        text: i18n(`${i18nKey}.logs.validatingTheme`, {
+            path: src,
+        }),
+    });
+    const assetType = 'THEME';
+    const validationId = await kickOffValidation(accountId, assetType, src);
+    await pollForValidationFinish(accountId, validationId);
+    SpinniesManager.remove('marketplaceValidation');
+    const validationResults = await fetchValidationResults(accountId, validationId);
+    processValidationErrors(i18nKey, validationResults);
+    displayValidationResults(i18nKey, validationResults);
+    process.exit();
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  yargs.positional('src', {
-    describe: i18n(`${i18nKey}.positionals.src.describe`),
-    type: 'string',
-  });
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    yargs.positional('src', {
+        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        type: 'string',
+    });
+    return yargs;
 };

package/commands/theme/preview.d.ts

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

package/commands/theme/preview.js

@@ -1,225 +1,190 @@
+"use strict";
 const fs = require('fs');
 const path = require('path');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  addAccountOptions,
-  addConfigOptions,
-  getAccountId,
-} = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, } = require('../../lib/commonOpts');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { preview } = require('@hubspot/theme-preview-dev-server');
 const { getUploadableFileList } = require('../../lib/upload');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const {
-  previewPrompt,
-  previewProjectPrompt,
-} = require('../../lib/prompts/previewPrompt');
+const { previewPrompt, previewProjectPrompt, } = require('../../lib/prompts/previewPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const {
-  FILE_UPLOAD_RESULT_TYPES,
-} = require('@hubspot/local-dev-lib/constants/files');
+const { FILE_UPLOAD_RESULT_TYPES, } = require('@hubspot/local-dev-lib/constants/files');
 const cliProgress = require('cli-progress');
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { handleExit, handleKeypress } = require('../../lib/process');
 const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
 const { getProjectConfig } = require('../../lib/projects');
-const {
-  findProjectComponents,
-  COMPONENT_TYPES,
-} = require('../../lib/projectStructure');
-
+const { findProjectComponents, COMPONENT_TYPES, } = require('../../lib/projectStructure');
 const i18nKey = 'commands.theme.subcommands.preview';
-
 exports.command = 'preview [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
-
 const validateSrcPath = src => {
-  const logInvalidPath = () => {
-    logger.error(
-      i18n(`${i18nKey}.errors.invalidPath`, {
-        path: src,
-      })
-    );
-  };
-  try {
-    const stats = fs.statSync(src);
-    if (!stats.isDirectory()) {
-      logInvalidPath();
-      return false;
+    const logInvalidPath = () => {
+        logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+            path: src,
+        }));
+    };
+    try {
+        const stats = fs.statSync(src);
+        if (!stats.isDirectory()) {
+            logInvalidPath();
+            return false;
+        }
+    }
+    catch (e) {
+        logInvalidPath();
+        return false;
     }
-  } catch (e) {
-    logInvalidPath();
-    return false;
-  }
-  return true;
+    return true;
 };
-
 const handleUserInput = () => {
-  const onTerminate = () => {
-    logger.log(i18n(`${i18nKey}.logs.processExited`));
-    process.exit(EXIT_CODES.SUCCESS);
-  };
-
-  handleExit(onTerminate);
-  handleKeypress(key => {
-    if ((key.ctrl && key.name === 'c') || key.name === 'q') {
-      onTerminate();
-    }
-  });
+    const onTerminate = () => {
+        logger.log(i18n(`${i18nKey}.logs.processExited`));
+        process.exit(EXIT_CODES.SUCCESS);
+    };
+    handleExit(onTerminate);
+    handleKeypress(key => {
+        if ((key.ctrl && key.name === 'c') || key.name === 'q') {
+            onTerminate();
+        }
+    });
 };
-
-const determineSrcAndDest = async options => {
-  let absoluteSrc;
-  let dest;
-  const { projectDir, projectConfig } = await getProjectConfig();
-  if (!(projectDir && projectConfig)) {
-    // Not in a project, prompt for src and dest of traditional theme
-    const previewPromptAnswers = await previewPrompt(options);
-    const src = options.src || previewPromptAnswers.src;
-    dest = options.dest || previewPromptAnswers.dest;
-    absoluteSrc = path.resolve(getCwd(), src);
-    if (!dest || !validateSrcPath(absoluteSrc)) {
-      process.exit(EXIT_CODES.ERROR);
+const determineSrcAndDest = async (options) => {
+    let absoluteSrc;
+    let dest;
+    const { projectDir, projectConfig } = await getProjectConfig();
+    if (!(projectDir && projectConfig)) {
+        // Not in a project, prompt for src and dest of traditional theme
+        const previewPromptAnswers = await previewPrompt(options);
+        const src = options.src || previewPromptAnswers.src;
+        dest = options.dest || previewPromptAnswers.dest;
+        absoluteSrc = path.resolve(getCwd(), src);
+        if (!dest || !validateSrcPath(absoluteSrc)) {
+            process.exit(EXIT_CODES.ERROR);
+        }
     }
-  } else {
-    // In a project
-    let themeJsonPath = getThemeJSONPath();
-    if (!themeJsonPath) {
-      const projectComponents = await findProjectComponents(projectDir);
-      const themeComponents = projectComponents.filter(
-        c => c.type === COMPONENT_TYPES.hublTheme
-      );
-      if (themeComponents.length === 0) {
-        logger.error(i18n(`${i18nKey}.errors.noThemeComponents`));
-        process.exit(EXIT_CODES.ERROR);
-      }
-      const answer = await previewProjectPrompt(themeComponents);
-      themeJsonPath = `${answer.themeComponentPath}/theme.json`;
+    else {
+        // In a project
+        let themeJsonPath = getThemeJSONPath();
+        if (!themeJsonPath) {
+            const projectComponents = await findProjectComponents(projectDir);
+            const themeComponents = projectComponents.filter(c => c.type === COMPONENT_TYPES.hublTheme);
+            if (themeComponents.length === 0) {
+                logger.error(i18n(`${i18nKey}.errors.noThemeComponents`));
+                process.exit(EXIT_CODES.ERROR);
+            }
+            const answer = await previewProjectPrompt(themeComponents);
+            themeJsonPath = `${answer.themeComponentPath}/theme.json`;
+        }
+        const { dir: themeDir } = path.parse(themeJsonPath);
+        absoluteSrc = themeDir;
+        const { base: themeName } = path.parse(themeDir);
+        dest = `@projects/${projectConfig.name}/${themeName}`;
     }
-    const { dir: themeDir } = path.parse(themeJsonPath);
-    absoluteSrc = themeDir;
-    const { base: themeName } = path.parse(themeDir);
-    dest = `@projects/${projectConfig.name}/${themeName}`;
-  }
-  return { absoluteSrc, dest };
+    return { absoluteSrc, dest };
 };
-
-exports.handler = async options => {
-  const { notify, skipUpload, noSsl, port, debug } = options;
-
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-
-  const { absoluteSrc, dest } = await determineSrcAndDest(options);
-
-  const filePaths = await getUploadableFileList(absoluteSrc, false);
-
-  const initialUploadProgressBar = new cliProgress.SingleBar(
-    {
-      gracefulExit: true,
-      format: '[{bar}] {percentage}% | {value}/{total} | {label}',
-      hideCursor: true,
-    },
-    cliProgress.Presets.rect
-  );
-  initialUploadProgressBar.start(filePaths.length, 0, {
-    label: i18n(`${i18nKey}.initialUploadProgressBar.start`),
-  });
-  let uploadsHaveStarted = false;
-  const uploadOptions = {
-    onAttemptCallback: () => {
-      /* Intentionally blank */
-    },
-    onSuccessCallback: () => {
-      initialUploadProgressBar.increment();
-      if (!uploadsHaveStarted) {
-        uploadsHaveStarted = true;
-        initialUploadProgressBar.update(0, {
-          label: i18n(`${i18nKey}.initialUploadProgressBar.uploading`),
-        });
-      }
-    },
-    onFirstErrorCallback: () => {
-      /* Intentionally blank */
-    },
-    onRetryCallback: () => {
-      /* Intentionally blank */
-    },
-    onFinalErrorCallback: () => initialUploadProgressBar.increment(),
-    onFinishCallback: results => {
-      initialUploadProgressBar.update(filePaths.length, {
-        label: i18n(`${i18nKey}.initialUploadProgressBar.finish`),
-      });
-      initialUploadProgressBar.stop();
-      results.forEach(result => {
-        if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
-          logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
-          logError(
-            result.error,
-            new ApiErrorContext({
-              accountId,
-              request: dest,
-              payload: result.file,
-            })
-          );
-        }
-      });
-    },
-  };
-
-  trackCommandUsage('preview', accountId);
-
-  preview(accountId, absoluteSrc, dest, {
-    notify,
-    filePaths,
-    skipUpload,
-    noSsl,
-    port,
-    debug,
-    uploadOptions,
-    handleUserInput,
-  });
+exports.handler = async (options) => {
+    const { notify, skipUpload, noSsl, port, debug } = options;
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    const { absoluteSrc, dest } = await determineSrcAndDest(options);
+    const filePaths = await getUploadableFileList(absoluteSrc, false);
+    const initialUploadProgressBar = new cliProgress.SingleBar({
+        gracefulExit: true,
+        format: '[{bar}] {percentage}% | {value}/{total} | {label}',
+        hideCursor: true,
+    }, cliProgress.Presets.rect);
+    initialUploadProgressBar.start(filePaths.length, 0, {
+        label: i18n(`${i18nKey}.initialUploadProgressBar.start`),
+    });
+    let uploadsHaveStarted = false;
+    const uploadOptions = {
+        onAttemptCallback: () => {
+            /* Intentionally blank */
+        },
+        onSuccessCallback: () => {
+            initialUploadProgressBar.increment();
+            if (!uploadsHaveStarted) {
+                uploadsHaveStarted = true;
+                initialUploadProgressBar.update(0, {
+                    label: i18n(`${i18nKey}.initialUploadProgressBar.uploading`),
+                });
+            }
+        },
+        onFirstErrorCallback: () => {
+            /* Intentionally blank */
+        },
+        onRetryCallback: () => {
+            /* Intentionally blank */
+        },
+        onFinalErrorCallback: () => initialUploadProgressBar.increment(),
+        onFinishCallback: results => {
+            initialUploadProgressBar.update(filePaths.length, {
+                label: i18n(`${i18nKey}.initialUploadProgressBar.finish`),
+            });
+            initialUploadProgressBar.stop();
+            results.forEach(result => {
+                if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
+                    logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
+                    logError(result.error, new ApiErrorContext({
+                        accountId,
+                        request: dest,
+                        payload: result.file,
+                    }));
+                }
+            });
+        },
+    };
+    trackCommandUsage('preview', accountId);
+    preview(accountId, absoluteSrc, dest, {
+        notify,
+        filePaths,
+        skipUpload,
+        noSsl,
+        port,
+        debug,
+        uploadOptions,
+        handleUserInput,
+    });
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-
-  yargs.option('src', {
-    describe: i18n(`${i18nKey}.options.src.describe`),
-    type: 'string',
-    requiresArg: true,
-  });
-  yargs.option('dest', {
-    describe: i18n(`${i18nKey}.options.dest.describe`),
-    type: 'string',
-    requiresArg: true,
-  });
-  yargs.option('notify', {
-    alias: 'n',
-    describe: i18n(`${i18nKey}.options.notify.describe`),
-    type: 'string',
-    requiresArg: true,
-  });
-  yargs.option('no-ssl', {
-    describe: i18n(`${i18nKey}.options.noSsl.describe`),
-    type: 'boolean',
-  });
-  yargs.option('port', {
-    describe: i18n(`${i18nKey}.options.port.describe`),
-    type: 'number',
-  });
-  yargs.option('debug', {
-    describe: false,
-    type: 'boolean',
-  });
-  yargs.option('skipUpload', {
-    alias: 'skip',
-    describe: false,
-    type: 'boolean',
-  });
-  return yargs;
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    yargs.option('src', {
+        describe: i18n(`${i18nKey}.options.src.describe`),
+        type: 'string',
+        requiresArg: true,
+    });
+    yargs.option('dest', {
+        describe: i18n(`${i18nKey}.options.dest.describe`),
+        type: 'string',
+        requiresArg: true,
+    });
+    yargs.option('notify', {
+        alias: 'n',
+        describe: i18n(`${i18nKey}.options.notify.describe`),
+        type: 'string',
+        requiresArg: true,
+    });
+    yargs.option('no-ssl', {
+        describe: i18n(`${i18nKey}.options.noSsl.describe`),
+        type: 'boolean',
+    });
+    yargs.option('port', {
+        describe: i18n(`${i18nKey}.options.port.describe`),
+        type: 'number',
+    });
+    yargs.option('debug', {
+        describe: false,
+        type: 'boolean',
+    });
+    yargs.option('skipUpload', {
+        alias: 'skip',
+        describe: false,
+        type: 'boolean',
+    });
+    return yargs;
 };

package/commands/theme.d.ts

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

package/commands/theme.js

@@ -1,20 +1,16 @@
+"use strict";
 const marketplaceValidate = require('./theme/marketplace-validate');
 const generateSelectors = require('./theme/generate-selectors');
 const previewCommand = require('./theme/preview');
-
 const { i18n } = require('../lib/lang');
-
 const i18nKey = 'commands.theme';
-
 exports.command = 'theme';
 exports.describe = i18n(`${i18nKey}.describe`);
-
 exports.builder = yargs => {
-  yargs
-    .command(previewCommand)
-    .command(marketplaceValidate)
-    .command(generateSelectors)
-    .demandCommand(1, '');
-
-  return yargs;
+    yargs
+        .command(previewCommand)
+        .command(marketplaceValidate)
+        .command(generateSelectors)
+        .demandCommand(1, '');
+    return yargs;
 };

package/commands/upload.d.ts

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