« 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/things
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/things')
-rw-r--r--src/data/things/thing.js4
-rw-r--r--src/data/things/track.js13
2 files changed, 7 insertions, 10 deletions
diff --git a/src/data/things/thing.js b/src/data/things/thing.js
index 798a057a..eaf4655d 100644
--- a/src/data/things/thing.js
+++ b/src/data/things/thing.js
@@ -854,8 +854,8 @@ export default class Thing extends CacheableObject {
 
       expose: {
         dependencies: ['artistData', contribsByRefDependency],
-        compute: ({artistData, [contribsByRefDependency]: contribsByRef}, callback) =>
-          callback({
+        compute: ({artistData, [contribsByRefDependency]: contribsByRef}, continuation) =>
+          continuation({
             [outputDependency]:
               Thing.findArtistsFromContribs(contribsByRef, artistData),
           }),
diff --git a/src/data/things/track.js b/src/data/things/track.js
index 414d5f29..74f5d7fb 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -301,12 +301,9 @@ export class Track extends Thing {
     },
 
     artistContribs: Thing.composite.from(`Track.artistContribs`, [
-      Track.composite.inheritFromOriginalRelease('artistContribs'),
-
-      Track.composite.withAlbumProperties({
-        properties: 'artistContribs',
-      }),
+      Track.composite.inheritFromOriginalRelease({property: 'artistContribs'}),
 
+      Track.composite.withAlbumProperties({properties: ['artistContribs']}),
       Thing.composite.withResolvedContribs({
         from: 'artistContribsByRef',
         to: '#artistContribs',
@@ -328,7 +325,7 @@ export class Track extends Thing {
     ]),
 
     contributorContribs: Thing.composite.from(`Track.contributorContribs`, [
-      Track.composite.inheritFromOriginalRelease('contributorContribs'),
+      Track.composite.inheritFromOriginalRelease({property: 'contributorContribs'}),
       Thing.common.dynamicContribs('contributorContribsByRef'),
     ]),
 
@@ -372,12 +369,12 @@ export class Track extends Thing {
     ]),
 
     referencedTracks: Thing.composite.from(`Track.referencedTracks`, [
-      Track.composite.inheritFromOriginalRelease('referencedTracks'),
+      Track.composite.inheritFromOriginalRelease({property: 'referencedTracks'}),
       Thing.common.dynamicThingsFromReferenceList('referencedTracksByRef', 'trackData', find.track),
     ]),
 
     sampledTracks: Thing.composite.from(`Track.sampledTracks`, [
-      Track.composite.inheritFromOriginalRelease('sampledTracks'),
+      Track.composite.inheritFromOriginalRelease({property: 'sampledTracks'}),
       Thing.common.dynamicThingsFromReferenceList('sampledTracksByRef', 'trackData', find.track),
     ]),