2 files changed, 49 insertions, 5 deletions

diff --git a/src/data/things.js b/src/data/things.js
index e061d581..6119f2d7 100644
--- a/src/data/things.js
+++ b/src/data/things.js
@@ -242,6 +242,41 @@ Thing.common = {
         }
     }),
 
+    // Dynamically inherit a contribution list from some other object, if it
+    // hasn't been overridden on this object. This is handy for solo albums
+    // where all tracks have the same artist, for example.
+    //
+    // Note: The arguments of this function aren't currently final! The final
+    // format will look more like (contribsByRef, parentContribsByRef), e.g.
+    // ('artistContribsByRef', '@album/artistContribsByRef').
+    dynamicInheritContribs: (
+        contribsByRefProperty,
+        parentContribsByRefProperty,
+        wikiDataProperty,
+        findFn
+    ) => ({
+        flags: {expose: true},
+        expose: {
+            dependencies: [contribsByRefProperty, wikiDataProperty, 'artistData'],
+            compute({
+                [Thing.instance]: thing,
+                [contribsByRefProperty]: contribsByRef,
+                [wikiDataProperty]: wikiData,
+                artistData
+            }) {
+                if (!artistData) return [];
+                const refs = (contribsByRef ?? findFn(thing, wikiData)?.[parentContribsByRefProperty]);
+                if (!refs) return [];
+                return (refs
+                    .map(({ who: ref, what }) => ({
+                        who: find.artist(ref, {wikiData: {artistData}}),
+                        what
+                    }))
+                    .filter(({ who }) => who));
+            }
+        }
+    }),
+
     // General purpose wiki data constructor, for properties like artistData,
     // trackData, etc.
     wikiData: (thingClass) => ({
@@ -388,6 +423,13 @@ TrackGroup.propertyDescriptors = {
 
 // -> Track
 
+// This is a quick utility function for now, since the same code is reused in
+// several places. Ideally it wouldn't be - we'd just reuse the `album` property
+// - but support for that hasn't been coded yet :P
+Track.findAlbum = (track, albumData) => {
+    return albumData?.find(album => album.tracks.includes(track));
+};
+
 Track.propertyDescriptors = {
     // Update & expose
 
@@ -447,7 +489,7 @@ Track.propertyDescriptors = {
             dependencies: ['albumData', 'dateFirstReleased'],
             compute: ({ albumData, dateFirstReleased, [Track.instance]: track }) => (
                 dateFirstReleased ??
-                albumData?.find(album => album.tracks.includes(track))?.date ??
+                Track.findAlbum(track)?.date ??
                 null
             )
         }
@@ -463,21 +505,21 @@ Track.propertyDescriptors = {
             transform: (coverArtDate, { albumData, dateFirstReleased, [Track.instance]: track }) => (
                 coverArtDate ??
                 dateFirstReleased ??
-                albumData?.find(album => album.tracks.includes(track))?.trackArtDate ??
-                albumData?.find(album => album.tracks.includes(track))?.date ??
+                Track.findAlbum(track, albumData)?.trackArtDate ??
+                Track.findAlbum(track, albumData)?.date ??
                 null
             )
         }
     },
 
     // Previously known as: (track).artists
-    artistContribs: Thing.common.dynamicContribs('artistContribsByRef'),
+    artistContribs: Thing.common.dynamicInheritContribs('artistContribsByRef', 'artistContribsByRef', 'albumData', Track.findAlbum),
 
     // Previously known as: (track).contributors
     contributorContribs: Thing.common.dynamicContribs('contributorContribsByRef'),
 
     // Previously known as: (track).coverArtists
-    coverArtistContribs: Thing.common.dynamicContribs('coverArtistContribsByRef'),
+    coverArtistContribs: Thing.common.dynamicInheritContribs('coverArtistContribsByRef', 'trackCoverArtistContribsByRef', 'albumData', Track.findAlbum),
 
     artTags: {
         flags: {expose: true},
diff --git a/src/upd8.js b/src/upd8.js
index d2f1b08d..69d45ece 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -2782,10 +2782,12 @@ async function main() {
     console.log(WD.trackData[0].artistContribs[0].who.name);
     const demoAlbum1 = WD.albumData.find(album => album.name === 'Alternia');
     const demoAlbum2 = WD.albumData.find(album => album.name === 'Homestuck Vol. 5');
+    const demoAlbum3 = WD.albumData.find(album => album.name === 'Homestuck Vol. 1');
     console.log(demoAlbum1.artistContribs[0]?.who.name);
     console.log(demoAlbum2.tracks[0].name,
         demoAlbum2.tracks[0].date,
         demoAlbum2.tracks[0].coverArtDate);
+    console.log(demoAlbum3.tracks[0].coverArtistContribs[0]?.who.name);
 
     return;