« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/data/things
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/things')
-rw-r--r--src/data/things/album.js16
-rw-r--r--src/data/things/artist.js4
-rw-r--r--src/data/things/contribution.js1
-rw-r--r--src/data/things/flash.js2
-rw-r--r--src/data/things/group.js1
-rw-r--r--src/data/things/homepage-layout.js3
-rw-r--r--src/data/things/track.js3
-rw-r--r--src/data/things/wiki-info.js1
8 files changed, 6 insertions, 25 deletions
diff --git a/src/data/things/album.js b/src/data/things/album.js
index 1f789306..e4463d27 100644
--- a/src/data/things/album.js
+++ b/src/data/things/album.js
@@ -3,15 +3,13 @@ export const DATA_ALBUM_DIRECTORY = 'album';
 import * as path from 'node:path';
 import {inspect} from 'node:util';
 
-import CacheableObject from '#cacheable-object';
 import {colors} from '#cli';
 import {input} from '#composite';
-import find from '#find';
 import {traverse} from '#node-utils';
 import {sortAlbumsTracksChronologically, sortChronologically} from '#sort';
 import {accumulateSum, empty} from '#sugar';
 import Thing from '#thing';
-import {isColor, isDate, isDirectory, validateWikiData} from '#validators';
+import {isColor, isDate, isDirectory} from '#validators';
 
 import {
   parseAdditionalFiles,
@@ -27,12 +25,8 @@ import {exitWithoutDependency, exposeDependency, exposeUpdateValueOrContinue}
   from '#composite/control-flow';
 import {withPropertyFromObject} from '#composite/data';
 
-import {
-  exitWithoutContribs,
-  withDirectory,
-  withResolvedReference,
-  withCoverArtDate,
-} from '#composite/wiki-data';
+import {exitWithoutContribs, withDirectory, withCoverArtDate}
+  from '#composite/wiki-data';
 
 import {
   additionalFiles,
@@ -53,7 +47,6 @@ import {
   reverseReferencedArtworkList,
   simpleDate,
   simpleString,
-  singleReference,
   soupyFind,
   thing,
   thingList,
@@ -70,7 +63,6 @@ export class Album extends Thing {
 
   static [Thing.getPropertyDescriptors] = ({
     ArtTag,
-    Artist,
     Group,
     Track,
     TrackSection,
@@ -508,7 +500,7 @@ export class Album extends Thing {
 
   static [Thing.getYamlLoadingSpec] = ({
     documentModes: {headerAndEntries},
-    thingConstructors: {Album, Track, TrackSectionHelper},
+    thingConstructors: {Album, Track},
   }) => ({
     title: `Process album files`,
 
diff --git a/src/data/things/artist.js b/src/data/things/artist.js
index 64487dd0..746e767a 100644
--- a/src/data/things/artist.js
+++ b/src/data/things/artist.js
@@ -5,14 +5,12 @@ import {inspect} from 'node:util';
 import CacheableObject from '#cacheable-object';
 import {colors} from '#cli';
 import {input} from '#composite';
-import find from '#find';
 import {sortAlphabetically} from '#sort';
-import {stitchArrays, unique} from '#sugar';
+import {stitchArrays} from '#sugar';
 import Thing from '#thing';
 import {isName, validateArrayItems} from '#validators';
 import {getKebabCase} from '#wiki-data';
 
-import {exposeDependency} from '#composite/control-flow';
 import {withReverseContributionList} from '#composite/wiki-data';
 
 import {
diff --git a/src/data/things/contribution.js b/src/data/things/contribution.js
index 5b6a4496..c92fafb4 100644
--- a/src/data/things/contribution.js
+++ b/src/data/things/contribution.js
@@ -8,7 +8,6 @@ import Thing from '#thing';
 import {isStringNonEmpty, isThing, validateReference} from '#validators';
 
 import {exitWithoutDependency, exposeDependency} from '#composite/control-flow';
-import {withResolvedReference} from '#composite/wiki-data';
 import {flag, simpleDate, soupyFind} from '#composite/wiki-properties';
 
 import {
diff --git a/src/data/things/flash.js b/src/data/things/flash.js
index a681e013..8a3fc374 100644
--- a/src/data/things/flash.js
+++ b/src/data/things/flash.js
@@ -1,7 +1,6 @@
 export const FLASH_DATA_FILE = 'flashes.yaml';
 
 import {input} from '#composite';
-import find from '#find';
 import {empty} from '#sugar';
 import {sortFlashesChronologically} from '#sort';
 import Thing from '#thing';
@@ -43,7 +42,6 @@ export class Flash extends Thing {
   static [Thing.referenceType] = 'flash';
 
   static [Thing.getPropertyDescriptors] = ({
-    Artist,
     Track,
     FlashAct,
     WikiInfo,
diff --git a/src/data/things/group.js b/src/data/things/group.js
index ffcc287c..8bc71931 100644
--- a/src/data/things/group.js
+++ b/src/data/things/group.js
@@ -1,7 +1,6 @@
 export const GROUP_DATA_FILE = 'groups.yaml';
 
 import {input} from '#composite';
-import find from '#find';
 import Thing from '#thing';
 import {parseAnnotatedReferences, parseSerieses} from '#yaml';
 
diff --git a/src/data/things/homepage-layout.js b/src/data/things/homepage-layout.js
index 52be1b11..47d92471 100644
--- a/src/data/things/homepage-layout.js
+++ b/src/data/things/homepage-layout.js
@@ -1,7 +1,6 @@
 export const HOMEPAGE_LAYOUT_DATA_FILE = 'homepage.yaml';
 
 import {input} from '#composite';
-import find from '#find';
 import Thing from '#thing';
 
 import {
@@ -55,7 +54,7 @@ export class HomepageLayout extends Thing {
 export class HomepageLayoutRow extends Thing {
   static [Thing.friendlyName] = `Homepage Row`;
 
-  static [Thing.getPropertyDescriptors] = ({Album, Group}) => ({
+  static [Thing.getPropertyDescriptors] = () => ({
     // Update & expose
 
     name: name('Unnamed Homepage Row'),
diff --git a/src/data/things/track.js b/src/data/things/track.js
index 3d02e85e..81ba35bb 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -3,7 +3,6 @@ import {inspect} from 'node:util';
 import CacheableObject from '#cacheable-object';
 import {colors} from '#cli';
 import {input} from '#composite';
-import find from '#find';
 import Thing from '#thing';
 import {isBoolean, isColor, isContributionList, isDate, isFileExtension}
   from '#validators';
@@ -21,7 +20,6 @@ import {
 import {withPropertyFromObject} from '#composite/data';
 
 import {
-  exitWithoutDependency,
   exposeConstant,
   exposeDependency,
   exposeDependencyOrContinue,
@@ -84,7 +82,6 @@ export class Track extends Thing {
   static [Thing.getPropertyDescriptors] = ({
     Album,
     ArtTag,
-    Artist,
     Flash,
     TrackSection,
     WikiInfo,
diff --git a/src/data/things/wiki-info.js b/src/data/things/wiki-info.js
index 1a91ac5e..590598be 100644
--- a/src/data/things/wiki-info.js
+++ b/src/data/things/wiki-info.js
@@ -1,7 +1,6 @@
 export const WIKI_INFO_FILE = 'wiki-info.yaml';
 
 import {input} from '#composite';
-import find from '#find';
 import Thing from '#thing';
 import {parseContributionPresets} from '#yaml';