From ddc3465fb48c540360fba977a59be9a5a3a49c04 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 6 Feb 2024 11:20:27 -0400 Subject: content: gAIP{*}ChunkedList: much more aggressive refactor --- .../generateArtistInfoPageFlashesChunkedList.js | 42 ++++++++++++++-------- 1 file changed, 27 insertions(+), 15 deletions(-) (limited to 'src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js') diff --git a/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js b/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js index ca0d0b50..75a1d05a 100644 --- a/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js +++ b/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js @@ -16,23 +16,35 @@ export default { extraDependencies: ['html', 'language'], query(artist) { - const processEntries = (things, details) => - things.map(thing => ({ - thing, - entry: details(thing), - })); - - const contributorEntries = - processEntries( - artist.flashesAsContributor, - flash => ({ - flash, - act: flash.act, - contribs: flash.contributorContribs, - })); + const processFlashEntry = ({flash, contribs}) => ({ + thing: flash, + entry: { + flash: flash, + act: flash.act, + contribs: contribs, + }, + }); + + const processFlashEntries = ({flashes, contribs}) => + stitchArrays({ + flash: flashes, + contribs: contribs, + }).map(processFlashEntry); + + const {flashesAsContributor} = artist; + + const flashesAsContributorContribs = + flashesAsContributor + .map(flash => flash.contributorContribs); + + const flashesAsContributorEntries = + processFlashEntries({ + flashes: flashesAsContributor, + contribs: flashesAsContributorContribs, + }); const entries = [ - ...contributorEntries, + ...flashesAsContributorEntries, ]; sortEntryThingPairs(entries, sortFlashesChronologically); -- cgit 1.3.0-6-gf8a5