bpmnlint-plugin-camunda-compat 0.1.1 → 0.2.0

package/CHANGELOG.md

@@ -1,15 +1,20 @@
 # Changelog
 
-All notable changes to [bpmnlint-plugin-example](https://github.com/camunda/bpmnlint-plugin-camunda-compat) are documented here. We use [semantic versioning](http://semver.org/) for releases.
+All notable changes to [bpmnlint-plugin-camunda-compat](https://github.com/camunda/bpmnlint-plugin-camunda-compat) are documented here. We use [semantic versioning](http://semver.org/) for releases.
 
 ## Unreleased
 
 ___Note:__ Yet to be released changes appear here._
 
-## 0.0.1
+## 0.2.0
+
+* `FEAT`: early return if execution platform does not match
+* `FIX`: correct check for `bpmn:BaseElement`
+
+## 0.1.1
 
 * `FEAT`: initial support for Camunda Cloud 1.0, 1.1, 1.2, and 1.3
 
 ## ...
 
-Check `git log` for earlier history.
+Check `git log` for earlier history.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmnlint-plugin-camunda-compat",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "A bpmnlint plug-in for Camunda Cloud and Platform compatibility",
   "main": "index.js",
   "scripts": {

package/rules/camunda-cloud-1-0.js

@@ -2,4 +2,4 @@ const { createRule } = require('./utils/rule');
 
 const checks = require('./camunda-cloud-1-0-checks');
 
-module.exports = createRule('1.0', checks);
+module.exports = createRule('Camunda Cloud', '1.0', checks);

package/rules/camunda-cloud-1-1.js

@@ -2,4 +2,4 @@ const { createRule } = require('./utils/rule');
 
 const checks = require('./camunda-cloud-1-1-checks');
 
-module.exports = createRule('1.1', checks);
+module.exports = createRule('Camunda Cloud', '1.1', checks);

package/rules/camunda-cloud-1-2.js

@@ -2,4 +2,4 @@ const { createRule } = require('./utils/rule');
 
 const checks = require('./camunda-cloud-1-2-checks');
 
-module.exports = createRule('1.2', checks);
+module.exports = createRule('Camunda Cloud', '1.2', checks);

package/rules/camunda-cloud-1-3.js

@@ -2,4 +2,4 @@ const { createRule } = require('./utils/rule');
 
 const checks = require('./camunda-cloud-1-3-checks');
 
-module.exports = createRule('1.3', checks);
+module.exports = createRule('Camunda Cloud', '1.3', checks);

package/rules/utils/rule.js

@@ -11,79 +11,38 @@ const {
 
 const { toSemverMinor } = require('./engine-profile');
 
-module.exports.createRule = function(version, checks) {
+module.exports.createRule = function(ruleExecutionPlatform, ruleExecutionPlatformVersion, checks) {
   return () => {
     return {
       check: (node, reporter) => {
-
-        // do not lint properties (yet)
-        if (!isAny(node, [ 'bpmn:FlowElement', 'bpmn:FlowElementsContainer' ])) {
-          return;
-        }
-
-        const engineProfile = getEngineProfile(node);
-
-        if (!engineProfile) {
-          return;
-        }
-
-        const {
-          executionPlatform,
-          executionPlatformVersion
-        } = engineProfile;
-
-        if (!executionPlatformVersion || toSemverMinor(executionPlatformVersion) !== version) {
+        if (is(node, 'bpmn:Definitions')) {
+          executionPlatform = node.get('modeler:executionPlatform');
+          executionPlatformVersion = node.get('modeler:executionPlatformVersion');
+
+          if (!executionPlatform
+            || executionPlatform !== ruleExecutionPlatform
+            || !executionPlatformVersion
+            || toSemverMinor(executionPlatformVersion) !== ruleExecutionPlatformVersion) {
+            return false;
+          }
+        } else if (!isAny(node, [ 'bpmn:FlowElement', 'bpmn:FlowElementsContainer' ])) {
           return;
         }
 
         const result = checkNode(node, checks);
 
         if (result === false) {
-          reporter.report(node.get('id') || '', `Element of type <${ node.$type }> not supported by ${ executionPlatform } ${ toSemverMinor(executionPlatformVersion) }`);
+          reporter.report(node.get('id') || '', `Element of type <${ node.$type }> not supported by ${ ruleExecutionPlatform } ${ toSemverMinor(ruleExecutionPlatformVersion) }`);
         }
 
         if (isString(result)) {
-          reporter.report(node.get('id') || '', `Element of type <${ result }> not supported by ${ executionPlatform } ${ toSemverMinor(executionPlatformVersion) }`);
+          reporter.report(node.get('id') || '', `Element of type <${ result }> not supported by ${ ruleExecutionPlatform } ${ toSemverMinor(ruleExecutionPlatformVersion) }`);
         }
       }
     };
   };
 }
 
-function getDefinitions(node) {
-  if (is(node, 'bpmn:Definitions')) {
-    return node;
-  }
-
-  const parent = node.$parent;
-
-  if (!parent) {
-    return null;
-  }
-
-  return getDefinitions(parent);
-}
-
-function getEngineProfile(node) {
-  const definitions = getDefinitions(node);
-
-  if (!definitions) {
-    return null;
-  }
-
-  const executionPlatform = definitions.get('modeler:executionPlatform'),
-        executionPlatformVersion = definitions.get('modeler:executionPlatformVersion');
-
-  if (!executionPlatform) {
-    return null;
-  }
-
-  return {
-    executionPlatform,
-    executionPlatformVersion
-  };
-}
-
 /**
  * @param {ModdleElement} node
  * @param {Array<Function>} checks
@@ -226,11 +185,5 @@ module.exports.hasLoopCharacteristicsOfType = function(type) {
 }
 
 module.exports.isNotBpmn = function(node) {
-  const { $descriptor: descriptor } = node;
-
-  const { $pkg: package } = descriptor;
-
-  const { uri } = package;
-
-  return uri !== 'http://www.omg.org/spec/BPMN/20100524/MODEL';
+  return !is(node, 'bpmn:BaseElement');
 }