bpmnlint-plugin-camunda-compat 2.10.0 → 2.11.1

package/index.js

@@ -64,6 +64,8 @@ const camundaCloud83Rules = withConfig({
   'signal-reference': 'error'
 }, { version: '8.3' });
 
+const camundaCloud84Rules = withConfig(camundaCloud83Rules, { version: '8.4' });
+
 const camundaPlatform719Rules = withConfig({
   'history-time-to-live': 'error'
 }, {
@@ -76,6 +78,11 @@ const camundaPlatform720Rules = withConfig(camundaPlatform719Rules, {
   version: '7.20'
 });
 
+const camundaPlatform721Rules = withConfig(camundaPlatform720Rules, {
+  platform: 'camunda-platform',
+  version: '7.21'
+});
+
 const rules = {
   'element-type': './rules/camunda-cloud/element-type',
   'called-element': './rules/camunda-cloud/called-element',
@@ -138,12 +145,18 @@ module.exports = {
     'camunda-cloud-8-3': {
       rules: camundaCloud83Rules
     },
+    'camunda-cloud-8-4': {
+      rules: camundaCloud84Rules
+    },
     'camunda-platform-7-19': {
       rules: camundaPlatform719Rules
     },
     'camunda-platform-7-20': {
       rules: camundaPlatform720Rules
     },
+    'camunda-platform-7-21': {
+      rules: camundaPlatform721Rules
+    },
     'all': {
       rules: Object.keys(rules).reduce((allRules, rule) => {
         return {

package/package.json

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

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

@@ -4,14 +4,19 @@ const {
   findExtensionElement,
   findExtensionElements,
   findParent,
-  hasProperties
+  hasProperties,
+  hasProperty
 } = require('../utils/element');
 
 const { reportErrors } = require('../utils/reporter');
 
 const { skipInNonExecutableProcess } = require('../utils/rule');
 
-module.exports = skipInNonExecutableProcess(function() {
+const { greaterOrEqual } = require('../utils/version');
+
+const formIdAllowedVersion = '8.4';
+
+module.exports = skipInNonExecutableProcess(function({ version }) {
   function check(node, reporter) {
     if (!is(node, 'bpmn:UserTask')) {
       return;
@@ -23,13 +28,39 @@ module.exports = skipInNonExecutableProcess(function() {
       return;
     }
 
-    let errors = hasProperties(formDefinition, {
-      formKey: {
-        required: true
+    let errors = [];
+
+    if (isFormIdAllowed(version)) {
+
+      // Camunda 8.3 and newer
+      errors = hasProperty(formDefinition, [
+        'formKey',
+        'formId'
+      ], node);
+    } else {
+
+      // Camunda 8.2 and older
+      errors = hasProperties(formDefinition, {
+        formId: {
+          allowed: false,
+          allowedVersion: formIdAllowedVersion
+        }
+      }, node);
+
+      if (errors.length) {
+        reportErrors(node, reporter, errors);
+
+        return;
       }
-    }, node);
 
-    if (errors && errors.length) {
+      errors = hasProperties(formDefinition, {
+        formKey: {
+          required: true
+        }
+      }, node);
+    }
+
+    if (errors.length) {
       reportErrors(node, reporter, errors);
 
       return;
@@ -49,7 +80,7 @@ module.exports = skipInNonExecutableProcess(function() {
       }
     }, node);
 
-    if (errors && errors.length) {
+    if (errors.length) {
       reportErrors(node, reporter, errors);
     }
   }
@@ -77,4 +108,8 @@ function findUserTaskForm(node, formKey) {
       return `camunda-forms:bpmn:${ id }` === formKey;
     });
   }
+}
+
+function isFormIdAllowed(version) {
+  return greaterOrEqual(version, formIdAllowedVersion);
 }

package/rules/utils/element.js

@@ -4,6 +4,8 @@ const {
   isFunction,
   isNil,
   isObject,
+  isString,
+  isUndefined,
   some
 } = require('min-dash');
 
@@ -141,7 +143,7 @@ module.exports.hasProperties = function(node, properties, parentNode = null) {
 
     const propertyValue = node.get(propertyName);
 
-    if (propertyChecks.required && !propertyValue) {
+    if (propertyChecks.required && isEmptyValue(propertyValue)) {
       return [
         ...results,
         {
@@ -164,7 +166,7 @@ module.exports.hasProperties = function(node, properties, parentNode = null) {
     if (propertyChecks.dependentRequired) {
       const dependency = node.get(propertyChecks.dependentRequired);
 
-      if (dependency && !propertyValue) {
+      if (dependency && isEmptyValue(propertyValue)) {
         return [
           ...results,
           {
@@ -303,7 +305,9 @@ function findProperties(node, propertyNames) {
   const properties = [];
 
   for (const propertyName of propertyNames) {
-    if (isDefined(node.get(propertyName))) {
+    const propertyValue = node.get(propertyName);
+
+    if (!isEmptyValue(propertyValue)) {
       properties.push(node.get(propertyName));
     }
   }
@@ -470,4 +474,12 @@ function findParent(node, type) {
   return findParent(parent, type);
 }
 
-module.exports.findParent = findParent;
+module.exports.findParent = findParent;
+
+function isEmptyString(value) {
+  return isString(value) && value.trim() === '';
+}
+
+function isEmptyValue(value) {
+  return isUndefined(value) || isNil(value) || isEmptyString(value);
+}