From ffffbc81426bb6ccd07ee6084a9c40fb126222ff Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 25 Nov 2025 14:55:54 -0400 Subject: data: Track: chop withDate --- src/data/composite/things/track/index.js | 1 - .../inheritContributionListFromMainRelease.js | 5 +-- src/data/composite/things/track/withDate.js | 42 ---------------------- .../composite/things/track/withTrackArtDate.js | 9 ++--- 4 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 src/data/composite/things/track/withDate.js (limited to 'src/data/composite/things/track') diff --git a/src/data/composite/things/track/index.js b/src/data/composite/things/track/index.js index c7c43f4c..35deb93f 100644 --- a/src/data/composite/things/track/index.js +++ b/src/data/composite/things/track/index.js @@ -4,7 +4,6 @@ export {default as inheritContributionListFromMainRelease} from './inheritContri export {default as inheritFromMainRelease} from './inheritFromMainRelease.js'; export {default as withAllReleases} from './withAllReleases.js'; export {default as withCoverArtistContribs} from './withCoverArtistContribs.js'; -export {default as withDate} from './withDate.js'; export {default as withDirectorySuffix} from './withDirectorySuffix.js'; export {default as withMainRelease} from './withMainRelease.js'; export {default as withMainReleaseTrack} from './withMainReleaseTrack.js'; diff --git a/src/data/composite/things/track/inheritContributionListFromMainRelease.js b/src/data/composite/things/track/inheritContributionListFromMainRelease.js index 89252feb..d3d0a442 100644 --- a/src/data/composite/things/track/inheritContributionListFromMainRelease.js +++ b/src/data/composite/things/track/inheritContributionListFromMainRelease.js @@ -8,7 +8,6 @@ import {exposeDependency, raiseOutputWithoutDependency} import {withRecontextualizedContributionList, withRedatedContributionList} from '#composite/wiki-data'; -import withDate from './withDate.js'; import withPropertyFromMainRelease from './withPropertyFromMainRelease.js'; @@ -30,11 +29,9 @@ export default templateCompositeFrom({ list: '#mainReleaseValue', }), - withDate(), - withRedatedContributionList({ list: '#mainReleaseValue', - date: '#date', + date: 'date', }), exposeDependency({ diff --git a/src/data/composite/things/track/withDate.js b/src/data/composite/things/track/withDate.js deleted file mode 100644 index 1851c0d2..00000000 --- a/src/data/composite/things/track/withDate.js +++ /dev/null @@ -1,42 +0,0 @@ -// Gets the track's own date. This is either its dateFirstReleased property -// or, if unset, the album's date. - -import {input, templateCompositeFrom} from '#composite'; - -import withPropertyFromAlbum from './withPropertyFromAlbum.js'; - -export default templateCompositeFrom({ - annotation: `withDate`, - - outputs: ['#date'], - - steps: () => [ - { - dependencies: ['disableDate'], - compute: (continuation, {disableDate}) => - (disableDate - ? continuation.raiseOutput({'#date': null}) - : continuation()), - }, - - { - dependencies: ['dateFirstReleased'], - compute: (continuation, {dateFirstReleased}) => - (dateFirstReleased - ? continuation.raiseOutput({'#date': dateFirstReleased}) - : continuation()), - }, - - withPropertyFromAlbum({ - property: input.value('date'), - }), - - { - dependencies: ['#album.date'], - compute: (continuation, {['#album.date']: albumDate}) => - (albumDate - ? continuation.raiseOutput({'#date': albumDate}) - : continuation.raiseOutput({'#date': null})), - }, - ], -}) diff --git a/src/data/composite/things/track/withTrackArtDate.js b/src/data/composite/things/track/withTrackArtDate.js index b7eff5ad..d7d043d6 100644 --- a/src/data/composite/things/track/withTrackArtDate.js +++ b/src/data/composite/things/track/withTrackArtDate.js @@ -3,7 +3,6 @@ import {isDate} from '#validators'; import {raiseOutputWithoutDependency} from '#composite/control-flow'; -import withDate from './withDate.js'; import withPropertyFromAlbum from './withPropertyFromAlbum.js'; export default templateCompositeFrom({ @@ -50,8 +49,10 @@ export default templateCompositeFrom({ : continuation()), }, - withDate().outputs({ - '#date': '#trackArtDate', - }), + { + dependencies: ['date'], + compute: (continuation, {date}) => + continuation({'#trackArtDate': date}), + }, ], }); -- cgit 1.3.0-6-gf8a5