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

package/src/features/tools/change-bounds/change-bounds-tracker.ts

@@ -32,7 +32,7 @@ import {
     isMoveable
 } from '@eclipse-glsp/sprotty';
 import { BoundsAwareModelElement, MoveableElement, ResizableModelElement, getElements } from '../../../utils/gmodel-util';
-import { ResizeHandleLocation, SResizeHandle } from '../../change-bounds/model';
+import { GResizeHandle, ResizeHandleLocation } from '../../change-bounds/model';
 import { DiagramMovementCalculator } from '../../change-bounds/tracker';
 import { ChangeBoundsManager } from './change-bounds-manager';
 
@@ -277,7 +277,7 @@ export class ChangeBoundsTracker {
     // RESIZE
     //
 
-    resizeElements(handle: SResizeHandle, opts?: Partial<ResizeOptions>): TrackedResize {
+    resizeElements(handle: GResizeHandle, opts?: Partial<ResizeOptions>): TrackedResize {
         const options = this.resolveResizeOptions(opts);
         const update = this.calculateDiagramMovement();
         const handleMove = this.calculateHandleMove(new MoveableResizeHandle(handle), update.vector, options);
@@ -315,7 +315,7 @@ export class ChangeBoundsTracker {
         return this.calculateElementMove(handle, diagramMovement, moveOptions);
     }
 
-    protected getResizableElements(handle: SResizeHandle, options: ResizeOptions): ResizableModelElement[] {
+    protected getResizableElements(handle: GResizeHandle, options: ResizeOptions): ResizableModelElement[] {
         return [handle.parent];
     }
 
@@ -447,11 +447,11 @@ export class ChangeBoundsTracker {
     }
 }
 
-export class MoveableResizeHandle extends SResizeHandle implements Locateable {
+export class MoveableResizeHandle extends GResizeHandle implements Locateable {
     constructor(
-        protected handle: SResizeHandle,
+        protected handle: GResizeHandle,
         override location: ResizeHandleLocation = handle.location,
-        readonly position = SResizeHandle.getHandlePosition(handle.parent, location)
+        readonly position = GResizeHandle.getHandlePosition(handle.parent, location)
     ) {
         super(location, handle.type, handle.hoverFeedback);
         this.id = handle.id;

package/src/features/tools/change-bounds/view.tsx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 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
@@ -16,14 +16,14 @@
 import { IView, Point, RenderingContext, setAttr, svg } from '@eclipse-glsp/sprotty';
 import { injectable } from 'inversify';
 import { VNode } from 'snabbdom';
-import { SResizeHandle } from '../../change-bounds/model';
+import { GResizeHandle } from '../../change-bounds/model';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const JSX = { createElement: svg };
 
 @injectable()
-export class SResizeHandleView implements IView {
-    render(handle: SResizeHandle, context: RenderingContext): VNode | undefined {
+export class GResizeHandleView implements IView {
+    render(handle: GResizeHandle, context: RenderingContext): VNode | undefined {
         if (context.targetKind === 'hidden') {
             return undefined;
         }
@@ -45,11 +45,16 @@ export class SResizeHandleView implements IView {
         return <g />;
     }
 
-    protected getPosition(handle: SResizeHandle): Point | undefined {
-        return Point.subtract(SResizeHandle.getHandlePosition(handle), handle.parent.bounds);
+    protected getPosition(handle: GResizeHandle): Point | undefined {
+        return Point.subtract(GResizeHandle.getHandlePosition(handle), handle.parent.bounds);
     }
 
     getRadius(): number {
         return 7;
     }
 }
+
+export {
+    /** @deprecated Use {@link GResizeHandleView} instead */
+    GResizeHandleView as SResizeHandleView
+};

package/src/features/tools/deletion/deletion-tool-module.ts

@@ -16,8 +16,11 @@
 import { FeatureModule, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
 import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
 
-export const deletionToolModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    bindAsService(context, TYPES.IDefaultTool, DelKeyDeleteTool);
-    bindAsService(context, TYPES.ITool, MouseDeleteTool);
-});
+export const deletionToolModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        bindAsService(context, TYPES.IDefaultTool, DelKeyDeleteTool);
+        bindAsService(context, TYPES.ITool, MouseDeleteTool);
+    },
+    { featureId: Symbol('deletionTool') }
+);

package/src/features/tools/edge-creation/edege-creation-module.ts

@@ -17,9 +17,12 @@ import { FeatureModule, TYPES, TriggerEdgeCreationAction, bindAsService, configu
 import { configureDanglingFeedbackEdge } from './dangling-edge-feedback';
 import { EdgeCreationTool } from './edge-creation-tool';
 
-export const edgeCreationToolModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    bindAsService(context, TYPES.ITool, EdgeCreationTool);
-    configureActionHandler(context, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
-    configureDanglingFeedbackEdge(context);
-});
+export const edgeCreationToolModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        bindAsService(context, TYPES.ITool, EdgeCreationTool);
+        configureActionHandler(context, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
+        configureDanglingFeedbackEdge(context);
+    },
+    { featureId: Symbol('edgeCreationTool') }
+);

package/src/features/tools/edge-edit/edge-edit-module.ts

@@ -23,16 +23,19 @@ import {
     SwitchRoutingModeCommand
 } from './edge-edit-tool-feedback';
 
-export const edgeEditToolModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    bindAsService(context, TYPES.IDefaultTool, EdgeEditTool);
+export const edgeEditToolModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        bindAsService(context, TYPES.IDefaultTool, EdgeEditTool);
 
-    // reconnect edge tool feedback
-    configureCommand(context, ShowEdgeReconnectHandlesFeedbackCommand);
-    configureCommand(context, HideEdgeReconnectHandlesFeedbackCommand);
-    configureCommand(context, DrawFeedbackEdgeSourceCommand);
-    configureCommand(context, SwitchRoutingModeCommand);
+        // reconnect edge tool feedback
+        configureCommand(context, ShowEdgeReconnectHandlesFeedbackCommand);
+        configureCommand(context, HideEdgeReconnectHandlesFeedbackCommand);
+        configureCommand(context, DrawFeedbackEdgeSourceCommand);
+        configureCommand(context, SwitchRoutingModeCommand);
 
-    // dangling edge feedback
-    configureDanglingFeedbackEdge(context);
-});
+        // dangling edge feedback
+        configureDanglingFeedbackEdge(context);
+    },
+    { featureId: Symbol('edgeEditTool') }
+);

package/src/features/tools/marquee-selection/marquee-selection-module.ts

@@ -20,13 +20,16 @@ import { DrawMarqueeCommand, MARQUEE, RemoveMarqueeCommand } from './marquee-too
 import { MarqueeNode } from './model';
 import { MarqueeView } from './view';
 
-export const marqueeSelectionToolModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    bindAsService(context, TYPES.IDefaultTool, MarqueeTool);
-    bindAsService(context, TYPES.ITool, MarqueeMouseTool);
+export const marqueeSelectionToolModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        bindAsService(context, TYPES.IDefaultTool, MarqueeTool);
+        bindAsService(context, TYPES.ITool, MarqueeMouseTool);
 
-    configureCommand(context, DrawMarqueeCommand);
-    configureCommand(context, RemoveMarqueeCommand);
+        configureCommand(context, DrawMarqueeCommand);
+        configureCommand(context, RemoveMarqueeCommand);
 
-    configureModelElement(context, MARQUEE, MarqueeNode, MarqueeView);
-});
+        configureModelElement(context, MARQUEE, MarqueeNode, MarqueeView);
+    },
+    { featureId: Symbol('marqueeSelectionTool') }
+);

package/src/features/tools/node-creation/node-creation-module.ts

@@ -35,5 +35,8 @@ export const nodeCreationToolModule = new FeatureModule(
         configureActionHandler(context, TriggerNodeCreationAction.KIND, NodeCreationTool);
         configureModelElement(context, InsertIndicator.TYPE, InsertIndicator, InsertIndicatorView);
     },
-    { requires: elementTemplateModule }
+    {
+        featureId: Symbol('nodeCreationTool'),
+        requires: elementTemplateModule
+    }
 );

package/src/features/tools/tool-focus-loss-module.ts

@@ -13,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from 'inversify';
 import { Action, FeatureModule, IActionHandler, ICommand, configureActionHandler } from '@eclipse-glsp/sprotty';
+import { injectable } from 'inversify';
 import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
 import { EnableDefaultToolsAction } from '../../base/tool-manager/tool';
 
@@ -34,6 +34,9 @@ export class EnableDefaultToolsOnFocusLossHandler implements IActionHandler {
 /**
  * Enables the default tools in the tool manager if the diagram looses focus.
  */
-export const toolFocusLossModule = new FeatureModule((bind, _unbind, isBound) => {
-    configureActionHandler({ bind, isBound }, FocusStateChangedAction.KIND, EnableDefaultToolsOnFocusLossHandler);
-});
+export const toolFocusLossModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        configureActionHandler({ bind, isBound }, FocusStateChangedAction.KIND, EnableDefaultToolsOnFocusLossHandler);
+    },
+    { featureId: Symbol('toolFocusLoss ') }
+);

package/src/features/undo-redo/undo-redo-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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,8 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { bindAsService, TYPES } from '@eclipse-glsp/sprotty';
+import { bindAsService, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
 import { GLSPUndoRedoKeyListener } from './undo-redo-key-listener';
 
 /**
@@ -23,6 +22,9 @@ import { GLSPUndoRedoKeyListener } from './undo-redo-key-listener';
  * 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 undoRedoModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    bindAsService(bind, TYPES.KeyListener, GLSPUndoRedoKeyListener);
-});
+export const undoRedoModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        bindAsService(bind, TYPES.KeyListener, GLSPUndoRedoKeyListener);
+    },
+    { featureId: Symbol('undoRedo') }
+);

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

@@ -25,19 +25,25 @@ import {
 } from './marker-navigator';
 import { ApplyMarkersCommand, DeleteMarkersCommand, SetMarkersActionHandler, ValidationFeedbackEmitter } from './validate';
 
-export const validationModule = new FeatureModule((bind, _unbind, isBound) => {
-    const context = { bind, isBound };
-    configureActionHandler(context, SetMarkersAction.KIND, SetMarkersActionHandler);
-    configureCommand(context, ApplyMarkersCommand);
-    configureCommand(context, DeleteMarkersCommand);
-    bind(ValidationFeedbackEmitter).toSelf().inSingletonScope();
-});
+export const validationModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        configureActionHandler(context, SetMarkersAction.KIND, SetMarkersActionHandler);
+        configureCommand(context, ApplyMarkersCommand);
+        configureCommand(context, DeleteMarkersCommand);
+        bind(ValidationFeedbackEmitter).toSelf().inSingletonScope();
+    },
+    { featureId: Symbol('validation') }
+);
 
-export const markerNavigatorModule = new FeatureModule((bind, _unbind, isBound) => {
-    bind(GModelElementComparator).to(LeftToRightTopToBottomComparator).inSingletonScope();
-    bind(MarkerNavigator).toSelf().inSingletonScope();
-    configureActionHandler({ bind, isBound }, NavigateToMarkerAction.KIND, NavigateToMarkerActionHandler);
-});
+export const markerNavigatorModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        bind(GModelElementComparator).to(LeftToRightTopToBottomComparator).inSingletonScope();
+        bind(MarkerNavigator).toSelf().inSingletonScope();
+        configureActionHandler({ bind, isBound }, NavigateToMarkerAction.KIND, NavigateToMarkerActionHandler);
+    },
+    { featureId: Symbol('markerNavigator') }
+);
 
 /**
  * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
@@ -49,5 +55,5 @@ export const standaloneMarkerNavigatorModule = new FeatureModule(
         bindAsService(bind, TYPES.IContextMenuProvider, MarkerNavigatorContextMenuItemProvider);
         bindAsService(bind, TYPES.KeyListener, MarkerNavigatorKeyListener);
     },
-    { requires: markerNavigatorModule }
+    { featureId: Symbol('standaloneMarkerNavigator'), requires: markerNavigatorModule }
 );

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/index.ts

@@ -67,7 +67,7 @@ export * from './features/accessibility/focus-tracker/focus-tracker-tool';
 export * from './features/accessibility/global-keylistener-tool';
 export * from './features/accessibility/key-shortcut/accessible-key-shortcut';
 export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
-export * from './features/accessibility/key-shortcut/di.config';
+export * from './features/accessibility/key-shortcut/shortcut-help-module';
 export * from './features/accessibility/keyboard-grid/action';
 export * from './features/accessibility/keyboard-grid/constants';
 export * from './features/accessibility/keyboard-grid/keyboard-grid';

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

package/lib/features/accessibility/key-shortcut/di.config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAiB,cAAc,EAAiC,MAAM,uBAAuB,CAAC;AACrG,OAAO,kCAAkC,CAAC;AAI1C;;GAEG;AACH,eAAO,MAAM,sBAAsB,iBAGjC,CAAC;AAEH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAIvE"}

package/lib/features/accessibility/key-shortcut/di.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/di.config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAA4C;AAC5C,mDAAqG;AACrG,4CAA0C;AAC1C,uEAAmG;AACnG,iFAA2E;AAE3E;;GAEG;AACU,QAAA,sBAAsB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACxF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,yBAAyB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AAEH,SAAgB,yBAAyB,CAAC,OAAuB;IAC7D,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,wDAAyB,CAAC,CAAC;IACtE,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,gDAAsB,CAAC,CAAC;IACnE,IAAA,gCAAsB,EAAC,OAAO,EAAE,wDAA8B,CAAC,IAAI,EAAE,gDAAsB,CAAC,CAAC;AACjG,CAAC;AAJD,8DAIC"}