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

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.78+6db8ac8",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9f86a52adb3d5ae444f8aeeed842fc01b443bd4e"
+  "gitHead": "6db8ac875b2714c17b314db076ca8edfc92706e5"
 }

package/wf-glsp-server-node.js

@@ -189,11 +189,14 @@ let CreateActivityNodeHandler = class CreateActivityNodeHandler extends create_w
     createNode(operation, relativeLocation) {
         return this.builder(relativeLocation).build();
     }
-    builder(point) {
+    builder(point = server_1.Point.ORIGIN, elementTypeId = this.elementTypeIds[0]) {
         return graph_extension_1.ActivityNode.builder()
-            .position(point !== null && point !== void 0 ? point : server_1.Point.ORIGIN)
-            .type(this.elementTypeIds[0])
-            .nodeType(model_types_1.ModelTypes.toNodeType(this.elementTypeIds[0]));
+            .position(point)
+            .type(elementTypeId)
+            .nodeType(model_types_1.ModelTypes.toNodeType(elementTypeId));
+    }
+    createTriggerGhostElement(elementTypeId) {
+        return { template: this.serializer.createSchema(this.builder(undefined, elementTypeId).build()) };
     }
 };
 exports.CreateActivityNodeHandler = CreateActivityNodeHandler;
@@ -279,14 +282,17 @@ class CreateCategoryHandler extends create_workflow_node_operation_handler_1.Cre
     createNode(operation, relativeLocation) {
         return this.builder(relativeLocation).build();
     }
-    builder(point) {
+    builder(point = server_1.Point.ORIGIN, elementTypeId = this.elementTypeIds[0]) {
         return graph_extension_1.Category.builder()
-            .type(this.elementTypeIds[0])
-            .position(point !== null && point !== void 0 ? point : server_1.Point.ORIGIN)
+            .type(elementTypeId)
+            .position(point)
             .name(this.label.replace(' ', '') + this.modelState.index.getAllByClass(graph_extension_1.Category).length)
             .addArgs(server_1.ArgsUtil.cornerRadius(5))
             .children();
     }
+    createTriggerGhostElement(elementTypeId) {
+        return { template: this.serializer.createSchema(this.builder(undefined, elementTypeId).build()), dynamic: true };
+    }
 }
 exports.CreateCategoryHandler = CreateCategoryHandler;
 
@@ -614,14 +620,17 @@ let CreateTaskHandler = class CreateTaskHandler extends create_workflow_node_ope
     createNode(operation, relativeLocation) {
         return this.builder(relativeLocation).build();
     }
-    builder(point) {
+    builder(point = protocol_1.Point.ORIGIN, elementTypeId = this.elementTypeIds[0]) {
         return graph_extension_1.TaskNode.builder()
             .position(point !== null && point !== void 0 ? point : protocol_1.Point.ORIGIN)
             .name(this.label.replace(' ', '') + this.modelState.index.getAllByClass(graph_extension_1.TaskNode).length)
-            .type(this.elementTypeIds[0])
-            .taskType(model_types_1.ModelTypes.toNodeType(this.elementTypeIds[0]))
+            .type(elementTypeId)
+            .taskType(model_types_1.ModelTypes.toNodeType(elementTypeId))
             .children();
     }
+    createTriggerGhostElement(elementTypeId) {
+        return { template: this.serializer.createSchema(this.builder(undefined, elementTypeId).build()), dynamic: true };
+    }
 };
 exports.CreateTaskHandler = CreateTaskHandler;
 exports.CreateTaskHandler = CreateTaskHandler = __decorate([
@@ -5100,7 +5109,7 @@ var TriggerNodeCreationAction;
         return base_protocol_1.Action.hasKind(object, TriggerNodeCreationAction.KIND) && (0, type_util_1.hasStringProp)(object, 'elementTypeId');
     }
     TriggerNodeCreationAction.is = is;
-    function create(elementTypeId, options = {}) {
+    function create(elementTypeId, options) {
         return Object.assign({ kind: TriggerNodeCreationAction.KIND, elementTypeId }, options);
     }
     TriggerNodeCreationAction.create = create;
@@ -6776,14 +6785,10 @@ class DisposableCollection {
     get disposed() {
         return this.disposables.length === 0;
     }
-    /**
-     * Pushes the given disposables to the collection.
-     * @param disposables The disposables that should be added
-     * @returns A disposable that removes the previously pushed values from the collection when invoked
-     */
     push(...disposables) {
-        this.disposables.push(...disposables);
-        return Disposable.create(() => (0, array_util_1.remove)(this.disposables, ...disposables));
+        const toAdd = (0, array_util_1.isArrayOfType)(disposables, Disposable.is) ? disposables : disposables.map(Disposable.create);
+        this.disposables.push(...toAdd);
+        return Disposable.create(() => (0, array_util_1.remove)(this.disposables, ...toAdd));
     }
     get isDisposed() {
         return this.disposed;
@@ -47708,9 +47713,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 +47723,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 +49597,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;
+        if (!isChild) {
+            dependents.add(elementToDelete);
         }
-        const parent = element.parent;
-        if (!parent) {
-            return element;
-        }
-        return this.findTopLevelElement(parent);
     }
 };
 exports.GModelDeleteOperationHandler = GModelDeleteOperationHandler;
@@ -49787,7 +49783,16 @@ let GModelCreateNodeOperationHandler = class GModelCreateNodeOperationHandler ex
         }
     }
     getTriggerActions() {
-        return this.elementTypeIds.map(typeId => protocol_1.TriggerNodeCreationAction.create(typeId));
+        return this.elementTypeIds.map(elementTypeId => this.createTriggerNodeCreationAction(elementTypeId));
+    }
+    createTriggerNodeCreationAction(elementTypeId) {
+        return protocol_1.TriggerNodeCreationAction.create(elementTypeId, { ghostElement: this.createTriggerGhostElement(elementTypeId), args: this.createTriggerArgs(elementTypeId) });
+    }
+    createTriggerGhostElement(elementTypeId) {
+        return undefined;
+    }
+    createTriggerArgs(elementTypeId) {
+        return undefined;
     }
     /**
      * Return the GModelElement that will contain the newly created node. It is usually
@@ -50764,7 +50769,16 @@ let JsonCreateNodeOperationHandler = class JsonCreateNodeOperationHandler extend
         this.operationType = protocol_1.CreateNodeOperation.KIND;
     }
     getTriggerActions() {
-        return this.elementTypeIds.map(typeId => protocol_1.TriggerNodeCreationAction.create(typeId));
+        return this.elementTypeIds.map(elementTypeId => this.createTriggerNodeCreationAction(elementTypeId));
+    }
+    createTriggerNodeCreationAction(elementTypeId) {
+        return protocol_1.TriggerNodeCreationAction.create(elementTypeId, { ghostElement: this.createTriggerGhostElement(elementTypeId), args: this.createTriggerArgs(elementTypeId) });
+    }
+    createTriggerGhostElement(elementTypeId) {
+        return undefined;
+    }
+    createTriggerArgs(elementTypeId) {
+        return undefined;
     }
     /**
      * Return the GModelElement that will contain the newly created node. It is usually