From 49537d408b17f7583cd00d0866f5de6797a0591e Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sun, 26 Nov 2023 17:32:28 -0400
Subject: data: shared & inferred additional names (for tracks)

---
 src/data/things/track.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/data/things')

diff --git a/src/data/things/track.js b/src/data/things/track.js
index f6320677..1f99ef53 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -24,7 +24,6 @@ import {
 
 import {
   additionalFiles,
-  additionalNameList,
   commentary,
   commentatorArtists,
   contributionList,
@@ -44,6 +43,7 @@ import {
 import {
   exitWithoutUniqueCoverArt,
   inheritFromOriginalRelease,
+  trackAdditionalNameList,
   trackReverseReferenceList,
   withAlbum,
   withAlwaysReferenceByDirectory,
@@ -64,7 +64,7 @@ export class Track extends Thing {
 
     name: name('Unnamed Track'),
     directory: directory(),
-    additionalNames: additionalNameList(),
+    additionalNames: trackAdditionalNameList(),
 
     duration: duration(),
     urls: urls(),
-- 
cgit 1.3.0-6-gf8a5


From 4ba84964a90ec93d6d30d577e9e00c3e5b4fca83 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sun, 3 Dec 2023 13:26:52 -0400
Subject: data: individual custom additional name list props

---
 src/data/things/track.js      |  9 +++++++--
 src/data/things/validators.js | 25 ++++++++++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'src/data/things')

diff --git a/src/data/things/track.js b/src/data/things/track.js
index 1f99ef53..08891719 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -24,6 +24,7 @@ import {
 
 import {
   additionalFiles,
+  additionalNameList,
   commentary,
   commentatorArtists,
   contributionList,
@@ -42,8 +43,9 @@ import {
 
 import {
   exitWithoutUniqueCoverArt,
+  inferredAdditionalNameList,
   inheritFromOriginalRelease,
-  trackAdditionalNameList,
+  sharedAdditionalNameList,
   trackReverseReferenceList,
   withAlbum,
   withAlwaysReferenceByDirectory,
@@ -64,7 +66,10 @@ export class Track extends Thing {
 
     name: name('Unnamed Track'),
     directory: directory(),
-    additionalNames: trackAdditionalNameList(),
+
+    additionalNames: additionalNameList(),
+    sharedAdditionalNames: sharedAdditionalNameList(),
+    inferredAdditionalNames: inferredAdditionalNameList(),
 
     duration: duration(),
     urls: urls(),
diff --git a/src/data/things/validators.js b/src/data/things/validators.js
index 55eedbcf..ac91b456 100644
--- a/src/data/things/validators.js
+++ b/src/data/things/validators.js
@@ -429,13 +429,6 @@ export function isURL(string) {
   return true;
 }
 
-export const isAdditionalName = validateProperties({
-  name: isName,
-  annotation: optional(isStringNonEmpty),
-});
-
-export const isAdditionalNameList = validateArrayItems(isAdditionalName);
-
 export function validateReference(type = 'track') {
   return (ref) => {
     isStringNonEmpty(ref);
@@ -557,6 +550,24 @@ export function validateWikiData({
   };
 }
 
+export const isAdditionalName = validateProperties({
+  name: isName,
+  annotation: optional(isStringNonEmpty),
+
+  // TODO: This only allows indicating sourcing from a track.
+  // That's okay for the current limited use of "from", but
+  // could be expanded later.
+  from:
+    // Double TODO: Explicitly allowing both references and
+    // live objects to co-exist is definitely weird, and
+    // altogether questions the way we define validators...
+    optional(oneOf(
+      validateReferenceList('track'),
+      validateWikiData({referenceType: 'track'}))),
+});
+
+export const isAdditionalNameList = validateArrayItems(isAdditionalName);
+
 // Compositional utilities
 
 export function oneOf(...checks) {
-- 
cgit 1.3.0-6-gf8a5