bpmnlint-plugin-camunda-compat 2.33.1 → 2.34.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmnlint-plugin-camunda-compat",
-  "version": "2.33.1",
+  "version": "2.34.1",
   "description": "A bpmnlint plug-in for Camunda compatibility",
   "main": "index.js",
   "scripts": {

package/rules/camunda-cloud/ad-hoc-sub-process.js

@@ -1,27 +1,53 @@
-const { is, isAny } = require('bpmnlint-utils');
+const { is } = require('bpmnlint-utils');
 
+const {
+  ERROR_TYPES,
+  hasProperties
+} = require('../utils/element');
 const { reportErrors } = require('../utils/reporter');
 
 const { skipInNonExecutableProcess } = require('../utils/rule');
+const { greaterOrEqual } = require('../utils/version');
 
-module.exports = skipInNonExecutableProcess(function() {
+const COMPLETION_ALLOWED_VERSION = '8.8';
+
+module.exports = skipInNonExecutableProcess(function({ version }) {
   function check(node, reporter) {
     if (!is(node, 'bpmn:AdHocSubProcess')) {
       return;
     }
 
-    // Ad-Hoc Sub-Process must contain at least one activity
-    if (node.get('flowElements').some(isActivity)) {
-      return;
+    const errors = [];
+
+    // ad-hoc sub-process must contain at least one activity
+    if (!node.get('flowElements').some(isActivity)) {
+      errors.push({
+        message: 'Element of type <bpmn:AdHocSubProcess> must contain at least one activity',
+        data: {
+          type: ERROR_TYPES.CHILD_ELEMENT_OF_TYPE_REQUIRED,
+          node,
+          parentNode: null,
+          requiredType: 'bpmn:Activity'
+        }
+      });
     }
 
-    reportErrors(node, reporter, {
-      message: 'Element of type <bpmn:AdHocSubProcess> must contain at least one activity',
-      data: {
-        node,
-        parentNode: null
-      }
-    });
+    if (!greaterOrEqual(version, COMPLETION_ALLOWED_VERSION)) {
+      errors.push(...hasProperties(node, {
+        completionCondition: {
+          allowed: false,
+          allowedVersion: COMPLETION_ALLOWED_VERSION
+        },
+        cancelRemainingInstances: {
+          allowed: value => value !== false, // only allow true which is default value
+          allowedVersion: COMPLETION_ALLOWED_VERSION
+        }
+      }, node));
+    }
+
+    if (errors.length) {
+      reportErrors(node, reporter, errors);
+    }
   }
 
   return {
@@ -30,5 +56,5 @@ module.exports = skipInNonExecutableProcess(function() {
 });
 
 function isActivity(element) {
-  return isAny(element, [ 'bpmn:Task', 'bpmn:SubProcess' ]);
-}
+  return is(element, 'bpmn:Activity');
+}

package/rules/camunda-cloud/error-reference.js

@@ -15,7 +15,7 @@ const { skipInNonExecutableProcess } = require('../utils/rule');
 const { greaterOrEqual } = require('../utils/version');
 const { annotateRule } = require('../helper');
 
-const noErrorRefAllowedVersion = '8.2';
+const NO_ERROR_REF_ALLOWED_VERSION = '8.2';
 
 module.exports = skipInNonExecutableProcess(function({ version }) {
   function check(node, reporter) {
@@ -69,5 +69,5 @@ module.exports = skipInNonExecutableProcess(function({ version }) {
 });
 
 function isNoErrorRefAllowed(node, version) {
-  return is(node, 'bpmn:CatchEvent') && greaterOrEqual(version, noErrorRefAllowedVersion);
+  return is(node, 'bpmn:CatchEvent') && greaterOrEqual(version, NO_ERROR_REF_ALLOWED_VERSION);
 }

package/rules/camunda-cloud/escalation-boundary-event-attached-to-ref.js

@@ -5,7 +5,6 @@ const {
 
 const {
   getEventDefinition,
-  isAnyExactly
 } = require('../utils/element');
 
 const { ERROR_TYPES } = require('../utils/error-types');
@@ -28,7 +27,7 @@ module.exports = skipInNonExecutableProcess(function() {
 
     const attachedToRef = node.get('attachedToRef');
 
-    if (attachedToRef && !isAnyExactly(attachedToRef, [ 'bpmn:CallActivity', 'bpmn:SubProcess' ])) {
+    if (attachedToRef && is(attachedToRef, 'bpmn:Task')) {
       reportErrors(node, reporter, {
         message: `Element of type <bpmn:BoundaryEvent> with event definition of type <bpmn:EscalationEventDefinition> is not allowed to be attached to element of type <${ attachedToRef.$type }>`,
         path: null,

package/rules/camunda-cloud/execution-listener.js

@@ -7,7 +7,6 @@ const { reportErrors } = require('../utils/reporter');
 
 const { skipInNonExecutableProcess } = require('../utils/rule');
 
-
 module.exports = skipInNonExecutableProcess(function() {
   function check(node, reporter) {
     const executionListeners = findExtensionElement(node, 'zeebe:ExecutionListeners');

package/rules/camunda-cloud/no-version-tag.js

@@ -6,12 +6,12 @@ const { reportErrors } = require('../utils/reporter');
 
 const { skipInNonExecutableProcess } = require('../utils/rule');
 
-const allowedVersion = '8.6';
+const ALLOWED_VERSION = '8.6';
 
 module.exports = skipInNonExecutableProcess(function() {
   function check(node, reporter) {
     if (is(node, 'bpmn:Process')) {
-      const errors = hasNoExtensionElement(node, 'zeebe:VersionTag', node, allowedVersion);
+      const errors = hasNoExtensionElement(node, 'zeebe:VersionTag', node, ALLOWED_VERSION);
 
       if (errors && errors.length) {
         reportErrors(node, reporter, errors);

package/rules/camunda-cloud/start-event-form.js

@@ -16,7 +16,7 @@ const { skipInNonExecutableProcess } = require('../utils/rule');
 
 const { greaterOrEqual } = require('../utils/version');
 
-const allowedVersion = '8.3';
+const ALLOWED_VERSION = '8.3';
 
 module.exports = skipInNonExecutableProcess(function({ version }) {
   function check(node, reporter) {
@@ -25,8 +25,8 @@ module.exports = skipInNonExecutableProcess(function({ version }) {
     }
 
     // Camunda 8.2 and older
-    if (!greaterOrEqual(version, allowedVersion)) {
-      let errors = hasNoExtensionElement(node, 'zeebe:FormDefinition', node, allowedVersion);
+    if (!greaterOrEqual(version, ALLOWED_VERSION)) {
+      let errors = hasNoExtensionElement(node, 'zeebe:FormDefinition', node, ALLOWED_VERSION);
 
       if (errors.length) {
         reportErrors(node, reporter, errors);

package/rules/camunda-cloud/task-listener.js

@@ -9,7 +9,6 @@ const { reportErrors } = require('../utils/reporter');
 
 const { skipInNonExecutableProcess } = require('../utils/rule');
 
-
 module.exports = skipInNonExecutableProcess(function() {
   function check(node, reporter) {
     if (!is(node, 'bpmn:UserTask')) {

package/rules/camunda-cloud/user-task-form.js

@@ -14,7 +14,7 @@ const { skipInNonExecutableProcess } = require('../utils/rule');
 
 const { greaterOrEqual } = require('../utils/version');
 
-const formIdAllowedVersions = {
+const FORM_ID_ALLOWED_VERSIONS = {
   desktop: '8.4',
   web: '8.0'
 };
@@ -55,7 +55,7 @@ module.exports = skipInNonExecutableProcess(function({ modeler = 'desktop', vers
 
     let errors;
 
-    const formIdAllowedVersion = formIdAllowedVersions[ modeler ];
+    const formIdAllowedVersion = FORM_ID_ALLOWED_VERSIONS[ modeler ];
 
     if (isFormIdAllowed(version, formIdAllowedVersion)) {
       errors = hasProperty(formDefinition, [

package/rules/utils/error-types.js

@@ -1,4 +1,5 @@
 module.exports.ERROR_TYPES = Object.freeze({
+  CHILD_ELEMENT_OF_TYPE_REQUIRED: 'camunda.childElementOfTypeRequired',
   CHILD_ELEMENT_TYPE_NOT_ALLOWED: 'camunda.childElementTypeNotAllowed',
   CONNECTORS_PROPERTY_VALUE_NOT_ALLOWED: 'camunda.connectors.propertyValueNotAllowed',
   ELEMENT_COLLAPSED_NOT_ALLOWED: 'camunda.elementCollapsedNotAllowed',