@eclipse-glsp/client 1.1.0-RC10 → 1.1.0-next.0363f0b.261

package/src/{base/container-modules.ts → default-modules.ts}

@@ -17,73 +17,77 @@
 import { Container, ContainerModule } from 'inversify';
 import {
     ContainerConfiguration,
+    FeatureModule,
     buttonModule,
-    defaultModule,
     edgeIntersectionModule,
     edgeLayoutModule,
     expandModule,
     fadeModule,
-    initializeContainer,
     labelEditUiModule,
     modelSourceModule,
-    openModule,
-    routingModule,
+    resolveContainerConfiguration,
     zorderModule
 } from '~glsp-sprotty';
-import glspBoundsModule from '../features/bounds/di.config';
-import glspCommandPaletteModule from '../features/command-palette/di.config';
-import glspContextMenuModule from '../features/context-menu/di.config';
-import { glspServerCopyPasteModule } from '../features/copy-paste/di.config';
-import glspDecorationModule from '../features/decoration/di.config';
-import glspEditLabelModule from '../features/edit-label/di.config';
-import glspExportModule from '../features/export/di.config';
-import modelHintsModule from '../features/hints/di.config';
-import glspHoverModule from '../features/hover/di.config';
-import layoutModule from '../features/layout/di.config';
-import glspMouseToolModule from '../features/mouse-tool/di.config';
-import navigationModule from '../features/navigation/di.config';
-import glspSelectModule from '../features/select/di.config';
-import sourceModelWatcherModule from '../features/source-model-watcher/di.config';
-import svgMetadataModule from '../features/svg-metadata/di.config';
-import toolFeedbackModule from '../features/tool-feedback/di.config';
-import toolPaletteModule from '../features/tool-palette/di.config';
-import { enableDefaultToolsOnFocusLossModule, toolsModule } from '../features/tools/di.config';
-import { markerNavigatorModule, validationModule } from '../features/validation/di.config';
-import glspViewportModule from '../features/viewport/di.config';
-import defaultGLSPModule from './di.config';
+import { defaultModule } from './base/default.module';
+import { boundsModule } from './features/bounds/bounds-module';
+import { commandPaletteModule } from './features/command-palette/command-palette-module';
+import { contextMenuModule } from './features/context-menu/context-menu-module';
+import { copyPasteModule } from './features/copy-paste/copy-paste-modules';
+import { decorationModule } from './features/decoration/decoration-module';
+import { exportModule } from './features/export/export-modules';
+import { typeHintsModule } from './features/hints/type-hints-module';
+import { hoverModule } from './features/hover/hover-module';
+import { labelEditModule } from './features/label-edit/label-edit-module';
+import { layoutModule } from './features/layout/layout-module';
+import { navigationModule } from './features/navigation/navigation-module';
+import { routingModule } from './features/routing/routing-module';
+import { selectModule } from './features/select/select-module';
+import { sourceModelWatcherModule } from './features/source-model-watcher/source-model-wacher-module';
+import { svgMetadataModule } from './features/svg-metadata/svg-metadata-module';
+import { toolPaletteModule } from './features/tool-palette/tool-palette-module';
+import { changeBoundsToolModule } from './features/tools/change-bounds/change-boounds-tool-module';
+import { deletionToolModule } from './features/tools/deletion/deletion-tool-module';
+import { edgeCreationToolModule } from './features/tools/edge-creation/edege-creation-module';
+import { edgeEditToolModule } from './features/tools/edge-edit/edge-edit-module';
+import { marqueeSelectionToolModule } from './features/tools/marquee-selection/marquee-selection-module';
+import { nodeCreationToolModule } from './features/tools/node-creation/node-creation-module';
+import { toolFocusLossModule } from './features/tools/tool-focus-loss-module';
+import { markerNavigatorModule, validationModule } from './features/validation/validation-modules';
+import { viewportModule } from './features/viewport/viewport-modules';
 
 export const DEFAULT_MODULES = [
     defaultModule,
-    defaultGLSPModule,
     buttonModule,
     edgeIntersectionModule,
     edgeLayoutModule,
     expandModule,
-    glspExportModule,
+    exportModule,
     fadeModule,
-    glspBoundsModule,
-    glspCommandPaletteModule,
-    glspContextMenuModule,
-    glspDecorationModule,
-    glspEditLabelModule,
-    glspHoverModule,
-    glspMouseToolModule,
-    glspSelectModule,
-    glspServerCopyPasteModule,
-    glspViewportModule,
+    boundsModule,
+    commandPaletteModule,
+    contextMenuModule,
+    decorationModule,
+    labelEditModule,
+    hoverModule,
+    selectModule,
+    copyPasteModule,
+    viewportModule,
     labelEditUiModule,
     layoutModule,
     markerNavigatorModule,
-    modelHintsModule,
+    typeHintsModule,
     modelSourceModule,
     sourceModelWatcherModule,
     navigationModule,
-    openModule,
-    toolPaletteModule,
     routingModule,
-    toolFeedbackModule,
-    toolsModule,
-    enableDefaultToolsOnFocusLossModule,
+    toolPaletteModule,
+    edgeCreationToolModule,
+    edgeEditToolModule,
+    deletionToolModule,
+    nodeCreationToolModule,
+    changeBoundsToolModule,
+    marqueeSelectionToolModule,
+    toolFocusLossModule,
     validationModule,
     zorderModule,
     svgMetadataModule
@@ -111,13 +115,24 @@ export const DEFAULT_MODULES = [
  * ```typescript
  * rebind(NavigationTargetResolver).to(MyNavigationTargetResolver);
  * ```
- *
- * @param containerConfiguration
+ * @param container The container that should be initialized
+ * @param containerConfigurations
  *          Custom modules to be loaded in addition to the default modules and/or default modules that should be excluded.
+ * @throws An error if the first module to load is not the `defaultModule` (or an equivalent custom replacement module)
  * @returns The initialized container.
  */
-export function initializeDiagramContainer(container: Container, ...containerConfiguration: ContainerConfiguration): Container {
-    return initializeContainer(container, ...DEFAULT_MODULES, ...containerConfiguration);
+export function initializeDiagramContainer(container: Container, ...containerConfigurations: ContainerConfiguration): Container {
+    const modules = resolveContainerConfiguration(...DEFAULT_MODULES, ...containerConfigurations);
+    // The `defaultModule` (or a custom replacement module with the same `featureId`) should be the first module that is
+    // loaded into the container
+    const firstModule = modules[0];
+    if (!firstModule || !(firstModule instanceof FeatureModule && firstModule.featureId === defaultModule.featureId)) {
+        throw new Error(
+            'Invalid module configuration. The first module to load should be the `defaultModule` (or an equivalent replacement module)'
+        );
+    }
+    container.load(...modules);
+    return container;
 }
 
 /**

package/src/features/accessibility/README.md

@@ -4,19 +4,19 @@ The features presented in the following are introduced for disability-aware conc
 
 ## Getting started
 
-In order to activate and use all of the currently provided keyboard only accessibility features, the module `glspAccessibilityModule` needs to be in use.
+In order to activate and use all of the currently provided keyboard only accessibility features, the module `accessibilityModule` needs to be in use.
 To activate and use only specific accessibility features, the respective module (see list below) needs to be in use.
 
 ## Features
 
 Below is a list of the keyboard only accessibility features:<br>
 
-| Feature |                                           Description                                            |                                             Shortcut                                              |          Module           |
-| ------- | :----------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------: | :-----------------------: |
-| Search  | Search for elements or edges using labels, types, etc. <br> with respective diagram highlighting |                                   <kbd>CTRL</kbd>+<kbd>F</kbd>                                    | `glspSearchPaletteModule` |
-| Move    |                       Move elements, edges or viewport into the directions                       |                <kbd>←</kbd> \|\| <kbd>↑</kbd> \|\| <kbd>→</kbd> \|\| <kbd>↓</kbd>                 |   `glspMoveZoomModule`    |
-| Zoom    |         Zoom in or out gradually to elements or viewport or reset to default zoom level.         |                 <kbd>+</kbd> \|\| <kbd>-</kbd> \|\| <kbd>CTRL</kbd>+<kbd>0</kbd>                  |   `glspMoveZoomModule`    |
-| Resize  |          Increase or decrease element sizes gradually or reset to default element size.          | <kbd>ALT</kbd>+<kbd>A</kbd> then <kbd>+</kbd> \|\| <kbd>-</kbd> \|\| <kbd>CTRL</kbd>+<kbd>0</kbd> |   `glspResizeKeyModule`   |
+| Feature |                                           Description                                            |                                             Shortcut                                              |        Module         |
+| ------- | :----------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------: | :-------------------: |
+| Search  | Search for elements or edges using labels, types, etc. <br> with respective diagram highlighting |                                   <kbd>CTRL</kbd>+<kbd>F</kbd>                                    | `searchPaletteModule` |
+| Move    |                       Move elements, edges or viewport into the directions                       |                <kbd>←</kbd> \|\| <kbd>↑</kbd> \|\| <kbd>→</kbd> \|\| <kbd>↓</kbd>                 |   `moveZoomModule`    |
+| Zoom    |         Zoom in or out gradually to elements or viewport or reset to default zoom level.         |                 <kbd>+</kbd> \|\| <kbd>-</kbd> \|\| <kbd>CTRL</kbd>+<kbd>0</kbd>                  |   `moveZoomModule`    |
+| Resize  |          Increase or decrease element sizes gradually or reset to default element size.          | <kbd>ALT</kbd>+<kbd>A</kbd> then <kbd>+</kbd> \|\| <kbd>-</kbd> \|\| <kbd>CTRL</kbd>+<kbd>0</kbd> |   `resizeKeyModule`   |
 
 ## Usage
 

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

@@ -14,16 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { configureMoveZoom } from './move-zoom/di.config';
-import { configureResizeTools } from './resize-key-tool/di.config';
-import { configureSearchPaletteModule } from './search/di.config';
-import { configureViewKeyTools } from './view-key-tools/di.config';
+import { FeatureModule } from '~glsp-sprotty';
+import { configureMoveZoom } from './move-zoom/move-zoom-module';
+import { configureResizeTools } from './resize-key-tool/resize-key-module';
+import { configureSearchPaletteModule } from './search/search-palette-module';
+import { configureViewKeyTools } from './view-key-tools/view-key-tools-module';
 
 /**
  * Enables the accessibility tools for a keyboard-only-usage
  */
-export const glspAccessibilityModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+export const accessibilityModule = new FeatureModule((bind, unbind, isBound, rebind) => {
     const context = { bind, unbind, isBound, rebind };
     configureResizeTools(context);
     configureViewKeyTools(context);

package/src/features/accessibility/move-zoom/{di.config.ts → move-zoom-module.ts}

@@ -14,15 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { BindingContext, configureActionHandler } from '~glsp-sprotty';
+import { BindingContext, FeatureModule, configureActionHandler } from '~glsp-sprotty';
 import { MoveElementAction, MoveElementHandler, MoveViewportAction, MoveViewportHandler } from './move-handler';
 import { ZoomElementAction, ZoomElementHandler, ZoomViewportAction, ZoomViewportHandler } from './zoom-handler';
 
 /**
  * Handles move and zoom actions.
  */
-export const glspMoveZoomModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+export const moveZoomModule = new FeatureModule((bind, unbind, isBound, rebind) => {
     const context = { bind, unbind, isBound, rebind };
     configureMoveZoom(context);
 });

package/src/features/accessibility/resize-key-tool/{di.config.ts → resize-key-module.ts}

@@ -14,15 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, configureActionHandler, TYPES } from '~glsp-sprotty';
+import { BindingContext, FeatureModule, TYPES, bindAsService, configureActionHandler } from '~glsp-sprotty';
 import { ResizeElementAction, ResizeElementHandler } from './resize-key-handler';
 import { ResizeKeyTool } from './resize-key-tool';
 
 /**
  * Handles resize actions.
  */
-export const glspResizeKeyModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+export const resizeKeyModule = new FeatureModule((bind, unbind, isBound, rebind) => {
     const context = { bind, unbind, isBound, rebind };
     configureResizeTools(context);
 });

package/src/features/accessibility/resize-key-tool/resize-key-tool.ts

@@ -17,9 +17,9 @@
 import { inject, injectable, optional } from 'inversify';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import { Action, EnableDefaultToolsAction, EnableToolsAction, ISnapper, KeyListener, KeyTool, SModelElement, TYPES } from '~glsp-sprotty';
+import { SelectionService } from '../../../base/selection-service';
 import { GLSPTool } from '../../../base/tool-manager/glsp-tool-manager';
 import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
-import { SelectionService } from '../../select/selection-service';
 import { ResizeElementAction, ResizeType } from './resize-key-handler';
 
 @injectable()
@@ -31,7 +31,7 @@ export class ResizeKeyTool implements GLSPTool {
     @inject(KeyTool) protected readonly keytool: KeyTool;
     @inject(TYPES.IMovementRestrictor) @optional() readonly movementRestrictor?: IMovementRestrictor;
     @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
-    @inject(TYPES.SelectionService) readonly selectionService: SelectionService;
+    @inject(SelectionService) readonly selectionService: SelectionService;
 
     protected resizeKeyListener: ResizeKeyListener = new ResizeKeyListener(this);
 

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

@@ -14,12 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, TYPES } from '~glsp-sprotty';
+import { bindAsService, BindingContext, FeatureModule, TYPES } from '~glsp-sprotty';
 import { SearchAutocompletePalette } from './search-palette';
 import { SearchAutocompletePaletteTool } from './search-tool';
 
-export const glspSearchPaletteModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
+export const searchPaletteModule = new FeatureModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, isBound, rebind };
     configureSearchPaletteModule(context);
 });

package/src/features/accessibility/search/search-palette.ts

@@ -34,7 +34,7 @@ import {
 import { AutocompleteSuggestion, IAutocompleteSuggestionProvider } from '../../autocomplete-palette/autocomplete-suggestion-providers';
 import { BaseAutocompletePalette } from '../../autocomplete-palette/base-autocomplete-palette';
 
-import { applyCssClasses, deleteCssClasses } from '../../tool-feedback/css-feedback';
+import { applyCssClasses, deleteCssClasses } from '../../../base/feedback/css-feedback';
 
 const CSS_SEARCH_HIDDEN = 'search-hidden';
 const CSS_SEARCH_HIGHLIGHTED = 'search-highlighted';

package/src/features/accessibility/view-key-tools/movement-key-tool.ts

@@ -20,7 +20,7 @@ import { Action, ISnapper, KeyListener, KeyTool, SModelElement, TYPES } from '~g
 import { GLSPTool } from '../../../base/tool-manager/glsp-tool-manager';
 import { GridSnapper } from '../../change-bounds/snap';
 
-import { SelectionService } from '../../select/selection-service';
+import { SelectionService } from '../../../base/selection-service';
 import { MoveElementAction, MoveViewportAction } from '../move-zoom/move-handler';
 
 /**
@@ -35,7 +35,7 @@ export class MovementKeyTool implements GLSPTool {
     protected readonly movementKeyListener = new MoveKeyListener(this);
 
     @inject(KeyTool) protected readonly keytool: KeyTool;
-    @inject(TYPES.SelectionService) selectionService: SelectionService;
+    @inject(SelectionService) selectionService: SelectionService;
     @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
 
     get id(): string {

package/src/features/accessibility/view-key-tools/{di.config.ts → view-key-tools-module.ts}

@@ -14,13 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, TYPES } from '~glsp-sprotty';
-import { DeselectKeyTool } from '../view-key-tools/deselect-key-tool';
+import { bindAsService, BindingContext, FeatureModule, TYPES } from '~glsp-sprotty';
+import { DeselectKeyTool } from './deselect-key-tool';
 import { MovementKeyTool } from './movement-key-tool';
 import { ZoomKeyTool } from './zoom-key-tool';
 
-export const glspViewKeyToolsModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
+export const viewKeyToolsModule = new FeatureModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, isBound, rebind };
     configureViewKeyTools(context);
 });

package/src/features/accessibility/view-key-tools/zoom-key-tool.ts

@@ -16,9 +16,9 @@
 
 import { inject, injectable } from 'inversify';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-import { Action, CenterAction, KeyListener, KeyTool, SModelElement, TYPES } from '~glsp-sprotty';
+import { Action, CenterAction, KeyListener, KeyTool, SModelElement } from '~glsp-sprotty';
+import { SelectionService } from '../../../base/selection-service';
 import { GLSPTool } from '../../../base/tool-manager/glsp-tool-manager';
-import { SelectionService } from '../../select/selection-service';
 import { ZoomElementAction, ZoomViewportAction } from '../move-zoom/zoom-handler';
 
 /**
@@ -33,7 +33,7 @@ export class ZoomKeyTool implements GLSPTool {
     protected readonly zoomKeyListener = new ZoomKeyListener(this);
 
     @inject(KeyTool) protected readonly keytool: KeyTool;
-    @inject(TYPES.SelectionService) selectionService: SelectionService;
+    @inject(SelectionService) selectionService: SelectionService;
 
     get id(): string {
         return ZoomKeyTool.ID;

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

@@ -13,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
 import {
+    FeatureModule,
     HBoxLayouter,
     HiddenBoundsUpdater,
     LayoutRegistry,
@@ -32,7 +32,7 @@ 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) => {
+export const boundsModule = new FeatureModule((bind, _unbind, isBound, _rebind) => {
     const context = { bind, isBound };
     configureCommand(context, SetBoundsCommand);
     configureCommand(context, RequestBoundsCommand);
@@ -45,5 +45,3 @@ const glspBoundsModule = new ContainerModule((bind, _unbind, isBound, _rebind) =
     configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
     configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
 });
-
-export default glspBoundsModule;

package/src/features/bounds/layouter-test-util.spec.ts

@@ -31,7 +31,7 @@ import {
     createFeatureSet,
     layoutableChildFeature
 } from '~glsp-sprotty';
-import { initializeDiagramContainer } from '../../base/container-modules';
+import { initializeDiagramContainer } from '../../default-modules';
 import { GLSPGraph } from '../../lib/model';
 import { StatefulLayouterExt } from './layouter';
 

package/src/features/change-bounds/movement-restrictor.ts

@@ -15,8 +15,8 @@
  ********************************************************************************/
 import { injectable } from 'inversify';
 import { BoundsAware, Point, SModelElement, SNode, SParentElement } from '~glsp-sprotty';
+import { ModifyCSSFeedbackAction } from '../../base/feedback/css-feedback';
 import { toAbsoluteBounds } from '../../utils/viewpoint-util';
-import { ModifyCSSFeedbackAction } from '../tool-feedback/css-feedback';
 import { SResizeHandle, isBoundsAwareMoveable } from './model';
 
 /**

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

@@ -13,17 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { CommandPalette, CommandPaletteActionProviderRegistry, TYPES, bindAsService } from '~glsp-sprotty';
+import { CommandPalette, CommandPaletteActionProviderRegistry, FeatureModule, TYPES, bindAsService } from '~glsp-sprotty';
 import '../../../css/command-palette.css';
 import { CommandPaletteTool } from './command-palette-tool';
 import { ServerCommandPaletteActionProvider } from './server-command-palette-provider';
 
-const glspCommandPaletteModule = new ContainerModule(bind => {
+export const commandPaletteModule = new FeatureModule(bind => {
     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 → context-menu-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 { ContextMenuProviderRegistry, IContextMenuService, TYPES, bindAsService } from '~glsp-sprotty';
+import { ContextMenuProviderRegistry, FeatureModule, IContextMenuService, TYPES, bindAsService } from '~glsp-sprotty';
 import { SelectionServiceAwareContextMenuMouseListener } from './selection-service-aware-context-menu-mouse-listener';
 import { ServerContextMenuItemProvider } from './server-context-menu-provider';
 
-const glspContextMenuModule = new ContainerModule(bind => {
+export const contextMenuModule = new FeatureModule(bind => {
     bind(TYPES.IContextMenuServiceProvider).toProvider<IContextMenuService>(
         ctx => () =>
             new Promise<IContextMenuService>((resolve, reject) => {
@@ -33,5 +32,3 @@ const glspContextMenuModule = new ContainerModule(bind => {
     bind(TYPES.IContextMenuProviderRegistry).to(ContextMenuProviderRegistry);
     bindAsService(bind, TYPES.IContextMenuItemProvider, ServerContextMenuItemProvider);
 });
-
-export default glspContextMenuModule;

package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts

@@ -15,8 +15,8 @@
  ********************************************************************************/
 import { inject, injectable, optional } from 'inversify';
 import { Action, ContextMenuProviderRegistry, IContextMenuServiceProvider, MouseListener, SModelElement, TYPES } from '~glsp-sprotty';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
-import { SelectionService } from '../select/selection-service';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
+import { SelectionService } from '../../base/selection-service';
 
 @injectable()
 export class SelectionServiceAwareContextMenuMouseListener extends MouseListener {
@@ -28,7 +28,7 @@ export class SelectionServiceAwareContextMenuMouseListener extends MouseListener
     @optional()
     protected readonly menuProvider?: ContextMenuProviderRegistry;
 
-    @inject(TYPES.SelectionService)
+    @inject(SelectionService)
     protected selectionService: SelectionService;
 
     /**

package/src/features/copy-paste/copy-paste-context-menu.ts

@@ -85,7 +85,7 @@ export class InvokeCopyPasteActionHandler 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/copy-paste/{di.config.ts → copy-paste-modules.ts}

@@ -13,23 +13,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { configureActionHandler, TYPES } from '~glsp-sprotty';
+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}

@@ -13,13 +13,10 @@
  *
  * 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 '../../../css/decoration.css';
 import { GlspDecorationPlacer } from './decoration-placer';
 
-const glspDecorationModule = new ContainerModule(bind => {
+export const decorationModule = new FeatureModule(bind => {
     bindAsService(bind, TYPES.IVNodePostprocessor, GlspDecorationPlacer);
 });
-
-export default glspDecorationModule;

package/src/features/export/{di.config.ts → export-modules.ts}

@@ -13,16 +13,38 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { bindAsService, configureCommand, ExportSvgCommand, ExportSvgKeyListener, ExportSvgPostprocessor, TYPES } from '~glsp-sprotty';
+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';
 
-const glspExportSvgModule = new ContainerModule((bind, _unbind, isBound) => {
+export const exportModule = new FeatureModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
-    bindAsService(context, TYPES.KeyListener, ExportSvgKeyListener);
     bindAsService(context, TYPES.HiddenVNodePostprocessor, ExportSvgPostprocessor);
     configureCommand(context, ExportSvgCommand);
     bind(TYPES.SvgExporter).to(GLSPSvgExporter).inSingletonScope();
 });
 
-export default glspExportSvgModule;
+/**
+ * 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/hints/{di.config.ts → type-hints-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 { SetTypeHintsAction, TYPES, configureActionHandler, configureCommand } from '~glsp-sprotty';
+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;