From 9e42c9f3773d431bc62fcf76f0da2cc852dfc329 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sat, 4 Nov 2023 20:22:00 -0300
Subject: data: wikiData: use validateWikiData instead of instance checks

---
 src/data/composite/wiki-properties/wikiData.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/data/composite')

diff --git a/src/data/composite/wiki-properties/wikiData.js b/src/data/composite/wiki-properties/wikiData.js
index 4ea47785..5965b949 100644
--- a/src/data/composite/wiki-properties/wikiData.js
+++ b/src/data/composite/wiki-properties/wikiData.js
@@ -1,17 +1,20 @@
 // General purpose wiki data constructor, for properties like artistData,
 // trackData, etc.
 
-import {validateArrayItems, validateInstanceOf} from '#validators';
+import {validateWikiData} from '#validators';
 
-// TODO: Not templateCompositeFrom.
+// TODO: Kludge.
+import Thing from '../../things/thing.js';
 
-// TODO: This should validate with validateWikiData.
+// TODO: Not templateCompositeFrom.
 
 export default function(thingClass) {
+  const referenceType = thingClass[Thing.referenceType];
+
   return {
     flags: {update: true},
     update: {
-      validate: validateArrayItems(validateInstanceOf(thingClass)),
+      validate: validateWikiData({referenceType}),
     },
   };
 }
-- 
cgit 1.3.0-6-gf8a5


From c4eba52cd5023e3b503937b47e2bc6f77527d5c3 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sat, 4 Nov 2023 20:43:29 -0300
Subject: data: wikiData: port to templateCompositeFrom syntax

---
 src/data/composite/wiki-properties/wikiData.js | 29 +++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'src/data/composite')

diff --git a/src/data/composite/wiki-properties/wikiData.js b/src/data/composite/wiki-properties/wikiData.js
index 5965b949..5cea49a0 100644
--- a/src/data/composite/wiki-properties/wikiData.js
+++ b/src/data/composite/wiki-properties/wikiData.js
@@ -1,20 +1,29 @@
 // General purpose wiki data constructor, for properties like artistData,
 // trackData, etc.
 
+import {input, templateCompositeFrom} from '#composite';
 import {validateWikiData} from '#validators';
 
+import {inputThingClass} from '#composite/wiki-data';
+
 // TODO: Kludge.
 import Thing from '../../things/thing.js';
 
-// TODO: Not templateCompositeFrom.
+export default templateCompositeFrom({
+  annotation: `wikiData`,
+
+  compose: false,
+
+  inputs: {
+    class: inputThingClass(),
+  },
 
-export default function(thingClass) {
-  const referenceType = thingClass[Thing.referenceType];
+  update: ({
+    [input.staticValue('class')]: thingClass,
+  }) => {
+    const referenceType = thingClass[Thing.referenceType];
+    return {validate: validateWikiData({referenceType})};
+  },
 
-  return {
-    flags: {update: true},
-    update: {
-      validate: validateWikiData({referenceType}),
-    },
-  };
-}
+  steps: () => [],
+});
-- 
cgit 1.3.0-6-gf8a5