« 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/things
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/things')
-rw-r--r--src/data/things/composite.js6
-rw-r--r--src/data/things/homepage-layout.js1
-rw-r--r--src/data/things/thing.js2
3 files changed, 2 insertions, 7 deletions
diff --git a/src/data/things/composite.js b/src/data/things/composite.js
index b6009525..eb93bd7c 100644
--- a/src/data/things/composite.js
+++ b/src/data/things/composite.js
@@ -976,8 +976,6 @@ export function compositeFrom(description) {
 
   const compositionNests = description.compose ?? true;
 
-  const exposeDependencies = new Set();
-
   // Steps default to exposing if using a shorthand syntax where flags aren't
   // specified at all.
   const stepsExpose =
@@ -1101,7 +1099,6 @@ export function compositeFrom(description) {
 
   const stepEntries = stitchArrays({
     step: steps,
-    expose: stepExposeDescriptions,
     stepComposes: stepsCompose,
     stepComputes: stepsCompute,
     stepTransforms: stepsTransform,
@@ -1110,7 +1107,6 @@ export function compositeFrom(description) {
   for (let i = 0; i < stepEntries.length; i++) {
     const {
       step,
-      expose,
       stepComposes,
       stepComputes,
       stepTransforms,
@@ -2046,7 +2042,7 @@ export const withPropertiesFromObject = templateCompositeFrom({
         '#entries',
       ],
 
-      compute: ({
+      compute: (continuation, {
         [input.staticDependency('object')]: object,
         [input.staticValue('properties')]: properties,
         [input.staticValue('prefix')]: prefix,
diff --git a/src/data/things/homepage-layout.js b/src/data/things/homepage-layout.js
index bade280c..bcf99e80 100644
--- a/src/data/things/homepage-layout.js
+++ b/src/data/things/homepage-layout.js
@@ -1,7 +1,6 @@
 import find from '#find';
 
 import {
-  compositeFrom,
   exposeDependency,
   input,
 } from '#composite';
diff --git a/src/data/things/thing.js b/src/data/things/thing.js
index 290be59b..f1302e17 100644
--- a/src/data/things/thing.js
+++ b/src/data/things/thing.js
@@ -456,7 +456,7 @@ export function inputWikiData({
   allowMixedTypes = false,
 } = {}) {
   return input({
-    validate: validateWikiData(referenceType),
+    validate: validateWikiData({referenceType, allowMixedTypes}),
     acceptsNull: true,
   });
 }