chore(modeling): connect reverse

* connecting reversely now possible * removed behaviors that made connecting reversely possible * fixed rules according to spec * fixed and refactored DRD updating * added test coverage for DRD updating Closes #429
bpmn-io · Nov 18, 2019 · f029d3e · f029d3e
1 parent 235eddf
commit f029d3e
Show file tree

Hide file tree

Showing 19 changed files with 936 additions and 725 deletions.
diff --git a/packages/dmn-js-drd/src/features/generate-di/DiGenerator.js b/packages/dmn-js-drd/src/features/generate-di/DiGenerator.js
@@ -5,73 +5,59 @@ import { is } from 'dmn-js-shared/lib/util/ModelUtil';
 
 
 /**
- * A component that generated basic DI, if graphical
- * information is missing on a dmn:Definitions element
- * to be imported.
+ * Generates missing DI on import.
  *
- * @param {EventBus} eventBus
  * @param {DrdFactory} drdFactory
  * @param {ElementFactory} elementFactory
+ * @param {EventBus} eventBus
  */
-export default function DiGenerator(eventBus, drdFactory, elementFactory) {
-
-  // ensure the definitions contains DI information
-  eventBus.on('import.start', ({ definitions }) => {
-    if (!containsDi(definitions)) {
-      createDi(definitions);
-    }
-  });
-
-
-  /**
-   * Create basic DI for given dmn:Definitions element
-   */
+export default function DiGenerator(drdFactory, elementFactory, eventBus) {
   function createDi(definitions) {
 
-    var idx = 0;
+    var index = 0;
 
-    forEach(definitions.drgElements, function(element) {
+    forEach(definitions.drgElements, function(drgElement) {
 
-      var bounds,
-          extensionElements,
-          dimensions;
-
-      // only create DI for decision elements;
-      // we're not a full fledged layouter (!)
-      if (!is(element, 'dmn:Decision')) {
+      // generate DI for decisions only
+      if (!is(drgElement, 'dmn:Decision')) {
         return;
       }
 
-      extensionElements = element.extensionElements;
+      var extensionElements = drgElement.extensionElements;
 
       if (!extensionElements) {
-        extensionElements = element.extensionElements = drdFactory.createDi();
-        extensionElements.$parent = element;
+        extensionElements = drgElement.extensionElements =
+          drdFactory.createExtensionElements();
+
+        extensionElements.$parent = drgElement;
       }
 
-      dimensions = elementFactory._getDefaultSize(element);
+      var dimensions = elementFactory._getDefaultSize(drgElement);
 
-      bounds = drdFactory.createDiBounds({
-        x: 150 + (idx * 30),
-        y: 150 + (idx * 30),
+      var bounds = drdFactory.createDiBounds({
+        x: 150 + (index * 30),
+        y: 150 + (index * 30),
         width: dimensions.width,
         height: dimensions.height
       });
 
-      // add bounds
       extensionElements.get('values').push(bounds);
+
       bounds.$parent = extensionElements;
 
-      // stacking elements nicely on top of each other
-      idx++;
+      index++;
     });
   }
 
+  eventBus.on('import.start', ({ definitions }) => {
+    if (!containsDi(definitions)) {
+      createDi(definitions);
+    }
+  });
 }
 
-
 DiGenerator.$inject = [
-  'eventBus',
   'drdFactory',
-  'elementFactory'
+  'elementFactory',
+  'eventBus'
 ];
diff --git a/packages/dmn-js-drd/src/features/modeling/DrdFactory.js b/packages/dmn-js-drd/src/features/modeling/DrdFactory.js
@@ -1,6 +1,6 @@
-import {
-  forEach
-} from 'min-dash';
+import { map } from 'min-dash';
+
+import { isAny } from 'dmn-js-shared/src/util/ModelUtil';
 
 
 export default function DrdFactory(moddle) {
@@ -11,15 +11,14 @@ DrdFactory.$inject = [ 'moddle' ];
 
 
 DrdFactory.prototype._needsId = function(element) {
-  return element.$instanceOf('dmn:DRGElement') ||
-         element.$instanceOf('dmn:Artifact') ||
-         element.$instanceOf('dmn:DMNElement');
+  return isAny(element, [
+    'dmn:Artifact',
+    'dmn:DMNElement',
+    'dmn:DRGElement'
+  ]);
 };
 
 DrdFactory.prototype._ensureId = function(element) {
-
-  // generate semantic ids for elements
-  // dmn:Decision -> Decision_ID
   var prefix = (element.$type || '').replace(/^[^:]*:/g, '') + '_';
 
   if (!element.id && this._needsId(element)) {
@@ -35,28 +34,25 @@ DrdFactory.prototype.create = function(type, attrs) {
   return element;
 };
 
-DrdFactory.prototype.createDi = function() {
-  return this.create('dmn:ExtensionElements', { values: [] });
-};
-
 DrdFactory.prototype.createDiBounds = function(bounds) {
   return this.create('biodi:Bounds', bounds);
 };
 
 DrdFactory.prototype.createDiEdge = function(source, waypoints) {
   var self = this;
-  var semanticWaypoints = [];
-
-  forEach(waypoints || [], function(wp) {
-    semanticWaypoints.push(self.createDiWaypoint(wp));
-  });
 
   return this.create('biodi:Edge', {
-    waypoints: semanticWaypoints,
-    source: source.id
+    source: source.id,
+    waypoints: map(waypoints, function(waypoint) {
+      return self.createDiWaypoint(waypoint);
+    })
   });
 };
 
 DrdFactory.prototype.createDiWaypoint = function(waypoint) {
   return this.create('biodi:Waypoint', waypoint);
+};
+
+DrdFactory.prototype.createExtensionElements = function() {
+  return this.create('dmn:ExtensionElements', { values: [] });
 };