@eclipse-glsp/client 1.1.0-next.c8b4f65.194 → 1.1.0-next.d9a27cd.236

package/src/features/tools/glsp-manhattan-edge-router.ts

@@ -0,0 +1,60 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 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
+ ********************************************************************************/
+
+import { almostEquals } from '@eclipse-glsp/protocol';
+import { ManhattanEdgeRouter, ResolvedHandleMove, SRoutableElement } from 'sprotty';
+
+export class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
+    protected override applyInnerHandleMoves(edge: SRoutableElement, moves: ResolvedHandleMove[]): void {
+        const route = this.route(edge);
+        const routingPoints = edge.routingPoints;
+        const minimalPointDistance = this.getOptions(edge).minimalPointDistance;
+        moves.forEach(move => {
+            const handle = move.handle;
+            const index = handle.pointIndex;
+            const correctedX = this.correctX(routingPoints, index, move.toPosition.x, minimalPointDistance);
+            const correctedY = this.correctY(routingPoints, index, move.toPosition.y, minimalPointDistance);
+            switch (handle.kind) {
+                case 'manhattan-50%':
+                    if (index < 0) {
+                        if (routingPoints.length === 0) {
+                            routingPoints.push({ x: correctedX, y: correctedY });
+                            move.handle.pointIndex = 0;
+                        } else if (almostEquals(route[0].x, route[1].x)) {
+                            this.alignX(routingPoints, 0, correctedX);
+                        } else {
+                            this.alignY(routingPoints, 0, correctedY);
+                        }
+                    } else if (index < routingPoints.length - 1) {
+                        if (almostEquals(routingPoints[index].x, routingPoints[index + 1].x)) {
+                            this.alignX(routingPoints, index, correctedX);
+                            this.alignX(routingPoints, index + 1, correctedX);
+                        } else {
+                            this.alignY(routingPoints, index, correctedY);
+                            this.alignY(routingPoints, index + 1, correctedY);
+                        }
+                    } else {
+                        if (almostEquals(route[route.length - 2].x, route[route.length - 1].x)) {
+                            this.alignX(routingPoints, routingPoints.length - 1, correctedX);
+                        } else {
+                            this.alignY(routingPoints, routingPoints.length - 1, correctedY);
+                        }
+                    }
+                    break;
+            }
+        });
+    }
+}

package/src/features/validation/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SetMarkersAction } from '@eclipse-glsp/protocol';
+import { bindAsService, SetMarkersAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import { configureActionHandler, configureCommand } from 'sprotty';
 import { TYPES } from '../../base/types';
@@ -47,7 +47,7 @@ export const markerNavigatorModule = new ContainerModule((bind, _unbind, isBound
  * in a standalone deployment of GLSP. If the GLSP diagram is in Theia use the Theia-native
  * `registerMarkerNavigationCommands()` in `glsp-theia-integration` instead.
  */
-export const markerNavigatorContextMenuModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(TYPES.IContextMenuProvider).to(MarkerNavigatorContextMenuItemProvider).inSingletonScope();
-    bind(TYPES.KeyListener).to(MarkerNavigatorKeyListener).inSingletonScope();
+export const markerNavigatorContextMenuModule = new ContainerModule(bind => {
+    bindAsService(bind, TYPES.IContextMenuProvider, MarkerNavigatorContextMenuItemProvider);
+    bindAsService(bind, TYPES.KeyListener, MarkerNavigatorKeyListener);
 });

package/src/features/validation/issue-marker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 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

package/src/features/validation/validate.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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
@@ -33,28 +33,25 @@ export class ValidationFeedbackEmitter implements IFeedbackEmitter {
 
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
-    private registeredAction: ApplyMarkersAction;
-
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    private constructor() {}
+    protected registeredFeedbackByReason: Map<string, ApplyMarkersAction> = new Map();
 
     /**
      * Register the action that should be emitted for visualizing validation feedback.
      * @param action the action that should be emitted when the model is updated and that will visualize the model validation feedback.
+     * @param reason the reason for this validation feedback.
      */
-    registerValidationFeedbackAction(action: ApplyMarkersAction): void {
-        // De-register old action responsible for applying markers and re-applying them when the model is updated
-        this.feedbackActionDispatcher.deregisterFeedback(this, []);
-
-        // Clear existing markers
-        if (this.registeredAction !== undefined) {
-            const deleteMarkersAction = DeleteMarkersAction.create(this.registeredAction.markers);
+    registerValidationFeedbackAction(action: ApplyMarkersAction, reason = ''): void {
+        // De-register feedback and clear existing markers with the same reason
+        const previousFeedbackWithSameReason = this.registeredFeedbackByReason.get(reason);
+        if (previousFeedbackWithSameReason) {
+            this.feedbackActionDispatcher.deregisterFeedback(this, [previousFeedbackWithSameReason]);
+            const deleteMarkersAction = DeleteMarkersAction.create(previousFeedbackWithSameReason.markers);
             this.actionDispatcher().then(dispatcher => dispatcher.dispatch(deleteMarkersAction));
         }
 
         // Register new action responsible for applying markers and re-applying them when the model is updated
-        this.feedbackActionDispatcher.registerFeedback(this, [action]);
-        this.registeredAction = action;
+        this.registeredFeedbackByReason.set(reason, action);
+        this.feedbackActionDispatcher.registerFeedback(this, [...this.registeredFeedbackByReason.values()]);
     }
 }
 
@@ -80,7 +77,7 @@ export abstract class ExternalMarkerManager {
         }
     }
 
-    abstract setMarkers(markers: Marker[], sourceUri?: string): void;
+    abstract setMarkers(markers: Marker[], reason?: string, sourceUri?: string): void;
 }
 
 @injectable()
@@ -97,14 +94,14 @@ export class SetMarkersActionHandler implements IActionHandler {
 
     handle(action: SetMarkersAction): void | Action | ICommand {
         const markers: Marker[] = action.markers;
-        this.setMarkers(markers);
+        this.setMarkers(markers, action.reason);
     }
 
-    async setMarkers(markers: Marker[]): Promise<void> {
+    async setMarkers(markers: Marker[], reason: string | undefined): Promise<void> {
         const uri = await this.editorContextService.getSourceUri();
-        this.externalMarkerManager?.setMarkers(markers, uri);
+        this.externalMarkerManager?.setMarkers(markers, reason, uri);
         const applyMarkersAction = ApplyMarkersAction.create(markers);
-        this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction);
+        this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction, reason);
     }
 }
 

package/src/features/viewport/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 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,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import {
     CenterCommand,
@@ -30,17 +31,18 @@ import {
 import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
 
 const glspViewportModule = new ContainerModule((bind, _unbind, isBound) => {
-    configureCommand({ bind, isBound }, CenterCommand);
-    configureCommand({ bind, isBound }, FitToScreenCommand);
-    configureCommand({ bind, isBound }, GetViewportCommand);
-    configureCommand({ bind, isBound }, SetViewportCommand);
-    bind(TYPES.KeyListener).to(CenterKeyboardListener);
-    bind(TYPES.MouseListener).to(ZoomMouseListener);
-    bind(GLSPScrollMouseListener).toSelf().inSingletonScope();
-    bind(TYPES.MouseListener).toService(GLSPScrollMouseListener);
+    const context = { bind, isBound };
+    configureCommand(context, CenterCommand);
+    configureCommand(context, FitToScreenCommand);
+    configureCommand(context, GetViewportCommand);
+    configureCommand(context, SetViewportCommand);
 
-    configureActionHandler({ bind, isBound }, EnableToolsAction.KIND, GLSPScrollMouseListener);
-    configureActionHandler({ bind, isBound }, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
+    bindAsService(context, TYPES.KeyListener, CenterKeyboardListener);
+    bindAsService(context, TYPES.MouseListener, ZoomMouseListener);
+    bindAsService(context, TYPES.MouseListener, GLSPScrollMouseListener);
+
+    configureActionHandler(context, EnableToolsAction.KIND, GLSPScrollMouseListener);
+    configureActionHandler(context, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
 });
 
 export default glspViewportModule;

package/src/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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
@@ -18,21 +18,23 @@ import glspCommandPaletteModule from './features/command-palette/di.config';
 import glspContextMenuModule from './features/context-menu/di.config';
 import { copyPasteContextMenuModule, glspServerCopyPasteModule } from './features/copy-paste/di.config';
 import glspDecorationModule from './features/decoration/di.config';
+import svgMetadataModule from './features/svg-metadata/di.config';
 import glspEditLabelModule from './features/edit-label/di.config';
 import modelHintsModule from './features/hints/di.config';
 import glspHoverModule from './features/hover/di.config';
 import layoutModule from './features/layout/di.config';
 import glspMouseToolModule from './features/mouse-tool/di.config';
-import { navigationModule } from './features/navigation/di.config';
+import navigationModule from './features/navigation/di.config';
 import saveModule from './features/save/di.config';
 import glspSelectModule from './features/select/di.config';
 import sourceModelWatcherModule from './features/source-model-watcher/di.config';
 import toolFeedbackModule from './features/tool-feedback/di.config';
 import paletteModule from './features/tool-palette/di.config';
 import { enableDefaultToolsOnFocusLossModule, toolsModule } from './features/tools/di.config';
-import { markerNavigatorModule, validationModule } from './features/validation/di.config';
+import { markerNavigatorContextMenuModule, markerNavigatorModule, validationModule } from './features/validation/di.config';
 import glspViewportModule from './features/viewport/di.config';
 
+// ------------------ Base ------------------
 export * from './base/action-dispatcher';
 export * from './base/actions/focus-change-action';
 export * from './base/argumentable';
@@ -50,18 +52,32 @@ export * from './base/model/model-registry';
 export * from './base/model/update-model-command';
 export * from './base/selection-clearing-mouse-listener';
 export * from './base/source-uri-aware';
+export * from './base/tool-manager/glsp-tool-manager';
 export * from './base/tool-manager/tool-actions';
 export * from './base/types';
 export * from './base/view/view-registry';
+//
+// ------------------ Features ------------------
+export * from './features/bounds/freeform-layout';
+export * from './features/bounds/glsp-hidden-bounds-updater';
+export * from './features/bounds/hbox-layout';
+export * from './features/bounds/layouter';
+export * from './features/bounds/vbox-layout';
 export * from './features/change-bounds/model';
 export * from './features/change-bounds/movement-restrictor';
 export * from './features/change-bounds/snap';
+export * from './features/command-palette/command-palette-tool';
 export * from './features/command-palette/server-command-palette-provider';
 export * from './features/context-menu/delete-element-context-menu';
+export * from './features/context-menu/selection-service-aware-context-menu-mouse-listener';
+export * from './features/context-menu/server-context-menu-provider';
+export * from './features/copy-paste/copy-paste-context-menu';
 export * from './features/copy-paste/copy-paste-handler';
 export * from './features/decoration/decoration-placer';
+export * from './features/svg-metadata/metadata-placer';
 export * from './features/edit-label/edit-label-tool';
 export * from './features/edit-label/edit-label-validator';
+export * from './features/export/glsp-svg-exporter';
 export * from './features/hints/model';
 export * from './features/hints/type-hints';
 export * from './features/hover/hover';
@@ -73,33 +89,47 @@ export * from './features/rank/model';
 export * from './features/reconnect/model';
 export * from './features/save/model';
 export * from './features/save/save-keylistener';
+export * from './features/select/select-feedback-action';
+export * from './features/select/select-mouse-listener';
+export * from './features/select/selection-service';
 export * from './features/source-model-watcher/source-model-changed-action-handler';
 export * from './features/tool-feedback/change-bounds-tool-feedback';
 export * from './features/tool-feedback/creation-tool-feedback';
 export * from './features/tool-feedback/css-feedback';
 export * from './features/tool-feedback/edge-edit-tool-feedback';
 export * from './features/tool-feedback/feedback-action-dispatcher';
+export * from './features/tool-feedback/marquee-tool-feedback';
 export * from './features/tool-feedback/model';
+export * from './features/tool-feedback/view';
 export * from './features/tool-palette/tool-palette';
 export * from './features/tools/base-glsp-tool';
 export * from './features/tools/change-bounds-tool';
 export * from './features/tools/delete-tool';
+export { configureMarqueeTool } from './features/tools/di.config';
 export * from './features/tools/edge-creation-tool';
 export * from './features/tools/edge-edit-tool';
+export * from './features/tools/enable-default-tools-on-focus-loss';
+export * from './features/tools/glsp-manhattan-edge-router';
 export * from './features/tools/marquee-behavior';
+export * from './features/tools/model';
 export * from './features/tools/node-creation-tool';
 export * from './features/validation/issue-marker';
 export * from './features/validation/marker-navigator';
 export * from './features/validation/validate';
 export * from './features/viewport/glsp-scroll-mouse-listener';
+//
+// ------------------ Misc ------------------
 export * from './lib/model';
 export * from './model-source/glsp-diagram-server';
 export * from './sprotty-reexport';
 export * from './utils/argument-utils';
+export * from './utils/html-utils';
+export * from './utils/layout-utils';
 export * from './utils/marker';
 export * from './utils/smodel-util';
 export * from './utils/viewpoint-util';
 export * from './views';
+// ------------------ DI Modules ------------------
 export {
     validationModule,
     saveModule,
@@ -121,6 +151,8 @@ export {
     navigationModule,
     markerNavigatorModule,
     glspDecorationModule,
-    sourceModelWatcherModule as modelSourceWatcherModule,
-    glspViewportModule
+    sourceModelWatcherModule,
+    markerNavigatorContextMenuModule,
+    glspViewportModule,
+    svgMetadataModule
 };

package/src/lib/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { exportFeature, SGraph, SModelElement, viewportFeature } from 'sprotty';
+import { Bounds, isBounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
+import { exportFeature, getRouteBounds, SEdge, SGraph, SModelElement, viewportFeature } from 'sprotty';
 import { Containable, containerFeature } from '../features/hints/model';
 import { Saveable, saveFeature } from '../features/save/model';
 
@@ -25,3 +25,35 @@ export class GLSPGraph extends SGraph implements Saveable, Containable {
         return true;
     }
 }
+
+export class GEdge extends SEdge {
+    override localToParent(point: Point | Bounds): Bounds {
+        const bounds = getRouteBounds(this.routingPoints);
+        const result = {
+            x: point.x + bounds.x,
+            y: point.y + bounds.y,
+            width: -1,
+            height: -1
+        };
+        if (isBounds(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+
+    override parentToLocal(point: Point | Bounds): Bounds {
+        const bounds = getRouteBounds(this.routingPoints);
+        const result = {
+            x: point.x - bounds.x,
+            y: point.y - bounds.y,
+            width: -1,
+            height: -1
+        };
+        if (isBounds(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+}

package/src/sprotty-reexport.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 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
@@ -22,7 +22,15 @@
 
 export * from '@eclipse-glsp/protocol';
 // sprotty-protocol
-export { CollapseExpandAction, CollapseExpandAllAction, ElementAndAlignment, SetBoundsAction } from 'sprotty-protocol/lib/actions';
+export {
+    BringToFrontAction,
+    CollapseExpandAction,
+    CollapseExpandAllAction,
+    ElementAndAlignment,
+    HoverFeedbackAction,
+    MoveAction,
+    SetBoundsAction
+} from 'sprotty-protocol/lib/actions';
 export { Viewport } from 'sprotty-protocol/lib/model';
 // ------------------ Base ------------------
 export * from 'sprotty/lib/base/actions/action-dispatcher';
@@ -144,7 +152,6 @@ export * from 'sprotty/lib/features/fade/model';
 export {
     AbstractHoverMouseListener,
     ClosePopupActionHandler,
-    HoverFeedbackAction,
     HoverFeedbackCommand,
     HoverKeyListener,
     HoverMouseListener,
@@ -154,7 +161,16 @@ export {
 } from 'sprotty/lib/features/hover/hover';
 export * from 'sprotty/lib/features/hover/model';
 export * from 'sprotty/lib/features/move/model';
-export * from 'sprotty/lib/features/move/move';
+export {
+    ElementMove,
+    LocationPostprocessor,
+    MorphEdgesAnimation,
+    MoveAnimation,
+    MoveCommand,
+    MoveMouseListener,
+    ResolvedElementMove,
+    ResolvedHandleMove
+} from 'sprotty/lib/features/move/move';
 export * from 'sprotty/lib/features/move/snap';
 export * from 'sprotty/lib/features/nameable/model';
 export * from 'sprotty/lib/features/open/model';
@@ -176,13 +192,13 @@ export * from 'sprotty/lib/features/select/model';
 export {
     GetSelectionAction,
     GetSelectionCommand,
-    SelectAllCommand,
-    SelectCommand,
+    SelectAllCommand as SprottySelectAllCommand,
+    SelectCommand as SprottySelectCommand,
     SelectionResult,
     SelectKeyboardListener,
     SelectMouseListener
 } from 'sprotty/lib/features/select/select';
-export * from 'sprotty/lib/features/undo-redo/undo-redo';
+export { UndoRedoKeyListener } from 'sprotty/lib/features/undo-redo/undo-redo';
 export * from 'sprotty/lib/features/update/model-matching';
 export { UpdateAnimationData, UpdateModelCommand } from 'sprotty/lib/features/update/update-model';
 export {
@@ -202,7 +218,7 @@ export {
 } from 'sprotty/lib/features/viewport/viewport';
 export * from 'sprotty/lib/features/viewport/viewport-root';
 export * from 'sprotty/lib/features/viewport/zoom';
-export * from 'sprotty/lib/features/zorder/zorder';
+export { BringToFrontCommand, ZOrderElement } from 'sprotty/lib/features/zorder/zorder';
 export { SCompartment, SEdge, SGraph, SGraphIndex, SLabel, SNode, SPort } from 'sprotty/lib/graph/sgraph';
 // ------------------ Graph ------------------
 export * from 'sprotty/lib/graph/sgraph-factory';

package/src/utils/html-utils.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2020 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

package/src/utils/smodel-util.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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,7 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { distinctAdd, ElementAndBounds, ElementAndRoutingPoints, remove, SModelElementSchema, TypeGuard } from '@eclipse-glsp/protocol';
+import {
+    distinctAdd,
+    ElementAndBounds,
+    ElementAndRoutingPoints,
+    Point,
+    remove,
+    SModelElementSchema,
+    TypeGuard
+} from '@eclipse-glsp/protocol';
 import {
     BoundsAware,
     EdgeRouterRegistry,
@@ -22,6 +30,7 @@ import {
     isSelectable,
     isSelected,
     ModelIndexImpl,
+    RoutedPoint,
     Selectable,
     SModelElement,
     SRoutableElement,
@@ -226,21 +235,57 @@ export function toElementAndRoutingPoints(element: SRoutableElement): ElementAnd
     };
 }
 
+/** Pure routing point data kinds. */
+export const ROUTING_POINT_KINDS = ['linear', 'bezier-junction'];
+
+/** Pure route data kinds. */
+export const ROUTE_KINDS = [...ROUTING_POINT_KINDS, 'source', 'target'];
+
 /**
  * Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
  * If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
  * points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
  * @param element The element to translate.
- * @param edgeRouterRegistry the edge router registry
+ * @param routerRegistry the edge router registry.
  * @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
  */
-export function calcElementAndRoutingPoints(element: SRoutableElement, edgeRouterRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
-    const router = edgeRouterRegistry?.get(element.routerKind);
-    // filter duplicate points (same x,y coordinates) and only keep actual routing points (no start or target, no volatile points)
-    const clientRoutingPoints = router?.route(element)
-        .filter((point, idx, route) => idx === route.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y))
-        .filter(point => point.kind === 'linear' || point.kind === 'bezier-junction');
-    return { elementId: element.id, newRoutingPoints: clientRoutingPoints || element.routingPoints };
+export function calcElementAndRoutingPoints(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
+    const newRoutingPoints = routerRegistry ? calcRoute(element, routerRegistry, ROUTING_POINT_KINDS) : element.routingPoints;
+    return { elementId: element.id, newRoutingPoints };
+}
+
+/**
+ * Helper function to calculate the route for a given {@link SRoutableElement}.
+ * If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the points
+ * from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
+ * @param element The element to translate.
+ * @param routerRegistry the edge router registry.
+ * @returns The corresponding route for the given element.
+ */
+export function calcElementAndRoute(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
+    let route: Point[] | undefined = routerRegistry ? calcRoute(element, routerRegistry, ROUTE_KINDS) : undefined;
+    if (!route) {
+        // add source and target to the routing points
+        route = [...element.routingPoints];
+        route.splice(0, 0, element.source?.position || Point.ORIGIN);
+        route.push(element.target?.position || Point.ORIGIN);
+    }
+    return { elementId: element.id, newRoutingPoints: route };
+}
+
+/**
+ * Helper function to calculate the route for a given {@link SRoutableElement}.
+ * @param element The element to translate.
+ * @param routerRegistry the edge router registry.
+ * @param pointKinds the routing point kinds that should be considered.
+ * @returns The corresponding route for the given element.
+ */
+export function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[]): RoutedPoint[] | undefined {
+    return routerRegistry
+        ?.get(element.routerKind)
+        .route(element)
+        .filter((point, idx, fullRoute) => idx === fullRoute.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y))
+        .filter(point => !pointKinds || pointKinds.includes(point.kind));
 }
 
 /**
@@ -265,4 +310,3 @@ export function getElementTypeId(input: SModelElement | SModelElementSchema | st
         return (input as any)['type'] as string;
     }
 }
-

package/src/views/base-view-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2023 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,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { DefaultTypes } from '@eclipse-glsp/protocol';
-import { ContainerModule, interfaces } from 'inversify';
+import { BindingContext, DefaultTypes } from '@eclipse-glsp/protocol';
+import { ContainerModule } from 'inversify';
 import {
     CircularNode,
     CircularNodeView,
@@ -53,17 +53,12 @@ import { GEdgeView } from './glsp-edge-view';
 import { GIssueMarkerView } from './issue-marker-view';
 import { RoundedCornerNodeView } from './rounded-corner-view';
 
-interface ContainerContext {
-    bind: interfaces.Bind;
-    isBound: interfaces.IsBound;
-}
-
 const baseViewModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     const context = { bind, unbind, isBound, rebind };
     configureDefaultModelElements(context);
 });
 
-export function configureDefaultModelElements(context: ContainerContext): void {
+export function configureDefaultModelElements(context: Pick<BindingContext, 'bind' | 'isBound'>): void {
     // HTML elements
     configureModelElement(context, DefaultTypes.HTML, HtmlRoot, HtmlRootView);
 

package/src/views/glsp-edge-view.tsx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 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,7 +32,7 @@ export class GEdgeView extends PolylineEdgeView {
         }
 
         return (
-            <g class-sprotty-edge={true} class-mouseover={edge.hoverFeedback} {...this.addtionalClasses(edge, context)}>
+            <g class-sprotty-edge={true} class-mouseover={edge.hoverFeedback} {...this.additionalClasses(edge, context)}>
                 {this.renderLine(edge, route, context)}
                 {this.renderAdditionals(edge, route, context)}
                 {context.renderChildren(edge, { route })}
@@ -40,7 +40,7 @@ export class GEdgeView extends PolylineEdgeView {
         );
     }
 
-    protected addtionalClasses(_edge: Readonly<SEdge>, _context: RenderingContext): Classes {
+    protected additionalClasses(_edge: Readonly<SEdge>, _context: RenderingContext): Classes {
         return {};
     }
 

package/src/views/glsp-projection-view.tsx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2017-2018 TypeFox and others.
+ * Copyright (c) 2017-2022 TypeFox 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