@eclipse-glsp-examples/workflow-glsp 0.9.0-next.d9bed812 → 0.9.0-next.e2f2fd8a

package/lib/workflow-views.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,22 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { IView, Point, PolylineEdgeView, RectangularNodeView, RenderingContext, SEdge, SShapeElement } from "@eclipse-glsp/client";
-import { VNode } from "snabbdom/vnode";
-import { ActivityNode, Icon, TaskNode, WeightedEdge } from "./model";
-export declare class TaskNodeView extends RectangularNodeView {
-    render(node: TaskNode, context: RenderingContext): VNode;
-    protected getRoundedCornerRadius(node: SShapeElement): number;
-}
-export declare class ForkOrJoinNodeView extends RectangularNodeView {
-    render(node: ActivityNode, context: RenderingContext): VNode;
-}
-export declare class WorkflowEdgeView extends PolylineEdgeView {
+import { IView, Point, PolylineEdgeViewWithGapsOnIntersections, RenderingContext, SEdge } from '@eclipse-glsp/client';
+import { VNode } from 'snabbdom';
+import { Icon } from './model';
+export declare class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
     protected renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[];
 }
-export declare class WeightedEdgeView extends WorkflowEdgeView {
-    render(edge: Readonly<WeightedEdge>, context: RenderingContext): VNode;
-}
 export declare class IconView implements IView {
     render(element: Icon, context: RenderingContext): VNode;
     getRadius(): number;

package/lib/workflow-views.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-views.d.ts","sourceRoot":"","sources":["../src/workflow-views.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,KAAK,EACL,KAAK,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,KAAK,EACL,aAAa,EAEhB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAIrE,qBACa,YAAa,SAAQ,mBAAmB;IACjD,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAcxD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM;CAGhE;AAED,qBACa,kBAAmB,SAAQ,mBAAmB;IACvD,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAQ/D;AAED,qBACa,gBAAiB,SAAQ,gBAAgB;IAClD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,EAAE;CAQlG;AAED,qBACa,gBAAiB,SAAQ,gBAAgB;IAClD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAiBzE;AAED,qBACa,QAAS,YAAW,KAAK;IAClC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAQvD,SAAS;CAGZ"}
+{"version":3,"file":"workflow-views.d.ts","sourceRoot":"","sources":["../src/workflow-views.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,KAAK,EACL,KAAK,EACL,uCAAuC,EACvC,gBAAgB,EAChB,KAAK,EAER,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAK/B,qBACa,gBAAiB,SAAQ,uCAAuC;IACzE,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,EAAE;CAiBlG;AAED,qBACa,QAAS,YAAW,KAAK;IAClC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAUvD,SAAS,IAAI,MAAM;CAGtB"}

package/lib/workflow-views.js

@@ -1,17 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -19,9 +6,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IconView = exports.WeightedEdgeView = exports.WorkflowEdgeView = exports.ForkOrJoinNodeView = exports.TaskNodeView = void 0;
+exports.IconView = exports.WorkflowEdgeView = void 0;
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -35,102 +22,38 @@ exports.IconView = exports.WeightedEdgeView = exports.WorkflowEdgeView = exports
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var client_1 = require("@eclipse-glsp/client");
-var inversify_1 = require("inversify");
-var snabbdom = require("snabbdom-jsx");
-var JSX = { createElement: snabbdom.svg };
-var TaskNodeView = /** @class */ (function (_super) {
-    __extends(TaskNodeView, _super);
-    function TaskNodeView() {
-        return _super !== null && _super.apply(this, arguments) || this;
+const client_1 = require("@eclipse-glsp/client");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const JSX = { createElement: sprotty_1.svg };
+let WorkflowEdgeView = class WorkflowEdgeView extends client_1.PolylineEdgeViewWithGapsOnIntersections {
+    renderAdditionals(edge, segments, context) {
+        const additionals = super.renderAdditionals(edge, segments, context);
+        const p1 = segments[segments.length - 2];
+        const p2 = segments[segments.length - 1];
+        const arrow = (JSX.createElement("path", { "class-sprotty-edge": true, "class-arrow": true, d: 'M 1.5,0 L 10,-4 L 10,4 Z', transform: `rotate(${client_1.toDegrees(client_1.angleOfPoint({ x: p1.x - p2.x, y: p1.y - p2.y }))} ${p2.x} ${p2.y}) translate(${p2.x} ${p2.y})` }));
+        additionals.push(arrow);
+        return additionals;
     }
-    TaskNodeView.prototype.render = function (node, context) {
-        var rcr = this.getRoundedCornerRadius(node);
-        var graph = JSX.createElement("g", null,
-            JSX.createElement("rect", { "class-sprotty-node": true, "class-task": true, "class-automated": node.taskType === 'automated', "class-manual": node.taskType === 'manual', "class-mouseover": node.hoverFeedback, "class-selected": node.selected, x: 0, y: 0, rx: rcr, ry: rcr, width: Math.max(0, node.bounds.width), height: Math.max(0, node.bounds.height) }),
-            context.renderChildren(node));
-        return graph;
-    };
-    TaskNodeView.prototype.getRoundedCornerRadius = function (node) {
-        return 5;
-    };
-    TaskNodeView = __decorate([
-        inversify_1.injectable()
-    ], TaskNodeView);
-    return TaskNodeView;
-}(client_1.RectangularNodeView));
-exports.TaskNodeView = TaskNodeView;
-var ForkOrJoinNodeView = /** @class */ (function (_super) {
-    __extends(ForkOrJoinNodeView, _super);
-    function ForkOrJoinNodeView() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    ForkOrJoinNodeView.prototype.render = function (node, context) {
-        var graph = JSX.createElement("g", null,
-            JSX.createElement("rect", { "class-sprotty-node": true, "class-forkOrJoin": true, "class-mouseover": node.hoverFeedback, "class-selected": node.selected, width: 10, height: Math.max(50, node.bounds.height) }));
-        return graph;
-    };
-    ForkOrJoinNodeView = __decorate([
-        inversify_1.injectable()
-    ], ForkOrJoinNodeView);
-    return ForkOrJoinNodeView;
-}(client_1.RectangularNodeView));
-exports.ForkOrJoinNodeView = ForkOrJoinNodeView;
-var WorkflowEdgeView = /** @class */ (function (_super) {
-    __extends(WorkflowEdgeView, _super);
-    function WorkflowEdgeView() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    WorkflowEdgeView.prototype.renderAdditionals = function (edge, segments, context) {
-        var p1 = segments[segments.length - 2];
-        var p2 = segments[segments.length - 1];
-        return [
-            JSX.createElement("path", { "class-sprotty-edge": true, "class-arrow": true, d: "M 1.5,0 L 10,-4 L 10,4 Z", transform: "rotate(" + client_1.toDegrees(client_1.angleOfPoint({ x: p1.x - p2.x, y: p1.y - p2.y })) + " " + p2.x + " " + p2.y + ") translate(" + p2.x + " " + p2.y + ")" })
-        ];
-    };
-    WorkflowEdgeView = __decorate([
-        inversify_1.injectable()
-    ], WorkflowEdgeView);
-    return WorkflowEdgeView;
-}(client_1.PolylineEdgeView));
+};
+WorkflowEdgeView = __decorate([
+    inversify_1.injectable()
+], WorkflowEdgeView);
 exports.WorkflowEdgeView = WorkflowEdgeView;
-var WeightedEdgeView = /** @class */ (function (_super) {
-    __extends(WeightedEdgeView, _super);
-    function WeightedEdgeView() {
-        return _super !== null && _super.apply(this, arguments) || this;
+let IconView = class IconView {
+    render(element, context) {
+        const radius = this.getRadius();
+        return (JSX.createElement("g", null,
+            JSX.createElement("circle", { "class-sprotty-icon": true, r: radius, cx: radius + 2, cy: radius + 2 }),
+            context.renderChildren(element)));
     }
-    WeightedEdgeView.prototype.render = function (edge, context) {
-        var router = this.edgeRouterRegistry.get(edge.routerKind);
-        var route = router.route(edge);
-        if (route.length === 0)
-            return this.renderDanglingEdge("Cannot compute route", edge, context);
-        return JSX.createElement("g", { "class-sprotty-edge": true, "class-weighted": true, "class-low": edge.probability === 'low', "class-medium": edge.probability === 'medium', "class-high": edge.probability === 'high', "class-mouseover": edge.hoverFeedback },
-            this.renderLine(edge, route, context),
-            this.renderAdditionals(edge, route, context),
-            context.renderChildren(edge, { route: route }));
-    };
-    WeightedEdgeView = __decorate([
-        inversify_1.injectable()
-    ], WeightedEdgeView);
-    return WeightedEdgeView;
-}(WorkflowEdgeView));
-exports.WeightedEdgeView = WeightedEdgeView;
-var IconView = /** @class */ (function () {
-    function IconView() {
+    getRadius() {
+        return 14;
     }
-    IconView.prototype.render = function (element, context) {
-        var radius = this.getRadius();
-        return JSX.createElement("g", null,
-            JSX.createElement("circle", { "class-sprotty-icon": true, r: radius, cx: radius, cy: radius }),
-            context.renderChildren(element));
-    };
-    IconView.prototype.getRadius = function () {
-        return 16;
-    };
-    IconView = __decorate([
-        inversify_1.injectable()
-    ], IconView);
-    return IconView;
-}());
+};
+IconView = __decorate([
+    inversify_1.injectable()
+], IconView);
 exports.IconView = IconView;
 //# sourceMappingURL=workflow-views.js.map

package/lib/workflow-views.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-views.js","sourceRoot":"","sources":["../src/workflow-views.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-views.js","sourceRoot":"","sources":["../src/workflow-views.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAQ8B;AAC9B,yCAAuC;AAEvC,qCAA8B;AAG9B,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAGnC,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,gDAAuC;IAC/D,iBAAiB,CAAC,IAAW,EAAE,QAAiB,EAAE,OAAyB;QACjF,MAAM,WAAW,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACrE,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACzC,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,CACV,kDACwB,IAAI,iBACX,IAAI,EACjB,CAAC,EAAC,0BAA0B,EAC5B,SAAS,EAAE,UAAU,kBAAS,CAAC,qBAAY,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,IAC/G,EAAE,CAAC,CACP,GAAG,GACL,CACL,CAAC;QACF,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ,CAAA;AAlBY,gBAAgB;IAD5B,sBAAU,EAAE;GACA,gBAAgB,CAkB5B;AAlBY,4CAAgB;AAqB7B,IAAa,QAAQ,GAArB,MAAa,QAAQ;IACjB,MAAM,CAAC,OAAa,EAAE,OAAyB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,CACH;YACI,oDAA4B,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,GAAW;YACrF,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAChC,CACP,CAAC;IACN,CAAC;IAED,SAAS;QACL,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAdY,QAAQ;IADpB,sBAAU,EAAE;GACA,QAAQ,CAcpB;AAdY,4BAAQ"}

package/package.json

@@ -1,47 +1,44 @@
 {
   "name": "@eclipse-glsp-examples/workflow-glsp",
-  "version": "0.9.0-next.d9bed812",
+  "version": "0.9.0-next.e2f2fd8a",
   "description": "GLSP diagrams for the Workflow DSL",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
-  "author": "Eclipse GLSP",
-  "contributors": [
-    {
-      "name": "Philip Langer",
-      "email": "planger@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    },
-    {
-      "name": "Tobias Ortmayr",
-      "email": "tortmayr@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    },
-    {
-      "name": "Martin Fleck",
-      "email": "mfleck@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    }
-  ],
   "keywords": [
-    "sprotty",
+    "glsp",
     "workflow",
     "diagram",
     "example"
   ],
+  "author": {
+    "name": "Eclipse GLSP"
+  },
+  "homepage": "https://www.eclipse.org/glsp/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/eclipse-glsp/glsp-client.git"
+  },
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "contributors": [
+    {
+      "name": "Eclipse GLSP Project",
+      "email": "glsp-dev@eclipse.org",
+      "url": "https://projects.eclipse.org/projects/ecd.glsp"
+    }
+  ],
   "dependencies": {
-    "@eclipse-glsp/client": "0.9.0-next.d9bed812",
+    "@eclipse-glsp/client": "0.9.0-next.e2f2fd8a",
     "balloon-css": "^0.5.0"
   },
   "devDependencies": {
     "mvn-artifact-download": "5.1.0",
     "rimraf": "^2.6.1",
-    "tslint": "^5.5.0",
     "typescript": "^3.9.2"
   },
   "scripts": {
-    "prepare": "yarn run clean && yarn run build",
+    "prepare": "yarn clean && yarn build && yarn lint",
     "clean": "rimraf lib",
-    "build": "tsc && yarn run lint",
-    "lint": "tslint -c ../../configs/tslint.json --project ./tsconfig.json",
+    "build": "tsc",
+    "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "watch": "tsc -w"
   },
   "files": [

package/scripts/download.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 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,20 +13,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import download from "mvn-artifact-download";
-import { join, resolve } from "path";
+import download from 'mvn-artifact-download';
+import { join, resolve } from 'path';
 
-const downloadDir = resolve(join(__dirname)) + "/../../..";
-const mavenRepository = "https://oss.sonatype.org/content/repositories/snapshots/";
-const groupId = "org.eclipse.glsp.example";
-const artifactId = "org.eclipse.glsp.example.workflow";
-const version = "0.9.0";
-const classifier = "glsp";
+const downloadDir = resolve(join(__dirname)) + '/../../..';
+const mavenRepository = 'https://oss.sonatype.org/content/repositories/snapshots/';
+const groupId = 'org.eclipse.glsp.example';
+const artifactId = 'org.eclipse.glsp.example.workflow';
+const version = '0.9.0';
+const classifier = 'glsp';
 
-console.log("Downloading latest version of the Workflow Example Java Server from the maven repository...");
-download({ groupId, artifactId, version, classifier, isSnapShot: true }, downloadDir, mavenRepository)
-    .then(() => console.log("Download completed. Start the server using this command: \njava -jar org.eclipse.glsp.example.workflow-"
-        + version + "-SNAPSHOT-glsp.jar org.eclipse.glsp.example.workflow.launch.ExampleServerLauncher --port=8081 --websocket\n\n"
-        + "After starting the server, access the following file locally in your browser to see the running example:\n"
-        + "./examples/workflow-standalone/app/diagram.html"
-    ));
+console.log('Downloading latest version of the Workflow Example Java Server from the maven repository...');
+download({ groupId, artifactId, version, classifier, isSnapShot: true }, downloadDir, mavenRepository).then(() =>
+    console.log(
+        'Download completed. Start the server using this command: \njava -jar org.eclipse.glsp.example.workflow-' +
+            version +
+            '-SNAPSHOT-glsp.jar org.eclipse.glsp.example.workflow.launch.ExampleServerLauncher --port=8081 --websocket\n\n' +
+            'After starting the server, access the following file locally in your browser to see the running example:\n' +
+            './examples/workflow-standalone/app/diagram.html'
+    )
+);

package/src/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,118 +13,69 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import "../css/diagram.css";
-import "balloon-css/balloon.min.css";
-import "sprotty/css/edit-label.css";
-
 import {
-    boundsModule,
-    buttonModule,
+    configureDefaultModelElements,
     configureModelElement,
     ConsoleLogger,
-    defaultGLSPModule,
-    defaultModule,
+    createClientContainer,
+    DefaultTypes,
     DeleteElementContextMenuItemProvider,
     DiamondNodeView,
-    edgeLayoutModule,
     editLabelFeature,
-    ExpandButtonView,
-    expandModule,
-    exportModule,
-    fadeModule,
-    GLSP_TYPES,
-    glspCommandPaletteModule,
-    glspContextMenuModule,
-    glspDecorationModule,
-    glspEditLabelModule,
-    GLSPGraph,
-    glspHoverModule,
-    glspMouseToolModule,
-    glspSelectModule,
-    glspServerCopyPasteModule,
     GridSnapper,
-    HtmlRoot,
-    HtmlRootView,
-    labelEditUiModule,
-    layoutCommandsModule,
     LogLevel,
-    markerNavigatorModule,
-    modelHintsModule,
-    modelSourceModule,
-    modelSourceWatcherModule,
-    navigationModule,
-    NoOverlapMovmentRestrictor,
-    openModule,
     overrideViewerOptions,
-    paletteModule,
-    PreRenderedElement,
-    PreRenderedView,
+    RectangularNodeView,
     RevealNamedElementActionProvider,
-    routingModule,
-    SButton,
+    RoundedCornerNodeView,
     SCompartment,
     SCompartmentView,
     SEdge,
-    SGraphView,
     SLabel,
     SLabelView,
-    SRoutingHandle,
-    SRoutingHandleView,
-    toolFeedbackModule,
-    toolsModule,
-    TYPES,
-    validationModule,
-    glspViewportModule,
-    zorderModule
-} from "@eclipse-glsp/client";
-import { Container, ContainerModule } from "inversify";
-
-import { directTaskEditor } from "./direct-task-editing/di.config";
-import { ActivityNode, Icon, TaskNode, WeightedEdge } from "./model";
-import { ForkOrJoinNodeView, IconView, TaskNodeView, WeightedEdgeView, WorkflowEdgeView } from "./workflow-views";
+    StructureCompartmentView,
+    TYPES
+} from '@eclipse-glsp/client';
+import 'balloon-css/balloon.min.css';
+import { Container, ContainerModule } from 'inversify';
+import 'sprotty/css/edit-label.css';
+import '../css/diagram.css';
+import { directTaskEditor } from './direct-task-editing/di.config';
+import { ActivityNode, CategoryNode, Icon, TaskNode, WeightedEdge } from './model';
+import { IconView, WorkflowEdgeView } from './workflow-views';
 
 const workflowDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     rebind(TYPES.ILogger).to(ConsoleLogger).inSingletonScope();
     rebind(TYPES.LogLevel).toConstantValue(LogLevel.warn);
-    bind(GLSP_TYPES.IMovementRestrictor).to(NoOverlapMovmentRestrictor).inSingletonScope();
     bind(TYPES.ISnapper).to(GridSnapper);
     bind(TYPES.ICommandPaletteActionProvider).to(RevealNamedElementActionProvider);
     bind(TYPES.IContextMenuItemProvider).to(DeleteElementContextMenuItemProvider);
     const context = { bind, unbind, isBound, rebind };
-    configureModelElement(context, 'graph', GLSPGraph, SGraphView);
-    configureModelElement(context, 'task:automated', TaskNode, TaskNodeView);
-    configureModelElement(context, 'task:manual', TaskNode, TaskNodeView);
+
+    configureDefaultModelElements(context);
+    configureModelElement(context, 'task:automated', TaskNode, RoundedCornerNodeView);
+    configureModelElement(context, 'task:manual', TaskNode, RoundedCornerNodeView);
     configureModelElement(context, 'label:heading', SLabel, SLabelView, { enable: [editLabelFeature] });
     configureModelElement(context, 'comp:comp', SCompartment, SCompartmentView);
     configureModelElement(context, 'comp:header', SCompartment, SCompartmentView);
     configureModelElement(context, 'label:icon', SLabel, SLabelView);
-    configureModelElement(context, 'html', HtmlRoot, HtmlRootView);
-    configureModelElement(context, 'pre-rendered', PreRenderedElement, PreRenderedView);
-    configureModelElement(context, 'button:expand', SButton, ExpandButtonView);
-    configureModelElement(context, 'routing-point', SRoutingHandle, SRoutingHandleView);
-    configureModelElement(context, 'volatile-routing-point', SRoutingHandle, SRoutingHandleView);
-    configureModelElement(context, 'edge', SEdge, WorkflowEdgeView);
-    configureModelElement(context, 'edge:weighted', WeightedEdge, WeightedEdgeView);
+    configureModelElement(context, DefaultTypes.EDGE, SEdge, WorkflowEdgeView);
+    configureModelElement(context, 'edge:weighted', WeightedEdge, WorkflowEdgeView);
     configureModelElement(context, 'icon', Icon, IconView);
     configureModelElement(context, 'activityNode:merge', ActivityNode, DiamondNodeView);
     configureModelElement(context, 'activityNode:decision', ActivityNode, DiamondNodeView);
-    configureModelElement(context, 'activityNode:fork', ActivityNode, ForkOrJoinNodeView);
-    configureModelElement(context, 'activityNode:join', ActivityNode, ForkOrJoinNodeView);
+    configureModelElement(context, 'activityNode:fork', ActivityNode, RectangularNodeView);
+    configureModelElement(context, 'activityNode:join', ActivityNode, RectangularNodeView);
+
+    configureModelElement(context, 'category', CategoryNode, RoundedCornerNodeView);
+    configureModelElement(context, 'struct', SCompartment, StructureCompartmentView);
 });
 
 export default function createContainer(widgetId: string): Container {
-    const container = new Container();
-
-    container.load(validationModule, defaultModule, glspMouseToolModule, defaultGLSPModule, glspSelectModule, boundsModule, glspViewportModule, toolsModule,
-        glspHoverModule, fadeModule, exportModule, expandModule, openModule, buttonModule, modelSourceModule, labelEditUiModule, glspEditLabelModule,
-        workflowDiagramModule, toolFeedbackModule, modelHintsModule, glspContextMenuModule, glspServerCopyPasteModule, modelSourceWatcherModule,
-        glspCommandPaletteModule, paletteModule, routingModule, glspDecorationModule, edgeLayoutModule, zorderModule,
-        layoutCommandsModule, directTaskEditor, navigationModule, markerNavigatorModule);
-
+    const container = createClientContainer(workflowDiagramModule, directTaskEditor);
     overrideViewerOptions(container, {
         baseDiv: widgetId,
-        hiddenDiv: widgetId + "_hidden"
+        hiddenDiv: widgetId + '_hidden'
     });
-
     return container;
 }

package/src/direct-task-editing/di.config.ts

@@ -13,10 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from "inversify";
-import { TYPES } from "sprotty";
+import { ContainerModule } from 'inversify';
+import { TYPES } from 'sprotty';
 
-import { TaskEditor } from "./direct-task-editor";
+import { TaskEditor } from './direct-task-editor';
 
 export const directTaskEditor = new ContainerModule((bind, _unbind, isBound) => {
     bind(TaskEditor).toSelf().inSingletonScope();

package/src/direct-task-editing/direct-task-editor.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 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
@@ -32,22 +32,21 @@ import {
     ValidationDecorator,
     ValidationStatus,
     ViewerOptions
-} from "@eclipse-glsp/client";
-import { inject, injectable } from "inversify";
-import { TYPES } from "sprotty/lib";
-import { DOMHelper } from "sprotty/lib/base/views/dom-helper";
+} from '@eclipse-glsp/client';
+import { inject, injectable } from 'inversify';
+import { TYPES } from 'sprotty/lib';
+import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
 
-import { isTaskNode, TaskNode } from "../model";
+import { isTaskNode, TaskNode } from '../model';
 
 export class ApplyTaskEditOperation implements Action {
     static readonly KIND = 'applyTaskEdit';
     readonly kind = ApplyTaskEditOperation.KIND;
-    constructor(readonly taskId: string, readonly expression: string) { }
+    constructor(readonly taskId: string, readonly expression: string) {}
 }
 
 @injectable()
 export class TaskEditor extends AbstractUIExtension {
-
     static readonly ID = 'task-editor';
     readonly autoSuggestionSettings = {
         noSuggestionsMessage: 'No suggestions available',
@@ -74,37 +73,43 @@ export class TaskEditor extends AbstractUIExtension {
     protected task: TaskNode;
     protected autoSuggestion: AutoCompleteWidget;
 
-    id() { return TaskEditor.ID; }
-    containerClass() { return 'command-palette'; }
+    id(): string {
+        return TaskEditor.ID;
+    }
+    containerClass(): string {
+        return 'command-palette';
+    }
 
     protected initializeContents(containerElement: HTMLElement): void {
         this.autoSuggestion = new AutoCompleteWidget(
             this.autoSuggestionSettings,
             { provideSuggestions: input => this.retrieveSuggestions(input) },
             { executeFromSuggestion: input => this.executeFromSuggestion(input) },
-            () => this.hide(), this.logger);
+            () => this.hide(),
+            this.logger
+        );
         this.autoSuggestion.configureValidation(
             { validate: input => this.validateInput(input) },
             new ValidationDecorator(containerElement)
         );
-        this.autoSuggestion.configureTextSubmitHandler(
-            { executeFromTextOnlyInput: (input: string) => this.executeFromTextOnlyInput(input) }
-        );
+        this.autoSuggestion.configureTextSubmitHandler({
+            executeFromTextOnlyInput: (input: string) => this.executeFromTextOnlyInput(input)
+        });
         this.autoSuggestion.initialize(containerElement);
     }
 
-    show(root: Readonly<SModelRoot>, ...contextElementIds: string[]) {
+    show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
         super.show(root, ...contextElementIds);
         this.autoSuggestion.open(root);
     }
 
-    protected onBeforeShow(containerElement: HTMLElement, root: Readonly<SModelRoot>, ...contextElementIds: string[]) {
+    protected onBeforeShow(containerElement: HTMLElement, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
         this.task = getTask(contextElementIds, root)[0];
         this.autoSuggestion.inputField.value = '';
         this.setPosition(containerElement);
     }
 
-    protected setPosition(containerElement: HTMLElement) {
+    protected setPosition(containerElement: HTMLElement): void {
         let x = 0;
         let y = 0;
 
@@ -120,8 +125,9 @@ export class TaskEditor extends AbstractUIExtension {
     }
 
     protected async retrieveSuggestions(input: string): Promise<LabeledAction[]> {
-        const response = await this.actionDispatcher.request(new RequestContextActions(TaskEditor.ID,
-            this.editorContextService.get({ ['text']: input })));
+        const response = await this.actionDispatcher.request(
+            new RequestContextActions(TaskEditor.ID, this.editorContextService.get({ ['text']: input }))
+        );
         if (isSetContextActionsAction(response)) {
             return response.actions;
         }
@@ -136,16 +142,16 @@ export class TaskEditor extends AbstractUIExtension {
         return Promise.reject();
     }
 
-    protected executeFromSuggestion(input: LabeledAction | Action[] | Action) {
+    protected executeFromSuggestion(input: LabeledAction | Action[] | Action): void {
         this.actionDispatcher.dispatchAll(toActionArray(input));
     }
 
-    protected executeFromTextOnlyInput(input: string) {
+    protected executeFromTextOnlyInput(input: string): void {
         const action = new ApplyTaskEditOperation(this.task.id, input);
         this.actionDispatcher.dispatch(action);
     }
 
-    hide() {
+    hide(): void {
         this.autoSuggestion.dispose();
         super.hide();
     }