data, yaml: new flash Color / color field

1 files changed, 17 insertions, 11 deletions

diff --git a/src/data/things/flash.js b/src/data/things/flash.js
index 511ff19c..71174931 100644
--- a/src/data/things/flash.js
+++ b/src/data/things/flash.js
@@ -10,6 +10,10 @@ import {
 } from '#validators';
 
 import {
+  exposeUpdateValueOrContinue,
+} from '#composite/control-flow';
+
+import {
   color,
   contributionList,
   directory,
@@ -58,6 +62,19 @@ export class Flash extends Thing {
       },
     },
 
+    color: [
+      exposeUpdateValueOrContinue({
+        validate: input.value(isColor),
+      }),
+
+      {
+        flags: {expose: true},
+        dependencies: ['this', 'flashActData'],
+        compute: ({this: flash, flashActData}) =>
+          flashActData.find((act) => act.flashes.includes(flash))?.color ?? null,
+      },
+    ],
+
     date: simpleDate(),
 
     coverArtFileExtension: fileExtension('jpg'),
@@ -90,17 +107,6 @@ export class Flash extends Thing {
           flashActData.find((act) => act.flashes.includes(flash)) ?? null,
       },
     },
-
-    color: {
-      flags: {expose: true},
-
-      expose: {
-        dependencies: ['this', 'flashActData'],
-
-        compute: ({this: flash, flashActData}) =>
-          flashActData.find((act) => act.flashes.includes(flash))?.color ?? null,
-      },
-    },
   });
 
   static [Thing.getSerializeDescriptors] = ({