refactor and some tweaks

Author: lee-leonardo

lib/projectBuilder.js

@@ -46,16 +46,14 @@ function validateManifest(w3cManifestInfo, platformModules, platforms) {
       var validationMessage = 'Manifest validation ' + severity + new Array(Math.max(maxLenSeverity - severity.length + 1, 0)).join(' ') + ' - ' + result.description + '(member: ' + result.member + ').';
       if (result.level === validationConstants.levels.suggestion || result.level === validationConstants.levels.warning) {
         log.warn(validationMessage, result.platform);
-      } else if (result.level === validationConstants.levels.error && projectValidation.isExpectedValidationError(result)) {
-        if (projectValidation.isExpectedCase(result, w3cManifestInfo)) {
-          log.warning(validationMessage, result.platform);
+      } else if (result.level === validationConstants.levels.error) {
+        // handle expected errors rather than deeming it as invalid
+        if (projectValidation.isExpectedValidationError(result) && projectValidation.isExpectedCase(result, w3cManifestInfo)) {
+          log.warn('Manifest validation ' + "WARNING" + new Array(Math.max(maxLenSeverity - severity.length + 1, 0)).join(' ') + ' - ' + result.description + '(member: ' + result.member + ').', result.platform);
         } else {
           log.error(validationMessage, result.platform);
           invalidManifest = true;
         }
-      } else if (result.level === validationConstants.levels.error) {
-        log.error(validationMessage, result.platform);
-        invalidManifest = true;
       }
     });
 

lib/validations.js

@@ -36,19 +36,19 @@ function manifestFormatValid(format) {
 }
 
 function isExpectedValidationError(errorResult) {
-  const checkForPurposeList = errorResult.member.contains("icons") && errorResult.member.contains("purpose")
+  const checkForPurposeList = errorResult.member.includes("icons") && errorResult.member.includes("purpose")
 
   return checkForPurposeList
 }
 
 function isExpectedCase(errorResult, w3cManifestInfo) {
-  const errorParams = errorResult.split('/').slice(1) //example: /icons/0/purpose -> ['icons', '0', 'purpose']
-  const isIconsPurpose = errorResult.member.contains("icons") && errorResult.member.contains("purpose")
+  const errorParams = errorResult.member.split('/').slice(1) //example: /icons/0/purpose -> ['icons', '0', 'purpose']
+  const isIconsPurpose = errorResult.member.includes("icons") && errorResult.member.includes("purpose")
 
   if (isIconsPurpose) {
     const [icons, index, purpose] = errorParams
 
-    return w3cManifestInfo[icons][index][purpose].split(" ").filter(entry => {
+    return w3cManifestInfo.content[icons][index][purpose].split(" ").filter(entry => {
       return (entry === "any" || entry === "maskable" || entry === "monochrome");
     }).length > 0
   }