fix: accept empty script expression without error

Related to camunda/camunda-modeler#4759
bpmn-io · Dec 16, 2024 · db7845e · db7845e
1 parent e6f589f
commit db7845e
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to [@bpmn-io/variable-resolver](https://github.com/bpmn-io/v
 
 ___Note:__ Yet to be released changes appear here._
 
+## 1.3.2
+
+* `FIX`: accept empty script expression without error ([#42](https://github.com/bpmn-io/variable-resolver/pull/42))
+
 ## 1.3.1
 
 * `FIX`: parse script task result as FEEL context ([#41](https://github.com/bpmn-io/variable-resolver/pull/41))

diff --git a/lib/zeebe/util/feelUtility.js b/lib/zeebe/util/feelUtility.js
@@ -213,12 +213,12 @@ function getIoExpression(variable, origin) {
  *
  * @param {ProcessVariable} variable
  * @param {djs.model.Base} origin
- * @returns { expression: String}
+ * @returns {string}
  */
 function getScriptExpression(variable, origin) {
   const script = getExtensionElementsList(origin, 'zeebe:Script')[0];
 
-  if (!script) {
+  if (!script || !script.expression) {
     return;
   }
 

diff --git a/test/fixtures/zeebe/mappings/script-task-empty-expression.bpmn b/test/fixtures/zeebe/mappings/script-task-empty-expression.bpmn
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0qieuld" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.28.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.6.0">
+  <bpmn:process id="Process_1" isExecutable="true">
+    <bpmn:scriptTask id="ScriptTask" name="Script Task">
+      <bpmn:extensionElements>
+        <zeebe:script resultVariable="scriptResult" />
+      </bpmn:extensionElements>
+    </bpmn:scriptTask>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+      <bpmndi:BPMNShape id="Activity_1g8b868_di" bpmnElement="ScriptTask">
+        <dc:Bounds x="160" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/test/fixtures/zeebe/mappings/script-task.bpmn b/test/fixtures/zeebe/mappings/script-task.bpmn
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0qieuld" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.28.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.6.0">
   <bpmn:process id="Process_1" isExecutable="true">
-    <bpmn:scriptTask id="Activity_0kxqawv" name="Script Task">
+    <bpmn:scriptTask id="ScriptTask" name="Script Task">
       <bpmn:extensionElements>
         <zeebe:script expression="={&#10;  foo: 123&#10;}" resultVariable="scriptResult" />
       </bpmn:extensionElements>
     </bpmn:scriptTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
-      <bpmndi:BPMNShape id="Activity_1g8b868_di" bpmnElement="Activity_0kxqawv">
+      <bpmndi:BPMNShape id="Activity_1g8b868_di" bpmnElement="ScriptTask">
         <dc:Bounds x="160" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>

diff --git a/test/spec/zeebe/Mappings.spec.js b/test/spec/zeebe/Mappings.spec.js
@@ -13,6 +13,7 @@ import primitivesXML from 'test/fixtures/zeebe/mappings/primitives.bpmn';
 import mergingXML from 'test/fixtures/zeebe/mappings/merging.bpmn';
 import scopeXML from 'test/fixtures/zeebe/mappings/scope.bpmn';
 import scriptTaskXML from 'test/fixtures/zeebe/mappings/script-task.bpmn';
+import scriptTaskEmptyExpressionXML from 'test/fixtures/zeebe/mappings/script-task-empty-expression.bpmn';
 
 import VariableProvider from 'lib/VariableProvider';
 
@@ -320,30 +321,55 @@ describe('ZeebeVariableResolver - Variable Mappings', function() {
 
   describe('Script Task', function() {
 
-    beforeEach(bootstrap(scriptTaskXML));
+    describe('valid', function() {
 
+      beforeEach(bootstrap(scriptTaskXML));
 
-    it('should add type annotation for script tasks', inject(async function(variableResolver, elementRegistry) {
 
-      // given
-      const root = elementRegistry.get('Process_1');
+      it('should add type annotation for script tasks', inject(async function(variableResolver, elementRegistry) {
 
-      // when
-      const variables = await variableResolver.getVariablesForElement(root.businessObject);
+        // given
+        const element = elementRegistry.get('ScriptTask');
 
-      // then
-      expect(variables).to.variableEqual([
-        {
-          name: 'scriptResult',
-          type: 'Context',
-          info: '',
-          entries: [
-            { name: 'foo', type: 'Number', info: '123', entries: [] },
-          ]
-        }
-      ]);
-    }));
+        // when
+        const variables = await variableResolver.getVariablesForElement(element.businessObject);
+
+        // then
+        expect(variables).to.variableEqual([
+          {
+            name: 'scriptResult',
+            type: 'Context',
+            info: '',
+            entries: [
+              { name: 'foo', type: 'Number', info: '123', entries: [] },
+            ]
+          }
+        ]);
+      }));
+    });
+
+
+    describe('empty expression', function() {
 
+      beforeEach(bootstrap(scriptTaskEmptyExpressionXML));
+
+
+      it('should NOT error for empty expression', inject(async function(variableResolver, elementRegistry) {
+
+        // given
+        const element = elementRegistry.get('ScriptTask');
+
+        // when
+        const variables = await variableResolver.getVariablesForElement(element.businessObject);
+
+        // then
+        expect(variables).to.variableEqual([
+          {
+            name: 'scriptResult'
+          }
+        ]);
+      }));
+    });
   });
 
 });