fix: same resultVariable and output names filter only output names

bpmn-io · Jan 7, 2025 · 7d79e35 · 7d79e35
1 parent 35b67c7
commit 7d79e35
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/zeebe/VariableResolver.js b/lib/zeebe/VariableResolver.js
@@ -40,8 +40,7 @@ export default class ZeebeVariableResolver extends BaseVariableResolver {
     }
 
     const namesToFilter = getElementNamesToRemove(moddleElement, inputOutput);
-
-    return variables.filter(v => {
+    const filteredVariables = variables.filter(v=> {
 
       // Keep all variables that are also defined in other elements
       if (v.origin.length > 1 || v.origin[0] !== bo) {
@@ -59,6 +58,12 @@ export default class ZeebeVariableResolver extends BaseVariableResolver {
       // Filter all pre-defined variables
       return !namesToFilter.includes(v.name);
     });
+
+    // keep only unique names
+    const uniqueVariables = new Map();
+    filteredVariables.forEach(v => uniqueVariables.set(v.name, v));
+
+    return Array.from(uniqueVariables.values());
   }
 
   /**

diff --git a/lib/zeebe/util/feelUtility.js b/lib/zeebe/util/feelUtility.js
@@ -159,7 +159,12 @@ export function getResultContext(expression, variables = {}) {
  * @returns {{ expression: String, unresolved: Array<String> }}}
  */
 function getExpressionDetails(variable, origin) {
-  const expression = getScriptExpression(variable, origin) || getIoExpression(variable, origin);
+
+  // if variable scope is parent scope, first check IoExpression and then ScriptExpression
+  // if variable is local scope (origin), first check ScriptExpression and then IoExpression
+  const expression = variable.scope !== origin
+    ? getIoExpression(variable, origin) || getScriptExpression(variable, origin)
+    : getScriptExpression(variable, origin) || getIoExpression(variable, origin);
 
   if (!expression) {
     return;