From 58fba5a7a859c5398e0e58f31d7e8e5a649db63b Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Wed, 2 Apr 2025 15:10:58 -0300 Subject: data, content: stub multiple artworks Only for tracks as of this commit, most anything else is in a severely broken state aye --- .../wiki-properties/constitutibleArtwork.js | 67 --------------------- .../wiki-properties/constitutibleArtworkList.js | 70 ++++++++++++++++++++++ src/data/composite/wiki-properties/index.js | 2 +- src/data/composite/wiki-properties/soupyReverse.js | 5 +- 4 files changed, 73 insertions(+), 71 deletions(-) delete mode 100644 src/data/composite/wiki-properties/constitutibleArtwork.js create mode 100644 src/data/composite/wiki-properties/constitutibleArtworkList.js (limited to 'src/data/composite/wiki-properties') diff --git a/src/data/composite/wiki-properties/constitutibleArtwork.js b/src/data/composite/wiki-properties/constitutibleArtwork.js deleted file mode 100644 index e0f0f521..00000000 --- a/src/data/composite/wiki-properties/constitutibleArtwork.js +++ /dev/null @@ -1,67 +0,0 @@ -import {input, templateCompositeFrom} from '#composite'; -import {isContributionList, isDate, validateThing} from '#validators'; - -import {exitWithoutDependency, exposeDependency, exposeUpdateValueOrContinue} - from '#composite/control-flow'; -import {withConstitutedArtwork} from '#composite/wiki-data'; - -export default templateCompositeFrom({ - annotation: `constitutibleArtwork`, - - compose: false, - - inputs: { - contribs: input.staticDependency({ - validate: isContributionList, - acceptsNull: true, - }), - - date: input.staticDependency({ - validate: isDate, - acceptsNull: true, - }), - - artistProperty: input.staticValue({ - type: 'string', - }), - }, - - steps: () => [ - exposeUpdateValueOrContinue({ - validate: input.value( - validateThing({ - referenceType: 'artwork', - })), - }), - - exitWithoutDependency({ - dependency: input('contribs'), - value: input.value(null), - }), - - { - dependencies: [ - input.staticDependency('contribs'), - input.staticDependency('date'), - ], - - compute: (continuation, { - [input.staticDependency('contribs')]: contribsProperty, - [input.staticDependency('date')]: dateProperty, - }) => continuation({ - ['#contribsProperty']: contribsProperty, - ['#dateProperty']: dateProperty, - }) - }, - - withConstitutedArtwork({ - contribsProperty: '#contribsProperty', - artistProperty: input('artistProperty'), - dateProperty: '#dateProperty', - }), - - exposeDependency({ - dependency: '#constitutedArtwork', - }), - ], -}); diff --git a/src/data/composite/wiki-properties/constitutibleArtworkList.js b/src/data/composite/wiki-properties/constitutibleArtworkList.js new file mode 100644 index 00000000..01429f03 --- /dev/null +++ b/src/data/composite/wiki-properties/constitutibleArtworkList.js @@ -0,0 +1,70 @@ +import {input, templateCompositeFrom} from '#composite'; +import {isContributionList, isDate, validateWikiData} from '#validators'; + +import {exitWithoutDependency, exposeUpdateValueOrContinue} + from '#composite/control-flow'; +import {withConstitutedArtwork} from '#composite/wiki-data'; + +export default templateCompositeFrom({ + annotation: `constitutibleArtwork`, + + compose: false, + + inputs: { + contribs: input.staticDependency({ + validate: isContributionList, + acceptsNull: true, + }), + + date: input.staticDependency({ + validate: isDate, + acceptsNull: true, + }), + + artistProperty: input.staticValue({ + type: 'string', + }), + }, + + steps: () => [ + exposeUpdateValueOrContinue({ + validate: input.value( + validateWikiData({ + referenceType: 'artwork', + })), + }), + + exitWithoutDependency({ + dependency: input('contribs'), + value: input.value([]), + }), + + { + dependencies: [ + input.staticDependency('contribs'), + input.staticDependency('date'), + ], + + compute: (continuation, { + [input.staticDependency('contribs')]: contribsProperty, + [input.staticDependency('date')]: dateProperty, + }) => continuation({ + ['#contribsProperty']: contribsProperty, + ['#dateProperty']: dateProperty, + }) + }, + + withConstitutedArtwork({ + contribsProperty: '#contribsProperty', + artistProperty: input('artistProperty'), + dateProperty: '#dateProperty', + }), + + { + dependencies: ['#constitutedArtwork'], + compute: ({ + ['#constitutedArtwork']: constitutedArtwork, + }) => [constitutedArtwork], + }, + ], +}); diff --git a/src/data/composite/wiki-properties/index.js b/src/data/composite/wiki-properties/index.js index 7583630d..d346c7e5 100644 --- a/src/data/composite/wiki-properties/index.js +++ b/src/data/composite/wiki-properties/index.js @@ -9,7 +9,7 @@ export {default as annotatedReferenceList} from './annotatedReferenceList.js'; export {default as color} from './color.js'; export {default as commentary} from './commentary.js'; export {default as commentatorArtists} from './commentatorArtists.js'; -export {default as constitutibleArtwork} from './constitutibleArtwork.js'; +export {default as constitutibleArtworkList} from './constitutibleArtworkList.js'; export {default as contentString} from './contentString.js'; export {default as contribsPresent} from './contribsPresent.js'; export {default as contributionList} from './contributionList.js'; diff --git a/src/data/composite/wiki-properties/soupyReverse.js b/src/data/composite/wiki-properties/soupyReverse.js index a3171738..b99c45da 100644 --- a/src/data/composite/wiki-properties/soupyReverse.js +++ b/src/data/composite/wiki-properties/soupyReverse.js @@ -24,9 +24,8 @@ soupyReverse.artworkContributionsBy = bindTo, referencing: thing => - (thing[artworkProperty] - ? thing[artworkProperty].artistContribs - : []), + thing[artworkProperty] + .flatMap(artwork => artwork.artistContribs), referenced: contrib => [contrib.artist], }); -- cgit 1.3.0-6-gf8a5