« 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/composite/wiki-data/withResolvedAnnotatedReferenceList.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js')
-rw-r--r--src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js25
1 files changed, 6 insertions, 19 deletions
diff --git a/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js b/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js
index c9a7c058..71bc56ac 100644
--- a/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js
+++ b/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js
@@ -1,12 +1,13 @@
 import {input, templateCompositeFrom} from '#composite';
 import {stitchArrays} from '#sugar';
-import {isDate, isObject, validateArrayItems} from '#validators';
+import {isObject, validateArrayItems} from '#validators';
 
 import {withPropertyFromList} from '#composite/data';
 
 import {raiseOutputWithoutDependency, withAvailabilityFilter}
   from '#composite/control-flow';
 
+import inputFindOptions from './inputFindOptions.js';
 import inputSoupyFind from './inputSoupyFind.js';
 import inputNotFoundMode from './inputNotFoundMode.js';
 import inputWikiData from './inputWikiData.js';
@@ -22,18 +23,14 @@ export default templateCompositeFrom({
       acceptsNull: true,
     }),
 
-    date: input({
-      validate: isDate,
-      acceptsNull: true,
-    }),
+    data: inputWikiData({allowMixedTypes: true}),
+    find: inputSoupyFind(),
+    findOptions: inputFindOptions(),
 
     reference: input({type: 'string', defaultValue: 'reference'}),
     annotation: input({type: 'string', defaultValue: 'annotation'}),
     thing: input({type: 'string', defaultValue: 'thing'}),
 
-    data: inputWikiData({allowMixedTypes: true}),
-    find: inputSoupyFind(),
-
     notFoundMode: inputNotFoundMode(),
   },
 
@@ -66,6 +63,7 @@ export default templateCompositeFrom({
       list: '#references',
       data: input('data'),
       find: input('find'),
+      findOptions: input('findOptions'),
       notFoundMode: input.value('null'),
     }),
 
@@ -91,17 +89,6 @@ export default templateCompositeFrom({
       }),
     },
 
-    {
-      dependencies: ['#matches', input('date')],
-      compute: (continuation, {
-        ['#matches']: matches,
-        [input('date')]: date,
-      }) => continuation({
-        ['#matches']:
-          matches.map(match => ({...match, date})),
-      }),
-    },
-
     withAvailabilityFilter({
       from: '#resolvedReferenceList',
     }),