@eclipse-glsp-examples/workflow-server-bundled 2.1.0-next.75 → 2.1.0-next.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server-bundled",
-  "version": "2.1.0-next.75+9f86a52",
+  "version": "2.1.0-next.77+1a0997e",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9f86a52adb3d5ae444f8aeeed842fc01b443bd4e"
+  "gitHead": "1a0997e056ff19b4435fa94e9ccda5f3957ed199"
 }

package/wf-glsp-server-node.js

@@ -47708,9 +47708,9 @@ let GModelIndex = class GModelIndex {
         return this.getElements(type).length;
     }
     /**
-     * Returns all incoming edges for a node.
+     * Returns all incoming edges for a node (or port).
      *
-     * @param node The node where the edges are connected.
+     * @param node The node (or port) where the edges are connected.
      *
      * @returns All incoming edges.
      */
@@ -47718,9 +47718,9 @@ let GModelIndex = class GModelIndex {
         return this.getAllEdges().filter(edge => edge.targetId === node.id);
     }
     /**
-     * Returns all outgoing edges for a node.
+     * Returns all outgoing edges for a node (or port).
      *
-     * @param node The node where the edges are connected.
+     * @param node The node (or port) where the edges are connected.
      *
      * @returns All outgoing edges.
      */
@@ -49592,49 +49592,40 @@ let GModelDeleteOperationHandler = class GModelDeleteOperationHandler extends gm
             this.logger.warn('Element not found: ' + elementId);
             return false;
         }
-        const nodeToDelete = this.findTopLevelElement(element);
-        if (!nodeToDelete.parent) {
-            this.logger.warn("The requested node doesn't have a parent; it can't be deleted");
+        if (!element.parent) {
+            this.logger.warn("The requested element doesn't have a parent; it can't be deleted");
             return false;
         }
         const dependents = new Set();
-        this.collectDependents(dependents, nodeToDelete, false);
+        this.collectDependents(dependents, element, false);
         dependents.forEach(dependant => {
-            const index = this.modelState.root.children.findIndex(element => element === dependant);
+            const index = dependant.parent.children.findIndex(element => element === dependant);
             if (index > -1) {
-                this.modelState.root.children.splice(index, 1);
+                dependant.parent.children.splice(index, 1);
             }
             this.allDependentsIds.add(dependant.id);
         });
         return true;
     }
-    collectDependents(dependents, nodeToDelete, isChild) {
-        if (dependents.has(nodeToDelete)) {
+    collectDependents(dependents, elementToDelete, isChild) {
+        if (dependents.has(elementToDelete)) {
             return;
         }
-        if (nodeToDelete.children.length > 0) {
-            nodeToDelete.children.forEach(child => this.collectDependents(dependents, child, true));
+        if (elementToDelete.children.length > 0) {
+            elementToDelete.children.forEach(child => this.collectDependents(dependents, child, true));
         }
-        if (nodeToDelete instanceof graph_1.GNode) {
+        if (elementToDelete instanceof graph_1.GNode || elementToDelete instanceof graph_1.GPort) {
             const index = this.modelState.index;
-            index.getIncomingEdges(nodeToDelete).forEach(incoming => {
+            index.getIncomingEdges(elementToDelete).forEach(incoming => {
                 dependents.add(incoming);
             });
-            index.getOutgoingEdges(nodeToDelete).forEach(outgoing => {
+            index.getOutgoingEdges(elementToDelete).forEach(outgoing => {
                 dependents.add(outgoing);
             });
         }
-        dependents.add(nodeToDelete);
-    }
-    findTopLevelElement(element) {
-        if (element instanceof graph_1.GNode || element instanceof graph_1.GEdge) {
-            return element;
-        }
-        const parent = element.parent;
-        if (!parent) {
-            return element;
+        if (!isChild) {
+            dependents.add(elementToDelete);
         }
-        return this.findTopLevelElement(parent);
     }
 };
 exports.GModelDeleteOperationHandler = GModelDeleteOperationHandler;