@eclipse-glsp/client 1.1.0-next.cab84ec.250 → 1.1.0-next.cc57a50.267

package/src/features/{edit-label → label-edit}/edit-label-tool.ts

@@ -21,9 +21,6 @@ import { BaseGLSPTool } from '../tools/base-glsp-tool';
 export class DirectLabelEditTool extends BaseGLSPTool {
     static readonly ID = 'glsp.direct-label-edit-tool';
 
-    protected editLabelMouseListener: MouseListener;
-    protected editLabelKeyListener: KeyListener;
-
     get id(): string {
         return DirectLabelEditTool.ID;
     }
@@ -37,14 +34,9 @@ export class DirectLabelEditTool extends BaseGLSPTool {
     }
 
     enable(): void {
-        this.editLabelKeyListener = this.createEditLabelKeyListener();
-        this.editLabelMouseListener = this.createEditLabelMouseListener();
-        this.mouseTool.register(this.editLabelMouseListener);
-        this.keyTool.register(this.editLabelKeyListener);
-    }
-
-    disable(): void {
-        this.keyTool.deregister(this.editLabelKeyListener);
-        this.mouseTool.deregister(this.editLabelMouseListener);
+        this.toDisposeOnDisable.push(
+            this.mouseTool.registerListener(this.createEditLabelMouseListener()),
+            this.keyTool.registerListener(this.createEditLabelKeyListener())
+        );
     }
 }

package/src/features/{edit-label/di.config.ts → label-edit/label-edit-module.ts}

@@ -13,16 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { ApplyLabelEditCommand, TYPES, bindAsService, configureCommand } from '~glsp-sprotty';
+import { ApplyLabelEditCommand, FeatureModule, TYPES, bindAsService, configureCommand } from '~glsp-sprotty';
 import { DirectLabelEditTool } from './edit-label-tool';
 import { BalloonLabelValidationDecorator, ServerEditLabelValidator } from './edit-label-validator';
 
-const glspEditLabelModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
+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 default glspEditLabelModule;

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

@@ -38,12 +38,11 @@ import {
     SModelRoot,
     SetBoundsAction,
     SetBoundsCommand,
-    TYPES,
-    defaultModule
+    TYPES
 } from '~glsp-sprotty';
+import { defaultModule } from '../../base/default.module';
+import { SelectionService } from '../../base/selection-service';
 import { resizeFeature } from '../change-bounds/model';
-import { SelectionService } from '../select/selection-service';
-import { FeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 import {
     AlignElementsAction,
     AlignElementsActionHandler,
@@ -80,7 +79,6 @@ class MockSelectionService extends SelectionService {
 // Generic Test setup
 const container = new Container();
 container.load(defaultModule);
-container.bind(TYPES.IFeedbackActionDispatcher).to(FeedbackActionDispatcher).inSingletonScope();
 container.rebind(TYPES.IModelFactory).to(SGraphFactory).inSingletonScope();
 const graphFactory = container.get<SGraphFactory>(TYPES.IModelFactory);
 

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

@@ -31,11 +31,11 @@ import {
     hasNumberProp,
     hasStringProp
 } from '~glsp-sprotty';
+import { SelectionService } from '../../base/selection-service';
 import { toValidElementAndBounds, toValidElementMove } from '../../utils/layout-utils';
 import { BoundsAwareModelElement, getElements } from '../../utils/smodel-util';
 import { isBoundsAwareMoveable, isResizable } from '../change-bounds/model';
 import { IMovementRestrictor } from '../change-bounds/movement-restrictor';
-import { SelectionService } from '../select/selection-service';
 
 /**
  * Used to specify the desired resize dimension for a {@link ResizeElementsCommand}.
@@ -161,7 +161,7 @@ export abstract class LayoutElementsActionHandler implements IActionHandler {
     @inject(TYPES.IActionDispatcher)
     protected actionDispatcher: IActionDispatcher;
 
-    @inject(TYPES.SelectionService)
+    @inject(SelectionService)
     protected selectionService: SelectionService;
 
     @inject(TYPES.IMovementRestrictor)

package/src/features/layout/{di.config.ts → layout-module.ts}

@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { configureActionHandler } from '~glsp-sprotty';
+import { FeatureModule, configureActionHandler } from '~glsp-sprotty';
 import {
     AlignElementsAction,
     AlignElementsActionHandler,
@@ -22,10 +21,8 @@ import {
     ResizeElementsActionHandler
 } from './layout-elements-action';
 
-const layoutModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
+export const layoutModule = new FeatureModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
     configureActionHandler(context, ResizeElementsAction.KIND, ResizeElementsActionHandler);
     configureActionHandler(context, AlignElementsAction.KIND, AlignElementsActionHandler);
 });
-
-export default layoutModule;

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

@@ -268,7 +268,7 @@ export class NavigationActionHandler implements IActionHandler {
         const timeout = this.notificationTimeout;
         this.dispatcher.dispatchAll([
             ServerStatusAction.create(message, { severity, timeout }),
-            ServerMessageAction.create(message, { severity, timeout })
+            ServerMessageAction.create(message, { severity })
         ]);
     }
 }

package/src/features/navigation/{di.config.ts → navigation-module.ts}

@@ -13,12 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { NavigateToExternalTargetAction, NavigateToTargetAction, configureActionHandler } from '~glsp-sprotty';
+import { FeatureModule, NavigateToExternalTargetAction, NavigateToTargetAction, configureActionHandler } from '~glsp-sprotty';
 import { NavigateAction, NavigationActionHandler, ProcessNavigationArgumentsAction } from './navigation-action-handler';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 
-const navigationModule = new ContainerModule((bind, _unbind, isBound) => {
+export const navigationModule = new FeatureModule((bind, _unbind, isBound) => {
     bind(NavigationTargetResolver).toSelf().inSingletonScope();
     bind(NavigationActionHandler).toSelf().inSingletonScope();
     configureActionHandler({ bind, isBound }, NavigateAction.KIND, NavigationActionHandler);
@@ -26,5 +25,3 @@ const navigationModule = new ContainerModule((bind, _unbind, isBound) => {
     configureActionHandler({ bind, isBound }, ProcessNavigationArgumentsAction.KIND, NavigationActionHandler);
     configureActionHandler({ bind, isBound }, NavigateToExternalTargetAction.KIND, NavigationActionHandler);
 });
-
-export default navigationModule;

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

@@ -0,0 +1,59 @@
+/********************************************************************************
+ * 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
+ * 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 {
+    AddRemoveBezierSegmentCommand,
+    AnchorComputerRegistry,
+    BezierDiamondAnchor,
+    BezierEdgeRouter,
+    BezierEllipseAnchor,
+    BezierRectangleAnchor,
+    DiamondAnchor,
+    EdgeRouterRegistry,
+    EllipseAnchor,
+    FeatureModule,
+    ManhattanDiamondAnchor,
+    ManhattanEllipticAnchor,
+    ManhattanRectangularAnchor,
+    PolylineEdgeRouter,
+    RectangleAnchor,
+    TYPES,
+    bindAsService,
+    configureCommand
+} from '~glsp-sprotty';
+import { GLSPManhattanEdgeRouter } from './glsp-manhattan-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();
+
+    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, BezierEdgeRouter);
+    bindAsService(context, TYPES.IAnchorComputer, BezierEllipseAnchor);
+    bindAsService(context, TYPES.IAnchorComputer, BezierRectangleAnchor);
+    bindAsService(context, TYPES.IAnchorComputer, BezierDiamondAnchor);
+
+    configureCommand({ bind, isBound }, AddRemoveBezierSegmentCommand);
+});

package/src/features/save/{di.config.ts → save-module.ts}

@@ -13,16 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { TYPES, bindAsService } from '~glsp-sprotty';
+import { FeatureModule, TYPES, bindAsService } from '~glsp-sprotty';
 import { SaveModelKeyboardListener } from './save-keylistener';
 
 /**
- * This module is not required the diagram is deployed in Theia with the `GLSPDiagramWidget`
- * but only intended to be used in a standalone deployment of GLSP.
+ * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
+ * When integrated into an application frame (e.g Theia/VS Code) this module is typically omitted and/or replaced
+ * with an application native module.
  */
-const saveModule = new ContainerModule(bind => {
+export const saveModule = new FeatureModule(bind => {
     bindAsService(bind, TYPES.KeyListener, SaveModelKeyboardListener);
 });
-
-export default saveModule;

package/src/features/select/{select-feedback-action.ts → select-feedback-command.ts}

@@ -14,32 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { inject, injectable } from 'inversify';
-import {
-    Action,
-    Command,
-    CommandExecutionContext,
-    SModelRoot,
-    SelectAction,
-    SprottySelectCommand,
-    TYPES,
-    hasArrayProp
-} from '~glsp-sprotty';
+import { Command, CommandExecutionContext, SModelRoot, SelectAction, SprottySelectCommand, TYPES } from '~glsp-sprotty';
+import { SelectFeedbackAction } from '../../base/selection-service';
 
-export interface SelectFeedbackAction extends Omit<SelectAction, 'kind'>, Action {
-    kind: typeof SelectFeedbackAction.KIND;
-}
-
-export namespace SelectFeedbackAction {
-    export const KIND = 'selectFeedback';
-
-    export function is(object: any): object is SelectFeedbackAction {
-        return Action.hasKind(object, KIND) && hasArrayProp(object, 'selectedElementsIDs') && hasArrayProp(object, 'deselectedElementsIDs');
-    }
-
-    export function create(options?: { selectedElementsIDs?: string[]; deselectedElementsIDs?: string[] }): SelectFeedbackAction {
-        return { ...SelectAction.create(options), kind: KIND };
-    }
-}
 @injectable()
 export class SelectFeedbackCommand extends Command {
     static readonly KIND = SelectFeedbackAction.KIND;

package/src/features/select/{di.config.ts → select-module.ts}

@@ -13,20 +13,27 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { TYPES, bindAsService, configureCommand } from '~glsp-sprotty';
-import { SelectFeedbackCommand } from './select-feedback-action';
+import { FeatureModule, SelectKeyboardListener, TYPES, bindAsService, configureCommand } from '~glsp-sprotty';
+import { SelectAllCommand, SelectCommand } from '../../base/selection-service';
+import { SelectFeedbackCommand } from './select-feedback-command';
 import { RankedSelectMouseListener } from './select-mouse-listener';
-import { SelectAllCommand, SelectCommand, SelectionService } from './selection-service';
 
-const glspSelectModule = new ContainerModule((bind, _unbind, isBound) => {
+export const selectModule = new FeatureModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
-    bindAsService(context, TYPES.SelectionService, SelectionService);
     configureCommand(context, SelectCommand);
     configureCommand(context, SelectAllCommand);
     configureCommand(context, SelectFeedbackCommand);
     bindAsService(context, TYPES.MouseListener, RankedSelectMouseListener);
-    bind(TYPES.SModelRootListener).toService(SelectionService);
 });
 
-export default glspSelectModule;
+/**
+ * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
+ * 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 standaloneSelectModule = new FeatureModule(
+    bind => {
+        bindAsService(bind, TYPES.KeyListener, SelectKeyboardListener);
+    },
+    { requires: selectModule }
+);

package/src/features/select/select-mouse-listener.ts

@@ -13,94 +13,42 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import {
-    Action,
-    BringToFrontAction,
-    SButton,
-    SModelElement,
-    SModelRoot,
-    SRoutableElement,
-    SRoutingHandle,
-    SelectAction,
-    SelectMouseListener,
-    SwitchEditModeAction,
-    findParentByFeature,
-    isCtrlOrCmd,
-    isSelectable,
-    toArray
-} from '~glsp-sprotty';
-import { DEFAULT_RANK, Ranked } from '../rank/model';
+import { Action, BringToFrontAction, SModelElement, SelectAction, SelectMouseListener, Selectable } from '~glsp-sprotty';
+import { Ranked } from '../../base/ranked';
 
 /**
  * Ranked select mouse listener that is executed before default mouse listeners when using the RankedMouseTool.
  * This ensures that default mouse listeners are working on a model that has selection changes already applied.
  */
 export class RankedSelectMouseListener extends SelectMouseListener implements Ranked {
-    rank: number = DEFAULT_RANK - 1; /* we want to be executed before all default mouse listeners */
+    rank: number = Ranked.DEFAULT_RANK - 100; /* we want to be executed before all default mouse listeners */
 
-    override mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[] {
+    protected override handleSelectTarget(
+        selectableTarget: SModelElement & Selectable,
+        deselectedElements: SModelElement[],
+        event: MouseEvent
+    ): (Action | Promise<Action>)[] {
         const result: Action[] = [];
-        if (this.buttonHandlerRegistry !== undefined && target instanceof SButton && target.enabled) {
-            const buttonHandler = this.buttonHandlerRegistry.get(target.type);
-            if (buttonHandler !== undefined) {
-                return buttonHandler.buttonPressed(target);
-            }
-        }
-        const selectableTarget = findParentByFeature(target, isSelectable);
-        if (selectableTarget !== undefined || target instanceof SModelRoot) {
-            this.hasDragged = false;
-            let deselect: SModelElement[] = [];
-            // multi-selection?
-            if (!isCtrlOrCmd(event)) {
-                deselect = toArray(
-                    target.root.index
-                        .all()
-                        .filter(
-                            element =>
-                                isSelectable(element) &&
-                                element.selected &&
-                                !(selectableTarget instanceof SRoutingHandle && element === (selectableTarget.parent as SModelElement))
-                        )
-                );
-            }
-            if (selectableTarget !== undefined) {
-                if (!selectableTarget.selected) {
-                    this.wasSelected = false;
-                    result.push(
-                        SelectAction.create({
-                            selectedElementsIDs: [selectableTarget.id],
-                            deselectedElementsIDs: deselect.map(e => e.id)
-                        })
-                    );
-                    result.push(BringToFrontAction.create([selectableTarget.id]));
-                    const routableDeselect = deselect.filter(e => e instanceof SRoutableElement).map(e => e.id);
-                    if (selectableTarget instanceof SRoutableElement) {
-                        result.push(
-                            SwitchEditModeAction.create({
-                                elementsToActivate: [selectableTarget.id],
-                                elementsToDeactivate: routableDeselect
-                            })
-                        );
-                    } else if (routableDeselect.length > 0) {
-                        result.push(SwitchEditModeAction.create({ elementsToDeactivate: routableDeselect }));
-                    }
-                } else if (isCtrlOrCmd(event)) {
-                    this.wasSelected = false;
-                    result.push(SelectAction.create({ deselectedElementsIDs: [selectableTarget.id] }));
-                    if (selectableTarget instanceof SRoutableElement) {
-                        result.push(SwitchEditModeAction.create({ elementsToDeactivate: [selectableTarget.id] }));
-                    }
-                } else {
-                    this.wasSelected = true;
-                }
-            } else {
-                result.push(SelectAction.create({ deselectedElementsIDs: deselect.map(e => e.id) }));
-                const routableDeselect = deselect.filter(e => e instanceof SRoutableElement).map(e => e.id);
-                if (routableDeselect.length > 0) {
-                    result.push(SwitchEditModeAction.create({ elementsToDeactivate: routableDeselect }));
-                }
-            }
-        }
+        result.push(
+            SelectAction.create({
+                selectedElementsIDs: [selectableTarget.id],
+                deselectedElementsIDs: deselectedElements.map(e => e.id)
+            })
+        );
+        result.push(BringToFrontAction.create([selectableTarget.id]));
+
+        return result;
+    }
+
+    protected override handleDeselectTarget(selectableTarget: SModelElement & Selectable, event: MouseEvent): (Action | Promise<Action>)[] {
+        const result: Action[] = [];
+        result.push(SelectAction.create({ selectedElementsIDs: [], deselectedElementsIDs: [selectableTarget.id] }));
+        return result;
+    }
+
+    protected override handleDeselectAll(deselectedElements: SModelElement[], event: MouseEvent): (Action | Promise<Action>)[] {
+        const result: Action[] = [];
+        result.push(SelectAction.create({ selectedElementsIDs: [], deselectedElementsIDs: deselectedElements.map(e => e.id) }));
         return result;
     }
 }

package/src/features/source-model-watcher/source-model-changed-action-handler.ts

@@ -70,7 +70,7 @@ export class SourceModelChangedActionHandler implements IActionHandler {
         const severity = 'WARNING';
         this.dispatcher.dispatchAll([
             ServerStatusAction.create(message, { severity, timeout }),
-            ServerMessageAction.create(message, { severity, timeout })
+            ServerMessageAction.create(message, { severity })
         ]);
     }
 }

package/src/features/source-model-watcher/{di.config.ts → source-model-wacher-module.ts}

@@ -13,12 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { SourceModelChangedAction, configureActionHandler } from '~glsp-sprotty';
+import { FeatureModule, SourceModelChangedAction, configureActionHandler } from '~glsp-sprotty';
 import { SourceModelChangedActionHandler } from './source-model-changed-action-handler';
 
-const sourceModelWatcherModule = new ContainerModule((bind, _unbind, isBound) => {
+export const sourceModelWatcherModule = new FeatureModule((bind, _unbind, isBound) => {
     configureActionHandler({ bind, isBound }, SourceModelChangedAction.KIND, SourceModelChangedActionHandler);
 });
-
-export default sourceModelWatcherModule;

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

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (c) 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 { FeatureModule, ServerStatusAction, TYPES, bindAsService, configureActionHandler } from '~glsp-sprotty';
+import '../../../css/status-overlay.css';
+import { StatusOverlay } from './status-overlay';
+
+export const statusModule = new FeatureModule((bind, unbind, isBound, rebind) => {
+    const context = { bind, unbind, isBound, rebind };
+    bindAsService(context, TYPES.IUIExtension, StatusOverlay);
+    configureActionHandler(context, ServerStatusAction.KIND, StatusOverlay);
+});

package/src/features/status/status-overlay.ts

@@ -0,0 +1,108 @@
+/********************************************************************************
+ * Copyright (c) 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 { injectable } from 'inversify';
+import { AbstractUIExtension, IActionHandler, ServerStatusAction, codiconCSSClasses } from '~glsp-sprotty';
+
+/**
+ * A reusable status overlay for rendering (icon + message) and handling of {@link ServerStatusAction}'s.
+ */
+@injectable()
+export class StatusOverlay extends AbstractUIExtension implements IActionHandler {
+    static readonly ID = 'glsp.server.status.overlay';
+
+    protected statusIconDiv?: HTMLDivElement;
+    protected statusMessageDiv?: HTMLDivElement;
+    protected pendingTimeout?: number;
+
+    override id(): string {
+        return StatusOverlay.ID;
+    }
+
+    override containerClass(): string {
+        return 'sprotty-status';
+    }
+    protected override initializeContents(containerElement: HTMLElement): void {
+        this.statusIconDiv = document.createElement('div');
+        containerElement.appendChild(this.statusIconDiv);
+
+        this.statusMessageDiv = document.createElement('div');
+        this.statusMessageDiv.classList.add('sprotty-status-message');
+        containerElement.appendChild(this.statusMessageDiv);
+    }
+
+    protected setStatus(status: ServerStatusAction): void {
+        if (this.statusMessageDiv) {
+            this.statusMessageDiv.textContent = status.message;
+            this.removeClasses(this.statusMessageDiv, 1);
+            this.statusMessageDiv.classList.add(status.severity.toLowerCase());
+        }
+        if (this.statusIconDiv) {
+            this.removeClasses(this.statusIconDiv, 0);
+            const classes = this.statusIconDiv.classList;
+            classes.add(status.severity.toLowerCase());
+            switch (status.severity) {
+                case 'FATAL':
+                    classes.add(...codiconCSSClasses('error'));
+                    break;
+                case 'ERROR':
+                    classes.add(...codiconCSSClasses('warning'));
+                    break;
+                case 'WARNING':
+                    classes.add(...codiconCSSClasses('warning'));
+                    break;
+                case 'INFO':
+                    classes.add(...codiconCSSClasses('info'));
+                    break;
+            }
+        }
+    }
+
+    protected clearStatus(): void {
+        this.setStatus(ServerStatusAction.create('', { severity: 'NONE' }));
+    }
+
+    protected clearTimeout(): void {
+        if (this.pendingTimeout) {
+            window.clearTimeout(this.pendingTimeout);
+            this.pendingTimeout = undefined;
+        }
+    }
+
+    protected removeClasses(element: Element, keep: number): void {
+        const classes = element.classList;
+        while (classes.length > keep) {
+            const item = classes.item(classes.length - 1);
+            if (item) {
+                classes.remove(item);
+            }
+        }
+    }
+
+    handle(action: ServerStatusAction): void {
+        this.clearTimeout();
+        if (action.severity === 'NONE') {
+            this.clearStatus();
+            return;
+        }
+        this.setStatus(action);
+
+        // Check for timeout
+        const statusTimeout = action.timeout ?? -1;
+        if (statusTimeout > 0) {
+            this.pendingTimeout = window.setTimeout(() => this.clearStatus(), statusTimeout);
+        }
+    }
+}

package/src/features/svg-metadata/{di.config.ts → svg-metadata-module.ts}

@@ -14,13 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { TYPES } from '~glsp-sprotty';
+import { FeatureModule, TYPES } from '~glsp-sprotty';
 import { MetadataPlacer } from './metadata-placer';
 
-const svgMetadataModule = new ContainerModule(bind => {
+export const svgMetadataModule = new FeatureModule(bind => {
     bind(MetadataPlacer).toSelf().inSingletonScope();
     bind(TYPES.IVNodePostprocessor).toService(MetadataPlacer);
 });
-
-export default svgMetadataModule;

package/src/features/tool-palette/{di.config.ts → tool-palette-module.ts}

@@ -13,15 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { bindAsService, configureActionHandler, EnableDefaultToolsAction, TYPES } from '~glsp-sprotty';
+import { bindAsService, configureActionHandler, EnableDefaultToolsAction, FeatureModule, TYPES } from '~glsp-sprotty';
 import '../../../css/tool-palette.css';
 import { EnableToolPaletteAction, ToolPalette } from './tool-palette';
 
-const toolPaletteModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
+export const toolPaletteModule = new FeatureModule((bind, _unbind, isBound, _rebind) => {
     bindAsService(bind, TYPES.IUIExtension, ToolPalette);
     configureActionHandler({ bind, isBound }, EnableToolPaletteAction.KIND, ToolPalette);
     configureActionHandler({ bind, isBound }, EnableDefaultToolsAction.KIND, ToolPalette);
 });
-
-export default toolPaletteModule;