From 9d99dafca9dc4e16b867b707746314040a8d9ba5 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sat, 11 Jan 2025 00:11:37 -0400
Subject: data: use soupyFind everywhere
also notes where remaining directly-provided wikiData() props
are used
---
src/data/composite/wiki-data/withParsedCommentaryEntries.js | 4 ++--
src/data/composite/wiki-data/withResolvedContribs.js | 3 +++
src/data/composite/wiki-data/withResolvedSeriesList.js | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
(limited to 'src/data/composite/wiki-data')
diff --git a/src/data/composite/wiki-data/withParsedCommentaryEntries.js b/src/data/composite/wiki-data/withParsedCommentaryEntries.js
index 144781a8..d302b59e 100644
--- a/src/data/composite/wiki-data/withParsedCommentaryEntries.js
+++ b/src/data/composite/wiki-data/withParsedCommentaryEntries.js
@@ -11,6 +11,7 @@ import {
withUnflattenedList,
} from '#composite/data';
+import inputSoupyFind from './inputSoupyFind.js';
import withResolvedReferenceList from './withResolvedReferenceList.js';
export default templateCompositeFrom({
@@ -122,8 +123,7 @@ export default templateCompositeFrom({
withResolvedReferenceList({
list: '#flattenedList',
- data: 'artistData',
- find: input.value(find.artist),
+ find: inputSoupyFind.input('artist'),
notFoundMode: input.value('null'),
}),
diff --git a/src/data/composite/wiki-data/withResolvedContribs.js b/src/data/composite/wiki-data/withResolvedContribs.js
index fd3d8a0d..838c991f 100644
--- a/src/data/composite/wiki-data/withResolvedContribs.js
+++ b/src/data/composite/wiki-data/withResolvedContribs.js
@@ -110,6 +110,7 @@ export default templateCompositeFrom({
'#thingProperty',
input('artistProperty'),
input.myself(),
+ 'find',
],
compute: (continuation, {
@@ -117,6 +118,7 @@ export default templateCompositeFrom({
['#thingProperty']: thingProperty,
[input('artistProperty')]: artistProperty,
[input.myself()]: myself,
+ ['find']: find,
}) => continuation({
['#contributions']:
details.map(details => {
@@ -127,6 +129,7 @@ export default templateCompositeFrom({
thing: myself,
thingProperty: thingProperty,
artistProperty: artistProperty,
+ find: find,
});
return contrib;
diff --git a/src/data/composite/wiki-data/withResolvedSeriesList.js b/src/data/composite/wiki-data/withResolvedSeriesList.js
index 4ac74cc3..d31aa01a 100644
--- a/src/data/composite/wiki-data/withResolvedSeriesList.js
+++ b/src/data/composite/wiki-data/withResolvedSeriesList.js
@@ -12,6 +12,7 @@ import {
withPropertiesFromList,
} from '#composite/data';
+import inputSoupyFind from './inputSoupyFind.js';
import withResolvedReferenceList from './withResolvedReferenceList.js';
export default templateCompositeFrom({
@@ -62,8 +63,7 @@ export default templateCompositeFrom({
withResolvedReferenceList({
list: '#flattenedList',
- data: 'albumData',
- find: input.value(find.album),
+ find: inputSoupyFind.input('album'),
notFoundMode: input.value('null'),
}),
--
cgit 1.3.0-6-gf8a5