bpmnlint-plugin-camunda-compat 2.40.0 → 2.41.0

package/package.json

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

package/rules/camunda-cloud/implementation/config.js

@@ -3,6 +3,7 @@ module.exports = {
     'bpmn:BusinessRuleTask': '1.3'
   },
   taskDefinition: {
+    'bpmn:AdHocSubProcess': '8.8',
     'bpmn:BusinessRuleTask': '1.1',
     'bpmn:IntermediateThrowEvent': {
       'bpmn:MessageEventDefinition': '1.2'

package/rules/camunda-cloud/implementation/index.js

@@ -27,13 +27,6 @@ module.exports = skipInNonExecutableProcess(function({ version }) {
     const scriptConfig = config.script[ node.$type ];
     const taskDefinitionConfig = config.taskDefinition[ node.$type ];
 
-    if (
-      (!calledDecisionConfig || (isString(calledDecisionConfig) && !greaterOrEqual(version, calledDecisionConfig)))
-      && (!scriptConfig || (isString(scriptConfig) && !greaterOrEqual(version, scriptConfig)))
-      && (!taskDefinitionConfig || (isString(taskDefinitionConfig) && !greaterOrEqual(version, taskDefinitionConfig)))) {
-      return;
-    }
-
     if (is(node, 'bpmn:ThrowEvent') && !getEventDefinition(node)) {
       return;
     }
@@ -150,6 +143,8 @@ module.exports = skipInNonExecutableProcess(function({ version }) {
 
       if (errors && errors.length) {
         reportErrors(node, reporter, errors);
+
+        return;
       }
     }
 
@@ -161,9 +156,9 @@ module.exports = skipInNonExecutableProcess(function({ version }) {
 
     if (allowedTypes.length === 0) {
       return;
-    } else if (allowedTypes.length === 1) {
+    } else if (allowedTypes.length === 1 && !canHaveExtensionlessImplementation(node)) {
       errors = hasExtensionElement(node, allowedTypes[0], node);
-    } else {
+    } else if (!canHaveExtensionlessImplementation(node)) {
       errors = hasExtensionElement(node, allowedTypes, node);
     }
 
@@ -216,3 +211,11 @@ function getAllowedVersion(config, node) {
 
   return eventDefinition && config[ eventDefinition.$type ];
 }
+
+/**
+ * Check if a BPMN element can have an extension-less implementation
+ * (e.g. ad-hoc subprocess with implementation type BPMN).
+ */
+function canHaveExtensionlessImplementation(node) {
+  return is(node, 'bpmn:AdHocSubProcess');
+}