adjust for #91

Author: Buckwich

lib/zeebe/VariableResolver.js

@@ -146,6 +146,7 @@ function expandHierarchicalNames(variables) {
         scope,
         provider,
         origin,
+        usedBy: lastVariable.usedBy ? [ ...lastVariable.usedBy ] : undefined,
         entries: [
           lastVariable
         ]

lib/zeebe/util/feelUtility.js

@@ -109,28 +109,64 @@ export function parseVariables(variables) {
 
 function annotateConsumedUsagesToScopedVariables(variables, consumedVariables) {
   for (const consumedVariable of consumedVariables) {
-    const scopedCandidates = variables.filter(v => v.name === consumedVariable.name && v.scope);
+    const candidateNames = getConsumedVariableCandidateNames(consumedVariable);
 
-    if (scopedCandidates.length !== 1) {
-      continue;
+    for (const candidateName of candidateNames) {
+      annotateConsumedUsagesToScopedVariableByName(variables, candidateName, consumedVariable.usedBy || []);
     }
+  }
+}
+
+function annotateConsumedUsagesToScopedVariableByName(variables, variableName, usages) {
+  const scopedCandidates = variables.filter(v => v.name === variableName && v.scope);
+
+  if (scopedCandidates.length !== 1) {
+    return;
+  }
+
+  const scopedVariable = scopedCandidates[0];
 
-    const scopedVariable = scopedCandidates[0];
+  if (!scopedVariable.usedBy) {
+    scopedVariable.usedBy = [];
+  }
 
-    if (!scopedVariable.usedBy) {
-      scopedVariable.usedBy = [];
+  for (const usage of usages) {
+    if (!usage || !usage.id) {
+      continue;
     }
 
-    for (const usage of consumedVariable.usedBy || []) {
-      if (!usage || !usage.id) {
-        continue;
-      }
+    if (!hasUsage(scopedVariable.usedBy, usage)) {
+      scopedVariable.usedBy.push(usage);
+    }
+  }
+}
 
-      if (!hasUsage(scopedVariable.usedBy, usage)) {
-        scopedVariable.usedBy.push(usage);
-      }
+function getConsumedVariableCandidateNames(consumedVariable) {
+  const names = [ consumedVariable.name ];
+
+  if (!consumedVariable.entries || !consumedVariable.entries.length) {
+    return names;
+  }
+
+  return [
+    ...names,
+    ...getNestedConsumedVariableNames(consumedVariable.name, consumedVariable.entries)
+  ];
+}
+
+function getNestedConsumedVariableNames(prefix, entries) {
+  const names = [];
+
+  for (const entry of entries || []) {
+    const name = `${prefix}.${entry.name}`;
+    names.push(name);
+
+    if (entry.entries && entry.entries.length) {
+      names.push(...getNestedConsumedVariableNames(name, entry.entries));
     }
   }
+
+  return names;
 }
 
 function findNearestScopedVariable(variables, variableName, origin) {