@hubspot/cli 4.0.2-beta.7 → 4.1.0

package/commands/theme/marketplace-validate.js

@@ -1,9 +1,7 @@
-const fs = require('fs');
-const path = require('path');
+const Spinnies = require('spinnies');
+const chalk = require('chalk');
 
-const { getCwd } = require('@hubspot/cli-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { walk } = require('@hubspot/cli-lib');
 
 const {
   addConfigOptions,
@@ -14,17 +12,16 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
-  logValidatorResults,
-} = require('../../lib/validators/logValidatorResults');
-const {
-  applyAbsoluteValidators,
-} = require('../../lib/validators/applyValidators');
-const MARKETPLACE_VALIDATORS = require('../../lib/validators');
-const { VALIDATION_RESULT } = require('../../lib/validators/constants');
+  requestValidation,
+  getValidationStatus,
+  getValidationResults,
+} = require('@hubspot/cli-lib/api/marketplaceValidation');
+
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.theme.subcommands.marketplaceValidate';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const SLEEP_TIME = 2000;
 
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -35,54 +32,101 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  const absoluteSrcPath = path.resolve(getCwd(), src);
-  let stats;
+
+  trackCommandUsage('validate', null, accountId);
+
+  const spinnies = new Spinnies();
+
+  spinnies.add('marketplaceValidation', {
+    text: i18n(`${i18nKey}.logs.validatingTheme`, {
+      path: src,
+    }),
+  });
+
+  // Kick off validation
+  let requestResult;
+  const assetType = 'THEME';
+  const requestGroup = 'EXTERNAL_DEVELOPER';
   try {
-    stats = fs.statSync(absoluteSrcPath);
-    if (!stats.isDirectory()) {
-      logger.error(
-        i18n(`${i18nKey}.errors.invalidPath`, {
-          path: src,
-        })
-      );
-      return;
-    }
-  } catch (e) {
-    logger.error(
-      i18n(`${i18nKey}.errors.invalidPath`, {
-        path: src,
-      })
-    );
-    return;
+    requestResult = await requestValidation(accountId, {
+      path: src,
+      assetType,
+      requestGroup,
+    });
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Poll till validation is finished
+  try {
+    const checkValidationStatus = async () => {
+      const validationStatus = await getValidationStatus(accountId, {
+        validationId: requestResult,
+      });
+
+      if (validationStatus === 'REQUESTED') {
+        await new Promise(resolve => setTimeout(resolve, SLEEP_TIME));
+        await checkValidationStatus();
+      }
+    };
+
+    await checkValidationStatus();
+
+    spinnies.remove('marketplaceValidation');
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
   }
 
-  if (!options.json) {
-    logger.log(
-      i18n(`${i18nKey}.logs.validatingTheme`, {
-        path: src,
-      })
-    );
+  // Fetch the validation results
+  let validationResults;
+  try {
+    validationResults = await getValidationResults(accountId, {
+      validationId: requestResult,
+    });
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  if (validationResults.errors.length) {
+    const { errors } = validationResults;
+
+    errors.forEach(err => {
+      logger.error(`${err.context}`);
+    });
+    process.exit(EXIT_CODES.ERROR);
   }
-  trackCommandUsage('validate', null, accountId);
 
-  const themeFiles = await walk(absoluteSrcPath);
-
-  applyAbsoluteValidators(
-    MARKETPLACE_VALIDATORS.theme,
-    absoluteSrcPath,
-    themeFiles,
-    accountId
-  ).then(groupedResults => {
-    logValidatorResults(groupedResults, { logAsJson: options.json });
-
-    if (
-      groupedResults
-        .flat()
-        .some(result => result.result === VALIDATION_RESULT.FATAL)
-    ) {
-      process.exit(EXIT_CODES.WARNING);
+  const displayResults = checks => {
+    if (checks) {
+      const { status, results } = checks;
+
+      if (status === 'FAIL') {
+        const failedValidations = results.filter(
+          test => test.status === 'FAIL'
+        );
+        failedValidations.forEach(val => {
+          logger.error(`${val.message}`);
+        });
+      }
+
+      if (status === 'PASS') {
+        logger.success(i18n(`${i18nKey}.results.noErrors`));
+      }
     }
-  });
+    return null;
+  };
+
+  logger.log(chalk.bold(i18n(`${i18nKey}.results.required`)));
+  displayResults(validationResults.results['REQUIRED']);
+  logger.log();
+  logger.log(chalk.bold(i18n(`${i18nKey}.results.recommended`)));
+  displayResults(validationResults.results['RECOMMENDED']);
+  logger.log();
+
+  process.exit();
 };
 
 exports.builder = yargs => {
@@ -90,12 +134,6 @@ exports.builder = yargs => {
   addAccountOptions(yargs, true);
   addUseEnvironmentOptions(yargs, true);
 
-  yargs.options({
-    json: {
-      describe: i18n(`${i18nKey}.options.json.describe`),
-      type: 'boolean',
-    },
-  });
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),
     type: 'string',

package/lib/validators/__tests__/validatorTestUtils.js

@@ -1,36 +1,8 @@
 //HACK so we can keep this util file next to the tests that use it
 test.skip('skip', () => null);
 
-const THEME_PATH = '/path/to/a/theme';
 const MODULE_PATH = 'module/path';
 
-const makeFindError = baseKey => (errors, errorKey) =>
-  errors.find(error => error.key === `${baseKey}.${errorKey}`);
-
-const generateModulesList = numFiles => {
-  const files = [];
-  for (let i = 0; i < numFiles; i++) {
-    const base = `module-${i}.module`;
-    files.push(`${base}/meta.json`);
-    files.push(`${base}/fields.json`);
-    files.push(`${base}/module.html`);
-    files.push(`${base}/module.js`);
-  }
-  return files;
-};
-
-const generateTemplatesList = numFiles => {
-  const files = [];
-  for (let i = 0; i < numFiles; i++) {
-    files.push(`template-${i}.html`);
-  }
-  return files;
-};
-
 module.exports = {
-  generateModulesList,
-  generateTemplatesList,
-  makeFindError,
-  THEME_PATH,
   MODULE_PATH,
 };

package/lib/validators/applyValidators.js

@@ -1,19 +1,3 @@
-async function applyAbsoluteValidators(validators, absolutePath, ...args) {
-  return Promise.all(
-    validators.map(async Validator => {
-      Validator.setAbsolutePath(absolutePath);
-      const validationResult = await Validator.validate(...args);
-      Validator.clearAbsolutePath();
-
-      if (!validationResult.length) {
-        // Return a success obj so we can log the successes
-        return [Validator.getSuccess()];
-      }
-      return validationResult;
-    })
-  );
-}
-
 async function applyRelativeValidators(validators, relativePath, ...args) {
   return Promise.all(
     validators.map(async Validator => {
@@ -30,4 +14,4 @@ async function applyRelativeValidators(validators, relativePath, ...args) {
   );
 }
 
-module.exports = { applyAbsoluteValidators, applyRelativeValidators };
+module.exports = { applyRelativeValidators };

package/lib/validators/constants.js

@@ -4,11 +4,6 @@ const SUCCESS = 'SUCCESS';
 
 const VALIDATION_RESULT = { WARNING, FATAL, SUCCESS };
 const VALIDATOR_KEYS = {
-  themeDependency: 'themeDependency',
-  themeModule: 'themeModule',
-  section: 'section',
-  template: 'template',
-  themeConfig: 'themeConfig',
   module: 'module',
   moduleDependency: 'moduleDependency',
 };

package/lib/validators/index.js

@@ -1,20 +1,7 @@
-const ThemeConfigValidator = require('./marketplaceValidators/theme/ThemeConfigValidator');
-const SectionValidator = require('./marketplaceValidators/theme/SectionValidator');
-const TemplateValidator = require('./marketplaceValidators/theme/TemplateValidator');
-const ThemeModuleValidator = require('./marketplaceValidators/theme/ThemeModuleValidator');
-const ThemeDependencyValidator = require('./marketplaceValidators/theme/ThemeDependencyValidator');
-
 const ModuleValidator = require('./marketplaceValidators/module/ModuleValidator');
 const ModuleDependencyValidator = require('./marketplaceValidators/module/ModuleDependencyValidator');
 
 const MARKETPLACE_VALIDATORS = {
-  theme: [
-    ThemeConfigValidator,
-    SectionValidator,
-    TemplateValidator,
-    ThemeModuleValidator,
-    ThemeDependencyValidator,
-  ],
   module: [ModuleValidator, ModuleDependencyValidator],
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.2-beta.7",
+  "version": "4.1.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.0.2-beta.7",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.7",
+    "@hubspot/cli-lib": "4.1.0",
+    "@hubspot/serverless-dev-runtime": "4.1.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0fe48550b57c3f8326262ed19decaeb4930f8c3a"
+  "gitHead": "642e8486f6dad6d91b1e5854fc427239ca4d11bb"
 }

package/lib/validators/__tests__/AbsoluteValidator.js

@@ -1,28 +0,0 @@
-const AbsoluteValidator = require('../marketplaceValidators/AbsoluteValidator');
-const { VALIDATION_RESULT } = require('../constants');
-
-const Validator = new AbsoluteValidator({
-  name: 'Test validator',
-  key: 'validatorKey',
-});
-
-describe('validators/marketplaceValidators/AbsoluteValidator', () => {
-  it('getSuccess returns expected object', async () => {
-    const success = Validator.getSuccess();
-
-    expect(success.validatorKey).toBe('validatorKey');
-    expect(success.validatorName).toBe('Test validator');
-    expect(success.result).toBe(VALIDATION_RESULT.SUCCESS);
-  });
-
-  it('getError returns expected object', async () => {
-    const errorObj = { key: 'errorkey', getCopy: () => 'Some error copy' };
-    const success = Validator.getError(errorObj);
-
-    expect(success.validatorKey).toBe('validatorKey');
-    expect(success.validatorName).toBe('Test validator');
-    expect(success.error).toBe('Some error copy');
-    expect(success.result).toBe(VALIDATION_RESULT.FATAL);
-    expect(success.key).toBe('validatorKey.errorkey');
-  });
-});

package/lib/validators/__tests__/TemplateValidator.js

@@ -1,101 +0,0 @@
-const fs = require('fs');
-const templates = require('@hubspot/cli-lib/templates');
-
-const TemplateValidator = require('../marketplaceValidators/theme/TemplateValidator');
-const { VALIDATION_RESULT } = require('../constants');
-const {
-  generateTemplatesList,
-  makeFindError,
-  THEME_PATH,
-} = require('./validatorTestUtils');
-
-jest.mock('fs');
-jest.mock('@hubspot/cli-lib/templates');
-
-const TEMPLATE_LIMIT = 50;
-
-const mockGetAnnotationValue = (templateType, rest) => {
-  templates.buildAnnotationValueGetter.mockImplementation(() => {
-    return key => {
-      if (key === 'templateType') {
-        return templateType;
-      }
-      return rest;
-    };
-  });
-};
-
-const findError = makeFindError('template');
-
-describe('validators/marketplaceValidators/theme/TemplateValidator', () => {
-  beforeEach(() => {
-    TemplateValidator.setAbsolutePath(THEME_PATH);
-    templates.isCodedFile.mockReturnValue(true);
-  });
-
-  it('returns error if template limit is exceeded', async () => {
-    mockGetAnnotationValue('page');
-
-    const validationErrors = TemplateValidator.validate(
-      generateTemplatesList(TEMPLATE_LIMIT + 1)
-    );
-    const limitError = findError(validationErrors, 'limitExceeded');
-    expect(limitError).toBeDefined();
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns no errors if template limit is not exceeded', async () => {
-    mockGetAnnotationValue('page');
-
-    const validationErrors = TemplateValidator.validate(
-      generateTemplatesList(TEMPLATE_LIMIT)
-    );
-    const limitError = findError(validationErrors, 'limitExceeded');
-    expect(limitError).not.toBeDefined();
-  });
-
-  it('returns error if template annotation is missing label and screenshotPath', async () => {
-    fs.readFileSync.mockReturnValue('mock');
-    mockGetAnnotationValue('page');
-
-    const validationErrors = TemplateValidator.validate(['template.html']);
-    expect(validationErrors.length).toBe(2);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if template type is not allowed', async () => {
-    fs.readFileSync.mockReturnValue('mock');
-    mockGetAnnotationValue('starter_landing_pages', 'value');
-
-    const validationErrors = TemplateValidator.validate(['template.html']);
-
-    expect(validationErrors.length).toBe(1);
-  });
-
-  it('returns error if template type is unknown', async () => {
-    fs.readFileSync.mockReturnValue('mock');
-    mockGetAnnotationValue('unknown-type', 'value');
-
-    const validationErrors = TemplateValidator.validate(['template.html']);
-
-    expect(validationErrors.length).toBe(1);
-  });
-
-  it('returns error if template type is not found', async () => {
-    fs.readFileSync.mockReturnValue('mock');
-    mockGetAnnotationValue(null, 'value');
-
-    const validationErrors = TemplateValidator.validate(['template.html']);
-
-    expect(validationErrors.length).toBe(1);
-  });
-
-  it('returns no error if template annotation has label and screenshotPath', async () => {
-    fs.readFileSync.mockReturnValue('mock');
-    mockGetAnnotationValue('page', 'value');
-
-    const validationErrors = TemplateValidator.validate(['template.html']);
-
-    expect(validationErrors.length).toBe(0);
-  });
-});

package/lib/validators/__tests__/ThemeConfigValidator.js

@@ -1,70 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const ThemeConfigValidator = require('../../validators/marketplaceValidators/theme/ThemeConfigValidator');
-const { VALIDATION_RESULT } = require('../../validators/constants');
-const { THEME_PATH } = require('./validatorTestUtils');
-
-jest.mock('fs');
-jest.mock('path');
-
-describe('validators/marketplaceValidators/theme/ThemeConfigValidator', () => {
-  beforeEach(() => {
-    ThemeConfigValidator.setAbsolutePath(THEME_PATH);
-  });
-
-  it('returns error if no theme.json file exists', async () => {
-    const validationErrors = ThemeConfigValidator.validate(['someFile.html']);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if theme.json file has invalid json', async () => {
-    fs.readFileSync.mockReturnValue('{} bad json }');
-
-    const validationErrors = ThemeConfigValidator.validate(['theme.json']);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if theme.json file is missing a label field', async () => {
-    fs.readFileSync.mockReturnValue('{ "screenshot_path": "./relative/path" }');
-
-    const validationErrors = ThemeConfigValidator.validate(['theme.json']);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if theme.json has screenshot path that is non-relative', async () => {
-    fs.readFileSync.mockReturnValue(
-      '{ "label": "yay", "screenshot_path": "/absolute/path" }'
-    );
-
-    const validationErrors = ThemeConfigValidator.validate(['theme.json']);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if theme.json has screenshot path that does not resolve', async () => {
-    fs.readFileSync.mockReturnValue(
-      '{ "label": "yay", "screenshot_path": "/absolute/path" }'
-    );
-    path.relative.mockReturnValue('theme.json');
-    fs.existsSync.mockReturnValue(false);
-
-    const validationErrors = ThemeConfigValidator.validate(['theme.json']);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns no error if theme.json file exists and has all required fields', async () => {
-    fs.readFileSync.mockReturnValue(
-      '{ "label": "yay", "screenshot_path": "./relative/path" }'
-    );
-    path.relative.mockReturnValue('theme.json');
-    fs.existsSync.mockReturnValue(true);
-
-    const validationErrors = ThemeConfigValidator.validate(['theme.json']);
-    expect(validationErrors.length).toBe(0);
-  });
-});

package/lib/validators/__tests__/ThemeDependencyValidator.js

@@ -1,89 +0,0 @@
-const fs = require('fs-extra');
-const marketplace = require('@hubspot/cli-lib/api/marketplace');
-
-const ThemeDependencyValidator = require('../marketplaceValidators/theme/ThemeDependencyValidator');
-const { VALIDATION_RESULT } = require('../constants');
-const { THEME_PATH } = require('./validatorTestUtils');
-
-jest.mock('fs-extra');
-jest.mock('@hubspot/cli-lib/api/marketplace');
-
-const getMockDependencyResult = (customPaths = []) => {
-  const result = {
-    dependencies: ['./relative/file-2.js', ...customPaths],
-  };
-  return Promise.resolve(result);
-};
-
-describe('validators/marketplaceValidators/theme/ThemeDependencyValidator', () => {
-  beforeEach(() => {
-    ThemeDependencyValidator.setAbsolutePath(THEME_PATH);
-  });
-
-  describe('isExternalDep', () => {
-    beforeEach(() => {
-      ThemeDependencyValidator.setAbsolutePath(THEME_PATH);
-    });
-
-    it('returns true if dep is external to the provided absolute path', () => {
-      const absoluteFilePath = `${THEME_PATH}/file.js`;
-      const relativeDepPath = '../external/dep/path/file2.js';
-      const isExternal = ThemeDependencyValidator.isExternalDep(
-        absoluteFilePath,
-        relativeDepPath
-      );
-      expect(isExternal).toBe(true);
-    });
-
-    it('returns false if dep is not external to the provided absolute path', () => {
-      const absoluteFilePath = `${THEME_PATH}/file.js`;
-      const relativeDepPath = './internal/dep/path/file2.js';
-      const isExternal = ThemeDependencyValidator.isExternalDep(
-        absoluteFilePath,
-        relativeDepPath
-      );
-      expect(isExternal).toBe(false);
-    });
-  });
-
-  describe('validate', () => {
-    beforeEach(() => {
-      fs.readFile.mockImplementation(() => Promise.resolve('source'));
-    });
-
-    it('returns error if any referenced path is absolute', async () => {
-      marketplace.fetchTemplateDependencies.mockReturnValue(
-        getMockDependencyResult(['/absolute/file-3.js'])
-      );
-      const validationErrors = await ThemeDependencyValidator.validate([
-        `${THEME_PATH}/template.html`,
-      ]);
-
-      expect(validationErrors.length).toBe(1);
-      expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-    });
-
-    it('returns error if any referenced path is external to the theme', async () => {
-      marketplace.fetchTemplateDependencies.mockReturnValue(
-        getMockDependencyResult(['../../external/file-3.js'])
-      );
-      const validationErrors = await ThemeDependencyValidator.validate([
-        `${THEME_PATH}/template.html`,
-      ]);
-
-      expect(validationErrors.length).toBe(1);
-      expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-    });
-
-    it('returns no errors if paths are relative and internal', async () => {
-      marketplace.fetchTemplateDependencies.mockReturnValue(
-        getMockDependencyResult()
-      );
-      const validationErrors = await ThemeDependencyValidator.validate([
-        `${THEME_PATH}/template.html`,
-      ]);
-
-      expect(validationErrors.length).toBe(0);
-    });
-  });
-});

package/lib/validators/__tests__/ThemeModuleValidator.js

@@ -1,84 +0,0 @@
-const fs = require('fs');
-const ThemeModuleValidator = require('../marketplaceValidators/theme/ThemeModuleValidator');
-const { VALIDATION_RESULT } = require('../constants');
-const {
-  generateModulesList,
-  makeFindError,
-  THEME_PATH,
-} = require('./validatorTestUtils');
-
-jest.mock('fs');
-
-const MODULE_LIMIT = 50;
-
-const findError = makeFindError('themeModule');
-
-describe('validators/marketplaceValidators/theme/ThemeModuleValidator', () => {
-  beforeEach(() => {
-    ThemeModuleValidator.setAbsolutePath(THEME_PATH);
-  });
-
-  it('returns error if module limit is exceeded', async () => {
-    const validationErrors = ThemeModuleValidator.validate(
-      generateModulesList(MODULE_LIMIT + 1)
-    );
-    const limitError = findError(validationErrors, 'limitExceeded');
-    expect(limitError).toBeDefined();
-    expect(limitError.result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns no limit error if module limit is not exceeded', async () => {
-    const validationErrors = ThemeModuleValidator.validate(
-      generateModulesList(MODULE_LIMIT)
-    );
-    const limitError = findError(validationErrors, 'limitExceeded');
-    expect(limitError).not.toBeDefined();
-  });
-
-  it('returns error if no module meta.json file exists', async () => {
-    const validationErrors = ThemeModuleValidator.validate([
-      'module.module/module.html',
-    ]);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if module meta.json file has invalid json', async () => {
-    fs.readFileSync.mockReturnValue('{} bad json }');
-
-    const validationErrors = ThemeModuleValidator.validate([
-      'module.module/meta.json',
-    ]);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if module meta.json file is missing a label field', async () => {
-    fs.readFileSync.mockReturnValue('{ "icon": "woo" }');
-
-    const validationErrors = ThemeModuleValidator.validate([
-      'module.module/meta.json',
-    ]);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if module meta.json file is missing an icon field', async () => {
-    fs.readFileSync.mockReturnValue('{ "label": "yay" }');
-
-    const validationErrors = ThemeModuleValidator.validate([
-      'module.module/meta.json',
-    ]);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns no error if module meta.json file exists and has all required fields', async () => {
-    fs.readFileSync.mockReturnValue('{ "label": "yay", "icon": "woo" }');
-
-    const validationErrors = ThemeModuleValidator.validate([
-      'module.module/meta.json',
-    ]);
-    expect(validationErrors.length).toBe(0);
-  });
-});

package/lib/validators/marketplaceValidators/AbsoluteValidator.js

@@ -1,50 +0,0 @@
-const path = require('path');
-
-const { VALIDATION_RESULT } = require('../constants');
-
-class AbsoluteValidator {
-  constructor({ name, key }) {
-    this.name = name;
-    this.key = key;
-  }
-
-  clearAbsolutePath() {
-    this._absolutePath = null;
-  }
-
-  setAbsolutePath(path) {
-    this._absolutePath = path;
-  }
-
-  getRelativePath(filePath) {
-    return this._absolutePath
-      ? path.relative(this._absolutePath, filePath)
-      : filePath;
-  }
-
-  getSuccess() {
-    return {
-      validatorKey: this.key,
-      validatorName: this.name,
-      result: VALIDATION_RESULT.SUCCESS,
-    };
-  }
-
-  getError(errorObj, file, extraContext = {}) {
-    const relativeFilePath = file ? this.getRelativePath(file) : null;
-    const context = {
-      filePath: relativeFilePath,
-      ...extraContext,
-    };
-    return {
-      validatorKey: this.key,
-      validatorName: this.name,
-      error: errorObj.getCopy(context),
-      result: errorObj.severity || VALIDATION_RESULT.FATAL,
-      key: `${this.key}.${errorObj.key}`,
-      context,
-    };
-  }
-}
-
-module.exports = AbsoluteValidator;

package/lib/validators/marketplaceValidators/theme/SectionValidator.js

@@ -1,96 +0,0 @@
-const {
-  ANNOTATION_KEYS,
-  buildAnnotationValueGetter,
-} = require('@hubspot/cli-lib/templates');
-const AbsoluteValidator = require('../AbsoluteValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-const SECTION_LIMIT = 50;
-
-class SectionValidator extends AbsoluteValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      LIMIT_EXCEEDED: {
-        key: 'limitExceeded',
-        getCopy: ({ limit, total }) =>
-          `Section limit exceeded. Themes can only have ${limit} sections, but this theme has ${total}`,
-      },
-      MISSING_LABEL: {
-        key: 'missingLabel',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The section is missing the "label" property`,
-      },
-      MISSING_SCREENSHOT_PATH: {
-        key: 'missingScreenshotPath',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The section is missing the "screenshotPath" property`,
-      },
-      MISSING_DESCRIPTION: {
-        key: 'missingDescription',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The section is missing the "description" property`,
-      },
-    };
-  }
-
-  // Validates:
-  // - All sections have a "description" annotation
-  // - All sections have a "label" annotation
-  // - All sections have a "screenshotPath" annotation
-  // - Theme does not have more than SECTION_LIMIT sections
-
-  validate(files) {
-    let validationErrors = [];
-    let sectionCount = 0;
-
-    files.forEach(file => {
-      if (file) {
-        const getAnnotationValue = buildAnnotationValueGetter(file);
-        const templateType = getAnnotationValue(ANNOTATION_KEYS.templateType);
-
-        if (templateType !== 'section') {
-          return;
-        }
-        sectionCount++;
-
-        const description = getAnnotationValue(ANNOTATION_KEYS.description);
-        const label = getAnnotationValue(ANNOTATION_KEYS.label);
-        const screenshotPath = getAnnotationValue(
-          ANNOTATION_KEYS.screenshotPath
-        );
-
-        if (!description) {
-          validationErrors.push(
-            this.getError(this.errors.MISSING_DESCRIPTION, file)
-          );
-        }
-        if (!label) {
-          validationErrors.push(this.getError(this.errors.MISSING_LABEL, file));
-        }
-        if (!screenshotPath) {
-          validationErrors.push(
-            this.getError(this.errors.MISSING_SCREENSHOT_PATH, file)
-          );
-        }
-      }
-    });
-
-    if (sectionCount > SECTION_LIMIT) {
-      validationErrors.push(
-        this.getError(this.errors.LIMIT_EXCEEDED, null, {
-          limit: SECTION_LIMIT,
-          total: sectionCount,
-        })
-      );
-    }
-
-    return validationErrors;
-  }
-}
-
-module.exports = new SectionValidator({
-  name: 'Section',
-  key: VALIDATOR_KEYS.section,
-});

package/lib/validators/marketplaceValidators/theme/TemplateValidator.js

@@ -1,175 +0,0 @@
-const {
-  ANNOTATION_KEYS,
-  buildAnnotationValueGetter,
-  isCodedFile,
-} = require('@hubspot/cli-lib/templates');
-const AbsoluteValidator = require('../AbsoluteValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-const TEMPLATE_LIMIT = 50;
-const TEMPLATE_IGNORE_LIST = ['section'];
-const TEMPLATE_COUNT_IGNORE_LIST = ['global_partial', 'section', 'none'];
-const VALIDATIONS_BY_TYPE = {
-  page: { allowed: true, label: true, screenshot: true },
-  starter_landing_pages: { allowed: false },
-  email: { allowed: false },
-  blog: { allowed: false },
-  none: { allowed: true, label: false, screenshot: false },
-  error_page: { allowed: true, label: true, screenshot: false },
-  password_prompt_page: { allowed: true, label: true, screenshot: false },
-  email_subscription_preferences_page: {
-    allowed: true,
-    label: true,
-    screenshot: false,
-  },
-  email_backup_unsubscribe_page: {
-    allowed: true,
-    label: true,
-    screenshot: false,
-  },
-  email_subscriptions_confirmation_page: {
-    allowed: true,
-    label: true,
-    screenshot: false,
-  },
-  search_results_page: { allowed: true, label: true, screenshot: false },
-  membership_login_page: { allowed: true, label: true, screenshot: false },
-  membership_register_page: { allowed: true, label: true, screenshot: false },
-  membership_reset_page: { allowed: true, label: true, screenshot: false },
-  membership_reset_request_page: {
-    allowed: true,
-    label: true,
-    screenshot: false,
-  },
-  membership_email_page: { allowed: true, label: true, screenshot: false },
-  global_partial: { allowed: true, label: true, screenshot: false },
-  knowledge_article: { allowed: false },
-  drag_drop_email: { allowed: false },
-  proposal: { allowed: false },
-  blog_listing: { allowed: true, label: true, screenshot: true },
-  blog_post: { allowed: true, label: true, screenshot: true },
-};
-
-class TemplateValidator extends AbsoluteValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      LIMIT_EXCEEDED: {
-        key: 'limitExceeded',
-        getCopy: ({ limit, total }) =>
-          `Template limit exceeded. Themes can only have ${limit} templates, but this theme has ${total}`,
-      },
-      MISSING_TEMPLATE_TYPE: {
-        key: 'missingTemplateType',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The template is missing the "templateType" property`,
-      },
-      UNKNOWN_TEMPLATE_TYPE: {
-        key: 'unknownTemplateType',
-        getCopy: ({ filePath, templateType }) =>
-          `Template ${filePath} has an unknown template type  of ${templateType}`,
-      },
-      RESTRICTED_TEMPLATE_TYPE: {
-        key: 'restrictedTemplateType',
-        getCopy: ({ filePath, templateType }) =>
-          `Template ${filePath} has a restricted template type of ${templateType}`,
-      },
-      MISSING_LABEL: {
-        key: 'missingLabel',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The template is missing the "label" property`,
-      },
-      MISSING_SCREENSHOT_PATH: {
-        key: 'missingScreenshotPath',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The template is missing the "screenshotPath" property`,
-      },
-    };
-  }
-
-  // Validates:
-  // - Theme does not contain more than TEMPLATE_LIMIT templates
-  // - All templates have valid template types
-  // - All templates that require a label have a "label" annotation
-  // - All templates that require a screenshot have a "screenshotPath" annotation
-  validate(files) {
-    let validationErrors = [];
-    let templateCount = 0;
-
-    files.forEach(file => {
-      if (isCodedFile(file)) {
-        const getAnnotationValue = buildAnnotationValueGetter(file);
-        const isAvailableForNewContent = getAnnotationValue(
-          ANNOTATION_KEYS.isAvailableForNewContent
-        );
-
-        if (isAvailableForNewContent !== 'false') {
-          const templateType = getAnnotationValue(ANNOTATION_KEYS.templateType);
-
-          if (TEMPLATE_IGNORE_LIST.includes(templateType)) {
-            return;
-          }
-
-          if (templateType) {
-            const label = getAnnotationValue(ANNOTATION_KEYS.label);
-            const screenshotPath = getAnnotationValue(
-              ANNOTATION_KEYS.screenshotPath
-            );
-
-            // Ignore global partials, sections, and templates with type of none in count
-            if (!TEMPLATE_COUNT_IGNORE_LIST.includes(templateType)) {
-              templateCount++;
-            }
-
-            const validations = VALIDATIONS_BY_TYPE[templateType];
-
-            if (validations) {
-              if (!validations.allowed) {
-                validationErrors.push(
-                  this.getError(this.errors.RESTRICTED_TEMPLATE_TYPE, file, {
-                    templateType,
-                  })
-                );
-              }
-              if (validations.label && !label) {
-                validationErrors.push(
-                  this.getError(this.errors.MISSING_LABEL, file)
-                );
-              }
-              if (validations.screenshot && !screenshotPath) {
-                validationErrors.push(
-                  this.getError(this.errors.MISSING_SCREENSHOT_PATH, file)
-                );
-              }
-            } else {
-              validationErrors.push(
-                this.getError(this.errors.UNKNOWN_TEMPLATE_TYPE, file)
-              );
-            }
-          } else {
-            validationErrors.push(
-              this.getError(this.errors.MISSING_TEMPLATE_TYPE, file)
-            );
-          }
-        }
-      }
-    });
-
-    if (templateCount > TEMPLATE_LIMIT) {
-      validationErrors.push(
-        this.getError(this.errors.LIMIT_EXCEEDED, null, {
-          limit: TEMPLATE_LIMIT,
-          total: templateCount,
-        })
-      );
-    }
-
-    return validationErrors;
-  }
-}
-
-module.exports = new TemplateValidator({
-  name: 'Template',
-  key: VALIDATOR_KEYS.template,
-});

package/lib/validators/marketplaceValidators/theme/ThemeConfigValidator.js

@@ -1,106 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const { isRelativePath } = require('@hubspot/cli-lib/path');
-const AbsoluteValidator = require('../AbsoluteValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-class ThemeValidator extends AbsoluteValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      MISSING_THEME_JSON: {
-        key: 'missingThemeJSON',
-        getCopy: () =>
-          'Missing the theme.json file. This file is required in all themes',
-      },
-      INVALID_THEME_JSON: {
-        key: 'invalidThemeJSON',
-        getCopy: ({ filePath }) => `Invalid json in the ${filePath} file`,
-      },
-      MISSING_LABEL: {
-        key: 'missingLabel',
-        getCopy: ({ filePath }) =>
-          `Missing required field in ${filePath}. The "label" field is required`,
-      },
-      MISSING_SCREENSHOT_PATH: {
-        key: 'missingScreenshotPath',
-        getCopy: ({ filePath }) =>
-          `Missing required field in ${filePath}. The "screenshot_path" field is required`,
-      },
-      ABSOLUTE_SCREENSHOT_PATH: {
-        key: 'absoluteScreenshotPath',
-        getCopy: ({ fieldPath }) =>
-          `Relative path required. The path for "screenshot_path" in ${fieldPath} must be relative`,
-      },
-      MISSING_SCREENSHOT: {
-        key: 'missingScreenshot',
-        getCopy: ({ fieldPath }) =>
-          `File not found. No file exists for the provided "screenshot_path" in ${fieldPath}`,
-      },
-    };
-  }
-
-  // Validates:
-  // - Theme contains a theme.json file at the theme root dir
-  // - theme.json file contains valid json
-  // - theme.json file has a "label" field
-  // - theme.json file has a relative path for "screenshot" field that resolves
-  validate(files) {
-    let validationErrors = [];
-    const themeJSONFile = files.find(filePath => {
-      // Check for theme.json at the theme root
-      const fileName = this.getRelativePath(filePath);
-      return fileName === 'theme.json';
-    });
-
-    if (!themeJSONFile) {
-      validationErrors.push(this.getError(this.errors.MISSING_THEME_JSON));
-    } else {
-      let themeJSON;
-
-      try {
-        themeJSON = JSON.parse(fs.readFileSync(themeJSONFile));
-      } catch (err) {
-        validationErrors.push(
-          this.getError(this.errors.INVALID_THEME_JSON, themeJSONFile)
-        );
-      }
-
-      if (themeJSON) {
-        if (!themeJSON.label) {
-          validationErrors.push(
-            this.getError(this.errors.MISSING_LABEL, themeJSONFile)
-          );
-        }
-        if (!themeJSON.screenshot_path) {
-          validationErrors.push(
-            this.getError(this.errors.MISSING_SCREENSHOT_PATH, themeJSONFile)
-          );
-        } else if (!isRelativePath(themeJSON.screenshot_path)) {
-          validationErrors.push(
-            this.getError(this.errors.ABSOLUTE_SCREENSHOT_PATH, themeJSONFile)
-          );
-        } else {
-          const absoluteScreenshotPath = path.resolve(
-            this._absolutePath,
-            themeJSON.screenshot_path
-          );
-          if (!fs.existsSync(absoluteScreenshotPath)) {
-            validationErrors.push(
-              this.getError(this.errors.MISSING_SCREENSHOT, themeJSONFile)
-            );
-          }
-        }
-      }
-    }
-
-    return validationErrors;
-  }
-}
-
-module.exports = new ThemeValidator({
-  name: 'Theme config',
-  key: VALIDATOR_KEYS.themeConfig,
-});

package/lib/validators/marketplaceValidators/theme/ThemeDependencyValidator.js

@@ -1,126 +0,0 @@
-const fs = require('fs-extra');
-const path = require('path');
-
-const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  HUBL_EXTENSIONS,
-  HUBSPOT_FOLDER,
-} = require('@hubspot/cli-lib/lib/constants');
-const {
-  fetchTemplateDependencies,
-} = require('@hubspot/cli-lib/api/marketplace');
-const { getExt, isRelativePath } = require('@hubspot/cli-lib/path');
-
-const AbsoluteValidator = require('../AbsoluteValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-class ThemeDependencyValidator extends AbsoluteValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      FAILED_TO_FETCH_DEPS: {
-        key: 'failedDepFetch',
-        getCopy: ({ filePath }) =>
-          `Internal Error. Failed to fetch dependencies for ${filePath}. Please try again`,
-      },
-      EXTERNAL_DEPENDENCY: {
-        key: 'externalDependency',
-        getCopy: ({ filePath, referencedFilePath }) =>
-          `External dependency. ${filePath} references a file (${referencedFilePath}) that is outside of the theme`,
-      },
-      ABSOLUTE_DEPENDENCY_PATH: {
-        key: 'absoluteDependencyPath',
-        getCopy: ({ filePath, referencedFilePath }) =>
-          `Relative path required. ${filePath} references a file (${referencedFilePath}) using an absolute path`,
-      },
-    };
-  }
-
-  failedToFetchDependencies(err, file, validationErrors) {
-    logger.debug(`Failed to fetch dependencies for ${file}: `, err.error);
-
-    validationErrors.push(
-      this.getError(this.errors.FAILED_TO_FETCH_DEPS, file)
-    );
-  }
-
-  async getAllDependenciesByFile(files, accountId, validationErrors) {
-    return Promise.all(
-      files
-        .filter(file => HUBL_EXTENSIONS.has(getExt(file)))
-        .map(async file => {
-          const source = await fs.readFile(file, { encoding: 'utf8' });
-          let deps = [];
-          if (!(source && source.trim())) {
-            return { file, deps };
-          }
-          const file_deps = await fetchTemplateDependencies(
-            accountId,
-            source
-          ).catch(err => {
-            this.failedToFetchDependencies(err, file, validationErrors);
-            return null;
-          });
-          if (file_deps) {
-            deps = file_deps.dependencies || [];
-          }
-          return { file, deps };
-        })
-    );
-  }
-
-  isExternalDep(file, relativeDepPath) {
-    // Get dir of file that references the dep
-    const { dir } = path.parse(file);
-    // Use dir to get the dep's absolute path
-    const absoluteDepPath = path.resolve(dir, relativeDepPath);
-    // Get relative path to dep using theme absolute path and dep absolute path
-    const relativePath = this.getRelativePath(absoluteDepPath);
-    // Check that dep is not within the theme
-    return relativePath && relativePath.startsWith('..');
-  }
-
-  // Validates:
-  // - Theme does not contain external dependencies
-  // - All paths are either @hubspot or relative
-  async validate(files, accountId) {
-    let validationErrors = [];
-
-    const dependencyData = await this.getAllDependenciesByFile(
-      files,
-      accountId,
-      validationErrors
-    );
-
-    dependencyData.forEach(depData => {
-      const { file, deps } = depData;
-      deps.forEach(dependency => {
-        // Ignore:
-        // - Hubspot modules
-        if (!dependency.startsWith(HUBSPOT_FOLDER)) {
-          if (!isRelativePath(dependency)) {
-            validationErrors.push(
-              this.getError(this.errors.ABSOLUTE_DEPENDENCY_PATH, file, {
-                referencedFilePath: dependency,
-              })
-            );
-          } else if (this.isExternalDep(file, dependency)) {
-            validationErrors.push(
-              this.getError(this.errors.EXTERNAL_DEPENDENCY, file, {
-                referencedFilePath: dependency,
-              })
-            );
-          }
-        }
-      });
-    });
-
-    return validationErrors;
-  }
-}
-
-module.exports = new ThemeDependencyValidator({
-  name: 'Theme dependency',
-  key: VALIDATOR_KEYS.themeDependency,
-});

package/lib/validators/marketplaceValidators/theme/ThemeModuleValidator.js

@@ -1,117 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const { isModuleFolderChild } = require('@hubspot/cli-lib/modules');
-const AbsoluteValidator = require('../AbsoluteValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-const MODULE_LIMIT = 50;
-
-class ThemeModuleValidator extends AbsoluteValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      LIMIT_EXCEEDED: {
-        key: 'limitExceeded',
-        getCopy: ({ limit, total }) =>
-          `Module limit exceeded. Themes can only have ${limit} modules, but this theme has ${total}`,
-      },
-      MISSING_META_JSON: {
-        key: 'missingMetaJSON',
-        getCopy: ({ filePath }) =>
-          `Module ${filePath} is missing the meta.json file`,
-      },
-      INVALID_META_JSON: {
-        key: 'invalidMetaJSON',
-        getCopy: ({ filePath }) =>
-          `Module ${filePath} has invalid json in the meta.json file`,
-      },
-      MISSING_LABEL: {
-        key: 'missingLabel',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The meta.json file is missing the "label" property`,
-      },
-      MISSING_ICON: {
-        key: 'missingIcon',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The meta.json file is missing the "icon" property`,
-      },
-    };
-  }
-
-  getUniqueModulesFromFiles(files) {
-    const uniqueModules = {};
-
-    files.forEach(file => {
-      if (isModuleFolderChild({ isLocal: true, path: file }, true)) {
-        const { base, dir } = path.parse(file);
-        if (!uniqueModules[dir]) {
-          uniqueModules[dir] = {};
-        }
-        uniqueModules[dir][base] = file;
-      }
-    });
-    return uniqueModules;
-  }
-
-  // Validates:
-  // - Theme does not have more than MODULE_LIMIT modules
-  // - Each module folder contains a meta.json file
-  // - Each module meta.json file contains valid json
-  // - Each module meta.json file has a "label" field
-  // - Each module meta.json file has an "icon" field
-  validate(files) {
-    let validationErrors = [];
-    const uniqueModules = this.getUniqueModulesFromFiles(files);
-    const numModules = Object.keys(uniqueModules).length;
-
-    if (numModules > MODULE_LIMIT) {
-      validationErrors.push(
-        this.getError(this.errors.LIMIT_EXCEEDED, null, {
-          limit: MODULE_LIMIT,
-          total: numModules,
-        })
-      );
-    }
-
-    Object.keys(uniqueModules).forEach(modulePath => {
-      const metaJSONFile = uniqueModules[modulePath]['meta.json'];
-
-      if (!metaJSONFile) {
-        validationErrors.push(
-          this.getError(this.errors.MISSING_META_JSON, modulePath)
-        );
-      } else {
-        let metaJSON;
-        try {
-          metaJSON = JSON.parse(fs.readFileSync(metaJSONFile));
-        } catch (err) {
-          validationErrors.push(
-            this.getError(this.errors.INVALID_META_JSON, modulePath)
-          );
-        }
-
-        if (metaJSON) {
-          if (!metaJSON.label) {
-            validationErrors.push(
-              this.getError(this.errors.MISSING_LABEL, modulePath)
-            );
-          }
-          if (!metaJSON.icon) {
-            validationErrors.push(
-              this.getError(this.errors.MISSING_ICON, modulePath)
-            );
-          }
-        }
-      }
-    });
-
-    return validationErrors;
-  }
-}
-
-module.exports = new ThemeModuleValidator({
-  name: 'Theme modules',
-  key: VALIDATOR_KEYS.themeModule,
-});