Add modeler Config to Rule Configs

lib/Linter.js

@@ -20,6 +20,8 @@ import { toSemverMinor } from './utils/version';
 
 import { getDocumentationUrl } from './utils/documentation';
 
+const NoopResolver = new StaticResolver({});
+
 /**
  * @param {Object} [options]
  * @param {string} [options.modeler='desktop']
@@ -113,7 +115,7 @@ export class Linter {
       {
         extends: `plugin:bpmnlint-plugin-camunda-compat/${ configName }`
       },
-      ...this._plugins.map(({ config }) => config)
+      ...this._plugins.map(({ config = {} }) => config)
     ];
 
     return configs.reduce(
@@ -150,14 +152,18 @@ export class Linter {
       };
     }
 
+    config.rules = addConfig(config.rules, {
+      modeler: this._modeler
+    });
+
     const ConfigResolver = new StaticResolver({
       [ `config:bpmnlint-plugin-camunda-compat/${ configName }` ]: config
     });
 
     return new Resolver([
       ConfigResolver,
       RulesResolver,
-      ...this._plugins.map(({ resolver }) => resolver)
+      ...this._plugins.map(({ resolver = NoopResolver }) => resolver)
     ]);
   }
 }
@@ -171,4 +177,24 @@ function getConfigName(executionPlatform, executionPlatformVersion) {
 
 function toLowerCase(string) {
   return string.toLowerCase();
+}
+
+function addConfig(rules, configToAdd) {
+  let rulesWithConfig = {};
+
+  for (let name in rules) {
+    let type, config;
+
+    if (Array.isArray(rules[ name ])) {
+      type = rules[ name ][0];
+      config = rules[ name ][1] || {};
+    } else {
+      type = rules[ name ];
+      config = {};
+    }
+
+    rulesWithConfig[ name ] = [ type, { ...config, ...configToAdd } ];
+  }
+
+  return rulesWithConfig;
 }

test/spec/Linter.spec.js

@@ -1,4 +1,4 @@
-import { expect } from 'chai';
+import sinon from 'sinon';
 
 import StaticResolver from 'bpmnlint/lib/resolver/static-resolver';
 
@@ -54,6 +54,39 @@ describe('Linter', function() {
       expect(linter._modeler).to.equal('web');
     });
 
+
+    it('should add modeler configuration to rule configurations', async function() {
+
+      // given
+      const spy = sinon.spy(() => {
+        return {
+          check: () => {}
+        };
+      });
+
+      const linter = new Linter({
+        modeler: 'web',
+        plugins: [
+          {
+            resolver: new StaticResolver({
+              'rule:bpmnlint-plugin-camunda-compat/element-type': spy
+            })
+          }
+        ]
+      });
+
+      const { root } = await createModdle(simpleXML);
+
+      // when
+      await linter.lint(root);
+
+      // then
+      expect(spy).to.have.been.calledWithMatch({
+        modeler: 'web',
+        version: '8.0'
+      });
+    });
+
   });
 
 

test/spec/utils/documentation.spec.js

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { getDocumentationUrl } from '../../../lib/utils/documentation';
 
 describe('utils/documentation', function() {

test/spec/utils/error-messages.spec.js

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import {
   getErrorMessage,
   getExecutionPlatformLabel

test/spec/utils/lint-helper.js

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import Linter from 'bpmnlint/lib/linter';
 
 async function lintNode(node, rule, config = {},) {

test/spec/utils/properties-panel.spec.js

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { Linter } from '../../..';
 
 import {

test/spec/utils/types.spec.js

@@ -1,5 +1,3 @@
-import { expect } from 'chai';
-
 import { getTypeString } from '../../../lib/utils/types';
 
 import { createElement } from '../../helper';