From f7376bb5eb2671de7242872ec0c4615b5e244aba Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Thu, 28 Sep 2023 14:12:56 -0300 Subject: data: misc minor fixes --- src/data/things/composite.js | 6 +----- src/data/things/homepage-layout.js | 1 - src/data/things/thing.js | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/data/things/composite.js b/src/data/things/composite.js index b600952..eb93bd7 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 bade280..bcf99e8 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 290be59..f1302e1 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, }); } -- cgit 1.3.0-6-gf8a5