@eclipse-glsp/client 1.1.0-next.ee71b2a.218 → 1.1.0-next.f382a8e.231

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * 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
@@ -13,27 +13,37 @@
  *
  * 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 {
-    configureCommand, configureLayout, HBoxLayouter, HiddenBoundsUpdater, Layouter,
-    LayoutRegistry, RequestBoundsCommand, SetBoundsCommand, StackLayouter, VBoxLayouter
+    configureCommand,
+    configureLayout,
+    HBoxLayouter,
+    HiddenBoundsUpdater,
+    Layouter,
+    LayoutRegistry,
+    RequestBoundsCommand,
+    SetBoundsCommand,
+    VBoxLayouter
 } from 'sprotty';
-import '../../../css/command-palette.css';
 import { TYPES } from '../../base/types';
+import { FreeFormLayouter } from './freeform-layout';
 import { GLSPHiddenBoundsUpdater } from './glsp-hidden-bounds-updater';
+import { HBoxLayouterExt } from './hbox-layout';
+import { VBoxLayouterExt } from './vbox-layout';
 
 const glspBoundsModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
-    configureCommand({ bind, isBound }, SetBoundsCommand);
-    configureCommand({ bind, isBound }, RequestBoundsCommand);
+    const context = { bind, isBound };
+    configureCommand(context, SetBoundsCommand);
+    configureCommand(context, RequestBoundsCommand);
     bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
-    bind(GLSPHiddenBoundsUpdater).toSelf().inSingletonScope();
-    bind(TYPES.HiddenVNodePostprocessor).toService(GLSPHiddenBoundsUpdater);
+    bindAsService(context, TYPES.HiddenVNodePostprocessor, GLSPHiddenBoundsUpdater);
     bind(TYPES.Layouter).to(Layouter).inSingletonScope();
     bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
 
-    configureLayout({ bind, isBound }, VBoxLayouter.KIND, VBoxLayouter);
-    configureLayout({ bind, isBound }, HBoxLayouter.KIND, HBoxLayouter);
-    configureLayout({ bind, isBound }, StackLayouter.KIND, StackLayouter);
+    configureLayout(context, VBoxLayouter.KIND, VBoxLayouterExt);
+    configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
+    configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
 });
 
 export default glspBoundsModule;

package/src/features/{layout/tests → bounds}/freeform-layout.spec.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
@@ -17,7 +17,7 @@ import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 import { BoundsData, ConsoleLogger, SModelElement } from 'sprotty';
-import { gModel, layout, sComp, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { gModel, layout, sComp, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
 
 describe('FreeFormLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/freeform-layout.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
@@ -20,7 +20,7 @@ import { AbstractLayout } from 'sprotty/lib/features/bounds/abstract-layout';
 import { AbstractLayoutOptions } from 'sprotty/lib/features/bounds/layout-options';
 
 /**
- * Layouts children of a container with explit X/Y positions
+ * Layouts children of a container with explicit X/Y positions
  */
 @injectable()
 export class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {

package/src/features/bounds/glsp-hidden-bounds-updater.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * 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
@@ -14,10 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import {
-    Action, ComputedBoundsAction, Deferred, ElementAndRoutingPoints, RequestAction,
-    ResponseAction
-} from '@eclipse-glsp/protocol';
+import { Action, ComputedBoundsAction, Deferred, ElementAndRoutingPoints, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
 import { VNode } from 'snabbdom';
 import { EdgeRouterRegistry, HiddenBoundsUpdater, IActionDispatcher, SModelElement, SRoutableElement } from 'sprotty';
@@ -30,7 +27,6 @@ import { calcElementAndRoute, isRoutable } from '../../utils/smodel-util';
  */
 @injectable()
 export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
-
     @inject(EdgeRouterRegistry) @optional() protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
 
     protected element2route: ElementAndRoutingPoints[] = [];
@@ -47,7 +43,8 @@ export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
 
     override postUpdate(cause?: Action): void {
         const actions = this.captureActions(() => super.postUpdate(cause));
-        actions.filter(action => ComputedBoundsAction.is(action))
+        actions
+            .filter(action => ComputedBoundsAction.is(action))
             .forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action as ComputedBoundsAction)));
         this.element2route = [];
     }

package/src/features/{layout/tests → bounds}/hbox-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, 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
@@ -19,7 +19,7 @@ import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
-import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
 
 describe('HBoxLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/hbox-layout.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

package/src/features/{layout/tests/layouter-test-util.ts → bounds/layouter-test-util.spec.ts}

@@ -15,8 +15,8 @@
  ********************************************************************************/
 
 import { Dimension, Point } from '@eclipse-glsp/protocol';
+import { Container } from 'inversify';
 import 'mocha';
-import 'reflect-metadata';
 import {
     BoundsData,
     ConsoleLogger,
@@ -30,9 +30,9 @@ import {
     SParentElement,
     TYPES
 } from 'sprotty';
-import { createDiagramContainer } from '../../../base/container-modules';
-import { GLSPGraph } from '../../../lib/model';
-import { StatefulLayouterExt } from '../layouter';
+import { initializeDiagramContainer } from '../../base/container-modules';
+import { GLSPGraph } from '../../lib/model';
+import { StatefulLayouterExt } from './layouter';
 
 export function gModel(): GLSPGraph {
     return new GLSPGraph();
@@ -117,6 +117,6 @@ export function layout(
 export function setupLayoutRegistry(): LayoutRegistry {
     // Generic Test setup
     // create client container that registers all default modules including the layoutModule
-    const layoutContainer = createDiagramContainer();
+    const layoutContainer = initializeDiagramContainer(new Container());
     return layoutContainer.get<LayoutRegistry>(TYPES.LayoutRegistry);
 }

package/src/features/{layout → bounds}/layouter.ts

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

package/src/features/{layout/tests → bounds}/vbox-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, 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
@@ -19,7 +19,7 @@ import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
-import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
 
 describe('VBoxLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/vbox-layout.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

package/src/features/command-palette/command-palette-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 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
@@ -25,7 +25,7 @@ export class CommandPaletteTool implements Tool {
 
     @postConstruct()
     protected postConstruct(): void {
-        this.commandPaletteKeyListener = this.createCommandPaleteKeyListener();
+        this.commandPaletteKeyListener = this.createCommandPaletteKeyListener();
     }
 
     get id(): string {
@@ -40,7 +40,7 @@ export class CommandPaletteTool implements Tool {
         this.keyTool.deregister(this.commandPaletteKeyListener);
     }
 
-    protected createCommandPaleteKeyListener(): KeyListener {
+    protected createCommandPaletteKeyListener(): KeyListener {
         return new CommandPaletteKeyListener();
     }
 }

package/src/features/command-palette/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,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 { CommandPalette, CommandPaletteActionProviderRegistry } from 'sprotty';
 import '../../../css/command-palette.css';
@@ -21,12 +22,10 @@ import { CommandPaletteTool } from './command-palette-tool';
 import { ServerCommandPaletteActionProvider } from './server-command-palette-provider';
 
 const glspCommandPaletteModule = new ContainerModule(bind => {
-    bind(CommandPalette).toSelf().inSingletonScope();
-    bind(TYPES.IUIExtension).toService(CommandPalette);
-    bind(CommandPaletteActionProviderRegistry).toSelf().inSingletonScope();
-    bind(TYPES.ICommandPaletteActionProviderRegistry).toService(CommandPaletteActionProviderRegistry);
-    bind(TYPES.ICommandPaletteActionProvider).to(ServerCommandPaletteActionProvider);
-    bind(TYPES.IDefaultTool).to(CommandPaletteTool);
+    bindAsService(bind, TYPES.IUIExtension, CommandPalette);
+    bind(TYPES.ICommandPaletteActionProviderRegistry).to(CommandPaletteActionProviderRegistry).inSingletonScope();
+    bindAsService(bind, TYPES.ICommandPaletteActionProvider, ServerCommandPaletteActionProvider);
+    bindAsService(bind, TYPES.IDefaultTool, CommandPaletteTool);
 });
 
 export default glspCommandPaletteModule;

package/src/features/context-menu/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,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 { ContextMenuProviderRegistry, IContextMenuService } from 'sprotty';
 import { TYPES } from '../../base/types';
@@ -30,9 +31,9 @@ const glspContextMenuModule = new ContainerModule(bind => {
                 }
             })
     );
-    bind(TYPES.MouseListener).to(SelectionServiceAwareContextMenuMouseListener);
+    bindAsService(bind, TYPES.MouseListener, SelectionServiceAwareContextMenuMouseListener);
     bind(TYPES.IContextMenuProviderRegistry).to(ContextMenuProviderRegistry);
-    bind(TYPES.IContextMenuItemProvider).to(ServerContextMenuItemProvider);
+    bindAsService(bind, TYPES.IContextMenuItemProvider, ServerContextMenuItemProvider);
 });
 
 export default glspContextMenuModule;

package/src/features/copy-paste/copy-paste-handler.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
@@ -96,7 +96,7 @@ const CLIPBOARD_DATA_FORMAT = 'text/plain';
 export class ServerCopyPasteHandler implements ICopyPasteHandler {
     @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
     @inject(TYPES.ViewerOptions) protected viewerOptions: ViewerOptions;
-    @inject(TYPES.IAsyncClipboardService) protected clipboadService: IAsyncClipboardService;
+    @inject(TYPES.IAsyncClipboardService) protected clipboardService: IAsyncClipboardService;
     @inject(EditorContextService) protected editorContext: EditorContextService;
 
     handleCopy(event: ClipboardEvent): void {
@@ -105,13 +105,13 @@ export class ServerCopyPasteHandler implements ICopyPasteHandler {
             event.clipboardData.setData(CLIPBOARD_DATA_FORMAT, toClipboardId(clipboardId));
             this.actionDispatcher
                 .request<SetClipboardDataAction>(RequestClipboardDataAction.create(this.editorContext.get()))
-                .then(action => this.clipboadService.put(action.clipboardData, clipboardId));
+                .then(action => this.clipboardService.put(action.clipboardData, clipboardId));
             event.preventDefault();
         } else {
             if (event.clipboardData) {
                 event.clipboardData.clearData();
             }
-            this.clipboadService.clear();
+            this.clipboardService.clear();
         }
     }
 
@@ -126,7 +126,7 @@ export class ServerCopyPasteHandler implements ICopyPasteHandler {
     handlePaste(event: ClipboardEvent): void {
         if (event.clipboardData && this.shouldPaste(event)) {
             const clipboardId = getClipboardIdFromDataTransfer(event.clipboardData);
-            const clipboardData = this.clipboadService.get(clipboardId);
+            const clipboardData = this.clipboardService.get(clipboardId);
             if (clipboardData) {
                 this.actionDispatcher.dispatch(PasteOperation.create({ clipboardData, editorContext: this.editorContext.get() }));
             }

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-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,14 +13,14 @@
  *
  * 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 '../../../css/decoration.css';
 import { TYPES } from '../../base/types';
 import { GlspDecorationPlacer } from './decoration-placer';
 
-const glspDecorationModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(GlspDecorationPlacer).toSelf().inSingletonScope();
-    bind(TYPES.IVNodePostprocessor).toService(GlspDecorationPlacer);
+const glspDecorationModule = new ContainerModule(bind => {
+    bindAsService(bind, TYPES.IVNodePostprocessor, GlspDecorationPlacer);
 });
 
 export default glspDecorationModule;

package/src/features/edit-label/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,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 { ApplyLabelEditCommand, configureCommand } from 'sprotty';
 import { TYPES } from '../../base/types';
@@ -22,7 +23,7 @@ import { BalloonLabelValidationDecorator, ServerEditLabelValidator } from './edi
 const glspEditLabelModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
     bind(TYPES.IEditLabelValidator).to(ServerEditLabelValidator);
     bind(TYPES.IEditLabelValidationDecorator).to(BalloonLabelValidationDecorator);
-    bind(TYPES.IDefaultTool).to(DirectLabelEditTool);
+    bindAsService(bind, TYPES.IDefaultTool, DirectLabelEditTool);
     configureCommand({ bind, isBound }, ApplyLabelEditCommand);
 });
 

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 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,15 +13,16 @@
  *
  * 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 { configureCommand, ExportSvgCommand, ExportSvgKeyListener, ExportSvgPostprocessor, TYPES } from 'sprotty';
 import { GLSPSvgExporter } from './glsp-svg-exporter';
 
 const glspExportSvgModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(ExportSvgKeyListener).toSelf().inSingletonScope();
-    bind(TYPES.KeyListener).toService(ExportSvgKeyListener);
-    bind(TYPES.HiddenVNodePostprocessor).to(ExportSvgPostprocessor).inSingletonScope();
-    configureCommand({ bind, isBound }, ExportSvgCommand);
+    const context = { bind, isBound };
+    bindAsService(context, TYPES.KeyListener, ExportSvgKeyListener);
+    bindAsService(context, TYPES.HiddenVNodePostprocessor, ExportSvgPostprocessor);
+    configureCommand(context, ExportSvgCommand);
     bind(TYPES.SvgExporter).to(GLSPSvgExporter).inSingletonScope();
 });
 

package/src/features/export/glsp-svg-exporter.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * 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
@@ -18,8 +18,8 @@ import { injectable } from 'inversify';
 import { ExportSvgAction, SModelRoot, SvgExporter } from 'sprotty';
 import { v4 as uuid } from 'uuid';
 
- @injectable()
- export class GLSPSvgExporter extends SvgExporter {
+@injectable()
+export class GLSPSvgExporter extends SvgExporter {
     override export(root: SModelRoot, _request?: RequestAction<ExportSvgAction>): void {
         if (typeof document !== 'undefined') {
             const svgElement = this.findSvgElement();
@@ -30,9 +30,10 @@ import { v4 as uuid } from 'uuid';
                     svgElement.id = originalId || uuid();
                     // provide generated svg code with respective sizing for proper viewing in browser and remove undesired border
                     const bounds = this.getBounds(root);
-                    const svg = this.createSvg(svgElement, root)
-                        .replace('style="',
-                            `style="width: ${bounds.width}px !important;height: ${bounds.height}px !important;border: none !important;`);
+                    const svg = this.createSvg(svgElement, root).replace(
+                        'style="',
+                        `style="width: ${bounds.width}px !important;height: ${bounds.height}px !important;border: none !important;`
+                    );
                     // do not give request/response id here as otherwise the action is treated as an unrequested response
                     this.actionDispatcher.dispatch(ExportSvgAction.create(svg, ''));
                 } finally {
@@ -47,4 +48,4 @@ import { v4 as uuid } from 'uuid';
         // search for first svg element as hierarchy within Sprotty might change
         return div && div.querySelector('svg');
     }
- }
+}

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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,
@@ -36,11 +37,12 @@ import { FocusStateChangedAction } from '../../base/actions/focus-change-action'
 import { GlspHoverMouseListener } from './hover';
 
 const glspHoverModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(TYPES.PopupVNodePostprocessor).to(PopupPositionUpdater).inSingletonScope();
-    bind(GlspHoverMouseListener).toSelf().inSingletonScope();
-    bind(TYPES.MouseListener).toService(GlspHoverMouseListener);
-    bind(TYPES.PopupMouseListener).to(PopupHoverMouseListener);
-    bind(TYPES.KeyListener).to(HoverKeyListener);
+    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,
@@ -49,7 +51,6 @@ const glspHoverModule = new ContainerModule((bind, _unbind, isBound) => {
     });
     bind(ClosePopupActionHandler).toSelf().inSingletonScope();
 
-    const context = { bind, isBound };
     configureCommand(context, HoverFeedbackCommand);
     configureCommand(context, SetPopupModelCommand);
     configureActionHandler(context, SetPopupModelCommand.KIND, ClosePopupActionHandler);

package/src/features/layout/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
@@ -14,27 +14,18 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { ContainerModule } from 'inversify';
-import { configureActionHandler, configureLayout, HBoxLayouter, TYPES, VBoxLayouter } from 'sprotty';
-import { FreeFormLayouter } from './freeform-layout';
-import { HBoxLayouterExt } from './hbox-layout';
+import { configureActionHandler } from 'sprotty';
 import {
     AlignElementsAction,
     AlignElementsActionHandler,
     ResizeElementsAction,
     ResizeElementsActionHandler
 } from './layout-elements-action';
-import { LayouterExt } from './layouter';
-import { VBoxLayouterExt } from './vbox-layout';
 
 const layoutModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, isBound };
     configureActionHandler(context, ResizeElementsAction.KIND, ResizeElementsActionHandler);
     configureActionHandler(context, AlignElementsAction.KIND, AlignElementsActionHandler);
-
-    rebind(VBoxLayouter).to(VBoxLayouterExt);
-    rebind(HBoxLayouter).to(HBoxLayouterExt);
-    rebind(TYPES.Layouter).to(LayouterExt);
-    configureLayout({ bind, isBound }, FreeFormLayouter.KIND, FreeFormLayouter);
 });
 
 export default layoutModule;

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -19,7 +19,7 @@ import { configureActionHandler } from 'sprotty';
 import { NavigateAction, NavigationActionHandler, ProcessNavigationArgumentsAction } from './navigation-action-handler';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 
-export const navigationModule = new ContainerModule((bind, _unbind, isBound) => {
+const navigationModule = new ContainerModule((bind, _unbind, isBound) => {
     bind(NavigationTargetResolver).toSelf().inSingletonScope();
     bind(NavigationActionHandler).toSelf().inSingletonScope();
     configureActionHandler({ bind, isBound }, NavigateAction.KIND, NavigationActionHandler);
@@ -27,3 +27,5 @@ export 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/navigation/navigation-action-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -123,7 +123,7 @@ export namespace ProcessNavigationArgumentsAction {
  *   *(a)* the navigation target already specifies element IDs, in which case this action handler navigates
  *         to the specified elements directly, by the selecting them and centering them in the viewport.
  *   *(b)* the arguments of the navigation targets don't contain element IDs, but other arguments, the
- *         navigation target needs to be resolved into actual elment IDs by the `NavigationTargetResolver`.
+ *         navigation target needs to be resolved into actual element IDs by the `NavigationTargetResolver`.
  *         This can for instance be useful, if the navigation deals with queries or some other more complex
  *         logic that can't be dealt with on the client.
  *  *(c)* the target isn't resolved by the `NavigationTargetResolver`, e.g. because the `uri` doesn't match

package/src/features/save/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,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 { TYPES } from '../../base/types';
 import { SaveModelKeyboardListener } from './save-keylistener';
@@ -22,7 +23,7 @@ import { SaveModelKeyboardListener } from './save-keylistener';
  * but only intended to be used in a standalone deployment of GLSP.
  */
 const saveModule = new ContainerModule(bind => {
-    bind(TYPES.KeyListener).to(SaveModelKeyboardListener);
+    bindAsService(bind, TYPES.KeyListener, SaveModelKeyboardListener);
 });
 
 export default saveModule;

package/src/features/select/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,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 { configureCommand } from 'sprotty';
 import { TYPES } from '../../base/types';
@@ -21,12 +22,12 @@ import { RankedSelectMouseListener } from './select-mouse-listener';
 import { SelectAllCommand, SelectCommand, SelectionService } from './selection-service';
 
 const glspSelectModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(SelectionService).toSelf().inSingletonScope();
-    bind(TYPES.SelectionService).toService(SelectionService);
-    configureCommand({ bind, isBound }, SelectCommand);
-    configureCommand({ bind, isBound }, SelectAllCommand);
-    configureCommand({ bind, isBound }, SelectFeedbackCommand);
-    bind(TYPES.MouseListener).to(RankedSelectMouseListener);
+    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);
 });