@eclipse-glsp/client 1.1.0-next.0d35bd0.205 → 1.1.0-next.0e4a7fc.263

package/src/features/copy-paste/{di.config.ts → copy-paste-modules.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,24 +13,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { configureActionHandler } from 'sprotty';
-import { TYPES } from '../../base/types';
+import { configureActionHandler, FeatureModule, TYPES } from '~glsp-sprotty';
 import { CopyPasteContextMenuItemProvider, InvokeCopyPasteAction, InvokeCopyPasteActionHandler } from './copy-paste-context-menu';
 import { LocalClipboardService, ServerCopyPasteHandler } from './copy-paste-handler';
 
-export const glspServerCopyPasteModule = new ContainerModule((bind, _unbind, isBound) => {
+export const copyPasteModule = new FeatureModule((bind, _unbind, isBound) => {
     bind(TYPES.ICopyPasteHandler).to(ServerCopyPasteHandler);
     bind(TYPES.IAsyncClipboardService).to(LocalClipboardService).inSingletonScope();
 });
 
 /**
- * This module is not required if the diagram is deployed in Theia but only intended to be used
- * in a standalone deployment of GLSP. If the GLSP diagram in Theia use the Theia-native
- * `CopyPasteMenuContribution` in `glsp-theia-integration` instead.
+ * 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 copyPasteContextMenuModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(TYPES.IContextMenuProvider).to(CopyPasteContextMenuItemProvider).inSingletonScope();
-    bind(InvokeCopyPasteActionHandler).toSelf().inSingletonScope();
-    configureActionHandler({ bind, isBound }, InvokeCopyPasteAction.KIND, InvokeCopyPasteActionHandler);
-});
+export const standaloneCopyPasteModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        bind(TYPES.IContextMenuProvider).to(CopyPasteContextMenuItemProvider).inSingletonScope();
+        bind(InvokeCopyPasteActionHandler).toSelf().inSingletonScope();
+        configureActionHandler({ bind, isBound }, InvokeCopyPasteAction.KIND, InvokeCopyPasteActionHandler);
+    },
+    { requires: copyPasteModule }
+);

package/src/features/decoration/{di.config.ts → decoration-module.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,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
+import { FeatureModule, TYPES, bindAsService } from '~glsp-sprotty';
 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);
+export const decorationModule = new FeatureModule(bind => {
+    bindAsService(bind, TYPES.IVNodePostprocessor, GlspDecorationPlacer);
 });
-
-export default glspDecorationModule;

package/src/features/decoration/decoration-placer.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,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { Decoration, DecorationPlacer, isSizeable, SChildElement, SModelElement, SRoutableElement } from 'sprotty';
+import { Decoration, DecorationPlacer, isSizeable, Point, SChildElement, SModelElement, SRoutableElement } from '~glsp-sprotty';
 
 @injectable()
 export class GlspDecorationPlacer extends DecorationPlacer {

package/src/features/export/export-modules.ts

@@ -0,0 +1,50 @@
+/********************************************************************************
+ * 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 {
+    bindAsService,
+    configureActionHandler,
+    configureCommand,
+    ExportSvgAction,
+    ExportSvgCommand,
+    ExportSvgKeyListener,
+    ExportSvgPostprocessor,
+    FeatureModule,
+    TYPES
+} from '~glsp-sprotty';
+import { ExportSvgActionHandler } from './export-svg-action-handler';
+import { GLSPSvgExporter } from './glsp-svg-exporter';
+
+export const exportModule = new FeatureModule((bind, _unbind, isBound) => {
+    const context = { bind, isBound };
+    bindAsService(context, TYPES.HiddenVNodePostprocessor, ExportSvgPostprocessor);
+    configureCommand(context, ExportSvgCommand);
+    bind(TYPES.SvgExporter).to(GLSPSvgExporter).inSingletonScope();
+});
+
+/**
+ * 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 standaloneExportModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        bindAsService(context, TYPES.KeyListener, ExportSvgKeyListener);
+        bind(ExportSvgActionHandler).toSelf().inSingletonScope();
+        configureActionHandler(context, ExportSvgAction.KIND, ExportSvgActionHandler);
+    },
+    { requires: exportModule }
+);

package/src/features/export/export-svg-action-handler.ts

@@ -0,0 +1,32 @@
+/********************************************************************************
+ * 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 { saveAs } from 'file-saver';
+import { injectable } from 'inversify';
+import { ExportSvgAction, IActionHandler } from '~glsp-sprotty';
+
+/**
+ * The default handler for {@link ExportSvgAction}s. This generic handler can be used in
+ * any GLSP project independent of the target platform. However, platform integration modules typically
+ *  * this handler is rebound to an application specific handler in platform integration modules
+ * (e.g. the Theia integration)
+ */
+@injectable()
+export class ExportSvgActionHandler implements IActionHandler {
+    handle(action: ExportSvgAction): void {
+        const blob = new Blob([action.svg], { type: 'text/plain;charset=utf-8' });
+        saveAs(blob, 'diagram.svg');
+    }
+}

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
@@ -13,13 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { RequestAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { ExportSvgAction, SModelRoot, SvgExporter } from 'sprotty';
 import { v4 as uuid } from 'uuid';
+import { ExportSvgAction, RequestAction, SModelRoot, SvgExporter } from '~glsp-sprotty';
 
- @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 +29,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 +47,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/hints/model.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
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { SModelElement, SModelExtension } from 'sprotty';
+import { SModelElement, SModelElementSchema, SModelExtension } from '~glsp-sprotty';
 
 export const containerFeature = Symbol('containable');
 

package/src/features/hints/{di.config.ts → type-hints-module.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,17 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SetTypeHintsAction } from '@eclipse-glsp/protocol';
-import { ContainerModule } from 'inversify';
-import { configureActionHandler, configureCommand } from 'sprotty';
-import { TYPES } from '../../base/types';
+import { FeatureModule, SetTypeHintsAction, TYPES, configureActionHandler, configureCommand } from '~glsp-sprotty';
 import { ApplyTypeHintsCommand, TypeHintProvider } from './type-hints';
 
-const modelHintsModule = new ContainerModule((bind, _unbind, isBound) => {
+export const typeHintsModule = new FeatureModule((bind, _unbind, isBound) => {
     bind(TypeHintProvider).toSelf().inSingletonScope();
     bind(TYPES.ITypeHintProvider).toService(TypeHintProvider);
     configureActionHandler({ bind, isBound }, SetTypeHintsAction.KIND, TypeHintProvider);
     configureCommand({ bind, isBound }, ApplyTypeHintsCommand);
 });
-
-export default modelHintsModule;

package/src/features/hints/type-hints.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,30 +13,34 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, EdgeTypeHint, SetTypeHintsAction, ShapeTypeHint, TypeHint } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
+    Action,
     CommandExecutionContext,
     CommandReturn,
     Connectable,
-    connectableFeature,
-    deletableFeature,
-    editFeature,
+    EdgeTypeHint,
     FeatureSet,
     IActionHandler,
     ICommand,
-    moveFeature,
     SEdge,
     SModelElement,
     SModelRoot,
-    SShapeElement
-} from 'sprotty';
-import { TYPES } from '../../base/types';
+    SShapeElement,
+    SetTypeHintsAction,
+    ShapeTypeHint,
+    TYPES,
+    TypeHint,
+    connectableFeature,
+    deletableFeature,
+    editFeature,
+    moveFeature
+} from '~glsp-sprotty';
+import { IFeedbackActionDispatcher } from '../../base/feedback/feedback-action-dispatcher';
+import { FeedbackCommand } from '../../base/feedback/feedback-command';
 import { getElementTypeId, hasCompatibleType } from '../../utils/smodel-util';
 import { resizeFeature } from '../change-bounds/model';
 import { reconnectFeature } from '../reconnect/model';
-import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
-import { FeedbackCommand } from '../tool-feedback/model';
 import { Containable, containerFeature, reparentFeature } from './model';
 
 /**

package/src/features/hover/{di.config.ts → hover-module.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,34 +13,36 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
 import {
     CenterCommand,
     ClosePopupActionHandler,
-    configureActionHandler,
-    configureCommand,
     EnableDefaultToolsAction,
     EnableToolsAction,
+    FeatureModule,
     FitToScreenCommand,
     HoverFeedbackCommand,
     HoverKeyListener,
     HoverState,
     MoveCommand,
     PopupHoverMouseListener,
+    PopupPositionUpdater,
     SetPopupModelCommand,
     SetViewportCommand,
-    TYPES
-} from 'sprotty';
-import { PopupPositionUpdater } from 'sprotty/lib/features/hover/popup-position-updater';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
+    TYPES,
+    bindAsService,
+    configureActionHandler,
+    configureCommand
+} from '~glsp-sprotty';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-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);
+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,
@@ -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);
@@ -62,5 +63,3 @@ const glspHoverModule = new ContainerModule((bind, _unbind, isBound) => {
     configureActionHandler(context, EnableDefaultToolsAction.KIND, GlspHoverMouseListener);
     configureActionHandler(context, FocusStateChangedAction.KIND, GlspHoverMouseListener);
 });
-
-export default glspHoverModule;

package/src/features/hover/hover.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,21 +13,28 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { injectable } from 'inversify';
 import {
     Action,
     Bounds,
+    EMPTY_ROOT,
+    EnableDefaultToolsAction,
+    EnableToolsAction,
+    HoverFeedbackAction,
+    HoverMouseListener,
+    IActionHandler,
+    ICommand,
     PreRenderedElementSchema,
     RequestPopupModelAction,
-    SetPopupModelAction,
+    SModelElement,
     SModelElementSchema,
-    SModelRootSchema
-} from '@eclipse-glsp/protocol';
-import { injectable } from 'inversify';
-import { EMPTY_ROOT, HoverFeedbackAction, HoverMouseListener, IActionHandler, ICommand, SModelElement } from 'sprotty';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
-import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool-actions';
-import { EdgeCreationTool } from '../tools/edge-creation-tool';
-import { getSeverity, GIssueMarker } from '../validation/issue-marker';
+    SModelRootSchema,
+    SetPopupModelAction
+} from '~glsp-sprotty';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
+import { EdgeCreationTool } from '../tools/edge-creation/edge-creation-tool';
+import { GIssueMarker, getSeverity } from '../validation/issue-marker';
+
 @injectable()
 export class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
     protected enableHover = true;

package/src/features/{edit-label → label-edit}/edit-label-tool.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
@@ -14,16 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import { EditLabelKeyListener, EditLabelMouseListener, KeyListener, MouseListener } from 'sprotty';
+import { EditLabelKeyListener, EditLabelMouseListener, KeyListener, MouseListener } from '~glsp-sprotty';
 import { BaseGLSPTool } from '../tools/base-glsp-tool';
 
 @injectable()
 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 → label-edit}/edit-label-validator.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,17 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, RequestEditValidationAction, SetEditValidationResultAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
-    EditableLabel,
+    Action,
     EditLabelValidationResult,
+    EditableLabel,
     IEditLabelValidationDecorator,
     IEditLabelValidator,
-    Severity,
+    RequestEditValidationAction,
     SModelElement,
-    TYPES
-} from 'sprotty';
+    SetEditValidationResultAction,
+    Severity,
+    TYPES,
+    ValidationStatus
+} from '~glsp-sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 
 export namespace LabelEditValidation {

package/src/features/{edit-label/di.config.ts → label-edit/label-edit-module.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,17 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { ApplyLabelEditCommand, configureCommand } from 'sprotty';
-import { TYPES } from '../../base/types';
+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);
-    bind(TYPES.IDefaultTool).to(DirectLabelEditTool);
+    bindAsService(bind, TYPES.IDefaultTool, DirectLabelEditTool);
     configureCommand({ bind, isBound }, ApplyLabelEditCommand);
 });
-
-export default glspEditLabelModule;

package/src/features/layout/layout-elements-action.spec.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,38 +14,35 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable deprecation/deprecation */
-import {
-    Action,
-    Bounds,
-    ChangeBoundsOperation,
-    ElementAndBounds,
-    RequestAction,
-    ResponseAction,
-    SetBoundsAction
-} from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import { Container } from 'inversify';
 import 'mocha';
 import 'reflect-metadata';
 import {
+    Action,
     AnimationFrameSyncer,
+    Bounds,
+    ChangeBoundsOperation,
     CommandExecutionContext,
     ConsoleLogger,
-    defaultModule,
+    ElementAndBounds,
     ElementMove,
     FeatureSet,
     IActionDispatcher,
     MoveAction,
     MoveCommand,
+    RequestAction,
+    ResponseAction,
     SChildElement,
-    SetBoundsCommand,
     SGraphFactory,
-    SModelRoot
-} from 'sprotty';
-import { TYPES } from '../../base/types';
+    SModelRoot,
+    SetBoundsAction,
+    SetBoundsCommand,
+    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,
@@ -82,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);