content: generateAdditionalFilesList: less-slots rewrite

6 files changed, 74 insertions, 172 deletions

diff --git a/src/content/dependencies/generateAdditionalFilesList.js b/src/content/dependencies/generateAdditionalFilesList.js
index 68120b23..7e05b5b5 100644
--- a/src/content/dependencies/generateAdditionalFilesList.js
+++ b/src/content/dependencies/generateAdditionalFilesList.js
@@ -1,26 +1,22 @@
-import {stitchArrays} from '#sugar';
-
 export default {
+  contentDependencies: ['generateAdditionalFilesListChunk'],
   extraDependencies: ['html'],
 
-  slots: {
-    chunks: {
-      validate: v => v.strictArrayOf(v.isHTML),
-    },
+  relations: (relation, additionalFiles) => ({
+    chunks:
+      additionalFiles
+        .map(file => relation('generateAdditionalFilesListChunk', file)),
+  }),
 
-    chunkItems: {
-      validate: v => v.strictArrayOf(v.isHTML),
-    },
+  slots: {
+    showFileSizes: {type: 'boolean', default: true},
   },
 
-  generate: (slots, {html}) =>
+  generate: (relations, slots, {html}) =>
     html.tag('ul', {class: 'additional-files-list'},
       {[html.onlyIfContent]: true},
 
-      stitchArrays({
-        chunk: slots.chunks,
-        items: slots.chunkItems,
-      }).map(({chunk, items}) =>
-          chunk.clone()
-            .slot('items', items))),
+      relations.chunks.map(chunk => chunk.slots({
+        showFileSizes: slots.showFileSizes,
+      }))),
 };
diff --git a/src/content/dependencies/generateAdditionalFilesListChunk.js b/src/content/dependencies/generateAdditionalFilesListChunk.js
index 507b2329..3cac851b 100644
--- a/src/content/dependencies/generateAdditionalFilesListChunk.js
+++ b/src/content/dependencies/generateAdditionalFilesListChunk.js
@@ -1,46 +1,81 @@
+import {stitchArrays} from '#sugar';
+
 export default {
-  extraDependencies: ['html', 'language'],
+  contentDependencies: ['linkAdditionalFile', 'transformContent'],
+  extraDependencies: ['getSizeOfMediaFile', 'html', 'language', 'urls'],
 
-  slots: {
-    title: {
-      type: 'html',
-      mutable: false,
-    },
+  relations: (relation, file) => ({
+    description:
+      relation('transformContent', file.description),
 
-    description: {
-      type: 'html',
-      mutable: false,
-    },
+    links:
+      file.filenames
+        .map(filename => relation('linkAdditionalFile', file, filename)),
+  }),
+
+  data: (file) => ({
+    title:
+      file.title,
+
+    paths:
+      file.paths,
+  }),
 
-    items: {
-      validate: v => v.looseArrayOf(v.isHTML),
+  slots: {
+    showFileSizes: {
+      type: 'boolean',
     },
   },
 
-  generate: (slots, {html, language}) =>
-    language.encapsulate('releaseInfo.additionalFiles.entry', capsule =>
+  generate: (data, relations, slots, {getSizeOfMediaFile, html, language, urls}) =>
+    language.encapsulate('releaseInfo.additionalFiles', capsule =>
       html.tag('li',
         html.tag('details',
-          html.isBlank(slots.items) &&
+          html.isBlank(relations.links) &&
             {open: true},
 
           [
             html.tag('summary',
               html.tag('span',
-                language.$(capsule, {
+                language.$(capsule, 'entry', {
                   title:
-                    html.tag('b', slots.title),
+                    html.tag('b', data.title),
                 }))),
 
             html.tag('ul', [
               html.tag('li', {class: 'entry-description'},
                 {[html.onlyIfContent]: true},
-                slots.description),
 
-              (html.isBlank(slots.items)
+                relations.description.slot('mode', 'inline')),
+
+              (html.isBlank(relations.links)
                 ? html.tag('li',
-                    language.$(capsule, 'noFilesAvailable'))
-                : slots.items),
+                    language.$(capsule, 'entry.noFilesAvailable'))
+
+                : stitchArrays({
+                    link: relations.links,
+                    path: data.paths,
+                  }).map(({link, path}) =>
+                      html.tag('li',
+                        language.encapsulate(capsule, 'file', workingCapsule => {
+                          const workingOptions = {file: link};
+
+                          if (slots.showFileSizes) {
+                            const fileSize =
+                              getSizeOfMediaFile(
+                                urls
+                                  .from('media.root')
+                                  .to(...path));
+
+                            if (fileSize) {
+                              workingCapsule += '.withSize';
+                              workingOptions.size =
+                                language.formatFileSize(fileSize);
+                            }
+                          }
+
+                          return language.$(workingCapsule, workingOptions);
+                        })))),
             ]),
           ]))),
 };
diff --git a/src/content/dependencies/generateAdditionalFilesListChunkItem.js b/src/content/dependencies/generateAdditionalFilesListChunkItem.js
deleted file mode 100644
index c37d6bb2..00000000
--- a/src/content/dependencies/generateAdditionalFilesListChunkItem.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export default {
-  extraDependencies: ['html', 'language'],
-
-  slots: {
-    fileLink: {
-      type: 'html',
-      mutable: false,
-    },
-
-    fileSize: {
-      validate: v => v.isWholeNumber,
-    },
-  },
-
-  generate(slots, {html, language}) {
-    const itemParts = ['releaseInfo.additionalFiles.file'];
-    const itemOptions = {file: slots.fileLink};
-
-    if (slots.fileSize) {
-      itemParts.push('withSize');
-      itemOptions.size = language.formatFileSize(slots.fileSize);
-    }
-
-    const li =
-      html.tag('li',
-        language.$(...itemParts, itemOptions));
-
-    return li;
-  },
-};
diff --git a/src/content/dependencies/generateAlbumAdditionalFilesList.js b/src/content/dependencies/generateAlbumAdditionalFilesList.js
deleted file mode 100644
index 07441f24..00000000
--- a/src/content/dependencies/generateAlbumAdditionalFilesList.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import {stitchArrays} from '#sugar';
-
-export default {
-  contentDependencies: [
-    'generateAdditionalFilesList',
-    'generateAdditionalFilesListChunk',
-    'generateAdditionalFilesListChunkItem',
-    'linkAdditionalFile',
-    'transformContent',
-  ],
-
-  extraDependencies: ['getSizeOfMediaFile', 'html', 'urls'],
-
-  relations: (relation, album, additionalFiles) => ({
-    list:
-      relation('generateAdditionalFilesList', additionalFiles),
-
-    chunks:
-      additionalFiles
-        .map(() => relation('generateAdditionalFilesListChunk')),
-
-    chunkDescriptions:
-      additionalFiles
-        .map(file => relation('transformContent', file.description)),
-
-    chunkItems:
-      additionalFiles
-        .map(file => file.paths
-          .map(() => relation('generateAdditionalFilesListChunkItem'))),
-
-    chunkItemFileLinks:
-      additionalFiles
-        .map(file => file.filenames
-          .map(filename => relation('linkAdditionalFile', file, filename))),
-  }),
-
-  data: (album, additionalFiles) => ({
-    albumDirectory: album.directory,
-
-    chunkTitles:
-      additionalFiles
-        .map(file => file.title),
-
-    chunkItemPaths:
-      additionalFiles
-        .map(file => file.paths),
-  }),
-
-  slots: {
-    showFileSizes: {type: 'boolean', default: true},
-  },
-
-  generate: (data, relations, slots, {getSizeOfMediaFile, urls}) =>
-    relations.list.slots({
-      chunks:
-        stitchArrays({
-          chunk: relations.chunks,
-          description: relations.chunkDescriptions,
-          title: data.chunkTitles,
-        }).map(({chunk, title, description}) =>
-            chunk.slots({
-              title,
-              description:
-                (description
-                  ? description.slot('mode', 'inline')
-                  : null),
-            })),
-
-      chunkItems:
-        stitchArrays({
-          items: relations.chunkItems,
-          fileLinks: relations.chunkItemFileLinks,
-          paths: data.chunkItemPaths,
-        }).map(({items, fileLinks, paths}) =>
-            stitchArrays({
-              item: items,
-              fileLink: fileLinks,
-              path: paths,
-            }).map(({item, fileLink, path}) =>
-                item.slots({
-                  fileLink: fileLink,
-                  fileSize:
-                    (slots.showFileSizes
-                      ? getSizeOfMediaFile(
-                          urls
-                            .from('media.root')
-                            .to(...path))
-                      : 0),
-                }))),
-    }),
-};
diff --git a/src/content/dependencies/generateAlbumInfoPage.js b/src/content/dependencies/generateAlbumInfoPage.js
index d0788523..ed19bf75 100644
--- a/src/content/dependencies/generateAlbumInfoPage.js
+++ b/src/content/dependencies/generateAlbumInfoPage.js
@@ -2,8 +2,8 @@ import {empty} from '#sugar';
 
 export default {
   contentDependencies: [
+    'generateAdditionalFilesList',
     'generateAdditionalNamesBox',
-    'generateAlbumAdditionalFilesList',
     'generateAlbumArtworkColumn',
     'generateAlbumBanner',
     'generateAlbumNavAccent',
@@ -72,9 +72,7 @@ export default {
       relation('generateAlbumTrackList', album),
 
     additionalFilesList:
-      relation('generateAlbumAdditionalFilesList',
-        album,
-        album.additionalFiles),
+      relation('generateAdditionalFilesList', album.additionalFiles),
 
     artistCommentaryEntries:
       album.commentary
diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js
index 11d179ad..ab6ea1cb 100644
--- a/src/content/dependencies/generateTrackInfoPage.js
+++ b/src/content/dependencies/generateTrackInfoPage.js
@@ -1,7 +1,7 @@
 export default {
   contentDependencies: [
+    'generateAdditionalFilesList',
     'generateAdditionalNamesBox',
-    'generateAlbumAdditionalFilesList',
     'generateAlbumNavAccent',
     'generateAlbumSecondaryNav',
     'generateAlbumSidebar',
@@ -95,19 +95,13 @@ export default {
       relation('generateLyricsSection', track.lyrics),
 
     sheetMusicFilesList:
-      relation('generateAlbumAdditionalFilesList',
-        track.album,
-        track.sheetMusicFiles),
+      relation('generateAdditionalFilesList', track.sheetMusicFiles),
 
     midiProjectFilesList:
-      relation('generateAlbumAdditionalFilesList',
-        track.album,
-        track.midiProjectFiles),
+      relation('generateAdditionalFilesList', track.midiProjectFiles),
 
     additionalFilesList:
-      relation('generateAlbumAdditionalFilesList',
-        track.album,
-        track.additionalFiles),
+      relation('generateAdditionalFilesList', track.additionalFiles),
 
     artistCommentarySection:
       relation('generateTrackArtistCommentarySection', track),