@eclipse-glsp/client 2.3.0-next.322 → 2.3.0-next.366

package/src/features/hints/type-hints-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -16,10 +16,13 @@
 import { FeatureModule, SetTypeHintsAction, TYPES, bindAsService, configureActionHandler, configureCommand } from '@eclipse-glsp/sprotty';
 import { ApplyTypeHintsCommand, TypeHintProvider } from './type-hint-provider';
 
-export const typeHintsModule = new FeatureModule((bind, unbind, isBound) => {
-    const context = { bind, unbind, isBound };
-    bindAsService(context, TYPES.ITypeHintProvider, TypeHintProvider);
-    bind(TYPES.IDiagramStartup).toService(TypeHintProvider);
-    configureActionHandler(context, SetTypeHintsAction.KIND, TypeHintProvider);
-    configureCommand(context, ApplyTypeHintsCommand);
-});
+export const typeHintsModule = new FeatureModule(
+    (bind, unbind, isBound) => {
+        const context = { bind, unbind, isBound };
+        bindAsService(context, TYPES.ITypeHintProvider, TypeHintProvider);
+        bind(TYPES.IDiagramStartup).toService(TypeHintProvider);
+        configureActionHandler(context, SetTypeHintsAction.KIND, TypeHintProvider);
+        configureCommand(context, ApplyTypeHintsCommand);
+    },
+    { featureId: Symbol('typeHints') }
+);

package/src/features/hover/hover-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2023 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -35,30 +35,33 @@ import { FocusStateChangedAction } from '../../base/focus/focus-state-change-act
 import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool';
 import { GlspHoverMouseListener } from './hover';
 
-export const hoverModule = new FeatureModule((bind, _unbind, isBound) => {
-    const context = { bind, isBound };
-    bindAsService(context, TYPES.PopupVNodePostprocessor, PopupPositionUpdater);
-    bindAsService(context, TYPES.MouseListener, GlspHoverMouseListener);
-    bindAsService(context, TYPES.PopupMouseListener, PopupHoverMouseListener);
-    bindAsService(context, TYPES.KeyListener, HoverKeyListener);
+export const hoverModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        bindAsService(context, TYPES.PopupVNodePostprocessor, PopupPositionUpdater);
+        bindAsService(context, TYPES.MouseListener, GlspHoverMouseListener);
+        bindAsService(context, TYPES.PopupMouseListener, PopupHoverMouseListener);
+        bindAsService(context, TYPES.KeyListener, HoverKeyListener);
 
-    bind<HoverState>(TYPES.HoverState).toConstantValue({
-        mouseOverTimer: undefined,
-        mouseOutTimer: undefined,
-        popupOpen: false,
-        previousPopupElement: undefined
-    });
-    bind(ClosePopupActionHandler).toSelf().inSingletonScope();
+        bind<HoverState>(TYPES.HoverState).toConstantValue({
+            mouseOverTimer: undefined,
+            mouseOutTimer: undefined,
+            popupOpen: false,
+            previousPopupElement: undefined
+        });
+        bind(ClosePopupActionHandler).toSelf().inSingletonScope();
 
-    configureCommand(context, HoverFeedbackCommand);
-    configureCommand(context, SetPopupModelCommand);
-    configureActionHandler(context, SetPopupModelCommand.KIND, ClosePopupActionHandler);
-    configureActionHandler(context, FitToScreenCommand.KIND, ClosePopupActionHandler);
-    configureActionHandler(context, CenterCommand.KIND, ClosePopupActionHandler);
-    configureActionHandler(context, SetViewportCommand.KIND, ClosePopupActionHandler);
-    configureActionHandler(context, MoveCommand.KIND, ClosePopupActionHandler);
-    configureActionHandler(context, FocusStateChangedAction.KIND, ClosePopupActionHandler);
-    configureActionHandler(context, EnableToolsAction.KIND, GlspHoverMouseListener);
-    configureActionHandler(context, EnableDefaultToolsAction.KIND, GlspHoverMouseListener);
-    configureActionHandler(context, FocusStateChangedAction.KIND, GlspHoverMouseListener);
-});
+        configureCommand(context, HoverFeedbackCommand);
+        configureCommand(context, SetPopupModelCommand);
+        configureActionHandler(context, SetPopupModelCommand.KIND, ClosePopupActionHandler);
+        configureActionHandler(context, FitToScreenCommand.KIND, ClosePopupActionHandler);
+        configureActionHandler(context, CenterCommand.KIND, ClosePopupActionHandler);
+        configureActionHandler(context, SetViewportCommand.KIND, ClosePopupActionHandler);
+        configureActionHandler(context, MoveCommand.KIND, ClosePopupActionHandler);
+        configureActionHandler(context, FocusStateChangedAction.KIND, ClosePopupActionHandler);
+        configureActionHandler(context, EnableToolsAction.KIND, GlspHoverMouseListener);
+        configureActionHandler(context, EnableDefaultToolsAction.KIND, GlspHoverMouseListener);
+        configureActionHandler(context, FocusStateChangedAction.KIND, GlspHoverMouseListener);
+    },
+    { featureId: Symbol('hover') }
+);

package/src/features/label-edit/label-edit-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -17,9 +17,12 @@ import { ApplyLabelEditCommand, FeatureModule, TYPES, bindAsService, configureCo
 import { DirectLabelEditTool } from './edit-label-tool';
 import { BalloonLabelValidationDecorator, ServerEditLabelValidator } from './edit-label-validator';
 
-export const labelEditModule = new FeatureModule((bind, _unbind, isBound, _rebind) => {
-    bind(TYPES.IEditLabelValidator).to(ServerEditLabelValidator);
-    bind(TYPES.IEditLabelValidationDecorator).to(BalloonLabelValidationDecorator);
-    bindAsService(bind, TYPES.IDefaultTool, DirectLabelEditTool);
-    configureCommand({ bind, isBound }, ApplyLabelEditCommand);
-});
+export const labelEditModule = new FeatureModule(
+    (bind, _unbind, isBound, _rebind) => {
+        bind(TYPES.IEditLabelValidator).to(ServerEditLabelValidator);
+        bind(TYPES.IEditLabelValidationDecorator).to(BalloonLabelValidationDecorator);
+        bindAsService(bind, TYPES.IDefaultTool, DirectLabelEditTool);
+        configureCommand({ bind, isBound }, ApplyLabelEditCommand);
+    },
+    { featureId: Symbol('labelEdit') }
+);

package/{lib/base/index.d.ts → src/features/label-edit-ui/label-edit-ui-module.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * 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
@@ -13,20 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './action-dispatcher';
-export * from './action-handler-registry';
-export * from './args-feature';
-export * from './auto-complete';
-export * from './command-stack';
-export * from './default.module';
-export * from './drag-aware-mouse-listener';
-export * from './editor-context-service';
-export * from './feedback';
-export * from './focus';
-export * from './model';
-export * from './ranked';
-export * from './selection-clearing-mouse-listener';
-export * from './selection-service';
-export * from './tool-manager';
-export * from './view';
-//# sourceMappingURL=index.d.ts.map
+import { EditLabelAction, EditLabelActionHandler, FeatureModule, TYPES, configureActionHandler } from '@eclipse-glsp/sprotty';
+import { GlspEditLabelUI } from './label-edit-ui';
+
+export const labelEditUiModule = new FeatureModule(
+    (bind, unbind, isBound, rebind, ...rest) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureActionHandler(context, EditLabelAction.KIND, EditLabelActionHandler);
+        bind(GlspEditLabelUI).toSelf().inSingletonScope();
+        bind(TYPES.IUIExtension).toService(GlspEditLabelUI);
+    },
+    { featureId: Symbol('labelEditUi') }
+);

package/src/features/label-edit-ui/label-edit-ui.ts

@@ -0,0 +1,35 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { EditLabelUI } from '@eclipse-glsp/sprotty';
+import { injectable } from 'inversify';
+import { CSS_HIDDEN_EXTENSION_CLASS, CSS_UI_EXTENSION_CLASS } from '../../base/ui-extension/ui-extension';
+
+@injectable()
+export class GlspEditLabelUI extends EditLabelUI {
+    protected override initializeContents(containerElement: HTMLElement): void {
+        super.initializeContents(containerElement);
+        containerElement.classList.add(CSS_UI_EXTENSION_CLASS);
+    }
+
+    protected override setContainerVisible(visible: boolean): void {
+        if (visible) {
+            this.containerElement?.classList.remove(CSS_HIDDEN_EXTENSION_CLASS);
+            this.editControl.focus();
+        } else {
+            this.containerElement?.classList.add(CSS_HIDDEN_EXTENSION_CLASS);
+        }
+    }
+}

package/src/features/layout/layout-elements-action.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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,17 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable, optional } from 'inversify';
 import {
     Action,
     ChangeBoundsOperation,
+    Dimension,
     ElementAndBounds,
     ElementMove,
+    GModelElement,
     IActionDispatcher,
     IActionHandler,
     ICommand,
     MoveAction,
-    GModelElement,
+    Point,
     SetBoundsAction,
     TYPES,
     Writable,
@@ -31,9 +32,10 @@ import {
     hasNumberProp,
     hasStringProp
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable, optional } from 'inversify';
 import { SelectionService } from '../../base/selection-service';
-import { toValidElementAndBounds, toValidElementMove } from '../../utils/layout-utils';
 import { BoundsAwareModelElement, getElements } from '../../utils/gmodel-util';
+import { toValidElementAndBounds, toValidElementMove } from '../../utils/layout-utils';
 import { isBoundsAwareMoveable, isResizable } from '../change-bounds/model';
 import { IMovementRestrictor } from '../change-bounds/movement-restrictor';
 
@@ -227,12 +229,13 @@ export class ResizeElementsActionHandler extends LayoutElementsActionHandler {
     resizeWidthAndHeight(elements: BoundsAwareModelElement[], reduceFn: ReduceFunction): void {
         const targetWidth = reduceFn(...elements.map(element => element.bounds.width));
         const targetHeight = reduceFn(...elements.map(element => element.bounds.height));
+        const targetDimension: Dimension = { width: targetWidth, height: targetHeight };
         this.dispatchResizeActions(elements, (element, bounds) => {
             // resize around center and middle (horizontal & vertical)
-            const halfDiffWidth = 0.5 * (targetWidth - element.bounds.width);
-            const halfDiffHeight = 0.5 * (targetHeight - element.bounds.height);
-            bounds.newPosition = { x: element.bounds.x - halfDiffWidth, y: element.bounds.y - halfDiffHeight };
-            bounds.newSize = { width: targetWidth, height: targetHeight };
+            const difference = Dimension.subtract(targetDimension, element.bounds);
+            const center = Dimension.center(difference);
+            bounds.newPosition = Point.subtract(element.bounds, center);
+            bounds.newSize = targetDimension;
         });
     }
 

package/src/features/layout/layout-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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,8 +21,11 @@ import {
     ResizeElementsActionHandler
 } from './layout-elements-action';
 
-export const layoutModule = new FeatureModule((bind, _unbind, isBound) => {
-    const context = { bind, isBound };
-    configureActionHandler(context, ResizeElementsAction.KIND, ResizeElementsActionHandler);
-    configureActionHandler(context, AlignElementsAction.KIND, AlignElementsActionHandler);
-});
+export const layoutModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        configureActionHandler(context, ResizeElementsAction.KIND, ResizeElementsActionHandler);
+        configureActionHandler(context, AlignElementsAction.KIND, AlignElementsActionHandler);
+    },
+    { featureId: Symbol('layout') }
+);

package/src/features/navigation/navigation-action-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2023 EclipseSource and others.
+ * Copyright (c) 2020-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,7 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
 import {
     Action,
     ActionHandlerRegistry,
@@ -38,6 +37,7 @@ import {
     hasObjectProp,
     hasStringProp
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
 import { EditorContextServiceProvider } from '../../base/editor-context-service';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 

package/src/features/navigation/navigation-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2023 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -17,11 +17,14 @@ import { FeatureModule, NavigateToExternalTargetAction, NavigateToTargetAction,
 import { NavigateAction, NavigationActionHandler, ProcessNavigationArgumentsAction } from './navigation-action-handler';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 
-export const navigationModule = new FeatureModule((bind, _unbind, isBound) => {
-    bind(NavigationTargetResolver).toSelf().inSingletonScope();
-    bind(NavigationActionHandler).toSelf().inSingletonScope();
-    configureActionHandler({ bind, isBound }, NavigateAction.KIND, NavigationActionHandler);
-    configureActionHandler({ bind, isBound }, NavigateToTargetAction.KIND, NavigationActionHandler);
-    configureActionHandler({ bind, isBound }, ProcessNavigationArgumentsAction.KIND, NavigationActionHandler);
-    configureActionHandler({ bind, isBound }, NavigateToExternalTargetAction.KIND, NavigationActionHandler);
-});
+export const navigationModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        bind(NavigationTargetResolver).toSelf().inSingletonScope();
+        bind(NavigationActionHandler).toSelf().inSingletonScope();
+        configureActionHandler({ bind, isBound }, NavigateAction.KIND, NavigationActionHandler);
+        configureActionHandler({ bind, isBound }, NavigateToTargetAction.KIND, NavigationActionHandler);
+        configureActionHandler({ bind, isBound }, ProcessNavigationArgumentsAction.KIND, NavigationActionHandler);
+        configureActionHandler({ bind, isBound }, NavigateToExternalTargetAction.KIND, NavigationActionHandler);
+    },
+    { featureId: Symbol('navigation') }
+);

package/src/features/routing/edge-router.ts

@@ -0,0 +1,171 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+import {
+    AbstractEdgeRouter,
+    BezierEdgeRouter,
+    GConnectableElement,
+    GParentElement,
+    GRoutableElement,
+    ManhattanEdgeRouter,
+    Point,
+    PolylineEdgeRouter,
+    ResolvedHandleMove,
+    almostEquals
+} from '@eclipse-glsp/sprotty';
+import { injectable } from 'inversify';
+
+@injectable()
+export abstract class GLSPAbstractEdgeRouter extends AbstractEdgeRouter {
+    override getTranslatedAnchor(
+        connectable: GConnectableElement,
+        refPoint: Point,
+        refContainer: GParentElement,
+        edge: GRoutableElement,
+        anchorCorrection?: number | undefined
+    ): Point {
+        // users may define all kinds of anchors and anchor computers, we want to make sure we return a valid one in any case
+        const anchor = super.getTranslatedAnchor(connectable, refPoint, refContainer, edge, anchorCorrection);
+        return Point.isValid(anchor) ? anchor : refPoint;
+    }
+
+    override cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void {
+        // sometimes it might happen that the source or target has the bounds not properly set when using the feedback edge
+        if (ensureBounds(edge.source) && ensureBounds(edge.target)) {
+            super.cleanupRoutingPoints(edge, routingPoints, updateHandles, addRoutingPoints);
+        }
+    }
+}
+
+@injectable()
+export class GLSPPolylineEdgeRouter extends PolylineEdgeRouter {
+    override getTranslatedAnchor(
+        connectable: GConnectableElement,
+        refPoint: Point,
+        refContainer: GParentElement,
+        edge: GRoutableElement,
+        anchorCorrection?: number | undefined
+    ): Point {
+        // users may define all kinds of anchors and anchor computers, we want to make sure we return a valid one in any case
+        const anchor = super.getTranslatedAnchor(connectable, refPoint, refContainer, edge, anchorCorrection);
+        return Point.isValid(anchor) ? anchor : refPoint;
+    }
+
+    override cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void {
+        // sometimes it might happen that the source or target has the bounds not properly set when using the feedback edge
+        if (ensureBounds(edge.source) && ensureBounds(edge.target)) {
+            super.cleanupRoutingPoints(edge, routingPoints, updateHandles, addRoutingPoints);
+        }
+    }
+}
+
+@injectable()
+export class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
+    override getTranslatedAnchor(
+        connectable: GConnectableElement,
+        refPoint: Point,
+        refContainer: GParentElement,
+        edge: GRoutableElement,
+        anchorCorrection?: number | undefined
+    ): Point {
+        // users may define all kinds of anchors and anchor computers, we want to make sure we return a valid one in any case
+        const anchor = super.getTranslatedAnchor(connectable, refPoint, refContainer, edge, anchorCorrection);
+        return Point.isValid(anchor) ? anchor : refPoint;
+    }
+
+    protected override applyInnerHandleMoves(edge: GRoutableElement, 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;
+            }
+        });
+    }
+
+    override cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void {
+        // sometimes it might happen that the source or target has the bounds not properly set when using the feedback edge
+        if (ensureBounds(edge.source) && ensureBounds(edge.target)) {
+            super.cleanupRoutingPoints(edge, routingPoints, updateHandles, addRoutingPoints);
+        }
+    }
+}
+
+@injectable()
+export class GLSPBezierEdgeRouter extends BezierEdgeRouter {
+    override getTranslatedAnchor(
+        connectable: GConnectableElement,
+        refPoint: Point,
+        refContainer: GParentElement,
+        edge: GRoutableElement,
+        anchorCorrection?: number | undefined
+    ): Point {
+        // users may define all kinds of anchors and anchor computers, we want to make sure we return a valid one in any case
+        const anchor = super.getTranslatedAnchor(connectable, refPoint, refContainer, edge, anchorCorrection);
+        return Point.isValid(anchor) ? anchor : refPoint;
+    }
+
+    override cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void {
+        // sometimes it might happen that the source or target has the bounds not properly set when using the feedback edge
+        if (ensureBounds(edge.source) && ensureBounds(edge.target)) {
+            super.cleanupRoutingPoints(edge, routingPoints, updateHandles, addRoutingPoints);
+        }
+    }
+}
+
+function ensureBounds(element?: GConnectableElement): boolean {
+    if (!element) {
+        return false;
+    }
+    if (element.bounds) {
+        return true;
+    }
+    if (element.position && element.size) {
+        element.bounds = { ...element.position, ...element.size };
+        return true;
+    }
+    return false;
+}

package/src/features/routing/routing-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -17,7 +17,6 @@ import {
     AddRemoveBezierSegmentCommand,
     AnchorComputerRegistry,
     BezierDiamondAnchor,
-    BezierEdgeRouter,
     BezierEllipseAnchor,
     BezierRectangleAnchor,
     DiamondAnchor,
@@ -27,33 +26,35 @@ import {
     ManhattanDiamondAnchor,
     ManhattanEllipticAnchor,
     ManhattanRectangularAnchor,
-    PolylineEdgeRouter,
     RectangleAnchor,
     TYPES,
     bindAsService,
     configureCommand
 } from '@eclipse-glsp/sprotty';
-import { GLSPManhattanEdgeRouter } from './glsp-manhattan-edge-router';
+import { GLSPBezierEdgeRouter, GLSPManhattanEdgeRouter, GLSPPolylineEdgeRouter } from './edge-router';
 
-export const routingModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    bind(EdgeRouterRegistry).toSelf().inSingletonScope();
-    bind(AnchorComputerRegistry).toSelf().inSingletonScope();
+export const routingModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        bind(EdgeRouterRegistry).toSelf().inSingletonScope();
+        bind(AnchorComputerRegistry).toSelf().inSingletonScope();
 
-    bindAsService(context, TYPES.IEdgeRouter, GLSPManhattanEdgeRouter);
-    bindAsService(context, TYPES.IAnchorComputer, ManhattanEllipticAnchor);
-    bindAsService(context, TYPES.IAnchorComputer, ManhattanRectangularAnchor);
-    bindAsService(context, TYPES.IAnchorComputer, ManhattanDiamondAnchor);
+        bindAsService(context, TYPES.IEdgeRouter, GLSPManhattanEdgeRouter);
+        bindAsService(context, TYPES.IAnchorComputer, ManhattanEllipticAnchor);
+        bindAsService(context, TYPES.IAnchorComputer, ManhattanRectangularAnchor);
+        bindAsService(context, TYPES.IAnchorComputer, ManhattanDiamondAnchor);
 
-    bindAsService(context, TYPES.IEdgeRouter, PolylineEdgeRouter);
-    bindAsService(context, TYPES.IAnchorComputer, EllipseAnchor);
-    bindAsService(context, TYPES.IAnchorComputer, RectangleAnchor);
-    bindAsService(context, TYPES.IAnchorComputer, DiamondAnchor);
+        bindAsService(context, TYPES.IEdgeRouter, GLSPPolylineEdgeRouter);
+        bindAsService(context, TYPES.IAnchorComputer, EllipseAnchor);
+        bindAsService(context, TYPES.IAnchorComputer, RectangleAnchor);
+        bindAsService(context, TYPES.IAnchorComputer, DiamondAnchor);
 
-    bindAsService(context, TYPES.IEdgeRouter, BezierEdgeRouter);
-    bindAsService(context, TYPES.IAnchorComputer, BezierEllipseAnchor);
-    bindAsService(context, TYPES.IAnchorComputer, BezierRectangleAnchor);
-    bindAsService(context, TYPES.IAnchorComputer, BezierDiamondAnchor);
+        bindAsService(context, TYPES.IEdgeRouter, GLSPBezierEdgeRouter);
+        bindAsService(context, TYPES.IAnchorComputer, BezierEllipseAnchor);
+        bindAsService(context, TYPES.IAnchorComputer, BezierRectangleAnchor);
+        bindAsService(context, TYPES.IAnchorComputer, BezierDiamondAnchor);
 
-    configureCommand({ bind, isBound }, AddRemoveBezierSegmentCommand);
-});
+        configureCommand({ bind, isBound }, AddRemoveBezierSegmentCommand);
+    },
+    { featureId: Symbol('routing') }
+);

package/src/features/save/save-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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,6 +21,9 @@ import { SaveModelKeyboardListener } from './save-keylistener';
  * When integrated into an application frame (e.g Theia/VS Code) this module is typically omitted and/or replaced
  * with an application native module.
  */
-export const saveModule = new FeatureModule(bind => {
-    bindAsService(bind, TYPES.KeyListener, SaveModelKeyboardListener);
-});
+export const saveModule = new FeatureModule(
+    bind => {
+        bindAsService(bind, TYPES.KeyListener, SaveModelKeyboardListener);
+    },
+    { featureId: Symbol('save') }
+);

package/src/features/select/select-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -18,13 +18,16 @@ import { SelectAllCommand, SelectCommand } from '../../base/selection-service';
 import { SelectFeedbackCommand } from './select-feedback-command';
 import { RankedSelectMouseListener } from './select-mouse-listener';
 
-export const selectModule = new FeatureModule((bind, _unbind, isBound) => {
-    const context = { bind, isBound };
-    configureCommand(context, SelectCommand);
-    configureCommand(context, SelectAllCommand);
-    configureCommand(context, SelectFeedbackCommand);
-    bindAsService(context, TYPES.MouseListener, RankedSelectMouseListener);
-});
+export const selectModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        configureCommand(context, SelectCommand);
+        configureCommand(context, SelectAllCommand);
+        configureCommand(context, SelectFeedbackCommand);
+        bindAsService(context, TYPES.MouseListener, RankedSelectMouseListener);
+    },
+    { featureId: Symbol('select') }
+);
 
 /**
  * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
@@ -35,5 +38,5 @@ export const standaloneSelectModule = new FeatureModule(
     bind => {
         bindAsService(bind, TYPES.KeyListener, SelectKeyboardListener);
     },
-    { requires: selectModule }
+    { featureId: Symbol('standaloneSelect'), requires: selectModule }
 );