content: generateTrackListDividedByGroups: move sprawl here

2 files changed, 18 insertions, 18 deletions

diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js
index bab9122f..9af85aac 100644
--- a/src/content/dependencies/generateTrackInfoPage.js
+++ b/src/content/dependencies/generateTrackInfoPage.js
@@ -24,21 +24,16 @@ export default {
     'transformContent',
   ],
 
-  extraDependencies: ['html', 'language', 'wikiData'],
+  extraDependencies: ['html', 'language'],
 
-  sprawl: ({wikiInfo}) => ({
-    divideTrackListsByGroups:
-      wikiInfo.divideTrackListsByGroups,
-  }),
-
-  query: (_sprawl, track) => ({
+  query: (track) => ({
     originalReleaseTrack:
       (track.isOriginalRelease
         ? track
         : track.originalReleaseTrack),
   }),
 
-  relations: (relation, query, sprawl, track) => ({
+  relations: (relation, query, track) => ({
     layout:
       relation('generatePageLayout'),
 
@@ -88,13 +83,11 @@ export default {
 
     referencedByTracksList:
       relation('generateTrackListDividedByGroups',
-        query.originalReleaseTrack.referencedByTracks,
-        sprawl.divideTrackListsByGroups),
+        query.originalReleaseTrack.referencedByTracks),
 
     sampledByTracksList:
       relation('generateTrackListDividedByGroups',
-        query.originalReleaseTrack.sampledByTracks,
-        sprawl.divideTrackListsByGroups),
+        query.originalReleaseTrack.sampledByTracks),
 
     flashesThatFeatureList:
       relation('generateTrackInfoPageFeaturedByFlashesList', track),
@@ -125,7 +118,7 @@ export default {
         .map(entry => relation('generateCommentaryEntry', entry)),
   }),
 
-  data: (_query, _sprawl, track) => ({
+  data: (_query, track) => ({
     name:
       track.name,
 
diff --git a/src/content/dependencies/generateTrackListDividedByGroups.js b/src/content/dependencies/generateTrackListDividedByGroups.js
index 3cba479e..230868d6 100644
--- a/src/content/dependencies/generateTrackListDividedByGroups.js
+++ b/src/content/dependencies/generateTrackListDividedByGroups.js
@@ -7,9 +7,16 @@ export default {
     'linkGroup',
   ],
 
-  extraDependencies: ['html', 'language'],
+  extraDependencies: ['html', 'language', 'wikiData'],
+
+  sprawl: ({wikiInfo}) => ({
+    divideTrackListsByGroups:
+      wikiInfo.divideTrackListsByGroups,
+  }),
+
+  query(sprawl, tracks) {
+    const dividingGroups = sprawl.divideTrackListsByGroups;
 
-  query(tracks, dividingGroups) {
     const groupings = new Map();
     const ungroupedTracks = [];
 
@@ -43,9 +50,9 @@ export default {
     return {groups, groupedTracks, ungroupedTracks};
   },
 
-  relations: (relation, query, tracks, groups) => ({
+  relations: (relation, query, sprawl, tracks) => ({
     flatList:
-      (empty(groups)
+      (empty(sprawl.divideTrackListsByGroups)
         ? relation('generateTrackList', tracks)
         : null),
 
@@ -66,7 +73,7 @@ export default {
         : relation('generateTrackList', query.ungroupedTracks)),
   }),
 
-  data: (query) => ({
+  data: (query, _sprawl, _tracks) => ({
     groupNames:
       query.groups
         .map(group => group.name),