From 4b62389403ef84497d5855e8ef1359ebf5784881 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 16 Nov 2023 14:12:06 -0400
Subject: content: generateCommentarySectionEntry -> generateCommentaryEntry

---
 .../dependencies/generateCommentaryEntry.js        | 77 ++++++++++++++++++++++
 .../dependencies/generateCommentarySection.js      |  4 +-
 .../dependencies/generateCommentarySectionEntry.js | 77 ----------------------
 3 files changed, 79 insertions(+), 79 deletions(-)
 create mode 100644 src/content/dependencies/generateCommentaryEntry.js
 delete mode 100644 src/content/dependencies/generateCommentarySectionEntry.js

(limited to 'src')

diff --git a/src/content/dependencies/generateCommentaryEntry.js b/src/content/dependencies/generateCommentaryEntry.js
new file mode 100644
index 00000000..22e8fd1e
--- /dev/null
+++ b/src/content/dependencies/generateCommentaryEntry.js
@@ -0,0 +1,77 @@
+export default {
+  contentDependencies: ['linkArtist', 'transformContent'],
+  extraDependencies: ['html', 'language'],
+
+  relations: (relation, entry) => ({
+    artistLink:
+      (entry.artist && !entry.artistDisplayText
+        ? relation('linkArtist', entry.artist)
+        : null),
+
+    artistsContent:
+      (entry.artistDisplayText
+        ? relation('transformContent', entry.artistDisplayText)
+        : null),
+
+    annotationContent:
+      (entry.annotation
+        ? relation('transformContent', entry.annotation)
+        : null),
+
+    bodyContent:
+      (entry.body
+        ? relation('transformContent', entry.body)
+        : null),
+  }),
+
+  data: (entry) => ({
+    date: entry.date,
+  }),
+
+  generate(data, relations, {html, language}) {
+    const artistsSpan =
+      html.tag('span', {class: 'commentary-entry-artists'},
+        (relations.artistsContent
+          ? relations.artistsContent.slot('mode', 'inline')
+       : relations.artistLink
+          ? relations.artistLink
+          : language.$('misc.artistCommentary.noArtist')));
+
+    const accentParts = ['misc.artistCommentary.entry.title.accent'];
+    const accentOptions = {};
+
+    if (relations.annotationContent) {
+      accentParts.push('withAnnotation');
+      accentOptions.annotation =
+        relations.annotationContent.slot('mode', 'inline');
+    }
+
+    if (data.date) {
+      accentParts.push('withDate');
+      accentOptions.date =
+        language.formatDate(data.date);
+    }
+
+    const accent =
+      (accentParts.length > 1
+        ? html.tag('span', {class: 'commentary-entry-accent'},
+            language.$(...accentParts, accentOptions))
+        : null);
+
+    const titleParts = ['misc.artistCommentary.entry.title'];
+    const titleOptions = {artists: artistsSpan};
+
+    if (accent) {
+      titleParts.push('withAccent');
+      titleOptions.accent = accent;
+    }
+
+    return html.tags([
+      html.tag('p', {class: 'commentary-entry-heading'},
+        language.$(...titleParts, titleOptions)),
+
+      html.tag('blockquote', {class: 'commentary-entry-body'},
+        relations.bodyContent.slot('mode', 'multiline')),
+    ]);
+  },
+};
diff --git a/src/content/dependencies/generateCommentarySection.js b/src/content/dependencies/generateCommentarySection.js
index d08c3c90..8ae1b2d0 100644
--- a/src/content/dependencies/generateCommentarySection.js
+++ b/src/content/dependencies/generateCommentarySection.js
@@ -1,7 +1,7 @@
 export default {
   contentDependencies: [
     'transformContent',
-    'generateCommentarySectionEntry',
+    'generateCommentaryEntry',
     'generateContentHeading',
   ],
 
@@ -13,7 +13,7 @@ export default {
 
     entries:
       entries.map(entry =>
-        relation('generateCommentarySectionEntry', entry)),
+        relation('generateCommentaryEntry', entry)),
   }),
 
   generate: (relations, {html, language}) =>
diff --git a/src/content/dependencies/generateCommentarySectionEntry.js b/src/content/dependencies/generateCommentarySectionEntry.js
deleted file mode 100644
index 22e8fd1e..00000000
--- a/src/content/dependencies/generateCommentarySectionEntry.js
+++ /dev/null
@@ -1,77 +0,0 @@
-export default {
-  contentDependencies: ['linkArtist', 'transformContent'],
-  extraDependencies: ['html', 'language'],
-
-  relations: (relation, entry) => ({
-    artistLink:
-      (entry.artist && !entry.artistDisplayText
-        ? relation('linkArtist', entry.artist)
-        : null),
-
-    artistsContent:
-      (entry.artistDisplayText
-        ? relation('transformContent', entry.artistDisplayText)
-        : null),
-
-    annotationContent:
-      (entry.annotation
-        ? relation('transformContent', entry.annotation)
-        : null),
-
-    bodyContent:
-      (entry.body
-        ? relation('transformContent', entry.body)
-        : null),
-  }),
-
-  data: (entry) => ({
-    date: entry.date,
-  }),
-
-  generate(data, relations, {html, language}) {
-    const artistsSpan =
-      html.tag('span', {class: 'commentary-entry-artists'},
-        (relations.artistsContent
-          ? relations.artistsContent.slot('mode', 'inline')
-       : relations.artistLink
-          ? relations.artistLink
-          : language.$('misc.artistCommentary.noArtist')));
-
-    const accentParts = ['misc.artistCommentary.entry.title.accent'];
-    const accentOptions = {};
-
-    if (relations.annotationContent) {
-      accentParts.push('withAnnotation');
-      accentOptions.annotation =
-        relations.annotationContent.slot('mode', 'inline');
-    }
-
-    if (data.date) {
-      accentParts.push('withDate');
-      accentOptions.date =
-        language.formatDate(data.date);
-    }
-
-    const accent =
-      (accentParts.length > 1
-        ? html.tag('span', {class: 'commentary-entry-accent'},
-            language.$(...accentParts, accentOptions))
-        : null);
-
-    const titleParts = ['misc.artistCommentary.entry.title'];
-    const titleOptions = {artists: artistsSpan};
-
-    if (accent) {
-      titleParts.push('withAccent');
-      titleOptions.accent = accent;
-    }
-
-    return html.tags([
-      html.tag('p', {class: 'commentary-entry-heading'},
-        language.$(...titleParts, titleOptions)),
-
-      html.tag('blockquote', {class: 'commentary-entry-body'},
-        relations.bodyContent.slot('mode', 'multiline')),
-    ]);
-  },
-};
-- 
cgit 1.3.0-6-gf8a5