Add template utils

packages/cli-lib/templates.js

@@ -1,6 +1,3 @@
-const fs = require('fs');
-const { logger } = require('./logger');
-
 // Matches the .html file extension, excluding module.html
 const TEMPLATE_EXTENSION_REGEX = new RegExp(/(?<!module)\.html$/);
 
@@ -16,28 +13,18 @@ const ANNOTATION_KEYS = {
   screenshotPath: 'screenshotPath',
 };
 
-const getFileAnnotations = filePath => {
-  try {
-    const data = fs.readFileSync(filePath, 'utf8');
-    return getAnnotationsFromSource(data);
-  } catch (err) {
-    logger.debug(err);
-    return '';
-  }
-};
-
-const getAnnotationsFromSource = source => {
-  const match = source.match(ANNOTATIONS_REGEX);
-  const annotation = match && match[1] ? match[1] : '';
-  return annotation;
-};
-
 const getAnnotationValue = (annotations, key) => {
   const valueRegex = new RegExp(`${key}${ANNOTATION_VALUE_REGEX}`);
   const match = annotations.match(valueRegex);
   return match ? match[1].trim() : null;
 };
 
+const buildAnnotationValueGetter = source => {
+  const match = source.match(ANNOTATIONS_REGEX);
+  const annotation = match && match[1] ? match[1] : '';
+  return annotationKey => getAnnotationValue(annotation, annotationKey);
+};
+
 /*
  * Returns true if:
  * .html extension (ignoring module.html)
@@ -47,7 +34,6 @@ const isCodedFile = filePath => TEMPLATE_EXTENSION_REGEX.test(filePath);
 module.exports = {
   ANNOTATION_KEYS,
   getAnnotationValue,
-  getAnnotationsFromSource,
-  getFileAnnotations,
+  buildAnnotationValueGetter,
   isCodedFile,
 };

packages/cli/lib/validators/marketplaceValidators/theme/TemplateValidator.js

@@ -1,11 +1,12 @@
+const fs = require('fs');
 const {
   ANNOTATION_KEYS,
-  getAnnotationValue,
-  getFileAnnotations,
+  buildAnnotationValueGetter,
   isCodedFile,
 } = require('@hubspot/cli-lib/templates');
 const BaseValidator = require('../BaseValidator');
 const { VALIDATOR_KEYS } = require('../../constants');
+const { logger } = require('@hubspot/cli-lib/logger');
 
 const TEMPLATE_LIMIT = 50;
 const TEMPLATE_COUNT_IGNORE_LIST = ['global_partial', 'none'];
@@ -99,24 +100,23 @@ class TemplateValidator extends BaseValidator {
 
     files.forEach(file => {
       if (isCodedFile(file)) {
-        const annotations = getFileAnnotations(file);
+        let data;
+        try {
+          data = fs.readFileSync(file, 'utf8');
+        } catch (e) {
+          logger.error(`Error reading file ${file}`);
+        }
+        const getAnnotationValue = buildAnnotationValueGetter(data);
+
         const isAvailableForNewContent = getAnnotationValue(
-          annotations,
           ANNOTATION_KEYS.isAvailableForNewContent
         );
 
         if (isAvailableForNewContent !== 'false') {
-          const templateType = getAnnotationValue(
-            annotations,
-            ANNOTATION_KEYS.templateType
-          );
+          const templateType = getAnnotationValue(ANNOTATION_KEYS.templateType);
           if (templateType) {
-            const label = getAnnotationValue(
-              annotations,
-              ANNOTATION_KEYS.label
-            );
+            const label = getAnnotationValue(ANNOTATION_KEYS.label);
             const screenshotPath = getAnnotationValue(
-              annotations,
               ANNOTATION_KEYS.screenshotPath
             );