@eclipse-glsp/client 2.2.0-next.343 → 2.2.0-next.344

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

@@ -33,25 +33,28 @@ import { OriginViewportCommand } from './origin-viewport';
 import { RepositionCommand } from './reposition';
 import { RestoreViewportHandler } from './viewport-handler';
 
-export const viewportModule = new FeatureModule((bind, _unbind, isBound) => {
-    const context = { bind, isBound };
-    configureCommand(context, CenterCommand);
-    configureCommand(context, FitToScreenCommand);
-    configureCommand(context, GetViewportCommand);
-    configureCommand(context, SetViewportCommand);
-    configureCommand(context, RepositionCommand);
-    configureCommand(context, OriginViewportCommand);
+export const viewportModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        configureCommand(context, CenterCommand);
+        configureCommand(context, FitToScreenCommand);
+        configureCommand(context, GetViewportCommand);
+        configureCommand(context, SetViewportCommand);
+        configureCommand(context, RepositionCommand);
+        configureCommand(context, OriginViewportCommand);
 
-    bindAsService(context, TYPES.MouseListener, ZoomMouseListener);
-    bindAsService(context, TYPES.MouseListener, GLSPScrollMouseListener);
+        bindAsService(context, TYPES.MouseListener, ZoomMouseListener);
+        bindAsService(context, TYPES.MouseListener, GLSPScrollMouseListener);
 
-    configureActionHandler(context, EnableToolsAction.KIND, GLSPScrollMouseListener);
-    configureActionHandler(context, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
+        configureActionHandler(context, EnableToolsAction.KIND, GLSPScrollMouseListener);
+        configureActionHandler(context, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
 
-    bindAsService(context, TYPES.IDiagramStartup, RestoreViewportHandler);
-    configureActionHandler(context, EnableDefaultToolsAction.KIND, RestoreViewportHandler);
-    configureActionHandler(context, FocusDomAction.KIND, RestoreViewportHandler);
-});
+        bindAsService(context, TYPES.IDiagramStartup, RestoreViewportHandler);
+        configureActionHandler(context, EnableDefaultToolsAction.KIND, RestoreViewportHandler);
+        configureActionHandler(context, FocusDomAction.KIND, RestoreViewportHandler);
+    },
+    { featureId: Symbol('viewport') }
+);
 
 /**
  * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
@@ -63,5 +66,5 @@ export const standaloneViewportModule = new FeatureModule(
         const context = { bind, isBound };
         bindAsService(context, TYPES.KeyListener, CenterKeyboardListener);
     },
-    { requires: viewportModule }
+    { featureId: Symbol('standaloneViewport'), requires: viewportModule }
 );

package/src/standalone-modules.ts

@@ -42,15 +42,18 @@ import { undoRedoModule } from './features/undo-redo/undo-redo-module';
 import { standaloneMarkerNavigatorModule } from './features/validation/validation-modules';
 import { standaloneViewportModule } from './features/viewport/viewport-modules';
 
-export const standaloneDefaultModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    bind(FallbackActionHandler).toSelf().inSingletonScope();
-    configureActionHandler(context, MessageAction.KIND, FallbackActionHandler);
-    configureActionHandler(context, StartProgressAction.KIND, FallbackActionHandler);
-    configureActionHandler(context, UpdateProgressAction.KIND, FallbackActionHandler);
-    configureActionHandler(context, EndProgressAction.KIND, FallbackActionHandler);
-    bindAsService(context, TYPES.KeyListener, LayoutKeyListener);
-});
+export const standaloneDefaultModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        bind(FallbackActionHandler).toSelf().inSingletonScope();
+        configureActionHandler(context, MessageAction.KIND, FallbackActionHandler);
+        configureActionHandler(context, StartProgressAction.KIND, FallbackActionHandler);
+        configureActionHandler(context, UpdateProgressAction.KIND, FallbackActionHandler);
+        configureActionHandler(context, EndProgressAction.KIND, FallbackActionHandler);
+        bindAsService(context, TYPES.KeyListener, LayoutKeyListener);
+    },
+    { featureId: Symbol('standaloneDefault') }
+);
 
 /**
  * A fallback action handler for actions sent by features that are currently not supported by

package/src/views/base-view-module.ts

@@ -53,10 +53,13 @@ import { GGraphView } from './ggraph-view';
 import { GIssueMarkerView } from './issue-marker-view';
 import { RoundedCornerNodeView } from './rounded-corner-view';
 
-export const baseViewModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureDefaultModelElements(context);
-});
+export const baseViewModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureDefaultModelElements(context);
+    },
+    { featureId: Symbol('baseView') }
+);
 
 export function configureDefaultModelElements(context: Pick<BindingContext, 'bind' | 'isBound'>): void {
     // HTML elements