« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/things/artist.js3
-rw-r--r--src/data/things/group.js10
2 files changed, 9 insertions, 4 deletions
diff --git a/src/data/things/artist.js b/src/data/things/artist.js
index 8ac370c2..c6ee222a 100644
--- a/src/data/things/artist.js
+++ b/src/data/things/artist.js
@@ -21,6 +21,7 @@ import {
   fileExtension,
   flag,
   name,
+  reverseAnnotatedReferenceList,
   reverseContributionList,
   reverseReferenceList,
   singleReference,
@@ -139,7 +140,7 @@ export class Artist extends Thing {
       list: input.value('commentatorArtists'),
     }),
 
-    closelyLinkedGroups: reverseReferenceList({
+    closelyLinkedGroups: reverseAnnotatedReferenceList({
       data: 'groupData',
       list: input.value('closelyLinkedArtists'),
     }),
diff --git a/src/data/things/group.js b/src/data/things/group.js
index 06791ccc..4a790140 100644
--- a/src/data/things/group.js
+++ b/src/data/things/group.js
@@ -3,9 +3,10 @@ export const GROUP_DATA_FILE = 'groups.yaml';
 import {input} from '#composite';
 import find from '#find';
 import Thing from '#thing';
-import {parseSerieses} from '#yaml';
+import {parseAnnotatedReferences, parseSerieses} from '#yaml';
 
 import {
+  annotatedReferenceList,
   color,
   contentString,
   directory,
@@ -29,7 +30,7 @@ export class Group extends Thing {
 
     urls: urls(),
 
-    closelyLinkedArtists: referenceList({
+    closelyLinkedArtists: annotatedReferenceList({
       class: input.value(Artist),
       find: input.value(find.artist),
       data: 'artistData',
@@ -120,7 +121,10 @@ export class Group extends Thing {
       'Description': {property: 'description'},
       'URLs': {property: 'urls'},
 
-      'Closely Linked Artists': {property: 'closelyLinkedArtists'},
+      'Closely Linked Artists': {
+        property: 'closelyLinkedArtists',
+        transform: parseAnnotatedReferences,
+      },
 
       'Featured Albums': {property: 'featuredAlbums'},