From ef1ec90608dc4a8cffbff2488ae3491a9efa7349 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Wed, 26 Nov 2025 21:38:50 -0400 Subject: data: Artwork: chop withDate It wasn't even used to compute the date property... --- src/data/composite/things/artwork/index.js | 1 - src/data/composite/things/artwork/withDate.js | 41 --------------------------- src/data/things/artwork.js | 7 ++--- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 src/data/composite/things/artwork/withDate.js (limited to 'src') diff --git a/src/data/composite/things/artwork/index.js b/src/data/composite/things/artwork/index.js index e2661b50..2cd3c388 100644 --- a/src/data/composite/things/artwork/index.js +++ b/src/data/composite/things/artwork/index.js @@ -1,2 +1 @@ export {default as withContainingArtworkList} from './withContainingArtworkList.js'; -export {default as withDate} from './withDate.js'; diff --git a/src/data/composite/things/artwork/withDate.js b/src/data/composite/things/artwork/withDate.js deleted file mode 100644 index 4666ff1b..00000000 --- a/src/data/composite/things/artwork/withDate.js +++ /dev/null @@ -1,41 +0,0 @@ -import {input, templateCompositeFrom} from '#composite'; - -import {raiseOutputWithoutDependency} from '#composite/control-flow'; -import {withPropertyFromObject} from '#composite/data'; - -export default templateCompositeFrom({ - annotation: `withDate`, - - inputs: { - from: input({ - defaultDependency: '_date', - acceptsNull: true, - }), - }, - - outputs: ['#date'], - - steps: () => [ - { - dependencies: [input('from')], - compute: (continuation, { - [input('from')]: date, - }) => - (date - ? continuation.raiseOutput({'#date': date}) - : continuation()), - }, - - raiseOutputWithoutDependency({ - dependency: 'dateFromThingProperty', - output: input.value({'#date': null}), - }), - - withPropertyFromObject({ - object: 'thing', - property: 'dateFromThingProperty', - }).outputs({ - ['#value']: '#date', - }), - ], -}) diff --git a/src/data/things/artwork.js b/src/data/things/artwork.js index 688cccb3..6ec524c2 100644 --- a/src/data/things/artwork.js +++ b/src/data/things/artwork.js @@ -62,8 +62,7 @@ import { wikiData, } from '#composite/wiki-properties'; -import {withContainingArtworkList, withDate} - from '#composite/things/artwork'; +import {withContainingArtworkList} from '#composite/things/artwork'; export class Artwork extends Thing { static [Thing.referenceType] = 'artwork'; @@ -135,11 +134,9 @@ export class Artwork extends Thing { artistContribsArtistProperty: simpleString(), artistContribs: [ - withDate(), - withResolvedContribs({ from: input.updateValue({validate: isContributionList}), - date: '#date', + date: 'date', thingProperty: input.thisProperty(), artistProperty: 'artistContribsArtistProperty', }), -- cgit 1.3.0-6-gf8a5