Use Checks From diagram-js

lib/features/auto-place/BpmnAutoPlaceUtil.js

@@ -13,6 +13,8 @@ import {
   getConnectedDistance
 } from 'diagram-js/lib/features/auto-place/AutoPlaceUtil';
 
+import { isConnection } from 'diagram-js/lib/util/ModelUtil';
+
 /**
  * @typedef {import('../../model/Types').Shape} Shape
  *
@@ -169,8 +171,4 @@ export function getDataElementPosition(source, element) {
   };
 
   return findFreePosition(source, element, position, generateGetNextPosition(nextPositionDirection));
-}
-
-function isConnection(element) {
-  return !!element.waypoints;
 }

lib/features/copy-paste/BpmnCopyPaste.js

@@ -190,4 +190,4 @@ BpmnCopyPaste.$inject = [
   'bpmnFactory',
   'eventBus',
   'moddleCopy'
-];
+];

lib/features/modeling/behavior/CreateParticipantBehavior.js

@@ -15,6 +15,8 @@ import {
 
 import { asTRBL } from 'diagram-js/lib/layout/LayoutUtil';
 
+import { isConnection } from 'diagram-js/lib/util/ModelUtil';
+
 /**
  * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
@@ -229,10 +231,6 @@ function getParticipantCreateConstraints(shape, childrenBBox) {
   };
 }
 
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
 function findParticipant(elements) {
   return find(elements, function(element) {
     return is(element, 'bpmn:Participant');

lib/features/modeling/cmd/SetColorHandler.js

@@ -14,6 +14,8 @@ import {
   isLabel
 } from '../../../util/LabelUtil';
 
+import { isConnection } from 'diagram-js/lib/util/ModelUtil';
+
 /**
  * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
  *
@@ -144,10 +146,6 @@ function colorToHex(color) {
   return /^#[0-9a-fA-F]{6}$/.test(context.fillStyle) ? context.fillStyle : null;
 }
 
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
 /**
  * Add legacy properties if required.
  *

lib/features/rules/BpmnRules.js

@@ -36,6 +36,8 @@ import {
   getBoundaryAttachment as isBoundaryAttachment
 } from '../snapping/BpmnSnappingUtil';
 
+import { isConnection } from 'diagram-js/lib/util/ModelUtil';
+
 /**
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
  *
@@ -486,15 +488,6 @@ function isEventBasedTarget(element) {
   );
 }
 
-/**
- * @param {Element} element
- *
- * @return {boolean}
- */
-function isConnection(element) {
-  return element.waypoints;
-}
-
 /**
  * @param {Element} element
  *

lib/util/LabelUtil.js

@@ -4,6 +4,10 @@ import {
 
 import { is } from './ModelUtil';
 
+import { isLabel } from 'diagram-js/lib/util/ModelUtil';
+
+export { isLabel } from 'diagram-js/lib/util/ModelUtil';
+
 /**
  * @typedef {import('diagram-js/lib/util/Types').Point} Point
  * @typedef {import('diagram-js/lib/util/Types').Rect} Rect
@@ -170,15 +174,6 @@ export function getExternalLabelBounds(di, element) {
   }, size);
 }
 
-/**
- * @param {Element} element
- *
- * @return {boolean}
- */
-export function isLabel(element) {
-  return element && !!element.labelTarget;
-}
-
 /**
  * @param {ModdleElement} semantic
  *

test/spec/features/copy-paste/BpmnCopyPasteSpec.js

@@ -28,6 +28,8 @@ import {
   is
 } from 'lib/util/ModelUtil';
 
+import { isRoot } from 'diagram-js/lib/util/ModelUtil';
+
 /**
  * @typedef {import('../../../../lib/model/Types').Element} Element
  */
@@ -1015,7 +1017,7 @@ function integrationTest(elementIds) {
       });
 
       // (4) move all elements except root
-      modeling.moveElements(elementRegistry.filter(isRoot), { x: 50, y: -50 });
+      modeling.moveElements(elementRegistry.filter(element => !isRoot(element)), { x: 50, y: -50 });
 
       // when
       // (5) undo moving, pasting and removing
@@ -1057,10 +1059,6 @@ function integrationTest(elementIds) {
   };
 }
 
-function isRoot(element) {
-  return !!element.parent;
-}
-
 function getPropertyForElements(elements, property) {
   return map(elements, function(element) {
     return element[ property ];

test/spec/features/rules/BpmnRulesSpec.js

@@ -71,14 +71,14 @@ describe('features/modeling/rules - BpmnRules', function() {
       // given
       var task1 = elementFactory.createShape({ type: 'bpmn:Task' }),
           task2 = elementFactory.createShape({ type: 'bpmn:Task' }),
-          sequenceFlow = elementFactory.createConnection({
+          messageFlow = elementFactory.createConnection({
             type: 'bpmn:MessageFlow',
             source: task1,
             target: task2
           });
 
       // then
-      expectCanCreate([ task1, task2, sequenceFlow ], 'Process', false);
+      expectCanCreate([ task1, task2, messageFlow ], 'Process', false);
     }));
 
 
@@ -2157,7 +2157,7 @@ describe('features/modeling/rules - BpmnRules', function() {
     it('should ignore label elements', inject(function(elementFactory, rules) {
 
       // given
-      var label = elementFactory.createShape({ type: 'bpmn:FlowNode', labelTarget: {} });
+      var label = elementFactory.createLabel({});
 
       // when
       var result = rules.allowed('connection.start', { source: label });

test/spec/features/rules/Helper.js

@@ -8,6 +8,10 @@ import {
   map
 } from 'min-dash';
 
+/**
+ * @typedef {import('../../../../lib/model/Types').Parent} Parent
+ * @typedef {import('../../../../lib/model/Types').Shape} Shape
+ */
 
 export function expectCanConnect(source, target, rules) {
 
@@ -49,6 +53,11 @@ export function expectCanDrop(element, target, expectedResult) {
 }
 
 
+/**
+ * @param {Shape|Element[]} shape Shape or array of elements to create.
+ * @param {Parent} target
+ * @param {any} expectedResult
+ */
 export function expectCanCreate(shape, target, expectedResult) {
 
   var result = getBpmnJS().invoke(function(rules) {