diff options
Diffstat (limited to 'src/data/composite')
7 files changed, 15 insertions, 14 deletions
diff --git a/src/data/composite/control-flow/exitWithoutUpdateValue.js b/src/data/composite/control-flow/exitWithoutUpdateValue.js index 3d9fbf76..5104a8c0 100644 --- a/src/data/composite/control-flow/exitWithoutUpdateValue.js +++ b/src/data/composite/control-flow/exitWithoutUpdateValue.js @@ -29,8 +29,8 @@ export default templateCompositeFrom({ steps: () => [ exitWithoutDependency({ dependency: input.updateValue(), - mode: input('mode'), value: input('value'), + mode: input('mode'), }), ], }); diff --git a/src/data/composite/wiki-data/splitContentNodesAround.js b/src/data/composite/wiki-data/splitContentNodesAround.js index afdbd3fa..f12bd8fc 100644 --- a/src/data/composite/wiki-data/splitContentNodesAround.js +++ b/src/data/composite/wiki-data/splitContentNodesAround.js @@ -42,8 +42,8 @@ export default templateCompositeFrom({ withMappedList({ list: '#separatorFilter', - filter: '#separatorFilter', map: input.value((_node, index) => index), + filter: '#separatorFilter', }), withFilteredList({ diff --git a/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js b/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js index 670dc422..71bc56ac 100644 --- a/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js +++ b/src/data/composite/wiki-data/withResolvedAnnotatedReferenceList.js @@ -23,14 +23,14 @@ export default templateCompositeFrom({ acceptsNull: true, }), - reference: input({type: 'string', defaultValue: 'reference'}), - annotation: input({type: 'string', defaultValue: 'annotation'}), - thing: input({type: 'string', defaultValue: 'thing'}), - 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'}), + notFoundMode: inputNotFoundMode(), }, diff --git a/src/data/composite/wiki-data/withResolvedContribs.js b/src/data/composite/wiki-data/withResolvedContribs.js index 60b5d4c6..7729d5b6 100644 --- a/src/data/composite/wiki-data/withResolvedContribs.js +++ b/src/data/composite/wiki-data/withResolvedContribs.js @@ -28,6 +28,7 @@ export default templateCompositeFrom({ date: input({ validate: isDate, acceptsNull: true, + defaultDependency: 'date', }), notFoundMode: inputNotFoundMode(), diff --git a/src/data/composite/wiki-properties/annotatedReferenceList.js b/src/data/composite/wiki-properties/annotatedReferenceList.js index aea0f22c..918f8567 100644 --- a/src/data/composite/wiki-properties/annotatedReferenceList.js +++ b/src/data/composite/wiki-properties/annotatedReferenceList.js @@ -57,13 +57,13 @@ export default templateCompositeFrom({ withResolvedAnnotatedReferenceList({ list: input.updateValue(), - reference: input('reference'), - annotation: input('annotation'), - thing: input('thing'), - data: input('data'), find: input('find'), findOptions: input('findOptions'), + + reference: input('reference'), + annotation: input('annotation'), + thing: input('thing'), }), exposeDependency({dependency: '#resolvedAnnotatedReferenceList'}), diff --git a/src/data/composite/wiki-properties/commentatorArtists.js b/src/data/composite/wiki-properties/commentatorArtists.js index 54d3e1a5..44dee028 100644 --- a/src/data/composite/wiki-properties/commentatorArtists.js +++ b/src/data/composite/wiki-properties/commentatorArtists.js @@ -14,10 +14,9 @@ export default templateCompositeFrom({ compose: false, steps: () => [ - exitWithoutDependency({ - dependency: 'commentary', - mode: input.value('falsy'), + exitWithoutDependency('commentary', { value: input.value([]), + mode: input.value('falsy'), }), withPropertyFromList({ diff --git a/src/data/composite/wiki-properties/contributionList.js b/src/data/composite/wiki-properties/contributionList.js index d9a6b417..04f93b52 100644 --- a/src/data/composite/wiki-properties/contributionList.js +++ b/src/data/composite/wiki-properties/contributionList.js @@ -29,6 +29,7 @@ export default templateCompositeFrom({ date: input({ validate: isDate, acceptsNull: true, + defaultDependency: 'date', }), artistProperty: input({ @@ -42,9 +43,9 @@ export default templateCompositeFrom({ steps: () => [ withResolvedContribs({ from: input.updateValue(), + date: input('date'), thingProperty: input.thisProperty(), artistProperty: input('artistProperty'), - date: input('date'), }), exposeDependencyOrContinue({ |