@camunda/linting 3.11.0 → 3.13.0

package/lib/Linter.js

@@ -1,200 +1,200 @@
-import BpmnModdle from 'bpmn-moddle';
-
-import { Linter as BpmnLinter } from 'bpmnlint';
-import StaticResolver from 'bpmnlint/lib/resolver/static-resolver';
-
-import Resolver from './Resolver';
-
-import { isString } from 'min-dash';
-
-import { resolver as RulesResolver } from './compiled-config';
-
-import modelerModdle from 'modeler-moddle/resources/modeler.json';
-import zeebeModdle from 'zeebe-bpmn-moddle/resources/zeebe.json';
-import camundaModdle from 'camunda-bpmn-moddle/resources/camunda.json';
-
-import { getErrorMessage } from './utils/error-messages';
-import { getEntryIds } from './utils/properties-panel';
-
-import { toSemverMinor } from './utils/version';
-
-import { getDocumentationUrl } from './utils/documentation';
-
-const NoopResolver = new StaticResolver({});
-
-/**
- * @param {Object} [options]
- * @param {string} [options.modeler='desktop']
- * @param {Array<Object>} [options.plugins=[]]
- * @param {string} [options.type='cloud']
- */
-export class Linter {
-  constructor(options = {}) {
-    const {
-      modeler = 'desktop',
-      plugins = [],
-      type = 'cloud'
-    } = options;
-
-    this._moddle = new BpmnModdle({
-      modeler: modelerModdle,
-
-      // Zeebe and Camunda moddle extensions can't be used together
-      // cf. https://github.com/camunda/camunda-modeler/issues/3853#issuecomment-1731145100
-      ...(type === 'cloud' ?
-        { zeebe: zeebeModdle } :
-        { camunda: camundaModdle })
-    });
-
-    this._modeler = modeler;
-    this._plugins = plugins;
-  }
-
-  async lint(contents) {
-    let rootElement;
-
-    if (isString(contents)) {
-      ({ rootElement } = await this._moddle.fromXML(contents));
-    } else {
-      rootElement = contents;
-    }
-
-    const executionPlatform = rootElement.get('modeler:executionPlatform'),
-          executionPlatformVersion = rootElement.get('modeler:executionPlatformVersion');
-
-    if (!executionPlatform || !executionPlatformVersion) {
-      return [];
-    }
-
-    const configName = getConfigName(executionPlatform, executionPlatformVersion);
-
-    const config = this._createConfig(configName);
-
-    const resolver = await this._createResolver(configName);
-
-    const linter = new BpmnLinter({
-      config,
-      resolver
-    });
-
-    const reportsByRule = await linter.lint(rootElement);
-
-    return Object.entries(reportsByRule).reduce((allReports, entry) => {
-      const [ rule, reports ] = entry;
-
-      return [
-        ...allReports,
-        ...reports.map(report => {
-          const entryIds = getEntryIds(report);
-
-          return {
-            ...report,
-            executionPlatform,
-            executionPlatformVersion,
-            message: getErrorMessage(
-              report,
-              executionPlatform,
-              executionPlatformVersion,
-              this._modeler
-            ),
-            propertiesPanel: {
-              entryIds
-            },
-            documentation: {
-              url: getDocumentationUrl(rule)
-            },
-            rule
-          };
-        })
-      ];
-    }, []);
-  }
-
-  _createConfig(configName) {
-    const configs = [
-      {
-        extends: `plugin:bpmnlint-plugin-camunda-compat/${ configName }`
-      },
-      ...this._plugins.map(({ config = {} }) => config)
-    ];
-
-    return configs.reduce(
-      (config, _config) => {
-        let { extends: _extends = [], rules = {} } = _config;
-
-        if (isString(_extends)) {
-          _extends = [ _extends ];
-        }
-
-        return {
-          extends: [ ...config.extends, ..._extends ],
-          rules: {
-            ...config.rules,
-            ...rules
-          }
-        };
-      },
-      {
-        extends: [],
-        rules: {}
-      }
-    );
-  }
-
-  async _createResolver(configName) {
-    const { configs } = await import('bpmnlint-plugin-camunda-compat');
-
-    let { [ configName ]: config } = configs;
-
-    if (!config) {
-      config = {
-        rules: {}
-      };
-    }
-
-    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 = NoopResolver }) => resolver)
-    ]);
-  }
-}
-
-function getConfigName(executionPlatform, executionPlatformVersion) {
-  return [
-    ...executionPlatform.split(' ').map(toLowerCase),
-    ...toSemverMinor(executionPlatformVersion).split('.')
-  ].join('-');
-}
-
-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;
+import BpmnModdle from 'bpmn-moddle';
+
+import { Linter as BpmnLinter } from 'bpmnlint';
+import StaticResolver from 'bpmnlint/lib/resolver/static-resolver';
+
+import Resolver from './Resolver';
+
+import { isString } from 'min-dash';
+
+import { resolver as RulesResolver } from './compiled-config';
+
+import modelerModdle from 'modeler-moddle/resources/modeler.json';
+import zeebeModdle from 'zeebe-bpmn-moddle/resources/zeebe.json';
+import camundaModdle from 'camunda-bpmn-moddle/resources/camunda.json';
+
+import { getErrorMessage } from './utils/error-messages';
+import { getEntryIds } from './utils/properties-panel';
+
+import { toSemverMinor } from './utils/version';
+
+import { getDocumentationUrl } from './utils/documentation';
+
+const NoopResolver = new StaticResolver({});
+
+/**
+ * @param {Object} [options]
+ * @param {string} [options.modeler='desktop']
+ * @param {Array<Object>} [options.plugins=[]]
+ * @param {string} [options.type='cloud']
+ */
+export class Linter {
+  constructor(options = {}) {
+    const {
+      modeler = 'desktop',
+      plugins = [],
+      type = 'cloud'
+    } = options;
+
+    this._moddle = new BpmnModdle({
+      modeler: modelerModdle,
+
+      // Zeebe and Camunda moddle extensions can't be used together
+      // cf. https://github.com/camunda/camunda-modeler/issues/3853#issuecomment-1731145100
+      ...(type === 'cloud' ?
+        { zeebe: zeebeModdle } :
+        { camunda: camundaModdle })
+    });
+
+    this._modeler = modeler;
+    this._plugins = plugins;
+  }
+
+  async lint(contents) {
+    let rootElement;
+
+    if (isString(contents)) {
+      ({ rootElement } = await this._moddle.fromXML(contents));
+    } else {
+      rootElement = contents;
+    }
+
+    const executionPlatform = rootElement.get('modeler:executionPlatform'),
+          executionPlatformVersion = rootElement.get('modeler:executionPlatformVersion');
+
+    if (!executionPlatform || !executionPlatformVersion) {
+      return [];
+    }
+
+    const configName = getConfigName(executionPlatform, executionPlatformVersion);
+
+    const config = this._createConfig(configName);
+
+    const resolver = await this._createResolver(configName);
+
+    const linter = new BpmnLinter({
+      config,
+      resolver
+    });
+
+    const reportsByRule = await linter.lint(rootElement);
+
+    return Object.entries(reportsByRule).reduce((allReports, entry) => {
+      const [ rule, reports ] = entry;
+
+      return [
+        ...allReports,
+        ...reports.map(report => {
+          const entryIds = getEntryIds(report);
+
+          return {
+            ...report,
+            executionPlatform,
+            executionPlatformVersion,
+            message: getErrorMessage(
+              report,
+              executionPlatform,
+              executionPlatformVersion,
+              this._modeler
+            ),
+            propertiesPanel: {
+              entryIds
+            },
+            documentation: {
+              url: getDocumentationUrl(rule)
+            },
+            rule
+          };
+        })
+      ];
+    }, []);
+  }
+
+  _createConfig(configName) {
+    const configs = [
+      {
+        extends: `plugin:bpmnlint-plugin-camunda-compat/${ configName }`
+      },
+      ...this._plugins.map(({ config = {} }) => config)
+    ];
+
+    return configs.reduce(
+      (config, _config) => {
+        let { extends: _extends = [], rules = {} } = _config;
+
+        if (isString(_extends)) {
+          _extends = [ _extends ];
+        }
+
+        return {
+          extends: [ ...config.extends, ..._extends ],
+          rules: {
+            ...config.rules,
+            ...rules
+          }
+        };
+      },
+      {
+        extends: [],
+        rules: {}
+      }
+    );
+  }
+
+  async _createResolver(configName) {
+    const { configs } = await import('bpmnlint-plugin-camunda-compat');
+
+    let { [ configName ]: config } = configs;
+
+    if (!config) {
+      config = {
+        rules: {}
+      };
+    }
+
+    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 = NoopResolver }) => resolver)
+    ]);
+  }
+}
+
+function getConfigName(executionPlatform, executionPlatformVersion) {
+  return [
+    ...executionPlatform.split(' ').map(toLowerCase),
+    ...toSemverMinor(executionPlatformVersion).split('.')
+  ].join('-');
+}
+
+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/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;
@@ -327,6 +327,10 @@ function getExtensionElementRequiredErrorMessage(report) {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Implementation>`;
   }
 
+  if (requiredExtensionElement === 'zeebe:FormDefinition') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Form>`;
+  }
+
   return message;
 }
 

package/package.json

@@ -1,84 +1,84 @@
-{
-  "name": "@camunda/linting",
-  "version": "3.11.0",
-  "description": "Linting for Camunda",
-  "main": "index.js",
-  "scripts": {
-    "all": "npm run lint && npm test",
-    "dev": "npm run test:watch",
-    "lint": "eslint .",
-    "start": "npm run start:cloud",
-    "start:platform": "cross-env SINGLE_START=platform npm run test:watch",
-    "start:cloud": "cross-env SINGLE_START=cloud npm run test:watch",
-    "test": "npm run compile-config && karma start",
-    "test:watch": "npm test -- --auto-watch --no-single-run",
-    "compile-config": "node tasks/compile-config.js",
-    "prepublish": "npm run compile-config"
-  },
-  "keywords": [
-    "bpmnlint",
-    "camunda"
-  ],
-  "author": {
-    "name": "Philipp Fromme",
-    "url": "https://github.com/philippfromme"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/camunda/linting"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@bpmn-io/diagram-js-ui": "^0.2.2",
-    "bpmn-moddle": "^8.0.0",
-    "bpmnlint": "^9.2.0",
-    "bpmnlint-plugin-camunda-compat": "^2.12.0",
-    "bpmnlint-utils": "^1.0.2",
-    "camunda-bpmn-moddle": "^7.0.1",
-    "clsx": "^2.0.0",
-    "min-dash": "^4.0.0",
-    "min-dom": "^4.1.0",
-    "modeler-moddle": "^0.2.0",
-    "semver-compare": "^1.0.0",
-    "zeebe-bpmn-moddle": "^1.0.0"
-  },
-  "devDependencies": {
-    "bpmn-js": "^13.2.2",
-    "bpmn-js-element-templates": "^1.3.0",
-    "bpmn-js-properties-panel": "^5.6.1",
-    "camunda-bpmn-js-behaviors": "^1.2.2",
-    "chai": "^4.3.7",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.45.0",
-    "eslint-plugin-bpmn-io": "^1.0.0",
-    "karma": "^6.4.2",
-    "karma-chrome-launcher": "^3.2.0",
-    "karma-debug-launcher": "0.0.5",
-    "karma-env-preprocessor": "^0.1.1",
-    "karma-mocha": "^2.0.1",
-    "karma-sinon-chai": "^2.0.2",
-    "karma-webpack": "^5.0.0",
-    "mocha": "^10.2.0",
-    "mocha-test-container-support": "^0.2.0",
-    "puppeteer": "^20.9.0",
-    "sinon": "^15.0.1",
-    "sinon-chai": "^3.7.0",
-    "webpack": "^5.75.0"
-  },
-  "peerDependencies": {
-    "bpmn-js-properties-panel": ">= 2.0.0"
-  },
-  "peerDependenciesMeta": {
-    "bpmn-js-properties-panel": {
-      "optional": true
-    }
-  },
-  "files": [
-    "assets",
-    "lib",
-    "modeler.js"
-  ],
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@camunda/linting",
+  "version": "3.13.0",
+  "description": "Linting for Camunda",
+  "main": "index.js",
+  "scripts": {
+    "all": "npm run lint && npm test",
+    "dev": "npm run test:watch",
+    "lint": "eslint .",
+    "start": "npm run start:cloud",
+    "start:platform": "cross-env SINGLE_START=platform npm run test:watch",
+    "start:cloud": "cross-env SINGLE_START=cloud npm run test:watch",
+    "test": "npm run compile-config && karma start",
+    "test:watch": "npm test -- --auto-watch --no-single-run",
+    "compile-config": "node tasks/compile-config.js",
+    "prepublish": "npm run compile-config"
+  },
+  "keywords": [
+    "bpmnlint",
+    "camunda"
+  ],
+  "author": {
+    "name": "Philipp Fromme",
+    "url": "https://github.com/philippfromme"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/camunda/linting"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "@bpmn-io/diagram-js-ui": "^0.2.2",
+    "bpmn-moddle": "^8.0.0",
+    "bpmnlint": "^9.2.0",
+    "bpmnlint-plugin-camunda-compat": "^2.14.0",
+    "bpmnlint-utils": "^1.0.2",
+    "camunda-bpmn-moddle": "^7.0.1",
+    "clsx": "^2.0.0",
+    "min-dash": "^4.0.0",
+    "min-dom": "^4.1.0",
+    "modeler-moddle": "^0.2.0",
+    "semver-compare": "^1.0.0",
+    "zeebe-bpmn-moddle": "^1.0.0"
+  },
+  "devDependencies": {
+    "bpmn-js": "^13.2.2",
+    "bpmn-js-element-templates": "^1.3.0",
+    "bpmn-js-properties-panel": "^5.6.1",
+    "camunda-bpmn-js-behaviors": "^1.2.2",
+    "chai": "^4.3.7",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.45.0",
+    "eslint-plugin-bpmn-io": "^1.0.0",
+    "karma": "^6.4.2",
+    "karma-chrome-launcher": "^3.2.0",
+    "karma-debug-launcher": "0.0.5",
+    "karma-env-preprocessor": "^0.1.1",
+    "karma-mocha": "^2.0.1",
+    "karma-sinon-chai": "^2.0.2",
+    "karma-webpack": "^5.0.0",
+    "mocha": "^10.2.0",
+    "mocha-test-container-support": "^0.2.0",
+    "puppeteer": "^20.9.0",
+    "sinon": "^15.0.1",
+    "sinon-chai": "^3.7.0",
+    "webpack": "^5.75.0"
+  },
+  "peerDependencies": {
+    "bpmn-js-properties-panel": ">= 2.0.0"
+  },
+  "peerDependenciesMeta": {
+    "bpmn-js-properties-panel": {
+      "optional": true
+    }
+  },
+  "files": [
+    "assets",
+    "lib",
+    "modeler.js"
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
+}