data, content: stub multiple artworks

Only for tracks as of this commit, most anything else is in a
severely broken state aye

12 files changed, 158 insertions, 100 deletions

diff --git a/src/content/dependencies/generateCoverArtwork.js b/src/content/dependencies/generateCoverArtwork.js
index 58c29830..719d14e9 100644
--- a/src/content/dependencies/generateCoverArtwork.js
+++ b/src/content/dependencies/generateCoverArtwork.js
@@ -1,7 +1,24 @@
 export default {
-  contentDependencies: ['image'],
+  contentDependencies: [
+    'generateCoverArtworkArtTagDetails',
+    'generateCoverArtworkArtistDetails',
+    'generateCoverArtworkOriginDetails',
+    'image',
+  ],
+
   extraDependencies: ['html'],
 
+  relations: (relation, artwork) => ({
+    originDetails:
+      relation('generateCoverArtworkOriginDetails', artwork),
+
+    artTagDetails:
+      relation('generateCoverArtworkArtTagDetails', artwork),
+
+    artistDetails:
+      relation('generateCoverArtworkArtistDetails', artwork),
+  }),
+
   slots: {
     image: {
       type: 'html',
@@ -21,13 +38,17 @@ export default {
       validate: v => v.looseArrayOf(v.isString),
     },
 
+    showOriginDetails: {type: 'boolean', default: false},
+    showArtTagDetails: {type: 'boolean', default: false},
+    showArtistDetails: {type: 'boolean', default: false},
+
     details: {
       type: 'html',
       mutable: false,
     },
   },
 
-  generate(slots, {html}) {
+  generate(relations, slots, {html}) {
     const square =
       (slots.dimensions
         ? slots.dimensions[0] === slots.dimensions[1]
@@ -54,7 +75,14 @@ export default {
                 ...sizeSlots,
               }),
 
-              slots.details,
+              slots.showOriginDetails &&
+                relations.originDetails,
+
+              slots.showArtTagDetails &&
+                relations.artTagDetails,
+
+              slots.showArtistDetails &&
+                relations.artistDetails,
             ]
        : slots.mode === 'thumbnail'
           ? slots.image.slots({
diff --git a/src/content/dependencies/generateTrackCoverArtwork.js b/src/content/dependencies/generateTrackCoverArtwork.js
index 937347a3..3fc219c8 100644
--- a/src/content/dependencies/generateTrackCoverArtwork.js
+++ b/src/content/dependencies/generateTrackCoverArtwork.js
@@ -1,9 +1,6 @@
 export default {
   contentDependencies: [
     'generateCoverArtwork',
-    'generateCoverArtworkArtTagDetails',
-    'generateCoverArtworkArtistDetails',
-    'generateCoverArtworkOriginDetails',
     'generateCoverArtworkReferenceDetails',
     'image',
     'linkAlbum',
@@ -13,65 +10,52 @@ export default {
 
   extraDependencies: ['html', 'language'],
 
-  query: (track) => ({
-    artTags:
-      (track.hasUniqueCoverArt
-        ? track.trackArtwork.artTags
-     : track.album.hasCoverArt
-        ? track.album.coverArtwork.artTags
-        : []),
-  }),
-
-  relations: (relation, query, track) => ({
+  relations: (relation, artwork) => ({
     coverArtwork:
-      relation('generateCoverArtwork'),
+      relation('generateCoverArtwork', artwork),
 
     image:
       relation('image'),
 
-    originDetails:
-      relation('generateCoverArtworkOriginDetails', track.trackArtwork),
-
-    artTagDetails:
-      relation('generateCoverArtworkArtTagDetails', track.trackArtwork),
-
-    artistDetails:
-      relation('generateCoverArtworkArtistDetails', track.trackArtwork),
-
-    referenceDetails:
-      relation('generateCoverArtworkReferenceDetails',
-        track.referencedArtworks,
-        track.referencedByArtworks),
+    // referenceDetails:
+    //   relation('generateCoverArtworkReferenceDetails',
+    //     artwork.referencedArtworks,
+    //     artwork.referencedByArtworks),
 
-    referencedArtworksLink:
-      relation('linkTrackReferencedArtworks', track),
+    // referencedArtworksLink:
+    //   relation('linkTrackReferencedArtworks', track),
 
-    referencingArtworksLink:
-      relation('linkTrackReferencingArtworks', track),
+    // referencingArtworksLink:
+    //   relation('linkTrackReferencingArtworks', track),
 
     albumLink:
-      relation('linkAlbum', track.album),
+      (artwork.thing.album
+        ? relation('linkAlbum', artwork.thing.album)
+        : relation('linkAlbum', artwork.thing)),
   }),
 
-  data: (query, track) => ({
+  data: (artwork) => ({
     path:
-      (track.hasUniqueCoverArt
-        ? ['media.trackCover', track.album.directory, track.directory, track.coverArtFileExtension]
-        : ['media.albumCover', track.album.directory, track.album.coverArtFileExtension]),
-
-    color:
-      track.color,
+      (artwork.thing.album
+        ? ['media.trackCover',
+           artwork.thing.album.directory,
+           artwork.thing.directory,
+           artwork.thing.coverArtFileExtension]
+        : ['media.albumCover',
+           artwork.thing.directory,
+           artwork.thing.coverArtFileExtension]),
+
+    // color:
+    //   track.color,
 
     dimensions:
-      (track.hasUniqueCoverArt
-        ? track.coverArtDimensions
-        : track.album.coverArtDimensions),
+      artwork.thing.coverArtDimensions,
 
     nonUnique:
-      !track.hasUniqueCoverArt,
+      !artwork.thing.album,
 
     warnings:
-      query.artTags
+      artwork.artTags
         .filter(tag => tag.isContentWarning)
         .map(tag => tag.name),
   }),
@@ -107,23 +91,19 @@ export default {
       image:
         relations.image.slots({
           path: data.path,
-          color: data.color,
+          // color: data.color,
           alt: language.$('misc.alt.trackCover'),
         }),
 
       dimensions: data.dimensions,
       warnings: data.warnings,
 
-      details: [
-        slots.showOriginDetails &&
-          relations.originDetails,
-
-        slots.details === 'tags' &&
-          relations.artTagDetails,
-
-        slots.details === 'artists'&&
-          relations.artistDetails,
+      showOriginDetails: slots.showOriginDetails,
+      showArtTagDetails: slots.details === 'tags',
+      showArtistDetails: slots.details === 'artists',
 
+      details: [
+        /*
         slots.showReferenceLinks &&
           relations.referenceDetails.slots({
             referencedLink:
@@ -132,6 +112,7 @@ export default {
             referencingLink:
               relations.referencingArtworksLink,
           }),
+        */
 
         slots.showNonUniqueLine &&
         data.nonUnique &&
diff --git a/src/content/dependencies/generateTrackCoverArtworks.js b/src/content/dependencies/generateTrackCoverArtworks.js
new file mode 100644
index 00000000..60d27d60
--- /dev/null
+++ b/src/content/dependencies/generateTrackCoverArtworks.js
@@ -0,0 +1,26 @@
+export default {
+  contentDependencies: ['generateTrackCoverArtwork'],
+
+  relations: (relation, track) => ({
+    albumCover:
+      (!track.hasUniqueCoverArt && track.album.hasCoverArt
+        ? relation('generateTrackCoverArtwork', track.album.coverArtworks[0])
+        : null),
+
+    trackCovers:
+      (track.hasUniqueCoverArt
+        ? track.trackArtworks.map(artwork =>
+            relation('generateTrackCoverArtwork', artwork))
+        : null),
+  }),
+
+  generate: (relations) =>
+    [relations.albumCover, ...relations.trackCovers ?? []]
+      .filter(Boolean)
+      .map(cover =>
+        cover.slots({
+          showOriginDetails: true,
+          showReferenceLinks: true,
+          showNonUniqueLine: true,
+        })),
+};
diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js
index a5e2a476..d2cdf416 100644
--- a/src/content/dependencies/generateTrackInfoPage.js
+++ b/src/content/dependencies/generateTrackInfoPage.js
@@ -11,7 +11,7 @@ export default {
     'generateContributionList',
     'generatePageLayout',
     'generateTrackArtistCommentarySection',
-    'generateTrackCoverArtwork',
+    'generateTrackCoverArtworks',
     'generateTrackInfoPageFeaturedByFlashesList',
     'generateTrackInfoPageOtherReleasesList',
     'generateTrackList',
@@ -58,9 +58,9 @@ export default {
     additionalNamesBox:
       relation('generateAdditionalNamesBox', track.additionalNames),
 
-    cover:
+    covers:
       (track.hasUniqueCoverArt || track.album.hasCoverArt
-        ? relation('generateTrackCoverArtwork', track)
+        ? relation('generateTrackCoverArtworks', track)
         : null),
 
     contentHeading:
@@ -142,13 +142,7 @@ export default {
         styleRules: [relations.albumStyleRules],
 
         coverColumnContent:
-          (relations.cover
-            ? relations.cover.slots({
-                showOriginDetails: true,
-                showReferenceLinks: true,
-                showNonUniqueLine: true,
-              })
-            : null),
+          relations.covers,
 
         mainContent: [
           relations.releaseInfo,
diff --git a/src/data/composite/data/withPropertyFromList.js b/src/data/composite/data/withPropertyFromList.js
index 65ebf77b..760095c2 100644
--- a/src/data/composite/data/withPropertyFromList.js
+++ b/src/data/composite/data/withPropertyFromList.js
@@ -5,11 +5,15 @@
 // original list are kept null here. Objects which don't have the specified
 // property are retained in-place as null.
 //
+// If the `internal` input is true, this reads the CacheableObject update value
+// of each object rather than its exposed value.
+//
 // See also:
 //  - withPropertiesFromList
 //  - withPropertyFromObject
 //
 
+import CacheableObject from '#cacheable-object';
 import {input, templateCompositeFrom} from '#composite';
 
 function getOutputName({list, property, prefix}) {
@@ -26,6 +30,7 @@ export default templateCompositeFrom({
     list: input({type: 'array'}),
     property: input({type: 'string'}),
     prefix: input.staticValue({type: 'string', defaultValue: null}),
+    internal: input({type: 'boolean', defaultValue: false}),
   },
 
   outputs: ({
@@ -37,13 +42,26 @@ export default templateCompositeFrom({
 
   steps: () => [
     {
-      dependencies: [input('list'), input('property')],
+      dependencies: [
+        input('list'),
+        input('property'),
+        input('internal'),
+      ],
+
       compute: (continuation, {
         [input('list')]: list,
         [input('property')]: property,
+        [input('internal')]: internal,
       }) => continuation({
         ['#values']:
-          list.map(item => item[property] ?? null),
+          list.map(item =>
+            (item === null
+              ? null
+           : internal
+              ? CacheableObject.getUpdateValue(item, property)
+                  ?? null
+              : item[property]
+                  ?? null)),
       }),
     },
 
diff --git a/src/data/composite/things/track/withHasUniqueCoverArt.js b/src/data/composite/things/track/withHasUniqueCoverArt.js
index 2ea845f6..e0a435fe 100644
--- a/src/data/composite/things/track/withHasUniqueCoverArt.js
+++ b/src/data/composite/things/track/withHasUniqueCoverArt.js
@@ -10,7 +10,7 @@ import {input, templateCompositeFrom} from '#composite';
 import {empty} from '#sugar';
 
 import {raiseOutputWithoutDependency} from '#composite/control-flow';
-import {withPropertyFromObject} from '#composite/data';
+import {withFlattenedList, withPropertyFromList} from '#composite/data';
 import {withResolvedContribs} from '#composite/wiki-data';
 
 import withPropertyFromAlbum from './withPropertyFromAlbum.js';
@@ -65,20 +65,24 @@ export default templateCompositeFrom({
             })),
     },
 
-    withPropertyFromObject({
-      object: 'trackArtwork',
+    raiseOutputWithoutDependency({
+      dependency: 'trackArtworks',
+      mode: input.value('empty'),
+      output: input.value({'#hasUniqueCoverArt': false}),
+    }),
+
+    withPropertyFromList({
+      list: 'trackArtworks',
       property: input.value('artistContribs'),
       internal: input.value(true),
     }),
 
-    raiseOutputWithoutDependency({
-      dependency: '#trackArtwork.artistContribs',
-      mode: input.value('empty'),
-      output: input.value({'#hasUniqueCoverArt': false}),
+    withFlattenedList({
+      list: '#trackArtworks.artistContribs',
     }),
 
     withResolvedContribs({
-      from: '#trackArtwork.artistContribs',
+      from: '#flattenedList',
       date: input.value(null),
     }),
 
diff --git a/src/data/composite/wiki-properties/constitutibleArtwork.js b/src/data/composite/wiki-properties/constitutibleArtworkList.js
index e0f0f521..01429f03 100644
--- a/src/data/composite/wiki-properties/constitutibleArtwork.js
+++ b/src/data/composite/wiki-properties/constitutibleArtworkList.js
@@ -1,7 +1,7 @@
 import {input, templateCompositeFrom} from '#composite';
-import {isContributionList, isDate, validateThing} from '#validators';
+import {isContributionList, isDate, validateWikiData} from '#validators';
 
-import {exitWithoutDependency, exposeDependency, exposeUpdateValueOrContinue}
+import {exitWithoutDependency, exposeUpdateValueOrContinue}
   from '#composite/control-flow';
 import {withConstitutedArtwork} from '#composite/wiki-data';
 
@@ -29,14 +29,14 @@ export default templateCompositeFrom({
   steps: () => [
     exposeUpdateValueOrContinue({
       validate: input.value(
-        validateThing({
+        validateWikiData({
           referenceType: 'artwork',
         })),
     }),
 
     exitWithoutDependency({
       dependency: input('contribs'),
-      value: input.value(null),
+      value: input.value([]),
     }),
 
     {
@@ -60,8 +60,11 @@ export default templateCompositeFrom({
       dateProperty: '#dateProperty',
     }),
 
-    exposeDependency({
-      dependency: '#constitutedArtwork',
-    }),
+    {
+      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],
   });
diff --git a/src/data/things/album.js b/src/data/things/album.js
index 4321635e..36069afb 100644
--- a/src/data/things/album.js
+++ b/src/data/things/album.js
@@ -35,7 +35,7 @@ import {
   commentary,
   color,
   commentatorArtists,
-  constitutibleArtwork,
+  constitutibleArtworkList,
   contentString,
   contribsPresent,
   contributionList,
@@ -159,7 +159,7 @@ export class Album extends Thing {
       dimensions(),
     ],
 
-    coverArtwork: constitutibleArtwork({
+    coverArtworks: constitutibleArtworkList({
       contribs: 'coverArtistContribs',
       date: 'coverArtDate',
       artistProperty: input.value('albumCoverArtistContributions'),
@@ -411,7 +411,7 @@ export class Album extends Thing {
       soupyReverse.contributionsBy('albumData', 'artistContribs'),
 
     albumCoverArtistContributionsBy:
-      soupyReverse.artworkContributionsBy('albumData', 'coverArtwork'),
+      soupyReverse.artworkContributionsBy('albumData', 'coverArtworks'),
 
     albumWallpaperArtistContributionsBy:
       soupyReverse.contributionsBy('albumData', 'wallpaperArtistContribs'),
@@ -468,7 +468,7 @@ export class Album extends Thing {
       'Listed in Galleries': {property: 'isListedInGalleries'},
 
       'Cover Artwork': {
-        property: 'coverArtwork',
+        property: 'coverArtworks',
         transform:
           parseArtwork({
             dateFromThingProperty: 'coverArtDate',
@@ -644,9 +644,7 @@ export class Album extends Thing {
           currentTrackSectionTracks.push(entry);
           trackData.push(entry);
 
-          if (entry.trackArtwork) {
-            artworkData.push(entry.trackArtwork);
-          }
+          artworkData.push(...entry.trackArtworks);
 
           entry.dataSourceAlbum = albumRef;
         }
@@ -655,6 +653,8 @@ export class Album extends Thing {
 
         albumData.push(album);
 
+        artworkData.push(...album.coverArtworks);
+
         album.trackSections = trackSections;
       }
 
diff --git a/src/data/things/track.js b/src/data/things/track.js
index 6954bda2..7188178a 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -39,7 +39,7 @@ import {
   additionalNameList,
   commentary,
   commentatorArtists,
-  constitutibleArtwork,
+  constitutibleArtworkList,
   contentString,
   contributionList,
   dimensions,
@@ -341,7 +341,7 @@ export class Track extends Thing {
       }),
     ],
 
-    trackArtwork: constitutibleArtwork({
+    trackArtworks: constitutibleArtworkList({
       contribs: 'coverArtistContribs',
       date: 'coverArtDate',
       artistProperty: input.value('trackCoverArtistContributions'),
@@ -573,7 +573,7 @@ export class Track extends Thing {
       },
 
       'Track Artwork': {
-        property: 'trackArtwork',
+        property: 'trackArtworks',
         transform:
           parseArtwork({
             dateFromThingProperty: 'coverArtDate',
@@ -704,7 +704,7 @@ export class Track extends Thing {
       soupyReverse.contributionsBy('trackData', 'contributorContribs'),
 
     trackCoverArtistContributionsBy:
-      soupyReverse.artworkContributionsBy('trackData', 'trackArtwork'),
+      soupyReverse.artworkContributionsBy('trackData', 'trackArtworks'),
 
     tracksWithCommentaryBy: {
       bindTo: 'trackData',
diff --git a/src/data/yaml.js b/src/data/yaml.js
index d30bb54c..b766e753 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -794,7 +794,7 @@ export function parseArtwork({
   artistContribsFromThingProperty,
   artistContribsArtistProperty,
 }) {
-  return (entry, {subdoc, Artwork}) =>
+  const parseSingleEntry = (entry, {subdoc, Artwork}) =>
     subdoc(Artwork, entry, {
       bindInto: 'thing',
       provide: {
@@ -803,6 +803,11 @@ export function parseArtwork({
         artistContribsArtistProperty,
       },
     });
+
+  return (value, ...args) =>
+    (Array.isArray(value)
+      ? value.map(entry => parseSingleEntry(entry, ...args))
+      : [parseSingleEntry(value, ...args)]);
 }
 
 // documentModes: Symbols indicating sets of behavior for loading and processing