@camunda/linting 3.10.0 → 3.12.0

package/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,6 +152,10 @@ export class Linter {
       };
     }
 
+    config.rules = addConfig(config.rules, {
+      modeler: this._modeler
+    });
+
     const ConfigResolver = new StaticResolver({
       [ `config:bpmnlint-plugin-camunda-compat/${ configName }` ]: config
     });
@@ -157,7 +163,7 @@ export class Linter {
     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;
 }

package/lib/compiled-config.js

@@ -57,7 +57,7 @@ const rules = {
   "camunda-compat/secrets": "error",
   "camunda-compat/sequence-flow-condition": "error",
   "camunda-compat/signal-reference": "error",
-  "camunda-compat/start-form": "error",
+  "camunda-compat/start-event-form": "error",
   "camunda-compat/subscription": "error",
   "camunda-compat/task-schedule": "error",
   "camunda-compat/timer": "error",
@@ -189,9 +189,9 @@ import rule_27 from 'bpmnlint-plugin-camunda-compat/rules/camunda-cloud/signal-r
 
 cache['bpmnlint-plugin-camunda-compat/signal-reference'] = rule_27;
 
-import rule_28 from 'bpmnlint-plugin-camunda-compat/rules/camunda-cloud/start-form';
+import rule_28 from 'bpmnlint-plugin-camunda-compat/rules/camunda-cloud/start-event-form';
 
-cache['bpmnlint-plugin-camunda-compat/start-form'] = rule_28;
+cache['bpmnlint-plugin-camunda-compat/start-event-form'] = rule_28;
 
 import rule_29 from 'bpmnlint-plugin-camunda-compat/rules/camunda-cloud/subscription';
 

package/lib/utils/error-messages.js

@@ -86,7 +86,7 @@ export function getErrorMessage(report, executionPlatform, executionPlatformVers
   }
 
   if (type === ERROR_TYPES.ELEMENT_COLLAPSED_NOT_ALLOWED) {
-    return getElementCollapsedNotAllowedErrorMessage(report);
+    return getElementCollapsedNotAllowedErrorMessage(report, executionPlatform, executionPlatformVersion);
   }
 
   if (type === ERROR_TYPES.ELEMENT_PROPERTY_VALUE_DUPLICATED) {
@@ -176,18 +176,18 @@ function getChildElementTypeNotAllowedErrorMessage(report, executionPlatform, ex
   );
 }
 
-function getElementCollapsedNotAllowedErrorMessage(report) {
+function getElementCollapsedNotAllowedErrorMessage(report, executionPlatform, executionPlatformVersion) {
   const {
     data,
     message
   } = report;
 
-  const { node } = data;
+  const { allowedVersion, node } = data;
 
   const typeString = getTypeString(node);
 
   if (is(node, 'bpmn:SubProcess')) {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must be expanded`;
+    return getSupportedMessage(`A collapsed <${typeString}>`, executionPlatform, executionPlatformVersion, allowedVersion);
   }
 
   return message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camunda/linting",
-  "version": "3.10.0",
+  "version": "3.12.0",
   "description": "Linting for Camunda",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@bpmn-io/diagram-js-ui": "^0.2.2",
     "bpmn-moddle": "^8.0.0",
     "bpmnlint": "^9.2.0",
-    "bpmnlint-plugin-camunda-compat": "^2.11.1",
+    "bpmnlint-plugin-camunda-compat": "^2.13.0",
     "bpmnlint-utils": "^1.0.2",
     "camunda-bpmn-moddle": "^7.0.1",
     "clsx": "^2.0.0",