jupiter-dynamic-forms 1.20.5 → 1.20.6

package/dist/index.mjs

@@ -3087,8 +3087,28 @@ function narrowByPreferredOccurrence(candidates, ctx) {
   });
   return result;
 }
+function narrowToDirectChildOfDescendantAnchor(candidates, variable, ctx) {
+  var _a, _b;
+  if (variable.bindAsSequence)
+    return candidates;
+  if (new Set(candidates.map((candidate) => candidate.conceptId)).size <= 1)
+    return candidates;
+  const relationFilter = variable.filters.find(
+    (filter2) => filter2.type === "CONCEPT_RELATION" && filter2.attributes["axis"] === "descendant"
+  );
+  const anchorQName = relationFilter == null ? void 0 : relationFilter.attributes["qname"];
+  const linkrole = relationFilter == null ? void 0 : relationFilter.attributes["linkrole"];
+  const anchorConceptId = anchorQName && linkrole ? (_a = ctx.conceptIdByQNamePerRole.get(linkrole)) == null ? void 0 : _a.get(anchorQName) : void 0;
+  const directChildren = new Set(anchorConceptId && linkrole ? ((_b = ctx.childrenByRole.get(linkrole)) == null ? void 0 : _b.get(anchorConceptId)) || [] : []);
+  if (directChildren.size === 0)
+    return candidates;
+  return candidates.filter((candidate) => directChildren.has(candidate.conceptId));
+}
 function resolveFormulaVariable(variable, ctx) {
-  const matched = narrowByPreferredOccurrence(narrowToCurrentPeriod(resolveMatchedCandidates(variable, ctx), variable, ctx), ctx);
+  const matched = narrowByPreferredOccurrence(
+    narrowToDirectChildOfDescendantAnchor(narrowToCurrentPeriod(resolveMatchedCandidates(variable, ctx), variable, ctx), variable, ctx),
+    ctx
+  );
   const values = matched.map((candidate) => {
     var _a;
     return resolveRawValue((_a = ctx.formData[candidate.conceptId]) == null ? void 0 : _a[candidate.columnId]);