From 4739ac5fae824c6c985fca9ae34f6335f5c9c13e Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 20 Jan 2024 16:32:56 -0400 Subject: data: inputThingClass -> isThingClass, use global Thing symbols --- .../composite/wiki-properties/singleReference.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/data/composite/wiki-properties/singleReference.js') diff --git a/src/data/composite/wiki-properties/singleReference.js b/src/data/composite/wiki-properties/singleReference.js index 34bd2e6d..db4fc9f9 100644 --- a/src/data/composite/wiki-properties/singleReference.js +++ b/src/data/composite/wiki-properties/singleReference.js @@ -8,14 +8,10 @@ // import {input, templateCompositeFrom} from '#composite'; -import {validateReference} from '#validators'; +import {isThingClass, validateReference} from '#validators'; import {exposeDependency} from '#composite/control-flow'; -import {inputThingClass, inputWikiData, withResolvedReference} - from '#composite/wiki-data'; - -// TODO: Kludge. -import Thing from '../../things/thing.js'; +import {inputWikiData, withResolvedReference} from '#composite/wiki-data'; export default templateCompositeFrom({ annotation: `singleReference`, @@ -23,17 +19,20 @@ export default templateCompositeFrom({ compose: false, inputs: { - class: inputThingClass(), + class: input.staticValue({validate: isThingClass}), + find: input({type: 'function'}), + data: inputWikiData({allowMixedTypes: false}), }, update: ({ [input.staticValue('class')]: thingClass, - }) => { - const {[Thing.referenceType]: referenceType} = thingClass; - return {validate: validateReference(referenceType)}; - }, + }) => ({ + validate: + validateReference( + thingClass[Symbol.for('Thing.referenceType')]), + }), steps: () => [ withResolvedReference({ -- cgit 1.3.0-6-gf8a5