data, content: Contribution.artistText preview

3 files changed, 37 insertions, 9 deletions

diff --git a/src/data/composite/wiki-data/withResolvedContribs.js b/src/data/composite/wiki-data/withResolvedContribs.js
index 0d96f1b7..3bbe1f81 100644
--- a/src/data/composite/wiki-data/withResolvedContribs.js
+++ b/src/data/composite/wiki-data/withResolvedContribs.js
@@ -82,27 +82,33 @@ export default templateCompositeFrom({
 
     withPropertiesFromList({
       list: input('from'),
-      properties: input.value(['artist', 'annotation']),
+      properties: input.value(['artist', 'artistText', 'annotation']),
       prefix: input.value('#contribs'),
     }),
 
     {
       dependencies: [
         '#contribs.artist',
+        '#contribs.artistText',
         '#contribs.annotation',
         input('date'),
       ],
 
       compute(continuation, {
         ['#contribs.artist']: artist,
+        ['#contribs.artistText']: artistText,
         ['#contribs.annotation']: annotation,
         [input('date')]: date,
       }) {
-        filterMultipleArrays(artist, annotation, (artist, _annotation) => artist);
+        filterMultipleArrays(
+          artist,
+          artistText,
+          annotation,
+          (artist, _artistText, _annotation) => artist);
 
         return continuation({
           ['#details']:
-            stitchArrays({artist, annotation})
+            stitchArrays({artist, artistText, annotation})
               .map(details => ({
                 ...details,
                 date: date ?? null,
diff --git a/src/data/things/contrib/Contribution.js b/src/data/things/contrib/Contribution.js
index 57a5c301..4352b58a 100644
--- a/src/data/things/contrib/Contribution.js
+++ b/src/data/things/contrib/Contribution.js
@@ -7,7 +7,7 @@ import {empty} from '#sugar';
 import Thing from '#thing';
 import {isBoolean, isStringNonEmpty, isThing} from '#validators';
 
-import {simpleDate, singleReference, soupyFind}
+import {simpleDate, singleReference, simpleString, soupyFind}
   from '#composite/wiki-properties';
 
 import {
@@ -56,6 +56,8 @@ export class Contribution extends Thing {
       find: soupyFind.input('artist'),
     }),
 
+    artistText: simpleString(),
+
     annotation: {
       flags: {update: true, expose: true},
       update: {validate: isStringNonEmpty},
diff --git a/src/data/yaml.js b/src/data/yaml.js
index 50496c00..2afaffb5 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -646,6 +646,9 @@ export const extractAccentRegex =
 export const extractPrefixAccentRegex =
   /^(?:\((?<accent>.*)\) )?(?<main>.*?)$/;
 
+export const asNameRegex =
+  /^as (?<name>\S.+?)(?:(?<=\S)[,:] | +- |$)(?: *(?<annotation>.*))?$/;
+
 // TODO: Should this fit better within actual YAML loading infrastructure??
 export function parseArrayEntries(entries, mapFn) {
   // If this isn't something we can parse, just return it as-is.
@@ -679,12 +682,14 @@ export function parseContributors(entries) {
     if (typeof item === 'object' && item['Who'])
       return {
         artist: item['Who'],
+        artistText: item['As'] ?? null,
         annotation: item['What'] ?? null,
       };
 
     if (typeof item === 'object' && item['Artist'])
       return {
         artist: item['Artist'],
+        artistText: item['Artist Text'] ?? null,
         annotation: item['Annotation'] ?? null,
 
         countInContributionTotals: item['Count In Contribution Totals'] ?? null,
@@ -693,13 +698,28 @@ export function parseContributors(entries) {
 
     if (typeof item !== 'string') return item;
 
-    const match = item.match(extractAccentRegex);
+    let match;
+
+    match = item.match(extractAccentRegex);
     if (!match) return item;
 
-    return {
-      artist: match.groups.main,
-      annotation: match.groups.accent ?? null,
-    };
+    const {accent} = match.groups;
+
+    let artist = match.groups.main;
+    let artistText = null;
+    let annotation = null;
+
+    if (accent) {
+      match = accent.match(asNameRegex);
+      if (match) {
+        artistText = match.groups.name;
+        annotation = match.groups.annotation ?? null;
+      } else {
+        annotation = accent;
+      }
+    }
+
+    return {artist, artistText, annotation};
   });
 }