chore: use instanceof checks for model elements

bpmn-io · May 3, 2023 · 9a2f5fb · 9a2f5fb
1 parent 4123430
commit 9a2f5fb
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 134 deletions.
diff --git a/lib/features/bendpoints/BendpointSnapping.js b/lib/features/bendpoints/BendpointSnapping.js
@@ -8,6 +8,8 @@ import { setSnapped } from '../snapping/SnapUtil';
 
 import { getClosestPointOnConnection } from './BendpointUtil';
 
+import { isConnection } from '../../model';
+
 /**
  * @typedef {import('../../core/EventBus').default} EventBus
  */
@@ -245,10 +247,3 @@ export default function BendpointSnapping(eventBus) {
 
 
 BendpointSnapping.$inject = [ 'eventBus' ];
-
-
-// helpers //////////////////////
-
-function isConnection(element) {
-  return element && !!element.waypoints;
-}
diff --git a/lib/features/copy-paste/CopyPaste.js b/lib/features/copy-paste/CopyPaste.js
@@ -17,6 +17,11 @@ import {
 
 import { eachElement } from '../../util/Elements';
 
+import {
+  isConnection,
+  isLabel
+} from '../../model';
+
 /**
  * @typedef {import('../../core/Types').ElementLike} Element
  * @typedef {import('../../core/Types').ShapeLike} Shape
@@ -314,7 +319,7 @@ CopyPaste.prototype._createElements = function(tree) {
 
       var element;
 
-      if (isConnection(attrs)) {
+      if (isConnectionLike(attrs)) {
         attrs.source = cache[ descriptor.source ];
         attrs.target = cache[ descriptor.target ];
 
@@ -325,7 +330,7 @@ CopyPaste.prototype._createElements = function(tree) {
         return;
       }
 
-      if (isLabel(attrs)) {
+      if (isLabelLike(attrs)) {
         attrs.labelTarget = cache[ attrs.labelTarget ];
 
         element = cache[ descriptor.id ] = self.createLabel(attrs);
@@ -580,14 +585,6 @@ function isAttacher(element) {
   return !!element.host;
 }
 
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
-function isLabel(element) {
-  return !!element.labelTarget;
-}
-
 function copyWaypoints(element) {
   return map(element.waypoints, function(waypoint) {
 
@@ -614,3 +611,11 @@ function removeElement(element, elements) {
 
   return elements.splice(index, 1);
 }
+
+function isConnectionLike(element) {
+  return element.waypoints;
+}
+
+function isLabelLike(element) {
+  return element.labelTarget;
+}
diff --git a/lib/features/create/Create.js b/lib/features/create/Create.js
@@ -15,6 +15,11 @@ import {
 
 import { getBBox } from '../../util/Elements';
 
+import {
+  isConnection,
+  isLabel
+} from '../../model';
+
 /**
  * @typedef {import('../../core/Types').ElementLike} Element
  * @typedef {import('../../core/Types').ShapeLike} Shape
@@ -367,14 +372,6 @@ function ensureConstraints(event) {
   }
 }
 
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
 function isSingleShape(elements) {
-  return elements && elements.length === 1 && !isConnection(elements[0]);
-}
-
-function isLabel(element) {
-  return !!element.labelTarget;
-}
+  return elements && elements.length === 1 && !isConnection(elements[ 0 ]);
+}
diff --git a/lib/features/modeling/cmd/CreateElementsHandler.js b/lib/features/modeling/cmd/CreateElementsHandler.js
@@ -14,6 +14,11 @@ import {
   getParents
 } from '../../../util/Elements';
 
+import {
+  isConnection,
+  isLabel
+} from '../../../model';
+
 /**
  * @typedef {import('../Modeling').default} Modeling
  */
@@ -127,14 +132,4 @@ CreateElementsHandler.prototype.preExecute = function(context) {
   });
 
   context.elements = values(cache);
-};
-
-// helpers //////////
-
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
-function isLabel(element) {
-  return !!element.labelTarget;
-}
+};
diff --git a/lib/features/modeling/cmd/DeleteShapeHandler.js b/lib/features/modeling/cmd/DeleteShapeHandler.js
@@ -5,6 +5,8 @@ import {
 
 import { saveClear } from '../../../util/Removal';
 
+import { isConnection } from '../../../model';
+
 /**
  * @typedef {import('../../../core/Canvas').default} Canvas
  * @typedef {import('../Modeling').default} Modeling
@@ -95,7 +97,3 @@ DeleteShapeHandler.prototype.revert = function(context) {
 
   return shape;
 };
-
-function isConnection(element) {
-  return element.waypoints;
-}
diff --git a/lib/features/move/MovePreview.js b/lib/features/move/MovePreview.js
@@ -22,6 +22,8 @@ import {
 
 import { translate } from '../../util/SvgTransformUtil';
 
+import { isConnection } from '../../model';
+
 /**
  * @typedef {import('../../model/Types').Element} Element
  *
@@ -252,10 +254,3 @@ function removeEdges(elements) {
 function haveDifferentParents(elements) {
   return size(groupBy(elements, function(e) { return e.parent && e.parent.id; })) !== 1;
 }
-
-/**
- * Checks if an element is a connection.
- */
-function isConnection(element) {
-  return element.waypoints;
-}
diff --git a/lib/features/resize/ResizeHandles.js b/lib/features/resize/ResizeHandles.js
@@ -25,6 +25,8 @@ import {
 
 import { getReferencePoint } from './Resize';
 
+import { isConnection } from '../../model';
+
 /**
  * @typedef {import('../../model/Types').Element} Element
  *
@@ -210,8 +212,4 @@ function getHandleOffset(direction) {
   }
 
   return offset;
-}
-
-function isConnection(element) {
-  return !!element.waypoints;
 }
diff --git a/lib/features/snapping/CreateMoveSnapping.js b/lib/features/snapping/CreateMoveSnapping.js
@@ -13,6 +13,11 @@ import {
   isNumber
 } from 'min-dash';
 
+import {
+  isConnection,
+  isLabel
+} from '../../model';
+
 /**
  * @typedef {import('../../core/ElementRegistry').default} ElementRegistry
  * @typedef {import('../../core/EventBus').default} EventBus
@@ -200,14 +205,6 @@ CreateMoveSnapping.prototype.getSnapTargets = function(shape, target) {
 
 // helpers //////////
 
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
 function isHidden(element) {
   return !!element.hidden;
-}
-
-function isLabel(element) {
-  return !!element.labelTarget;
 }
diff --git a/lib/features/snapping/ResizeSnapping.js b/lib/features/snapping/ResizeSnapping.js
@@ -17,6 +17,11 @@ import {
 
 import { forEach } from 'min-dash';
 
+import {
+  isConnection,
+  isLabel
+} from '../../model';
+
 /**
  * @typedef {import('../../core/EventBus').default} EventBus
  * @typedef {import('./Snapping').default} Snapping
@@ -157,18 +162,10 @@ function isAttached(element, host) {
   return element.host === host;
 }
 
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
 function isHidden(element) {
   return !!element.hidden;
 }
 
-function isLabel(element) {
-  return !!element.labelTarget;
-}
-
 function isHorizontal(direction) {
   return direction === 'n' || direction === 's';
 }

diff --git a/lib/features/space-tool/SpaceTool.js b/lib/features/space-tool/SpaceTool.js
@@ -20,6 +20,11 @@ import { set as setCursor } from '../../util/Cursor';
 
 import { selfAndAllChildren } from '../../util/Elements';
 
+import {
+  isConnection,
+  isLabel
+} from '../../model';
+
 /**
  * @typedef {import('../../core/Types').ShapeLike} Shape
  *
@@ -619,12 +624,4 @@ function includes(array, item) {
 
 function isAttacher(element) {
   return !!element.host;
-}
-
-function isConnection(element) {
-  return !!element.waypoints;
-}
-
-function isLabel(element) {
-  return !!element.labelTarget;
 }
diff --git a/lib/features/space-tool/SpaceToolPreview.js b/lib/features/space-tool/SpaceToolPreview.js
@@ -19,6 +19,8 @@ import {
   translate
 } from '../../util/SvgTransformUtil';
 
+import { isConnection } from '../../model';
+
 /**
  * @typedef {import('../../core/Canvas').default} Canvas
  * @typedef {import('../../core/ElementRegistry').default} ElementRegistry
@@ -301,13 +303,3 @@ SpaceToolPreview.$inject = [
   'styles',
   'previewSupport'
 ];
-
-
-// helpers //////////////////////
-
-/**
- * Checks if an element is a connection.
- */
-function isConnection(element) {
-  return element.waypoints;
-}
diff --git a/lib/layout/LayoutUtil.js b/lib/layout/LayoutUtil.js
@@ -10,6 +10,8 @@ import {
 
 import intersectPaths from 'path-intersection';
 
+import { isConnection } from '../model';
+
 /**
  * @typedef {import('../core/Types').ElementLike} Element
  * @typedef {import('../core/Types').ConnectionLike} Connection
@@ -302,8 +304,4 @@ export function filterRedundantWaypoints(waypoints) {
 
 function distance(a, b) {
   return Math.sqrt(Math.pow(a.x - b.x, 2) + Math.pow(a.y - b.y, 2));
-}
-
-function isConnection(element) {
-  return !!element.waypoints;
 }