From 4739ac5fae824c6c985fca9ae34f6335f5c9c13e Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sat, 20 Jan 2024 16:32:56 -0400
Subject: data: inputThingClass -> isThingClass, use global Thing symbols

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

(limited to 'src/data/composite/wiki-properties/wikiData.js')

diff --git a/src/data/composite/wiki-properties/wikiData.js b/src/data/composite/wiki-properties/wikiData.js
index 5cea49a0..3bebed33 100644
--- a/src/data/composite/wiki-properties/wikiData.js
+++ b/src/data/composite/wiki-properties/wikiData.js
@@ -2,12 +2,7 @@
 // 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';
+import {isThingClass, validateWikiData} from '#validators';
 
 export default templateCompositeFrom({
   annotation: `wikiData`,
@@ -15,15 +10,18 @@ export default templateCompositeFrom({
   compose: false,
 
   inputs: {
-    class: inputThingClass(),
+    class: input.staticValue({validate: isThingClass}),
   },
 
   update: ({
     [input.staticValue('class')]: thingClass,
-  }) => {
-    const referenceType = thingClass[Thing.referenceType];
-    return {validate: validateWikiData({referenceType})};
-  },
+  }) => ({
+    validate:
+      validateWikiData({
+        referenceType:
+          thingClass[Symbol.for('Thing.referenceType')],
+      }),
+  }),
 
   steps: () => [],
 });
-- 
cgit 1.3.0-6-gf8a5