data, content: AdditionalFile.files -> filenames

4 files changed, 47 insertions, 51 deletions

diff --git a/src/content/dependencies/generateAlbumAdditionalFilesList.js b/src/content/dependencies/generateAlbumAdditionalFilesList.js
index ad17206f..9fbd1553 100644
--- a/src/content/dependencies/generateAlbumAdditionalFilesList.js
+++ b/src/content/dependencies/generateAlbumAdditionalFilesList.js
@@ -22,21 +22,17 @@ export default {
     chunkDescriptions:
       additionalFiles
         .map(({description}) =>
-          (description
-            ? relation('transformContent', description)
-            : null)),
+          relation('transformContent', description)),
 
     chunkItems:
       additionalFiles
-        .map(({files}) =>
-          (files ?? [])
-            .map(() => relation('generateAdditionalFilesListChunkItem'))),
+        .map(({filenames}) => filenames
+          .map(() => relation('generateAdditionalFilesListChunkItem'))),
 
     chunkItemFileLinks:
       additionalFiles
-        .map(({files}) =>
-          (files ?? [])
-            .map(file => relation('linkAlbumAdditionalFile', album, file))),
+        .map(({filenames}) => filenames
+          .map(filename => relation('linkAlbumAdditionalFile', album, filename))),
   }),
 
   data: (album, additionalFiles) => ({
@@ -46,9 +42,9 @@ export default {
       additionalFiles
         .map(({title}) => title),
 
-    chunkItemLocations:
+    chunkItemFilenames:
       additionalFiles
-        .map(({files}) => files ?? []),
+        .map(({filenames}) => filenames),
   }),
 
   slots: {
@@ -75,13 +71,13 @@ export default {
         stitchArrays({
           items: relations.chunkItems,
           fileLinks: relations.chunkItemFileLinks,
-          locations: data.chunkItemLocations,
-        }).map(({items, fileLinks, locations}) =>
+          filenames: data.chunkItemFilenames,
+        }).map(({items, fileLinks, filenames}) =>
             stitchArrays({
               item: items,
               fileLink: fileLinks,
-              location: locations,
-            }).map(({item, fileLink, location}) =>
+              filename: filenames,
+            }).map(({item, fileLink, filename}) =>
                 item.slots({
                   fileLink: fileLink,
                   fileSize:
@@ -89,7 +85,7 @@ export default {
                       ? getSizeOfMediaFile(
                           urls
                             .from('media.root')
-                            .to('media.albumAdditionalFile', data.albumDirectory, location))
+                            .to('media.albumAdditionalFile', data.albumDirectory, filename))
                       : 0),
                 }))),
     }),
diff --git a/src/content/dependencies/generateListAllAdditionalFilesChunk.js b/src/content/dependencies/generateListAllAdditionalFilesChunk.js
index deb8c4ea..3cae7d3c 100644
--- a/src/content/dependencies/generateListAllAdditionalFilesChunk.js
+++ b/src/content/dependencies/generateListAllAdditionalFilesChunk.js
@@ -17,7 +17,7 @@ export default {
       validate: v => v.strictArrayOf(v.strictArrayOf(v.isHTML)),
     },
 
-    additionalFileFiles: {
+    additionalFileFilenames: {
       validate: v => v.strictArrayOf(v.strictArrayOf(v.isString)),
     },
 
@@ -36,11 +36,11 @@ export default {
           stitchArrays({
             additionalFileTitle: slots.additionalFileTitles,
             additionalFileLinks: slots.additionalFileLinks,
-            additionalFileFiles: slots.additionalFileFiles,
+            additionalFileFilenames: slots.additionalFileFilenames,
           }).map(({
               additionalFileTitle,
               additionalFileLinks,
-              additionalFileFiles,
+              additionalFileFilenames,
             }) =>
               language.encapsulate('listingPage', slots.stringsKey, 'file', capsule =>
                 (additionalFileLinks.length === 1
@@ -75,13 +75,13 @@ export default {
                         html.tag('ul',
                           stitchArrays({
                             additionalFileLink: additionalFileLinks,
-                            additionalFileFile: additionalFileFiles,
-                          }).map(({additionalFileLink, additionalFileFile}) =>
+                            additionalFileFilebane: additionalFileFilenames,
+                          }).map(({additionalFileLink, additionalFileFilebane}) =>
                               html.tag('li',
                                 additionalFileLink.slots({
                                   content:
                                     language.$(capsule, {
-                                      title: additionalFileFile,
+                                      title: additionalFileFilebane,
                                     }),
                                 })))),
                       ]))))))),
diff --git a/src/content/dependencies/linkAlbumAdditionalFile.js b/src/content/dependencies/linkAlbumAdditionalFile.js
index 39e7111e..527133db 100644
--- a/src/content/dependencies/linkAlbumAdditionalFile.js
+++ b/src/content/dependencies/linkAlbumAdditionalFile.js
@@ -7,18 +7,18 @@ export default {
     };
   },
 
-  data(album, file) {
+  data(album, filename) {
     return {
       albumDirectory: album.directory,
-      file,
+      filename,
     };
   },
 
   generate(data, relations) {
     return relations.linkTemplate
       .slots({
-        path: ['media.albumAdditionalFile', data.albumDirectory, data.file],
-        content: data.file,
+        path: ['media.albumAdditionalFile', data.albumDirectory, data.filename],
+        content: data.filename,
       });
   },
 };
diff --git a/src/content/dependencies/listAllAdditionalFilesTemplate.js b/src/content/dependencies/listAllAdditionalFilesTemplate.js
index e33ad7b5..9b890526 100644
--- a/src/content/dependencies/listAllAdditionalFilesTemplate.js
+++ b/src/content/dependencies/listAllAdditionalFilesTemplate.js
@@ -60,10 +60,10 @@ export default {
         .map(byAlbum => byAlbum
           .map(({title}) => title));
 
-    const albumAdditionalFileFiles =
+    const albumAdditionalFileFilenames =
       albumAdditionalFileObjects
         .map(byAlbum => byAlbum
-          .map(({files}) => files ?? []));
+          .map(({filenames}) => filenames));
 
     const trackAdditionalFileTitles =
       trackAdditionalFileObjects
@@ -71,20 +71,20 @@ export default {
           .map(byTrack => byTrack
             .map(({title}) => title)));
 
-    const trackAdditionalFileFiles =
+    const trackAdditionalFileFilenames =
       trackAdditionalFileObjects
         .map(byAlbum => byAlbum
           .map(byTrack => byTrack
-            .map(({files}) => files ?? [])));
+            .map(({filenames}) => filenames)));
 
     return {
       spec,
       albums,
       tracks,
       albumAdditionalFileTitles,
-      albumAdditionalFileFiles,
+      albumAdditionalFileFilenames,
       trackAdditionalFileTitles,
-      trackAdditionalFileFiles,
+      trackAdditionalFileFilenames,
     };
   },
 
@@ -113,28 +113,28 @@ export default {
     albumAdditionalFileLinks:
       stitchArrays({
         album: query.albums,
-        files: query.albumAdditionalFileFiles,
-      }).map(({album, files: byAlbum}) =>
-          byAlbum.map(files => files
-            .map(file =>
-              relation('linkAlbumAdditionalFile', album, file)))),
+        filenames: query.albumAdditionalFileFilenames,
+      }).map(({album, filenames: byAlbum}) =>
+          byAlbum
+            .map(filenames => filenames
+              .map(filename => relation('linkAlbumAdditionalFile', album, filename)))),
 
     trackAdditionalFileLinks:
       stitchArrays({
         album: query.albums,
-        files: query.trackAdditionalFileFiles,
-      }).map(({album, files: byAlbum}) =>
+        filenames: query.trackAdditionalFileFilenames,
+      }).map(({album, filenames: byAlbum}) =>
           byAlbum
             .map(byTrack => byTrack
-              .map(files => files
-                .map(file => relation('linkAlbumAdditionalFile', album, file))))),
+              .map(filenames => filenames
+                .map(filename => relation('linkAlbumAdditionalFile', album, filename))))),
   }),
 
   data: (query) => ({
     albumAdditionalFileTitles: query.albumAdditionalFileTitles,
     trackAdditionalFileTitles: query.trackAdditionalFileTitles,
-    albumAdditionalFileFiles: query.albumAdditionalFileFiles,
-    trackAdditionalFileFiles: query.trackAdditionalFileFiles,
+    albumAdditionalFileFilenames: query.albumAdditionalFileFilenames,
+    trackAdditionalFileFilenames: query.trackAdditionalFileFilenames,
   }),
 
   slots: {
@@ -155,8 +155,8 @@ export default {
           trackAdditionalFileTitles: data.trackAdditionalFileTitles,
           albumAdditionalFileLinks: relations.albumAdditionalFileLinks,
           trackAdditionalFileLinks: relations.trackAdditionalFileLinks,
-          albumAdditionalFileFiles: data.albumAdditionalFileFiles,
-          trackAdditionalFileFiles: data.trackAdditionalFileFiles,
+          albumAdditionalFileFilenames: data.albumAdditionalFileFilenames,
+          trackAdditionalFileFilenames: data.trackAdditionalFileFilenames,
         }).map(({
             albumLink,
             trackLinks,
@@ -166,8 +166,8 @@ export default {
             trackAdditionalFileTitles,
             albumAdditionalFileLinks,
             trackAdditionalFileLinks,
-            albumAdditionalFileFiles,
-            trackAdditionalFileFiles,
+            albumAdditionalFileFilenames,
+            trackAdditionalFileFilenames,
           }) => [
             html.tag('h3', {class: 'content-heading'}, albumLink),
 
@@ -178,7 +178,7 @@ export default {
 
                 additionalFileTitles: albumAdditionalFileTitles,
                 additionalFileLinks: albumAdditionalFileLinks,
-                additionalFileFiles: albumAdditionalFileFiles,
+                additionalFileFilenames: albumAdditionalFileFilenames,
 
                 stringsKey: slots.stringsKey,
               }),
@@ -188,19 +188,19 @@ export default {
                 trackChunk: trackChunks,
                 trackAdditionalFileTitles,
                 trackAdditionalFileLinks,
-                trackAdditionalFileFiles,
+                trackAdditionalFileFilenames,
               }).map(({
                   trackLink,
                   trackChunk,
                   trackAdditionalFileTitles,
                   trackAdditionalFileLinks,
-                  trackAdditionalFileFiles,
+                  trackAdditionalFileFilenames,
                 }) =>
                   trackChunk.slots({
                     title: trackLink,
                     additionalFileTitles: trackAdditionalFileTitles,
                     additionalFileLinks: trackAdditionalFileLinks,
-                    additionalFileFiles: trackAdditionalFileFiles,
+                    additionalFileFilenames: trackAdditionalFileFilenames,
                     stringsKey: slots.stringsKey,
                   })),
             ]),