@eclipse-glsp/client 1.1.0-next.35bf56e.230 → 1.1.0-next.383e4e9.264

package/src/features/validation/validate.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,15 +13,27 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, DeleteMarkersAction, hasArrayProp, Marker, SetMarkersAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
-import { CommandExecutionContext, CommandReturn, IActionDispatcher, IActionHandler, ICommand, SIssueMarker, SParentElement } from 'sprotty';
+import {
+    Action,
+    CommandExecutionContext,
+    CommandReturn,
+    DeleteMarkersAction,
+    IActionDispatcher,
+    IActionHandler,
+    ICommand,
+    Marker,
+    SIssueMarker,
+    SParentElement,
+    SetMarkersAction,
+    TYPES,
+    hasArrayProp
+} from '~glsp-sprotty';
 import { EditorContextService } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
+import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../../base/feedback/feedback-action-dispatcher';
+import { FeedbackCommand } from '../../base/feedback/feedback-command';
 import { removeCssClasses } from '../../utils/smodel-util';
-import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
-import { FeedbackCommand } from '../tool-feedback/model';
-import { createSIssue, getOrCreateSIssueMarker, getSeverity, getSIssueMarker, GIssueMarker } from './issue-marker';
+import { GIssueMarker, createSIssue, getOrCreateSIssueMarker, getSIssueMarker, getSeverity } from './issue-marker';
 
 /**
  * Feedback emitter sending actions for visualizing model validation feedback and
@@ -33,28 +45,25 @@ export class ValidationFeedbackEmitter implements IFeedbackEmitter {
 
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
-    private registeredAction: ApplyMarkersAction;
-
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    private constructor() {}
+    protected registeredFeedbackByReason: Map<string, ApplyMarkersAction> = new Map();
 
     /**
      * Register the action that should be emitted for visualizing validation feedback.
      * @param action the action that should be emitted when the model is updated and that will visualize the model validation feedback.
+     * @param reason the reason for this validation feedback.
      */
-    registerValidationFeedbackAction(action: ApplyMarkersAction): void {
-        // De-register old action responsible for applying markers and re-applying them when the model is updated
-        this.feedbackActionDispatcher.deregisterFeedback(this, []);
-
-        // Clear existing markers
-        if (this.registeredAction !== undefined) {
-            const deleteMarkersAction = DeleteMarkersAction.create(this.registeredAction.markers);
+    registerValidationFeedbackAction(action: ApplyMarkersAction, reason = ''): void {
+        // De-register feedback and clear existing markers with the same reason
+        const previousFeedbackWithSameReason = this.registeredFeedbackByReason.get(reason);
+        if (previousFeedbackWithSameReason) {
+            this.feedbackActionDispatcher.deregisterFeedback(this, [previousFeedbackWithSameReason]);
+            const deleteMarkersAction = DeleteMarkersAction.create(previousFeedbackWithSameReason.markers);
             this.actionDispatcher().then(dispatcher => dispatcher.dispatch(deleteMarkersAction));
         }
 
         // Register new action responsible for applying markers and re-applying them when the model is updated
-        this.feedbackActionDispatcher.registerFeedback(this, [action]);
-        this.registeredAction = action;
+        this.registeredFeedbackByReason.set(reason, action);
+        this.feedbackActionDispatcher.registerFeedback(this, [...this.registeredFeedbackByReason.values()]);
     }
 }
 
@@ -80,7 +89,7 @@ export abstract class ExternalMarkerManager {
         }
     }
 
-    abstract setMarkers(markers: Marker[], sourceUri?: string): void;
+    abstract setMarkers(markers: Marker[], reason?: string, sourceUri?: string): void;
 }
 
 @injectable()
@@ -97,14 +106,14 @@ export class SetMarkersActionHandler implements IActionHandler {
 
     handle(action: SetMarkersAction): void | Action | ICommand {
         const markers: Marker[] = action.markers;
-        this.setMarkers(markers);
+        this.setMarkers(markers, action.reason);
     }
 
-    async setMarkers(markers: Marker[]): Promise<void> {
+    async setMarkers(markers: Marker[], reason: string | undefined): Promise<void> {
         const uri = await this.editorContextService.getSourceUri();
-        this.externalMarkerManager?.setMarkers(markers, uri);
+        this.externalMarkerManager?.setMarkers(markers, reason, uri);
         const applyMarkersAction = ApplyMarkersAction.create(markers);
-        this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction);
+        this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction, reason);
     }
 }
 

package/src/features/validation/{di.config.ts → validation-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,10 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SetMarkersAction } from '@eclipse-glsp/protocol';
-import { ContainerModule } from 'inversify';
-import { configureActionHandler, configureCommand } from 'sprotty';
-import { TYPES } from '../../base/types';
+import { FeatureModule, SetMarkersAction, TYPES, bindAsService, configureActionHandler, configureCommand } from '~glsp-sprotty';
 import {
     LeftToRightTopToBottomComparator,
     MarkerNavigator,
@@ -28,7 +25,7 @@ import {
 } from './marker-navigator';
 import { ApplyMarkersCommand, DeleteMarkersCommand, SetMarkersActionHandler, ValidationFeedbackEmitter } from './validate';
 
-export const validationModule = new ContainerModule((bind, _unbind, isBound) => {
+export const validationModule = new FeatureModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
     configureActionHandler(context, SetMarkersAction.KIND, SetMarkersActionHandler);
     configureCommand(context, ApplyMarkersCommand);
@@ -36,18 +33,21 @@ export const validationModule = new ContainerModule((bind, _unbind, isBound) =>
     bind(ValidationFeedbackEmitter).toSelf().inSingletonScope();
 });
 
-export const markerNavigatorModule = new ContainerModule((bind, _unbind, isBound) => {
+export const markerNavigatorModule = new FeatureModule((bind, _unbind, isBound) => {
     bind(SModelElementComparator).to(LeftToRightTopToBottomComparator).inSingletonScope();
     bind(MarkerNavigator).toSelf().inSingletonScope();
     configureActionHandler({ bind, isBound }, NavigateToMarkerAction.KIND, NavigateToMarkerActionHandler);
 });
 
 /**
- * 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 is in Theia use the Theia-native
- * `registerMarkerNavigationCommands()` 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 markerNavigatorContextMenuModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(TYPES.IContextMenuProvider).to(MarkerNavigatorContextMenuItemProvider).inSingletonScope();
-    bind(TYPES.KeyListener).to(MarkerNavigatorKeyListener).inSingletonScope();
-});
+export const standaloneMarkerNavigatorModule = new FeatureModule(
+    bind => {
+        bindAsService(bind, TYPES.IContextMenuProvider, MarkerNavigatorContextMenuItemProvider);
+        bindAsService(bind, TYPES.KeyListener, MarkerNavigatorKeyListener);
+    },
+    { requires: markerNavigatorModule }
+);

package/src/features/viewport/glsp-scroll-mouse-listener.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
@@ -13,10 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { EnableDefaultToolsAction, EnableToolsAction, IActionHandler, ICommand, ScrollMouseListener, SModelElement } from 'sprotty';
-import { MarqueeMouseTool } from '../tools/marquee-mouse-tool';
+import {
+    Action,
+    EnableDefaultToolsAction,
+    EnableToolsAction,
+    IActionHandler,
+    ICommand,
+    ScrollMouseListener,
+    SModelElement
+} from '~glsp-sprotty';
+import { MarqueeMouseTool } from '../tools/marquee-selection/marquee-mouse-tool';
 
 @injectable()
 export class GLSPScrollMouseListener extends ScrollMouseListener implements IActionHandler {

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

@@ -0,0 +1,58 @@
+/********************************************************************************
+ * 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
+ * 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,
+    CenterCommand,
+    CenterKeyboardListener,
+    configureActionHandler,
+    configureCommand,
+    EnableDefaultToolsAction,
+    EnableToolsAction,
+    FeatureModule,
+    FitToScreenCommand,
+    GetViewportCommand,
+    SetViewportCommand,
+    TYPES,
+    ZoomMouseListener
+} from '~glsp-sprotty';
+import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
+
+export const viewportModule = new FeatureModule((bind, _unbind, isBound) => {
+    const context = { bind, isBound };
+    configureCommand(context, CenterCommand);
+    configureCommand(context, FitToScreenCommand);
+    configureCommand(context, GetViewportCommand);
+    configureCommand(context, SetViewportCommand);
+
+    bindAsService(context, TYPES.MouseListener, ZoomMouseListener);
+    bindAsService(context, TYPES.MouseListener, GLSPScrollMouseListener);
+
+    configureActionHandler(context, EnableToolsAction.KIND, GLSPScrollMouseListener);
+    configureActionHandler(context, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
+});
+
+/**
+ * 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 standaloneViewportModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        bindAsService(context, TYPES.KeyListener, CenterKeyboardListener);
+    },
+    { requires: viewportModule }
+);

package/src/{base/tool-manager/tool-actions.ts → glsp-sprotty/augmented-actions.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * 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
@@ -13,13 +13,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+/* eslint-disable @typescript-eslint/no-shadow */
+/* eslint-disable-next-line no-restricted-imports*/
 import { Action, hasArrayProp } from '@eclipse-glsp/protocol';
+import { SetBoundsAction } from 'sprotty-protocol/lib/actions';
 import { EnableDefaultToolsAction, EnableToolsAction } from 'sprotty/lib/base/tool-manager/tool';
-/* eslint-disable no-shadow */
 
 /**
- * Use module augmentation to add the `is` utility function to the tool action namespaces provided by sprotty
+ * Use module augmentation to add namespaces and  the `is` utility function to sprotty actions that directly reused by GLSP
  */
+declare module 'sprotty-protocol/lib/actions' {
+    namespace SetBoundsAction {
+        export function is(object: any): object is SetBoundsAction;
+    }
+}
+
+SetBoundsAction.is = (object: any): object is SetBoundsAction =>
+    Action.hasKind(object, SetBoundsAction.KIND) && hasArrayProp(object, 'bounds');
+
 declare module 'sprotty/lib/base/tool-manager/tool' {
     export namespace EnableDefaultToolsAction {
         export function is(object: any): object is EnableDefaultToolsAction;

package/src/{sprotty-reexport.ts → glsp-sprotty/index.ts}

@@ -19,19 +19,32 @@
  * The deprecated definitions are planned to be removed with Sprotty 1.0.0.
  * Until then we have to manually reexport the sprotty main index and exclude the clashing types.
  */
+/* eslint-disable no-restricted-imports */
 
+/**
+ * @eclipse-glsp/protocol
+ */
 export * from '@eclipse-glsp/protocol';
-// sprotty-protocol
+/*
+ * sprotty-protocol
+ */
 export {
     BringToFrontAction,
     CollapseExpandAction,
     CollapseExpandAllAction,
     ElementAndAlignment,
+    GetSelectionAction,
+    GetViewportAction,
     HoverFeedbackAction,
     MoveAction,
-    SetBoundsAction
+    SelectionResult,
+    SetBoundsAction,
+    ViewportResult
 } from 'sprotty-protocol/lib/actions';
 export { Viewport } from 'sprotty-protocol/lib/model';
+/*
+ * sprotty
+ */
 // ------------------ Base ------------------
 export * from 'sprotty/lib/base/actions/action-dispatcher';
 export * from 'sprotty/lib/base/actions/action-handler';
@@ -46,15 +59,15 @@ export * from 'sprotty/lib/base/commands/command-stack-options';
 export * from 'sprotty/lib/base/features/initialize-canvas';
 export { SetModelCommand } from 'sprotty/lib/base/features/set-model';
 export {
-    createRandomId,
     FeatureSet,
     IModelIndex,
-    isParent,
     ModelIndexImpl,
-    SChildElement,
-    SModelElement,
-    SModelRoot,
-    SParentElement
+    SChildElementImpl as SChildElement,
+    SModelElementImpl as SModelElement,
+    SModelRootImpl as SModelRoot,
+    SParentElementImpl as SParentElement,
+    createRandomId,
+    isParent
 } from 'sprotty/lib/base/model/smodel';
 export * from 'sprotty/lib/base/model/smodel-extension';
 export * from 'sprotty/lib/base/model/smodel-factory';
@@ -70,6 +83,7 @@ export * from 'sprotty/lib/base/tool-manager/tool';
 export * from 'sprotty/lib/base/tool-manager/tool-manager';
 export * from 'sprotty/lib/base/ui-extensions/ui-extension';
 export * from 'sprotty/lib/base/ui-extensions/ui-extension-registry';
+export * from 'sprotty/lib/base/views/dom-helper';
 export * from 'sprotty/lib/base/views/key-tool';
 export * from 'sprotty/lib/base/views/mouse-tool';
 export * from 'sprotty/lib/base/views/thunk-view';
@@ -79,6 +93,7 @@ export * from 'sprotty/lib/base/views/viewer-cache';
 export * from 'sprotty/lib/base/views/viewer-options';
 export * from 'sprotty/lib/base/views/vnode-postprocessor';
 export * from 'sprotty/lib/base/views/vnode-utils';
+export * from 'sprotty/lib/features/bounds/abstract-layout';
 // ------------------ Features ------------------
 export {
     RequestBoundsCommand,
@@ -89,36 +104,37 @@ export {
 export * from 'sprotty/lib/features/bounds/hbox-layout';
 export * from 'sprotty/lib/features/bounds/hidden-bounds-updater';
 export * from 'sprotty/lib/features/bounds/layout';
+export * from 'sprotty/lib/features/bounds/layout-options';
 export {
     Alignable,
-    alignFeature,
     BoundsAware,
+    LayoutContainer,
+    LayoutableChild,
+    ModelLayoutOptions,
+    SShapeElementImpl as SShapeElement,
+    alignFeature,
     boundsFeature,
     findChildrenAtPosition,
     getAbsoluteBounds,
     getAbsoluteClientBounds,
     isAlignable,
     isBoundsAware,
-    isLayoutableChild,
     isLayoutContainer,
+    isLayoutableChild,
     isSizeable,
-    LayoutableChild,
-    layoutableChildFeature,
-    LayoutContainer,
     layoutContainerFeature,
-    ModelLayoutOptions,
-    SShapeElement
+    layoutableChildFeature
 } from 'sprotty/lib/features/bounds/model';
 export * from 'sprotty/lib/features/bounds/stack-layout';
 export * from 'sprotty/lib/features/bounds/vbox-layout';
 export * from 'sprotty/lib/features/bounds/views';
 export {
     ButtonHandlerRegistry,
-    configureButtonHandler,
     IButtonHandler,
-    IButtonHandlerRegistration
+    IButtonHandlerRegistration,
+    configureButtonHandler
 } from 'sprotty/lib/features/button/button-handler';
-export * from 'sprotty/lib/features/button/model';
+export { SButtonImpl as SButton, SButtonSchema } from 'sprotty/lib/features/button/model';
 export * from 'sprotty/lib/features/command-palette/action-providers';
 export * from 'sprotty/lib/features/command-palette/command-palette';
 export { Anchor, IContextMenuService, IContextMenuServiceProvider } from 'sprotty/lib/features/context-menu/context-menu-service';
@@ -129,13 +145,11 @@ export * from 'sprotty/lib/features/decoration/model';
 export * from 'sprotty/lib/features/decoration/views';
 export * from 'sprotty/lib/features/edge-intersection/intersection-finder';
 export * from 'sprotty/lib/features/edge-intersection/sweepline';
-export * from 'sprotty/lib/features/edge-layout/di.config';
 export * from 'sprotty/lib/features/edge-layout/edge-layout';
 export * from 'sprotty/lib/features/edge-layout/model';
 export * from 'sprotty/lib/features/edit/create';
 export * from 'sprotty/lib/features/edit/create-on-drag';
 export * from 'sprotty/lib/features/edit/delete';
-export * from 'sprotty/lib/features/edit/di.config';
 export * from 'sprotty/lib/features/edit/edit-label';
 export * from 'sprotty/lib/features/edit/edit-label-ui';
 export * from 'sprotty/lib/features/edit/edit-routing';
@@ -146,7 +160,7 @@ export * from 'sprotty/lib/features/expand/model';
 export * from 'sprotty/lib/features/expand/views';
 export { ExportSvgCommand, ExportSvgKeyListener, ExportSvgPostprocessor, RequestExportSvgAction } from 'sprotty/lib/features/export/export';
 export * from 'sprotty/lib/features/export/model';
-export { SvgExporter } from 'sprotty/lib/features/export/svg-exporter';
+export { ExportSvgAction, SvgExporter } from 'sprotty/lib/features/export/svg-exporter';
 export * from 'sprotty/lib/features/fade/fade';
 export * from 'sprotty/lib/features/fade/model';
 export {
@@ -160,6 +174,7 @@ export {
     SetPopupModelCommand
 } from 'sprotty/lib/features/hover/hover';
 export * from 'sprotty/lib/features/hover/model';
+export { PopupPositionUpdater } from 'sprotty/lib/features/hover/popup-position-updater';
 export * from 'sprotty/lib/features/move/model';
 export {
     ElementMove,
@@ -183,20 +198,31 @@ export * from 'sprotty/lib/features/routing/bezier-anchors';
 export * from 'sprotty/lib/features/routing/bezier-edge-router';
 export * from 'sprotty/lib/features/routing/manhattan-anchors';
 export * from 'sprotty/lib/features/routing/manhattan-edge-router';
-export * from 'sprotty/lib/features/routing/model';
+export {
+    Connectable,
+    RoutingHandleKind,
+    SConnectableElementImpl as SConnectableElement,
+    SDanglingAnchorImpl as SDanglingAnchor,
+    SRoutableElementImpl as SRoutableElement,
+    SRoutingHandleImpl as SRoutingHandle,
+    connectableFeature,
+    edgeInProgressID,
+    edgeInProgressTargetHandleID,
+    getAbsoluteRouteBounds,
+    getRouteBounds,
+    isConnectable
+} from 'sprotty/lib/features/routing/model';
 export * from 'sprotty/lib/features/routing/polyline-anchors';
 export * from 'sprotty/lib/features/routing/polyline-edge-router';
 export * from 'sprotty/lib/features/routing/routing';
 export * from 'sprotty/lib/features/routing/views';
 export * from 'sprotty/lib/features/select/model';
 export {
-    GetSelectionAction,
     GetSelectionCommand,
-    SelectAllCommand as SprottySelectAllCommand,
-    SelectCommand as SprottySelectCommand,
-    SelectionResult,
     SelectKeyboardListener,
-    SelectMouseListener
+    SelectMouseListener,
+    SelectAllCommand as SprottySelectAllCommand,
+    SelectCommand as SprottySelectCommand
 } from 'sprotty/lib/features/select/select';
 export { UndoRedoKeyListener } from 'sprotty/lib/features/undo-redo/undo-redo';
 export * from 'sprotty/lib/features/update/model-matching';
@@ -209,17 +235,20 @@ export {
 } from 'sprotty/lib/features/viewport/center-fit';
 export * from 'sprotty/lib/features/viewport/model';
 export * from 'sprotty/lib/features/viewport/scroll';
-export {
-    GetViewportAction,
-    GetViewportCommand,
-    SetViewportCommand,
-    ViewportAnimation,
-    ViewportResult
-} from 'sprotty/lib/features/viewport/viewport';
+export { GetViewportCommand, SetViewportCommand, ViewportAnimation } from 'sprotty/lib/features/viewport/viewport';
 export * from 'sprotty/lib/features/viewport/viewport-root';
 export * from 'sprotty/lib/features/viewport/zoom';
 export { BringToFrontCommand, ZOrderElement } from 'sprotty/lib/features/zorder/zorder';
-export { SCompartment, SEdge, SGraph, SGraphIndex, SLabel, SNode, SPort } from 'sprotty/lib/graph/sgraph';
+export {
+    SCompartmentImpl as SCompartment,
+    SEdgeImpl as SEdge,
+    SGraphImpl as SGraph,
+    SGraphIndex,
+    SLabelImpl as SLabel,
+    SNodeImpl as SNode,
+    SPortImpl as SPort
+} from 'sprotty/lib/graph/sgraph';
+export * from 'sprotty/lib/lib/virtualize';
 // ------------------ Graph ------------------
 export * from 'sprotty/lib/graph/sgraph-factory';
 export * from 'sprotty/lib/graph/views';
@@ -230,12 +259,12 @@ export {
     CircularNode,
     CircularPort,
     DiamondNode,
-    ForeignObjectElement,
-    HtmlRoot,
-    PreRenderedElement,
+    ForeignObjectElementImpl as ForeignObjectElement,
+    HtmlRootImpl as HtmlRoot,
+    PreRenderedElementImpl as PreRenderedElement,
     RectangularNode,
     RectangularPort,
-    ShapedPreRenderedElement
+    ShapedPreRenderedElementImpl as ShapedPreRenderedElement
 } from 'sprotty/lib/lib/model';
 // ------------------ Library ------------------
 export * from 'sprotty/lib/lib/modules';
@@ -251,35 +280,20 @@ export * from 'sprotty/lib/model-source/websocket';
 export * from 'sprotty/lib/utils/browser';
 export * from 'sprotty/lib/utils/codicon';
 export * from 'sprotty/lib/utils/color';
-export { Diamond, Insets, intersection, Line, Orientation, PointToPointLine } from 'sprotty/lib/utils/geometry';
+export { Diamond, Insets, Line, Orientation, PointToPointLine, intersection } from 'sprotty/lib/utils/geometry';
 export * from 'sprotty/lib/utils/inversify';
+export * from 'sprotty/lib/utils/iterable';
+export * from 'sprotty/lib/utils/keyboard';
 export * from 'sprotty/lib/utils/logging';
 export * from 'sprotty/lib/utils/registry';
-export { defaultModule };
-export {
-    graphModule,
-    boundsModule,
-    buttonModule,
-    commandPaletteModule,
-    contextMenuModule,
-    decorationModule,
-    edgeIntersectionModule,
-    edgeLayoutModule,
-    expandModule,
-    exportModule,
-    fadeModule,
-    hoverModule,
-    moveModule,
-    openModule,
-    routingModule,
-    selectModule,
-    undoRedoModule,
-    updateModule,
-    viewportModule,
-    zorderModule
-};
-export { modelSourceModule };
-
+/**
+ * Misc glsp adaptions/augmentations
+ */
+export * from './augmented-actions';
+export * from './types';
+/**
+ * Modules
+ */
 import defaultModule from 'sprotty/lib/base/di.config';
 import boundsModule from 'sprotty/lib/features/bounds/di.config';
 import buttonModule from 'sprotty/lib/features/button/di.config';
@@ -288,6 +302,7 @@ import contextMenuModule from 'sprotty/lib/features/context-menu/di.config';
 import decorationModule from 'sprotty/lib/features/decoration/di.config';
 import edgeIntersectionModule from 'sprotty/lib/features/edge-intersection/di.config';
 import edgeLayoutModule from 'sprotty/lib/features/edge-layout/di.config';
+import { edgeEditModule, labelEditModule, labelEditUiModule } from 'sprotty/lib/features/edit/di.config';
 import expandModule from 'sprotty/lib/features/expand/di.config';
 import exportModule from 'sprotty/lib/features/export/di.config';
 import fadeModule from 'sprotty/lib/features/fade/di.config';
@@ -302,3 +317,31 @@ import viewportModule from 'sprotty/lib/features/viewport/di.config';
 import zorderModule from 'sprotty/lib/features/zorder/di.config';
 import graphModule from 'sprotty/lib/graph/di.config';
 import modelSourceModule from 'sprotty/lib/model-source/di.config';
+
+export {
+    buttonModule,
+    edgeEditModule,
+    edgeIntersectionModule,
+    edgeLayoutModule,
+    expandModule,
+    fadeModule,
+    graphModule,
+    labelEditUiModule,
+    modelSourceModule,
+    moveModule,
+    openModule,
+    boundsModule as sprottyBoundsModule,
+    commandPaletteModule as sprottyCommandModule,
+    contextMenuModule as sprottyContextMenuModule,
+    decorationModule as sprottyDecorationModule,
+    defaultModule as sprottyDefaultModule,
+    exportModule as sprottyExportModule,
+    hoverModule as sprottyHoverModule,
+    labelEditModule as sprottyLabelEditModule,
+    routingModule as sprottyRoutingModule,
+    selectModule as sprottySelectModule,
+    undoRedoModule as sprottyUndoRedoModule,
+    viewportModule as sprottyViewportModule,
+    updateModule,
+    zorderModule
+};

package/src/{base → glsp-sprotty}/types.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
  ********************************************************************************/
+// eslint-disable-next-line no-restricted-imports
 import { TYPES as SprottyTYPES } from 'sprotty';
 /**
  * Reexport of the TYPES namespace of sprotty augments with additional GLSP specific service
@@ -26,10 +27,8 @@ export const TYPES = {
     IToolFactory: Symbol('Factory<Tool>'),
     ITypeHintProvider: Symbol('ITypeHintProvider'),
     IMovementRestrictor: Symbol('IMovementRestrictor'),
-    SelectionService: Symbol('SelectionService'),
-    SelectionListener: Symbol('SelectionListener'),
-    SModelRootListener: Symbol('SModelRootListener'),
-    MouseTool: Symbol('MouseTool'),
+    ISelectionListener: Symbol('ISelectionListener'),
+    ISModelRootListener: Symbol('ISModelRootListener'),
     IContextMenuProvider: Symbol('IContextMenuProvider'),
     ICopyPasteHandler: Symbol('ICopyPasteHandler'),
     ITool: Symbol('ITool'),