@camunda/linting 0.11.0 → 0.13.0

package/lib/utils/error-messages.js

@@ -1,6 +1,6 @@
 import { ERROR_TYPES } from 'bpmnlint-plugin-camunda-compat/rules/utils/element';
 
-import { is } from 'bpmnlint-utils';
+import { is, isAny } from 'bpmnlint-utils';
 
 import {
   every,
@@ -216,6 +216,10 @@ function getExtensionElementNotAllowedErrorMessage(report, executionPlatform, ex
     return getSupportedMessage(`${ getIndefiniteArticle(typeString) } <${ typeString }> with <Extension properties>`, executionPlatform, executionPlatformVersion, allowedVersion);
   }
 
+  if (is(node, 'bpmn:ScriptTask') && is(extensionElement, 'zeebe:Script')) {
+    return getSupportedMessage('A <Script Task> with <Implementation: FEEL expression>', executionPlatform, executionPlatformVersion, allowedVersion);
+  }
+
   return message;
 }
 
@@ -253,6 +257,10 @@ function getExtensionElementRequiredErrorMessage(report) {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Implementation>`;
   }
 
+  if (isArray(requiredExtensionElement) && requiredExtensionElement.includes('zeebe:Script')) {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Implementation>`;
+  }
+
   return message;
 }
 
@@ -335,8 +343,16 @@ function getPropertyRequiredErrorMessage(report) {
     return 'A <Business Rule Task> with <Implementation: DMN decision> must have a defined <Result variable>';
   }
 
-  if (parentNode && is(parentNode, 'bpmn:BusinessRuleTask') && is(node, 'zeebe:TaskDefinition') && requiredProperty === 'type') {
-    return 'A <Business Rule Task> with <Implementation: Job worker> must have a defined <Task definition type>';
+  if (parentNode && is(parentNode, 'bpmn:ScriptTask') && is(node, 'zeebe:Script') && requiredProperty === 'expression') {
+    return 'A <Script Task> with <Implementation: FEEL expression> must have a defined <FEEL expression>';
+  }
+
+  if (parentNode && is(parentNode, 'bpmn:ScriptTask') && is(node, 'zeebe:Script') && requiredProperty === 'resultVariable') {
+    return 'A <Script Task> with <Implementation: FEEL expression> must have a defined <Result variable>';
+  }
+
+  if (parentNode && isAny(parentNode, [ 'bpmn:BusinessRuleTask', 'bpmn:ScriptTask' ]) && is(node, 'zeebe:TaskDefinition') && requiredProperty === 'type') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Implementation: Job worker> must have a defined <Task definition type>`;
   }
 
   if (is(node, 'zeebe:CalledElement') && requiredProperty === 'processId') {

package/lib/utils/properties-panel.js

@@ -59,6 +59,11 @@ export function getEntryIds(report) {
     return [ 'businessRuleImplementation' ];
   }
 
+  // script task
+  if (isExtensionElementRequiredError(data, 'zeebe:Script', 'bpmn:ScriptTask')) {
+    return [ 'scriptImplementation' ];
+  }
+
   if (isPropertyError(data, 'errorRef')) {
     return [ 'errorRef' ];
   }
@@ -71,10 +76,14 @@ export function getEntryIds(report) {
     return [ 'decisionId' ];
   }
 
-  if (isPropertyError(data, 'resultVariable', 'zeebe:CalledDecision')) {
+  if (isPropertyError(data, 'resultVariable')) {
     return [ 'resultVariable' ];
   }
 
+  if (isPropertyError(data, 'expression', 'zeebe:Script')) {
+    return [ 'scriptExpression' ];
+  }
+
   if (isPropertyError(data, 'errorCode', 'bpmn:Error')) {
     return [ 'errorCode' ];
   }
@@ -207,6 +216,10 @@ export function getErrorMessage(id, report) {
     return;
   }
 
+  if (data.type === ERROR_TYPES.EXPRESSION_NOT_ALLOWED) {
+    return 'Cannot be an expression.';
+  }
+
   if (id === 'isExecutable') {
     const { parentNode } = data;
 
@@ -217,7 +230,7 @@ export function getErrorMessage(id, report) {
     }
   }
 
-  if (id === 'businessRuleImplementation') {
+  if ([ 'businessRuleImplementation', 'scriptImplementation' ].includes(id)) {
     return 'Implementation must be defined.';
   }
 
@@ -233,11 +246,15 @@ export function getErrorMessage(id, report) {
     return 'Decision ID must be defined.';
   }
 
+  if (id === 'scriptExpression') {
+    return 'FEEL expression must be defined.';
+  }
+
   if (id === 'resultVariable') {
     return 'Result variable must be defined.';
   }
 
-  if (id === 'errorCode') {
+  if (id === 'errorCode' && data.type === ERROR_TYPES.PROPERTY_REQUIRED) {
     return 'Code must be defined.';
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camunda/linting",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "Linting for Camunda Platform",
   "main": "index.js",
   "scripts": {
@@ -27,16 +27,15 @@
   "dependencies": {
     "bpmn-moddle": "^7.1.3",
     "bpmnlint": "^8.0.0",
-    "bpmnlint-plugin-camunda-compat": "^0.16.0",
+    "bpmnlint-plugin-camunda-compat": "^0.18.0",
     "bpmnlint-utils": "^1.0.2",
     "min-dash": "^4.0.0",
     "min-dom": "^4.0.1",
-    "zeebe-bpmn-moddle": "^0.15.0"
+    "zeebe-bpmn-moddle": "^0.17.0"
   },
   "devDependencies": {
-    "@bpmn-io/properties-panel": "^0.23.0",
-    "bpmn-js": "^9.4.0",
-    "bpmn-js-properties-panel": "^1.10.0",
+    "bpmn-js": "^11.1.1",
+    "bpmn-js-properties-panel": "^1.15.0",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",
     "eslint": "^8.23.1",