@eclipse-glsp-examples/workflow-server 2.1.1 → 2.2.0-next.104

package/src/browser/example1.json

@@ -5,10 +5,7 @@
       "name": "Push",
       "taskType": "manual",
       "id": "task0",
-      "cssClasses": [
-        "task",
-        "manual"
-      ],
+      "cssClasses": ["task", "manual"],
       "children": [
         {
           "id": "task0_icon",
@@ -66,10 +63,7 @@
       "name": "ChkWt",
       "taskType": "automated",
       "id": "task0_automated",
-      "cssClasses": [
-        "task",
-        "automated"
-      ],
+      "cssClasses": ["task", "automated"],
       "children": [
         {
           "id": "task0_automated_icon",
@@ -194,9 +188,7 @@
     {
       "nodeType": "forkNode",
       "id": "bb2709f5-0ff0-4438-8853-b7e934b506d7",
-      "cssClasses": [
-        "forkOrJoin"
-      ],
+      "cssClasses": ["forkOrJoin"],
       "type": "activityNode:fork",
       "position": {
         "x": 170.0,
@@ -216,9 +208,7 @@
     {
       "nodeType": "joinNode",
       "id": "bd94e44e-19f9-446e-89d4-97ca1a63c17b",
-      "cssClasses": [
-        "forkOrJoin"
-      ],
+      "cssClasses": ["forkOrJoin"],
       "type": "activityNode:join",
       "position": {
         "x": 560.0,
@@ -245,10 +235,7 @@
       "name": "WtOK",
       "taskType": "automated",
       "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04",
-      "cssClasses": [
-        "task",
-        "automated"
-      ],
+      "cssClasses": ["task", "automated"],
       "children": [
         {
           "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04_icon",
@@ -304,9 +291,7 @@
     },
     {
       "id": "2317f24a-034e-4352-8857-d361dc8f5ed7",
-      "cssClasses": [
-        "medium"
-      ],
+      "cssClasses": ["medium"],
       "type": "edge:weighted",
       "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4",
       "targetId": "e47d5eba-612d-4c43-9aba-2c5502ff4f04"
@@ -333,10 +318,7 @@
       "name": "RflWt",
       "taskType": "manual",
       "id": "a63cfd87-da7c-4846-912b-29040b776bfb",
-      "cssClasses": [
-        "task",
-        "manual"
-      ],
+      "cssClasses": ["task", "manual"],
       "children": [
         {
           "id": "54f08126-6041-44ce-9d8b-e7a549e48f91",
@@ -392,9 +374,7 @@
     },
     {
       "id": "9bb443d7-44f3-4192-8dd8-1a2782593373",
-      "cssClasses": [
-        "medium"
-      ],
+      "cssClasses": ["medium"],
       "type": "edge:weighted",
       "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4",
       "targetId": "a63cfd87-da7c-4846-912b-29040b776bfb"
@@ -421,10 +401,7 @@
       "name": "Brew",
       "taskType": "automated",
       "id": "7afd430b-5031-4082-8190-7e755c57cde9",
-      "cssClasses": [
-        "task",
-        "automated"
-      ],
+      "cssClasses": ["task", "automated"],
       "children": [
         {
           "id": "7afd430b-5031-4082-8190-7e755c57cde9_icon",
@@ -491,10 +468,7 @@
       "name": "ChkTp",
       "taskType": "automated",
       "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17",
-      "cssClasses": [
-        "task",
-        "automated"
-      ],
+      "cssClasses": ["task", "automated"],
       "children": [
         {
           "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17_icon",
@@ -570,10 +544,7 @@
       "name": "KeepTp",
       "taskType": "automated",
       "id": "4b06ed95-c9be-47df-9941-98099259be4a",
-      "cssClasses": [
-        "task",
-        "automated"
-      ],
+      "cssClasses": ["task", "automated"],
       "children": [
         {
           "id": "4b06ed95-c9be-47df-9941-98099259be4a_icon",
@@ -631,10 +602,7 @@
       "name": "PreHeat",
       "taskType": "automated",
       "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6",
-      "cssClasses": [
-        "task",
-        "automated"
-      ],
+      "cssClasses": ["task", "automated"],
       "children": [
         {
           "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6_icon",
@@ -690,18 +658,14 @@
     },
     {
       "id": "d04afaf8-0894-4284-b844-22b255893107",
-      "cssClasses": [
-        "medium"
-      ],
+      "cssClasses": ["medium"],
       "type": "edge:weighted",
       "sourceId": "activityNode2",
       "targetId": "4b06ed95-c9be-47df-9941-98099259be4a"
     },
     {
       "id": "b9ef468f-2aaf-41b9-b408-29e2d08e490e",
-      "cssClasses": [
-        "medium"
-      ],
+      "cssClasses": ["medium"],
       "type": "edge:weighted",
       "sourceId": "activityNode2",
       "targetId": "80d1792f-9c7e-41c0-8eca-eeb0509397b6"
@@ -727,4 +691,4 @@
   ],
   "type": "graph",
   "revision": 10
-}
+}

package/src/browser/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,5 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from '../common/index';
 export * from './mock-model-storage';
+export * from './reexport';

package/src/browser/reexport.ts

@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from '../common';

package/src/common/handler/create-activity-node-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,10 +26,7 @@ export abstract class CreateActivityNodeHandler extends CreateWorkflowNodeOperat
     }
 
     protected builder(point: Point = Point.ORIGIN, elementTypeId = this.elementTypeIds[0]): ActivityNodeBuilder {
-        return ActivityNode.builder()
-            .position(point)
-            .type(elementTypeId)
-            .nodeType(ModelTypes.toNodeType(elementTypeId));
+        return ActivityNode.builder().position(point).type(elementTypeId).nodeType(ModelTypes.toNodeType(elementTypeId));
     }
 
     override createTriggerGhostElement(elementTypeId: string): GhostElement | undefined {

package/src/common/handler/create-decision-node-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point } from '@eclipse-glsp/server';
+import { GResizeLocation, Point } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import { ActivityNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
@@ -25,6 +25,6 @@ export class CreateDecisionNodeHandler extends CreateActivityNodeHandler {
     label = 'Decision Node';
 
     protected override builder(point?: Point): ActivityNodeBuilder {
-        return super.builder(point).addCssClass('decision');
+        return super.builder(point).addCssClass('decision').resizeLocations(GResizeLocation.CROSS);
     }
 }

package/src/common/handler/create-merge-node-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point } from '@eclipse-glsp/server';
+import { GResizeLocation, Point } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import { ActivityNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
@@ -25,6 +25,6 @@ export class CreateMergeNodeHandler extends CreateActivityNodeHandler {
     label = 'Merge Node';
 
     protected override builder(point: Point | undefined): ActivityNodeBuilder {
-        return super.builder(point).addCssClass('merge');
+        return super.builder(point).addCssClass('merge').resizeLocations(GResizeLocation.CROSS);
     }
 }

package/src/common/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 STMicroelectronics and others.
+ * Copyright (c) 2023-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +29,6 @@ export * from './handler/create-task-handler';
 export * from './handler/create-weighted-edge-handler';
 export * from './handler/create-workflow-node-operation-handler';
 export * from './handler/grid-snapper';
-export * from './index';
 export * from './labeledit/workflow-label-edit-validator';
 export * from './layout/workflow-layout-configurator';
 export * from './marker/workflow-model-validator';
@@ -46,5 +45,6 @@ export * from './taskedit/task-edit-validator';
 export * from './util/model-types';
 export * from './workflow-diagram-configuration';
 export * from './workflow-diagram-module';
+export * from './workflow-edge-creation-checker';
 export * from './workflow-glsp-server';
 export * from './workflow-popup-factory';

package/src/common/provider/node-documentation-navigation-target-provider.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Args, EditorContext, NavigationTarget } from '@eclipse-glsp/protocol';
-import { JsonOpenerOptions, ModelState, NavigationTargetProvider } from '@eclipse-glsp/server';
+import { GLabel, JsonOpenerOptions, ModelState, NavigationTargetProvider } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import { TaskNode } from '../graph-extension';
 
@@ -28,7 +28,7 @@ export class NodeDocumentationNavigationTargetProvider implements NavigationTarg
     getTargets(editorContext: EditorContext): NavigationTarget[] {
         if (editorContext.selectedElementIds.length === 1) {
             const taskNode = this.modelState.index.findByClass(editorContext.selectedElementIds[0], TaskNode);
-            if (!taskNode || !(taskNode.id === 'task0')) {
+            if (!taskNode || !taskNode.children.some(child => child instanceof GLabel && child.text === 'Push')) {
                 return [];
             }
 

package/src/common/workflow-diagram-configuration.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,33 +48,26 @@ export class WorkflowDiagramConfiguration implements DiagramConfiguration {
         return [
             createDefaultShapeTypeHint(types.MANUAL_TASK),
             createDefaultShapeTypeHint(types.AUTOMATED_TASK),
-            createDefaultShapeTypeHint(types.FORK_NODE),
-            createDefaultShapeTypeHint(types.JOIN_NODE),
+            createDefaultShapeTypeHint({ elementTypeId: types.FORK_NODE, resizable: false }),
+            createDefaultShapeTypeHint({ elementTypeId: types.JOIN_NODE, resizable: false }),
             createDefaultShapeTypeHint(types.DECISION_NODE),
             createDefaultShapeTypeHint(types.MERGE_NODE),
-            {
+            createDefaultShapeTypeHint({
                 elementTypeId: types.CATEGORY,
-                repositionable: true,
-                deletable: true,
-                resizable: true,
-                reparentable: true,
                 containableElementTypeIds: [types.TASK, types.ACTIVITY_NODE, types.CATEGORY]
-            }
+            })
         ];
     }
 
     get edgeTypeHints(): EdgeTypeHint[] {
         return [
             createDefaultEdgeTypeHint(DefaultTypes.EDGE),
-            {
+            createDefaultEdgeTypeHint({
                 elementTypeId: types.WEIGHTED_EDGE,
-                repositionable: true,
-                deletable: true,
-                routable: true,
                 dynamic: true,
                 sourceElementTypeIds: [types.ACTIVITY_NODE],
                 targetElementTypeIds: [types.TASK, types.ACTIVITY_NODE]
-            }
+            })
         ];
     }
 
@@ -83,13 +76,20 @@ export class WorkflowDiagramConfiguration implements DiagramConfiguration {
     animatedUpdate = true;
 }
 
-export function createDefaultShapeTypeHint(elementId: string): ShapeTypeHint {
-    return { elementTypeId: elementId, repositionable: true, deletable: true, resizable: true, reparentable: true };
+export function createDefaultShapeTypeHint(template: { elementTypeId: string } & Partial<ShapeTypeHint>): ShapeTypeHint;
+export function createDefaultShapeTypeHint(elementId: string): ShapeTypeHint;
+export function createDefaultShapeTypeHint(
+    elementIdOrTemplate: string | ({ elementTypeId: string } & Partial<ShapeTypeHint>)
+): ShapeTypeHint {
+    const template = typeof elementIdOrTemplate === 'string' ? { elementTypeId: elementIdOrTemplate } : elementIdOrTemplate;
+    return { repositionable: true, deletable: true, resizable: true, reparentable: true, ...template };
 }
 
-export function createDefaultEdgeTypeHint(elementId: string): EdgeTypeHint {
+export function createDefaultEdgeTypeHint(template: { elementTypeId: string } & Partial<EdgeTypeHint>): EdgeTypeHint;
+export function createDefaultEdgeTypeHint(elementId: string): EdgeTypeHint;
+export function createDefaultEdgeTypeHint(elementIdOrTemplate: string | ({ elementTypeId: string } & Partial<EdgeTypeHint>)): EdgeTypeHint {
+    const template = typeof elementIdOrTemplate === 'string' ? { elementTypeId: elementIdOrTemplate } : elementIdOrTemplate;
     return {
-        elementTypeId: elementId,
         repositionable: true,
         deletable: true,
         routable: true,
@@ -110,6 +110,7 @@ export function createDefaultEdgeTypeHint(elementId: string): EdgeTypeHint {
             types.FORK_NODE,
             types.JOIN_NODE,
             types.CATEGORY
-        ]
+        ],
+        ...template
     };
 }

package/src/common/workflow-edge-creation-checker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,7 @@ import { ModelTypes } from './util/model-types';
 @injectable()
 export class WorkflowEdgeCreationChecker implements EdgeCreationChecker {
     isValidSource(edgeType: string, sourceElement: GModelElement): boolean {
-        return edgeType !== ModelTypes.WEIGHTED_EDGE || sourceElement.type === ModelTypes.DECISION_NODE;
+        return edgeType !== ModelTypes.WEIGHTED_EDGE && sourceElement.type === ModelTypes.DECISION_NODE;
     }
     isValidTarget(edgeType: string, sourceElement: GModelElement, targetElement: GModelElement): boolean {
         return (

package/src/common/workflow-popup-factory.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@ export class WorkflowPopupFactory implements PopupModelFactory {
         return undefined;
     }
 
-    private generateBody(task: TaskNode): string {
+    protected generateBody(task: TaskNode): string {
         return `Type: ${task.taskType} ${NL}
             Duration: ${task.duration} ${NL}
             Reference: ${task.references} ${NL}`;

package/src/node/.indexignore

@@ -0,0 +1,4 @@
+# The app.ts is the entrypoint when the workflow server is used bundled in an external node process
+# It launches the server when imported so it has to be excluded from the default export to avoid unintended
+# autostarts when the server package is directly integrated into a node backed (e.g. Theia)
+app.ts

package/src/node/app.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2024 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,7 +16,7 @@
 import 'reflect-metadata';
 
 import { configureELKLayoutModule } from '@eclipse-glsp/layout-elk';
-import { createAppModule, GModelStorage, SocketServerLauncher, WebSocketServerLauncher } from '@eclipse-glsp/server/node';
+import { createAppModule, GModelStorage, Logger, SocketServerLauncher, WebSocketServerLauncher } from '@eclipse-glsp/server/node';
 import { Container } from 'inversify';
 
 import { WorkflowLayoutConfigurator } from '../common/layout/workflow-layout-configurator';
@@ -27,6 +27,16 @@ async function launch(argv?: string[]): Promise<void> {
     const options = createWorkflowCliParser().parse(argv);
     const appContainer = new Container();
     appContainer.load(createAppModule(options));
+    const logger = appContainer.get(Logger);
+
+    // Add fallback hooks to catch unhandled exceptions & promise rejections and prevent the node process from crashing
+    process.on('unhandledRejection', (reason, p) => {
+        logger.error('Unhandled Rejection:', p, reason);
+    });
+
+    process.on('uncaughtException', error => {
+        logger.error('Uncaught exception:', error);
+    });
 
     const elkLayoutModule = configureELKLayoutModule({ algorithms: ['layered'], layoutConfigurator: WorkflowLayoutConfigurator });
     const serverModule = new WorkflowServerModule().configureDiagramModule(new WorkflowDiagramModule(() => GModelStorage), elkLayoutModule);

package/src/node/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,5 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from '../common/index';
+export * from './reexport';
 export * from './workflow-cli-parser';

package/src/node/reexport.ts

@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from '../common';