data: improve selecting values for input tokens in dependencies

1 files changed, 35 insertions, 10 deletions

diff --git a/src/data/things/composite.js b/src/data/things/composite.js
index 98537c95..da2848f8 100644
--- a/src/data/things/composite.js
+++ b/src/data/things/composite.js
@@ -1163,21 +1163,46 @@ export function compositeFrom(description) {
 
       let continuationStorage;
 
+      const filterableDependencies = {
+        ...availableDependencies,
+        ...inputMetadata,
+        ...inputValues,
+        ...
+          (expectingTransform
+            ? {[input.updateValue()]: valueSoFar}
+            : {}),
+        [input.myself()]: initialDependencies?.['this'] ?? null,
+      };
+
+      const selectDependencies =
+        (expose.dependencies ?? []).map(dependency => {
+          if (!isInputToken(dependency)) return dependency;
+          const tokenShape = getInputTokenShape(dependency);
+          const tokenValue = getInputTokenValue(dependency);
+          switch (tokenShape) {
+            case 'input':
+            case 'input.staticDependency':
+            case 'input.staticValue':
+              return dependency;
+            case 'input.myself':
+              return input.myself();
+            case 'input.dependency':
+              return tokenValue;
+            case 'input.updateValue':
+              return input.updateValue();
+            default:
+              throw new Error(`Unexpected token ${tokenShape} as dependency`);
+          }
+        })
+
       const filteredDependencies =
-        filterProperties({
-          ...availableDependencies,
-          ...inputMetadata,
-          ...inputValues,
-          ...
-            (callingTransformForThisStep
-              ? {[input.updateValue()]: valueSoFar}
-              : {}),
-          [input.myself()]: initialDependencies['this'],
-        }, expose.dependencies ?? []);
+        filterProperties(filterableDependencies, selectDependencies);
 
       debug(() => [
         `step #${i+1} - ${callingTransformForThisStep ? 'transform' : 'compute'}`,
         `with dependencies:`, filteredDependencies,
+        `selecting:`, selectDependencies,
+        `from available:`, filterableDependencies,
         ...callingTransformForThisStep ? [`from value:`, valueSoFar] : []]);
 
       let result;