@camunda/linting 0.15.1 → 0.17.0

package/lib/utils/error-messages.js

@@ -96,7 +96,7 @@ export function getErrorMessage(report, executionPlatform, executionPlatformVers
   }
 
   if (type === ERROR_TYPES.PROPERTY_REQUIRED) {
-    return getPropertyRequiredErrorMessage(report);
+    return getPropertyRequiredErrorMessage(report, executionPlatform, executionPlatformVersion);
   }
 
   if (type === ERROR_TYPES.PROPERTY_VALUE_DUPLICATED) {
@@ -224,6 +224,10 @@ function getExtensionElementNotAllowedErrorMessage(report, executionPlatform, ex
     return getSupportedMessage('A <Script Task> with <Implementation: FEEL expression>', executionPlatform, executionPlatformVersion, allowedVersion);
   }
 
+  if (is(node, 'bpmn:UserTask') && is(extensionElement, 'zeebe:TaskSchedule')) {
+    return getSupportedMessage('A <User Task> with <Due date> or <Follow up date>', executionPlatform, executionPlatformVersion, allowedVersion);
+  }
+
   return message;
 }
 
@@ -329,13 +333,14 @@ function getPropertyNotAllowedErrorMessage(report, executionPlatform, executionP
 }
 
 
-function getPropertyRequiredErrorMessage(report) {
+function getPropertyRequiredErrorMessage(report, executionPlatform, executionPlatformVersion) {
   const {
     data,
     message
   } = report;
 
   const {
+    allowedVersion,
     node,
     parentNode,
     requiredProperty
@@ -368,7 +373,13 @@ function getPropertyRequiredErrorMessage(report) {
   }
 
   if (is(node, 'bpmn:Error') && requiredProperty === 'errorCode') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Error Reference> must have a defined <Error code>`;
+
+    if (parentNode && is(parentNode, 'bpmn:CatchEvent')) {
+      return getSupportedMessage(`${ getIndefiniteArticle(typeString) } <${ typeString }> without defined <Error code>`, executionPlatform, executionPlatformVersion, allowedVersion);
+    } else if (parentNode && is(parentNode, 'bpmn:ThrowEvent')) {
+      return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Error Reference> must have a defined <Error code>`;
+    }
+
   }
 
   if (is(node, 'bpmn:Escalation') && requiredProperty === 'escalationCode') {
@@ -392,7 +403,13 @@ function getPropertyRequiredErrorMessage(report) {
   }
 
   if (requiredProperty === 'errorRef') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Error Reference>`;
+
+    if (parentNode && is(parentNode, 'bpmn:CatchEvent')) {
+      return getSupportedMessage(`${ getIndefiniteArticle(typeString) } <${ typeString }> without defined <Error Reference>`, executionPlatform, executionPlatformVersion, allowedVersion);
+    } else if (parentNode && is(parentNode, 'bpmn:ThrowEvent')) {
+      return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Error Reference>`;
+    }
+
   }
 
   if (requiredProperty === 'messageRef') {
@@ -422,12 +439,17 @@ function getPropertyRequiredErrorMessage(report) {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Timer duration>`;
   }
 
+  if (is(node, 'bpmn:Process') && requiredProperty === 'historyTimeToLive') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <History time to live>`;
+  }
+
   return message;
 }
 
 function getExpressionRequiredErrorMessage(report) {
   const {
-    data
+    data,
+    message
   } = report;
 
   const {
@@ -441,11 +463,14 @@ function getExpressionRequiredErrorMessage(report) {
   if (is(node, 'bpmn:FormalExpression') && TIMER_PROPERTIES.includes(property)) {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Timer value>`;
   }
+
+  return message;
 }
 
 function getExpressionValueNotAllowedErrorMessage(report) {
   const {
-    data
+    data,
+    message
   } = report;
 
   const {
@@ -457,16 +482,26 @@ function getExpressionValueNotAllowedErrorMessage(report) {
   const typeString = getTypeString(parentNode || node);
 
   if (is(node, 'bpmn:FormalExpression') && property === 'timeCycle') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> should be an expression, an ISO 8601 repeating interval, or a cron expression (cron requires Camunda Platform 8.1 or newer)`;
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression (cron requires Camunda Platform 8.1 or newer)`;
   }
 
   if (is(node, 'bpmn:FormalExpression') && property === 'timeDate') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time date> should be an expression, or an ISO 8601 date`;
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time date> must be an expression, or an ISO 8601 date`;
   }
 
   if (is(node, 'bpmn:FormalExpression') && property === 'timeDuration') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time duration> should be an expression, or an ISO 8601 interval`;
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time duration> must be an expression, or an ISO 8601 interval`;
   }
+
+  if (is(node, 'zeebe:TaskSchedule') && property === 'dueDate') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Due date> must be an ISO 8601 date`;
+  }
+
+  if (is(node, 'zeebe:TaskSchedule') && property === 'followUpDate') {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Follow up date> must be an ISO 8601 date`;
+  }
+
+  return message;
 }
 
 function getSupportedMessage(prefix, executionPlatform, executionPlatformVersion, allowedVersion) {
@@ -495,4 +530,4 @@ function getExpressionNotAllowedErrorMessage(report) {
   }
 
   return report.message;
-}
+}

package/lib/utils/properties-panel.js

@@ -217,6 +217,34 @@ export function getEntryIds(report) {
     return [ 'assignmentDefinitionCandidateUsers' ];
   }
 
+  if (isPropertyError(data, 'historyTimeToLive', 'bpmn:Process')) {
+    return [ 'historyTimeToLive' ];
+  }
+
+  if (isExpressionValueNotAllowedError(data, 'dueDate', 'zeebe:TaskSchedule')) {
+    return [ 'taskScheduleDueDate' ];
+  }
+
+  if (isExpressionValueNotAllowedError(data, 'followUpDate', 'zeebe:TaskSchedule')) {
+    return [ 'taskScheduleFollowUpDate' ];
+  }
+
+  if (isExtensionElementNotAllowedError(data, 'zeebe:TaskSchedule', 'bpmn:UserTask')) {
+    const { extensionElement: taskSchedule } = data;
+
+    let ids = [];
+
+    if (taskSchedule.get('dueDate')) {
+      ids = [ ...ids, 'taskScheduleDueDate' ];
+    }
+
+    if (taskSchedule.get('followUpDate')) {
+      ids = [ ...ids, 'taskScheduleFollowUpDate' ];
+    }
+
+    return ids;
+  }
+
   return [];
 }
 
@@ -354,6 +382,26 @@ export function getErrorMessage(id, report) {
   if (id === 'assignmentDefinitionCandidateUsers') {
     return 'Not supported.';
   }
+
+  if (id === 'historyTimeToLive') {
+    return 'Time to live must be defined.';
+  }
+
+  if (id === 'taskScheduleDueDate') {
+    if (data.type === ERROR_TYPES.EXTENSION_ELEMENT_NOT_ALLOWED) {
+      return 'Not supported.';
+    } else {
+      return 'Must be an ISO 8601 date.';
+    }
+  }
+
+  if (id === 'taskScheduleFollowUpDate') {
+    if (data.type === ERROR_TYPES.EXTENSION_ELEMENT_NOT_ALLOWED) {
+      return 'Not supported.';
+    } else {
+      return 'Must be an ISO 8601 date.';
+    }
+  }
 }
 
 function isExtensionElementNotAllowedError(data, extensionElement, type) {

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@camunda/linting",
-  "version": "0.15.1",
+  "version": "0.17.0",
   "description": "Linting for Camunda Platform",
   "main": "index.js",
   "scripts": {
     "all": "npm run lint && npm test",
     "dev": "npm run test:watch",
     "lint": "eslint .",
-    "start": "cross-env SINGLE_START=modeler npm run test:watch",
+    "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": "karma start",
     "test:watch": "npm test -- --auto-watch --no-single-run"
   },
@@ -27,15 +29,16 @@
   "dependencies": {
     "bpmn-moddle": "^8.0.0",
     "bpmnlint": "^8.0.0",
-    "bpmnlint-plugin-camunda-compat": "^0.21.0",
+    "bpmnlint-plugin-camunda-compat": "^0.24.0",
     "bpmnlint-utils": "^1.0.2",
     "min-dash": "^4.0.0",
     "min-dom": "^4.1.0",
-    "zeebe-bpmn-moddle": "^0.17.0"
+    "zeebe-bpmn-moddle": "^0.18.0"
   },
   "devDependencies": {
     "bpmn-js": "^11.1.1",
     "bpmn-js-properties-panel": "^1.15.1",
+    "camunda-bpmn-js-behaviors": "^0.5.0",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
     "eslint": "^8.32.0",