Logic change in Validator.js

Author: ivansg44

lib/Validator.js

@@ -293,6 +293,8 @@ class Validator {
           // Issue: parse can fail on decimal but menu has "Missing"
           if (parsed === undefined) {
             parse_error = `Value does not match format for ${slotType.uri}`;
+            // We do not process any nested anyOf, allOf, etc.
+            return parse_error
 
             //if (!(anyOfValidators.length || allOfValidators.length || exactlyOneOfValidators.length || noneOfValidators.length)) {
             //  return parse_error;
@@ -345,11 +347,6 @@ class Validator {
           const results = anyOfValidators.map((fn) => fn(value));
           const valid = results.some((result) => result === undefined);
           if (!valid) {
-            // If every condition gives format error, just return one error
-            // TODO does this apply in allOf, second branch of exactlyOneOf?
-            if (results.every((result) => result === parse_error)) {
-              return parse_error;
-            }
             return results.join('\n');
           }
         }
@@ -386,17 +383,21 @@ class Validator {
           }
         }
 
-        if (
-          anyOfValidators.length ||
-          allOfValidators.length ||
-          exactlyOneOfValidators.length ||
-          noneOfValidators.length
-        ) {
-          // We passed validation here which means a parse error can be overriden
-        } else if (parse_error.length) {
-          //There were no other ranges besides basic slotType so
-          return parse_error;
-        }
+        // The below code seems to imply that we can ignore parse errors, as
+        // long as nested anyOfs, allOfs, etc. are valid. The test suite seems
+        // to want something different, so we now return parse error
+        // immediately.
+        // if (
+        //   anyOfValidators.length ||
+        //   allOfValidators.length ||
+        //   exactlyOneOfValidators.length ||
+        //   noneOfValidators.length
+        // ) {
+        //   // We passed validation here which means a parse error can be overriden
+        // } else if (parse_error.length) {
+        //   //There were no other ranges besides basic slotType so
+        //   return parse_error;
+        // }
       }
     };