From ba94f5c02f867630604f94eb64138fe260c320c1 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sat, 13 Jan 2024 14:30:44 -0400
Subject: yaml: refactor custom last step in reference validation

---
 src/data/yaml.js | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'src/data/yaml.js')

diff --git a/src/data/yaml.js b/src/data/yaml.js
index cdbd6954..9ee1d612 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -1902,23 +1902,31 @@ export function filterReferenceErrors(wikiData) {
 
             let newPropertyValue = value;
 
-            if (findFnKey === '_commentary') {
-              // Commentary doesn't write a property value, so no need to set.
-              filter(
-                value, {message: errorMessage},
-                decorateErrorWithIndex(refs =>
-                  (refs.length === 1
-                    ? suppress(findFn)(refs[0])
-                    : filterAggregate(
-                        refs, {message: `Errors in entry's artist references`},
-                        decorateErrorWithIndex(suppress(findFn)))
-                          .aggregate
-                          .close())));
-            } else if (Array.isArray(value)) {
-              newPropertyValue = filter(
-                value, {message: errorMessage},
-                decorateErrorWithIndex(suppress(findFn)));
-            } else {
+            determineNewPropertyValue: {
+              if (findFnKey === '_commentary') {
+                filter(
+                  value, {message: errorMessage},
+                  decorateErrorWithIndex(refs =>
+                    (refs.length === 1
+                      ? suppress(findFn)(refs[0])
+                      : filterAggregate(
+                          refs, {message: `Errors in entry's artist references`},
+                          decorateErrorWithIndex(suppress(findFn)))
+                            .aggregate
+                            .close())));
+
+                // Commentary doesn't write a property value, so no need to set
+                // anything on `newPropertyValue`.
+                break determineNewPropertyValue;
+              }
+
+              if (Array.isArray(value)) {
+                newPropertyValue = filter(
+                  value, {message: errorMessage},
+                  decorateErrorWithIndex(suppress(findFn)));
+                break determineNewPropertyValue;
+              }
+
               nest({message: errorMessage},
                 suppress(({call}) => {
                   try {
-- 
cgit 1.3.0-6-gf8a5