From 160c6c4c92f0c574981bab9fabd5f2d06cb0bf10 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 26 Jun 2023 08:44:44 -0300 Subject: util: new sortEntryThingPairs util --- .../generateArtistInfoPageTracksChunkedList.js | 57 +++++++++------------- 1 file changed, 24 insertions(+), 33 deletions(-) (limited to 'src/content/dependencies') diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js b/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js index 27d8a56a..0132d7ba 100644 --- a/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js +++ b/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js @@ -1,26 +1,10 @@ -import {accumulateSum, stitchArrays, unique} from '../../util/sugar.js'; -import {chunkByProperties, sortAlbumsTracksChronologically} from '../../util/wiki-data.js'; +import {accumulateSum, stitchArrays} from '../../util/sugar.js'; -// TODO: This obviously needs to be more generalized. -function sortContributionEntries(entries, sortFunction) { - const things = unique(entries.map(({thing}) => thing)); - sortFunction(things); - - const outputArrays = []; - const thingToOutputArray = new Map(); - - for (const thing of things) { - const array = []; - thingToOutputArray.set(thing, array); - outputArrays.push(array); - } - - for (const entry of entries) { - thingToOutputArray.get(entry.thing).push(entry); - } - - entries.splice(0, entries.length, ...outputArrays.flat()); -} +import { + chunkByProperties, + sortAlbumsTracksChronologically, + sortEntryThingPairs, +} from '../../util/wiki-data.js'; export default { contentDependencies: [ @@ -36,27 +20,34 @@ export default { query(artist) { const entries = [ ...artist.tracksAsArtist.map(track => ({ - track, - date: track.date, thing: track, - album: track.album, - contribs: track.artistContribs, + entry: { + track, + album: track.album, + date: track.date, + contribs: track.artistContribs, + }, })), ...artist.tracksAsContributor.map(track => ({ - track, - date: track.date, thing: track, - album: track.album, - contribs: track.contributorContribs, + entry: { + track, + date: track.date, + album: track.album, + contribs: track.contributorContribs, + }, })), ]; - sortContributionEntries(entries, sortAlbumsTracksChronologically); + sortEntryThingPairs(entries, sortAlbumsTracksChronologically); - const chunks = chunkByProperties(entries, ['album', 'date']); + const chunks = + chunkByProperties( + entries.map(({entry}) => entry), + ['album', 'date']); - return {entries, chunks}; + return {chunks}; }, relations(relation, query, artist) { -- cgit 1.3.0-6-gf8a5