Simplify ShapeUtil.isCatchEvent method (only return boolean)

process-analytics · Oct 13, 2023 · 5c42362 · 5c42362
1 parent 7256178
commit 5c42362
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/component/parser/json/converter/ProcessConverter.ts b/src/component/parser/json/converter/ProcessConverter.ts
@@ -288,7 +288,7 @@ export default class ProcessConverter {
 
   private buildShapeBpmnCatchEvent(
     bpmnElement: TCatchEvent,
-    elementKind: ShapeBpmnElementKind.EVENT_BOUNDARY | ShapeBpmnElementKind.EVENT_START | ShapeBpmnElementKind.EVENT_INTERMEDIATE_CATCH,
+    elementKind: BpmnEventKind,
     eventDefinitionKind: ShapeBpmnEventDefinitionKind,
     parentId: string,
   ): ShapeBpmnIntermediateCatchEvent | ShapeBpmnStartEvent | ShapeBpmnBoundaryEvent {
@@ -303,7 +303,7 @@ export default class ProcessConverter {
 
   private buildShapeBpmnThrowEvent(
     bpmnElement: TThrowEvent,
-    elementKind: ShapeBpmnElementKind.EVENT_END | ShapeBpmnElementKind.EVENT_INTERMEDIATE_THROW,
+    elementKind: BpmnEventKind,
     eventDefinitionKind: ShapeBpmnEventDefinitionKind,
     parentId: string,
   ): ShapeBpmnIntermediateThrowEvent | ShapeBpmnEvent {

diff --git a/src/model/bpmn/internal/shape/utils.ts b/src/model/bpmn/internal/shape/utils.ts
@@ -45,7 +45,7 @@ export class ShapeUtil {
     return ShapeBpmnElementKind.EVENT_START === kind;
   }
 
-  static isCatchEvent(kind: ShapeBpmnElementKind): kind is ShapeBpmnElementKind.EVENT_INTERMEDIATE_CATCH | ShapeBpmnElementKind.EVENT_BOUNDARY | ShapeBpmnElementKind.EVENT_START {
+  static isCatchEvent(kind: ShapeBpmnElementKind): boolean {
     return ShapeBpmnElementKind.EVENT_INTERMEDIATE_CATCH === kind || ShapeBpmnElementKind.EVENT_BOUNDARY === kind || ShapeBpmnElementKind.EVENT_START === kind;
   }