support art tag info pages; ensure "art tag" terminology everywhere

1 files changed, 18 insertions, 16 deletions

diff --git a/src/data/things/art-tag.js b/src/data/things/art-tag.js
index dd3dddf2..60a4340d 100644
--- a/src/data/things/art-tag.js
+++ b/src/data/things/art-tag.js
@@ -24,7 +24,7 @@ import {
   wikiData,
 } from '#composite/wiki-properties';
 
-import {withAllDescendantTags} from '#composite/things/art-tag';
+import {withAllDescendantArtTags} from '#composite/things/art-tag';
 
 export class ArtTag extends Thing {
   static [Thing.referenceType] = 'tag';
@@ -53,7 +53,7 @@ export class ArtTag extends Thing {
 
     description: simpleString(),
 
-    directDescendantTags: referenceList({
+    directDescendantArtTags: referenceList({
       class: input.value(ArtTag),
       find: soupyFind.input('artTag'),
     }),
@@ -94,21 +94,23 @@ export class ArtTag extends Thing {
     },
 
     indirectlyTaggedInThings: [
-      withAllDescendantTags(),
+      withAllDescendantArtTags(),
 
       {
-        dependencies: ['#allDescendantTags'],
-        compute: ({'#allDescendantTags': allDescendantTags}) =>
-          unique(allDescendantTags.flatMap(tag => tag.directlyTaggedInThings)),
+        dependencies: ['#allDescendantArtTags'],
+        compute: ({'#allDescendantArtTags': allDescendantArtTags}) =>
+          unique(
+            allDescendantArtTags
+              .flatMap(artTag => artTag.directlyTaggedInThings)),
       },
     ],
 
-    allDescendantTags: [
-      withAllDescendantTags(),
-      exposeDependency({dependency: '#allDescendantTags'}),
+    allDescendantArtTags: [
+      withAllDescendantArtTags(),
+      exposeDependency({dependency: '#allDescendantArtTags'}),
     ],
 
-    directAncestorTags: reverseReferenceList({
+    directAncestorArtTags: reverseReferenceList({
       reverse: soupyReverse.input('artTagsWhichDirectlyAncestor'),
     }),
   });
@@ -118,10 +120,10 @@ export class ArtTag extends Thing {
       referenceTypes: ['tag'],
       bindTo: 'artTagData',
 
-      getMatchableNames: tag =>
-        (tag.isContentWarning
-          ? [`cw: ${tag.name}`]
-          : [tag.name]),
+      getMatchableNames: artTag =>
+        (artTag.isContentWarning
+          ? [`cw: ${artTag.name}`]
+          : [artTag.name]),
     },
   };
 
@@ -130,7 +132,7 @@ export class ArtTag extends Thing {
       bindTo: 'artTagData',
 
       referencing: artTag => [artTag],
-      referenced: artTag => artTag.directDescendantTags,
+      referenced: artTag => artTag.directDescendantArtTags,
     },
   };
 
@@ -145,7 +147,7 @@ export class ArtTag extends Thing {
       'Color': {property: 'color'},
       'Is CW': {property: 'isContentWarning'},
 
-      'Direct Descendant Tags': {property: 'directDescendantTags'},
+      'Direct Descendant Tags': {property: 'directDescendantArtTags'},
     },
   };