squash: sep out logic for io and script

lib/zeebe/VariableResolver.js

@@ -1,6 +1,6 @@
 import { getProcessVariables } from '@bpmn-io/extract-process-variables/zeebe';
 import { BaseVariableResolver } from '../base/VariableResolver';
-import { parseVariables, getScriptExpression, getIoExpression } from './util/feelUtility';
+import { parseVariables, isScriptResultVariable, isOutputVariable } from './util/feelUtility';
 import {
   getBusinessObject,
   is
@@ -29,14 +29,14 @@ export default class ZeebeVariableResolver extends BaseVariableResolver {
     // filter based on resultVariable if output exists.
 
     const outputExists = variables.some(variable =>
-      getIoExpression(variable, variable.origin[0]) && variable.scope === bo
+      isOutputVariable(variable, variable.origin[0]) && variable.scope === bo
     );
 
     if (outputExists && !moddleElement) {
 
       // remove script variable if exists from variables.
       const filteredVariables = variables.filter(
-        variable => !getScriptExpression(variable, variable.origin[0])
+        variable => !isScriptResultVariable(variable, variable.origin[0])
       );
 
       return filteredVariables;

lib/zeebe/util/feelUtility.js

@@ -207,6 +207,31 @@ export function getIoExpression(variable, origin) {
 
 }
 
+export function isOutputVariable(variable, origin) {
+  const ioMapping = getExtensionElementsList(origin, 'zeebe:IoMapping')[0];
+
+  if (!ioMapping) {
+    return;
+  }
+
+  let mappings;
+  if (origin != variable.scope) {
+    mappings = ioMapping.outputParameters;
+  }
+
+  if (!mappings) {
+    return;
+  }
+
+  const mapping = mappings.find(mapping => mapping.target === variable.name);
+  if (mapping) {
+    return true;
+  }
+
+  return;
+}
+
+
 /**
  * Given a Variable and a specific origin, return the mapping expression for script
  * task result variable. Returns undefined if no mapping exists for the given origin.
@@ -218,7 +243,7 @@ export function getIoExpression(variable, origin) {
 export function getScriptExpression(variable, origin) {
   const script = getExtensionElementsList(origin, 'zeebe:Script')[0];
 
-  if (!script) {
+  if (!script || !script.expression) {
     return;
   }
 
@@ -227,6 +252,16 @@ export function getScriptExpression(variable, origin) {
   }
 }
 
+export function isScriptResultVariable(variable, origin) {
+  const script = getExtensionElementsList(origin, 'zeebe:Script')[0];
+
+  if (script && script.resultVariable === variable.name) {
+    return true;
+  }
+
+  return;
+}
+
 /**
  * Traverses the parseTree and returns all `VariableName` nodes with no value
  *