Cleanup output code

Author: jdesrosiers

lib/keywords/validation.js

@@ -66,47 +66,58 @@ const interpret = (url, instance, { ast, dynamicAnchors, errors, annotations, ou
     for (const [keywordId, schemaUri, keywordValue] of ast[url]) {
       const context = { ast, dynamicAnchors, errors: [], annotations: [], outputFormat };
       const keywordHandler = getKeyword(keywordId);
-      if (!keywordHandler.interpret(keywordValue, instance, context)) {
+      const isKeywordValid = keywordHandler.interpret(keywordValue, instance, context);
+      if (!isKeywordValid) {
         isSchemaValid = false;
-        if (outputFormat === FLAG) {
-          continue;
-        }
-
-        const outputUnit = {
-          keyword: keywordId,
-          absoluteKeywordLocation: schemaUri,
-          instanceLocation: Instance.uri(instance)
-        };
-
-        if (outputFormat !== BASIC || !keywordHandler.simpleApplicator) {
-          errors.push(outputUnit);
-        }
-
-        if (outputFormat === DETAILED && context.errors.length > 0) {
-          outputUnit.errors = context.errors;
-        } else if (outputFormat === BASIC) {
-          errors.push(...context.errors);
-        }
-      } else {
-        if (outputFormat === FLAG) {
-          continue;
-        }
+      }
 
-        if (keywordHandler.annotation) {
-          const outputUnit = {
-            keyword: keywordId,
-            absoluteKeywordLocation: schemaUri,
-            instanceLocation: Instance.uri(instance),
-            annotation: keywordHandler.annotation(keywordValue)
-          };
-          schemaAnnotations.push(outputUnit);
+      switch (outputFormat) {
+        case FLAG:
+          break;
+        case BASIC:
+          if (!isKeywordValid) {
+            if (!keywordHandler.simpleApplicator) {
+              errors.push({
+                keyword: keywordId,
+                absoluteKeywordLocation: schemaUri,
+                instanceLocation: Instance.uri(instance)
+              });
+            }
+            errors.push(...context.errors);
+          } else {
+            if (keywordHandler.annotation) {
+              const outputUnit = {
+                keyword: keywordId,
+                absoluteKeywordLocation: schemaUri,
+                instanceLocation: Instance.uri(instance),
+                annotation: keywordHandler.annotation(keywordValue)
+              };
+              schemaAnnotations.push(outputUnit);
+            }
+            schemaAnnotations.push(...context.annotations);
+          }
+          break;
+        case DETAILED: {
+          if (!isKeywordValid) {
+            const outputUnit = {
+              keyword: keywordId,
+              absoluteKeywordLocation: schemaUri,
+              instanceLocation: Instance.uri(instance)
+            };
+
+            errors.push(outputUnit);
+            if (context.errors.length > 0) {
+              outputUnit.errors = context.errors;
+            }
+          }
+          break;
         }
-
-        schemaAnnotations.push(...context.annotations);
+        default:
+          throw Error(`Unsupported output format '${outputFormat}'`);
       }
     }
 
-    if (isSchemaValid) {
+    if (outputFormat === BASIC && isSchemaValid) {
       annotations.push(...schemaAnnotations);
     }