@camunda/linting 0.5.0 → 0.6.0

package/README.md

@@ -1,8 +1,10 @@
 # @camunda/linting
 
+[![CI](https://github.com/camunda/linting/actions/workflows/CI.yml/badge.svg)](https://github.com/camunda/linting/actions/workflows/CI.yml)
+
 The BPMN linter used by the Camunda Desktop and Web Modeler. Batteries included. 🔋
 
-# Features
+## Features
 
 * bundles [bpmnlint](https://github.com/bpmn-io/bpmnlint) and [bpmnlint-plugin-camunda-compat](https://github.com/camunda/bpmnlint-plugin-camunda-compat/)
 * configures linter based on `modeler:executionPlatform` and `modeler:executionPlatformVersion`
@@ -10,7 +12,7 @@ The BPMN linter used by the Camunda Desktop and Web Modeler. Batteries included.
 * creates errors to be shown in properties panel
 * creates error overlays to be shown on canvas 
 
-# Usage
+## Usage
 
 ```javascript
 import Modeler from 'bpmn-js/lib/Modeler';
@@ -47,7 +49,7 @@ modeler.get('linting').setErrors(reports);
 modeler.get('linting').showError(report);
 ```
 
-# Development
+## Development
 
 ```sh
 # install
@@ -63,6 +65,6 @@ npm run test:watch
 npm start
 ```
 
-# License
+## License
 
-MIT
+MIT

package/lib/utils/error-messages.js

@@ -59,6 +59,7 @@ function getIndefiniteArticle(type) {
     'Error',
     'Escalation',
     'Event',
+    'Inclusive',
     'Intermediate',
     'Undefined'
   ].includes(type.split(' ')[ 0 ])) {
@@ -200,9 +201,9 @@ function getPropertyNotAllowedErrorMessage(report, executionPlatformLabel, model
     property
   } = error;
 
-  if (property === 'modelerTemplate') {
-    const typeString = getTypeString(parentNode || node);
+  const typeString = getTypeString(parentNode || node);
 
+  if (property === 'modelerTemplate') {
     if (modeler === 'desktop') {
       return `${ getIndefiniteArticle(typeString) } <Template ${ typeString }> is not supported by ${ executionPlatformLabel }`;
     } else if (modeler === 'web') {
@@ -210,6 +211,10 @@ function getPropertyNotAllowedErrorMessage(report, executionPlatformLabel, model
     }
   }
 
+  if (is(node, 'bpmn:InclusiveGateway') && property === 'incoming') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> with more than one incoming <Sequence Flow> is not supported by ${ executionPlatformLabel }`;
+  }
+
   return message;
 }
 
@@ -284,6 +289,10 @@ function getPropertyRequiredErrorMessage(report, executionPlatformLabel) {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Form type: Camunda forms> must have a defined <Form JSON configuration>`;
   }
 
+  if (is(node, 'bpmn:SequenceFlow') && requiredProperty === 'conditionExpression') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Condition expression> or be the default <Sequence Flow>`;
+  }
+
   return message;
 }
 

package/lib/utils/properties-panel.js

@@ -130,6 +130,10 @@ export function getEntryIds(report) {
     });
   }
 
+  if (isPropertyRequiredError(error, 'conditionExpression', 'bpmn:SequenceFlow')) {
+    return [ 'conditionExpression' ];
+  }
+
   return [];
 }
 
@@ -201,6 +205,10 @@ export function getErrorMessage(id) {
   if (/^.+-extensionProperty-[0-9]+-name$/.test(id)) {
     return 'Not supported.';
   }
+
+  if (id === 'conditionExpression') {
+    return 'Condition expression must be defined.';
+  }
 }
 
 function isExtensionElementNotAllowedError(error, extensionElement, type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camunda/linting",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Linting for Camunda Platform",
   "main": "index.js",
   "scripts": {
@@ -26,15 +26,16 @@
   "dependencies": {
     "bpmn-moddle": "^7.1.2",
     "bpmnlint": "^7.8.0",
-    "bpmnlint-plugin-camunda-compat": "^0.11.0",
+    "bpmnlint-plugin-camunda-compat": "^0.12.0",
     "bpmnlint-utils": "^1.0.2",
     "min-dash": "^3.8.1",
     "min-dom": "^3.2.1",
-    "modeler-moddle": "^0.2.0",
-    "zeebe-bpmn-moddle": "^0.14.0"
+    "zeebe-bpmn-moddle": "^0.15.0"
   },
   "devDependencies": {
+    "@bpmn-io/properties-panel": "^0.20.2",
     "bpmn-js": "^9.4.0",
+    "bpmn-js-properties-panel": "^1.6.1",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",
     "eslint": "^4.11.0",
@@ -48,6 +49,7 @@
     "karma-webpack": "^5.0.0",
     "mocha": "^4.0.1",
     "mocha-test-container-support": "^0.2.0",
+    "modeler-moddle": "^0.2.0",
     "puppeteer": "^16.2.0",
     "sinon": "^14.0.0",
     "sinon-chai": "^3.7.0",