5 files changed, 45 insertions, 21 deletions

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],
   });