bpmnlint-plugin-camunda-compat 0.15.1 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmnlint-plugin-camunda-compat",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "A bpmnlint plug-in for Camunda Platform compatibility",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "zeebe-bpmn-moddle": "^0.14.0"
   },
   "dependencies": {
-    "@bpmn-io/feel-lint": "^0.1.0",
+    "@bpmn-io/feel-lint": "^0.1.1",
     "@bpmn-io/moddle-utils": "^0.1.0",
     "bpmnlint-utils": "^1.0.2",
     "min-dash": "^3.8.1",

package/rules/called-decision-or-task-definition/config.js

@@ -4,7 +4,9 @@ module.exports = {
   },
   taskDefinition: {
     'bpmn:BusinessRuleTask': '1.1',
-    'bpmn:IntermediateThrowEvent': '1.2',
+    'bpmn:IntermediateThrowEvent': {
+      'bpmn:MessageEventDefinition': '1.2',
+    },
     'bpmn:ScriptTask': '1.1',
     'bpmn:SendTask': '1.1',
     'bpmn:ServiceTask': '1.0'

package/rules/called-decision-or-task-definition/index.js

@@ -2,6 +2,8 @@ const { is } = require('bpmnlint-utils');
 
 const { getPath } = require('@bpmn-io/moddle-utils');
 
+const { isString } = require('min-dash');
+
 const config = require('./config');
 
 const { greaterOrEqual } = require('../utils/version');
@@ -19,9 +21,12 @@ const { ERROR_TYPES } = require('../utils/error-types');
 
 module.exports = function({ version }) {
   function check(node, reporter) {
+    const calledDecisionConfig = config.calledDecision[ node.$type ];
+    const taskDefinitionConfig = config.taskDefinition[ node.$type ];
+
     if (
-      (!config.calledDecision[ node.$type ] || !greaterOrEqual(version, config.calledDecision[ node.$type ]))
-      && (!config.taskDefinition[ node.$type ] || !greaterOrEqual(version, config.taskDefinition[ node.$type ]))) {
+      (!calledDecisionConfig || (isString(calledDecisionConfig) && !greaterOrEqual(version, calledDecisionConfig)))
+      && (!taskDefinitionConfig || (isString(taskDefinitionConfig) && !greaterOrEqual(version, taskDefinitionConfig)))) {
       return;
     }
 
@@ -37,7 +42,7 @@ module.exports = function({ version }) {
     if (calledDecision && !taskDefinition) {
 
       if (!isCalledDecisionAllowed(node, version)) {
-        const allowedVersion = config.calledDecision[ node.$type ] || null;
+        const allowedVersion = getAllowedVersion(calledDecisionConfig, node);
 
         reportErrors(node, reporter, {
           message: allowedVersion
@@ -75,7 +80,7 @@ module.exports = function({ version }) {
     if (!calledDecision && taskDefinition) {
 
       if (!isTaskDefinitionAllowed(node, version)) {
-        const allowedVersion = config.taskDefinition[ node.$type ] || null;
+        const allowedVersion = getAllowedVersion(taskDefinitionConfig, node);
 
         reportErrors(node, reporter, {
           message: allowedVersion
@@ -112,7 +117,7 @@ module.exports = function({ version }) {
       ], node);
     } else if (isCalledDecisionAllowed(node, version)) {
       errors = hasExtensionElement(node, 'zeebe:CalledDecision', node);
-    } else {
+    } else if (isTaskDefinitionAllowed(node, version)) {
       errors = hasExtensionElement(node, 'zeebe:TaskDefinition', node);
     }
 
@@ -137,5 +142,21 @@ function isCalledDecisionAllowed(node, version) {
 function isTaskDefinitionAllowed(node, version) {
   const { taskDefinition } = config;
 
-  return taskDefinition[ node.$type ] && greaterOrEqual(version, taskDefinition[ node.$type ]);
+  const allowedVersion = getAllowedVersion(taskDefinition[ node.$type ], node);
+
+  return allowedVersion && greaterOrEqual(version, allowedVersion);
+}
+
+function getAllowedVersion(config, node) {
+  if (!config) {
+    return null;
+  }
+
+  if (isString(config)) {
+    return config;
+  }
+
+  const eventDefinition = getEventDefinition(node);
+
+  return eventDefinition && config[ eventDefinition.$type ];
 }

package/rules/element-type/config.js

@@ -24,11 +24,13 @@ module.exports = {
   'bpmn:InclusiveGateway': '8.1',
   'bpmn:IntermediateCatchEvent': {
     'bpmn:MessageEventDefinition': '1.0',
-    'bpmn:TimerEventDefinition': '1.0'
+    'bpmn:TimerEventDefinition': '1.0',
+    'bpmn:LinkEventDefinition': '8.2'
   },
   'bpmn:IntermediateThrowEvent': {
     '_': '1.1',
-    'bpmn:MessageEventDefinition': '1.2'
+    'bpmn:MessageEventDefinition': '1.2',
+    'bpmn:LinkEventDefinition': '8.2'
   },
   'bpmn:ManualTask': '1.1',
   'bpmn:MessageFlow': '1.0',

package/rules/utils/iso8601.js

@@ -9,7 +9,7 @@ const ZONE_ID = '(\\[[^\\]]+\\])';
 const TIMEZONE = `(Z|([+-](0[0-9]|1[0-3]):[0-5][0-9]${ZONE_ID}?))`;
 
 const ISO_DATE_REGEX = new RegExp(`^${DATE}T${HOUR}:${MINUTE}:${SECOND}${TIMEZONE}$`);
-const ISO_DURATION = 'P(?!$)(\\d+(\\.\\d+)?[Yy])?(\\d+(\\.\\d+)?[Mm])?(\\d+(\\.\\d+)?[Dd])?(T(?!$)(\\d+(\\.\\d+)?[Hh])?(\\d+(\\.\\d+)?[Mm])?(\\d+(\\.\\d+)?[Ss])?)?$';
+const ISO_DURATION = 'P(?!$)(\\d+(\\.\\d+)?[Yy])?(\\d+(\\.\\d+)?[Mm])?(\\d+(\\.\\d+)?[Ww])?(\\d+(\\.\\d+)?[Dd])?(T(?!$)(\\d+(\\.\\d+)?[Hh])?(\\d+(\\.\\d+)?[Mm])?(\\d+(\\.\\d+)?[Ss])?)?$';
 const ISO_DURATION_REGEX = new RegExp(`^${ISO_DURATION}$`);
 const ISO_CYCLE = `R(-1|\\d+)?/${ISO_DURATION}`;
 const ISO_CYCLE_REGEX = new RegExp(`^${ISO_CYCLE}$`);