@eclipse-glsp/client 0.9.0-next.f54fd689 → 0.9.0

package/src/features/validation/validate.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable, optional } from "inversify";
+import { Action, DeleteMarkersAction, Marker, SetMarkersAction } from '@eclipse-glsp/protocol';
+import { inject, injectable, optional } from 'inversify';
 import {
-    Action,
     Command,
     CommandExecutionContext,
     CommandReturn,
@@ -26,17 +26,14 @@ import {
     SModelRoot,
     SParentElement,
     TYPES
-} from "sprotty";
-
-import { EditorContextService } from "../../base/editor-context";
-import { GLSP_TYPES } from "../../base/types";
-import { Marker } from "../../utils/marker";
-import { removeCssClasses } from "../../utils/smodel-util";
-import { getSeverity } from "../hover/hover";
-import { IFeedbackActionDispatcher, IFeedbackEmitter } from "../tool-feedback/feedback-action-dispatcher";
-import { FeedbackCommand } from "../tool-feedback/model";
-import { createSIssue, getOrCreateSIssueMarker, getSIssueMarker } from "./issue-marker";
-
+} from 'sprotty';
+import { EditorContextService } from '../../base/editor-context-service';
+import { GLSP_TYPES } from '../../base/types';
+import { removeCssClasses } from '../../utils/smodel-util';
+import { getSeverity } from '../hover/hover';
+import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
+import { FeedbackCommand } from '../tool-feedback/model';
+import { createSIssue, getOrCreateSIssueMarker, getSIssueMarker } from './issue-marker';
 
 /**
  * Feedback emitter sending actions for visualizing model validation feedback and
@@ -44,20 +41,20 @@ import { createSIssue, getOrCreateSIssueMarker, getSIssueMarker } from "./issue-
  */
 @injectable()
 export class ValidationFeedbackEmitter implements IFeedbackEmitter {
-
     @inject(GLSP_TYPES.IFeedbackActionDispatcher) protected feedbackActionDispatcher: IFeedbackActionDispatcher;
 
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
     private registeredAction: MarkersAction;
 
-    private constructor() { }
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    private constructor() {}
 
     /**
      * 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.
      */
-    registerValidationFeedbackAction(action: MarkersAction) {
+    registerValidationFeedbackAction(action: MarkersAction): void {
         // De-register old action responsible for applying markers and re-applying them when the model is updated
         this.feedbackActionDispatcher.deregisterFeedback(this, []);
 
@@ -73,17 +70,6 @@ export class ValidationFeedbackEmitter implements IFeedbackEmitter {
     }
 }
 
-/**
- * Action to set markers for a model
- */
-export class SetMarkersAction implements MarkersAction {
-    constructor(public readonly markers: Marker[], public readonly kind = SetMarkersCommand.KIND) { }
-}
-
-export function isSetMarkersAction(action: Action): action is SetMarkersAction {
-    return SetMarkersCommand.KIND === action.kind && ('markers' in action);
-}
-
 /**
  * Manages current markers for the outside of the GLSP.
  *
@@ -92,16 +78,15 @@ export function isSetMarkersAction(action: Action): action is SetMarkersAction {
  */
 @injectable()
 export abstract class ExternalMarkerManager {
-
     languageLabel: string;
 
     protected actionDispatcher?: IActionDispatcher;
 
-    connect(actionDispatcher: IActionDispatcher) {
+    connect(actionDispatcher: IActionDispatcher): void {
         this.actionDispatcher = actionDispatcher;
     }
 
-    removeMarkers(markers: Marker[]) {
+    removeMarkers(markers: Marker[]): void {
         if (this.actionDispatcher) {
             this.actionDispatcher.dispatch(new DeleteMarkersAction(markers));
         }
@@ -115,12 +100,11 @@ export abstract class ExternalMarkerManager {
  */
 @injectable()
 export class SetMarkersCommand extends Command {
-
     @inject(ValidationFeedbackEmitter) protected validationFeedbackEmitter: ValidationFeedbackEmitter;
     @inject(ExternalMarkerManager) @optional() protected externalMarkerManager?: ExternalMarkerManager;
     @inject(EditorContextService) protected editorContextService: EditorContextService;
 
-    static readonly KIND = 'setMarkers';
+    static readonly KIND = SetMarkersAction.KIND;
 
     constructor(@inject(TYPES.Action) public action: SetMarkersAction) {
         super();
@@ -129,7 +113,9 @@ export class SetMarkersCommand extends Command {
     async execute(context: CommandExecutionContext): Promise<SModelRoot> {
         const markers: Marker[] = this.action.markers;
         const uri = await this.editorContextService.getSourceUri();
-        if (this.externalMarkerManager) this.externalMarkerManager.setMarkers(markers, uri);
+        if (this.externalMarkerManager) {
+            this.externalMarkerManager.setMarkers(markers, uri);
+        }
         const applyMarkersAction: ApplyMarkersAction = new ApplyMarkersAction(markers);
         this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction);
         return context.root;
@@ -144,15 +130,6 @@ export class SetMarkersCommand extends Command {
     }
 }
 
-
-/**
-* Action to retrieve markers for a model
-*/
-export class RequestMarkersAction implements Action {
-    static readonly KIND = "requestMarkers";
-    constructor(public readonly elementsIDs: string[] = [], public readonly kind = RequestMarkersAction.KIND) { }
-}
-
 /**
  * Interface for actions processing markers
  */
@@ -165,7 +142,7 @@ export interface MarkersAction extends Action {
  */
 @injectable()
 export class ApplyMarkersAction implements MarkersAction {
-    constructor(public readonly markers: Marker[], public readonly kind = ApplyMarkersCommand.KIND) { }
+    constructor(public readonly markers: Marker[], public readonly kind = ApplyMarkersCommand.KIND) {}
 }
 
 /**
@@ -173,7 +150,7 @@ export class ApplyMarkersAction implements MarkersAction {
  */
 @injectable()
 export class ApplyMarkersCommand extends FeedbackCommand {
-    static KIND = "applyMarkers";
+    static KIND = 'applyMarkers';
     readonly priority = 0;
 
     constructor(@inject(TYPES.Action) protected action: ApplyMarkersAction) {
@@ -203,7 +180,7 @@ export class ApplyMarkersCommand extends FeedbackCommand {
     }
 }
 
-function addMaxSeverityCSSClassToIssueParent(modelElement: SParentElement, issueMarker: SIssueMarker) {
+function addMaxSeverityCSSClassToIssueParent(modelElement: SParentElement, issueMarker: SIssueMarker): void {
     const maxSeverityCSSClass = getSeverity(issueMarker);
 
     if (!modelElement.cssClasses) {
@@ -214,25 +191,16 @@ function addMaxSeverityCSSClassToIssueParent(modelElement: SParentElement, issue
     }
 }
 
-function removeCSSClassFromIssueParent(modelElement: SParentElement, issueMarker: SIssueMarker) {
+function removeCSSClassFromIssueParent(modelElement: SParentElement, issueMarker: SIssueMarker): void {
     removeCssClasses(modelElement, [getSeverity(issueMarker)]);
 }
 
-
-/**
- * Action for clearing makers of a model
- */
-@injectable()
-export class DeleteMarkersAction implements MarkersAction {
-    constructor(public readonly markers: Marker[], public readonly kind = DeleteMarkersCommand.KIND) { }
-}
-
 /**
  * Command for handling `DeleteMarkersAction`
  */
 @injectable()
 export class DeleteMarkersCommand extends Command {
-    static KIND = "deleteMarkers";
+    static KIND = DeleteMarkersAction.KIND;
 
     constructor(@inject(TYPES.Action) protected action: DeleteMarkersAction) {
         super();
@@ -271,5 +239,3 @@ export class DeleteMarkersCommand extends Command {
         return this.execute(context);
     }
 }
-
-

package/src/features/viewport/di.config.ts

@@ -0,0 +1,47 @@
+/********************************************************************************
+ * Copyright (c) 2021 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 { ContainerModule } from 'inversify';
+import {
+    CenterCommand,
+    CenterKeyboardListener,
+    configureActionHandler,
+    configureCommand,
+    EnableDefaultToolsAction,
+    EnableToolsAction,
+    FitToScreenCommand,
+    GetViewportCommand,
+    SetViewportCommand,
+    TYPES,
+    ZoomMouseListener
+} from 'sprotty';
+
+import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
+
+const glspViewportModule = new ContainerModule((bind, _unbind, isBound) => {
+    configureCommand({ bind, isBound }, CenterCommand);
+    configureCommand({ bind, isBound }, FitToScreenCommand);
+    configureCommand({ bind, isBound }, GetViewportCommand);
+    configureCommand({ bind, isBound }, SetViewportCommand);
+    bind(TYPES.KeyListener).to(CenterKeyboardListener);
+    bind(TYPES.MouseListener).to(ZoomMouseListener);
+    bind(GLSPScrollMouseListener).toSelf().inSingletonScope();
+    bind(TYPES.MouseListener).toService(GLSPScrollMouseListener);
+
+    configureActionHandler({ bind, isBound }, EnableToolsAction.KIND, GLSPScrollMouseListener);
+    configureActionHandler({ bind, isBound }, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
+});
+
+export default glspViewportModule;

package/src/features/viewport/glsp-scroll-mouse-listener.ts

@@ -0,0 +1,41 @@
+/********************************************************************************
+ * Copyright (c) 2021 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 { 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';
+
+@injectable()
+export class GLSPScrollMouseListener extends ScrollMouseListener implements IActionHandler {
+    preventScrolling = false;
+
+    handle(action: Action): void | Action | ICommand {
+        if (action instanceof EnableToolsAction) {
+            if (action.toolIds.includes(MarqueeMouseTool.ID)) {
+                this.preventScrolling = true;
+            }
+        } else if (action instanceof EnableDefaultToolsAction) {
+            this.preventScrolling = false;
+        }
+    }
+
+    mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[] {
+        if (this.preventScrolling) {
+            return [];
+        }
+        return super.mouseDown(target, event);
+    }
+}

package/src/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,44 +13,46 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import defaultGLSPModule from "./base/di.config";
-import glspCommandPaletteModule from "./features/command-palette/di.config";
-import glspContextMenuModule from "./features/context-menu/di.config";
-import { copyPasteContextMenuModule, glspServerCopyPasteModule } from "./features/copy-paste/di.config";
-import glspDecorationModule from "./features/decoration/di.config";
-import glspEditLabelModule from "./features/edit-label/di.config";
-import modelHintsModule from "./features/hints/di.config";
-import glspHoverModule from "./features/hover/di.config";
-import layoutCommandsModule from "./features/layout/di.config";
-import modelSourceWatcherModule from "./features/model-source-watcher/di.config";
-import glspMouseToolModule from "./features/mouse-tool/di.config";
-import { navigationModule } from "./features/navigation/di.config";
-import saveModule from "./features/save/di.config";
-import glspSelectModule from "./features/select/di.config";
-import toolFeedbackModule from "./features/tool-feedback/di.config";
-import paletteModule from "./features/tool-palette/di.config";
-import toolsModule from "./features/tools/di.config";
-import { markerNavigatorModule, validationModule } from "./features/validation/di.config";
+import defaultGLSPModule from './base/di.config';
+import glspCommandPaletteModule from './features/command-palette/di.config';
+import glspContextMenuModule from './features/context-menu/di.config';
+import { copyPasteContextMenuModule, glspServerCopyPasteModule } from './features/copy-paste/di.config';
+import glspDecorationModule from './features/decoration/di.config';
+import glspEditLabelModule from './features/edit-label/di.config';
+import modelHintsModule from './features/hints/di.config';
+import glspHoverModule from './features/hover/di.config';
+import layoutCommandsModule from './features/layout/di.config';
+import modelSourceWatcherModule from './features/model-source-watcher/di.config';
+import glspMouseToolModule from './features/mouse-tool/di.config';
+import { navigationModule } from './features/navigation/di.config';
+import saveModule from './features/save/di.config';
+import glspSelectModule from './features/select/di.config';
+import toolFeedbackModule from './features/tool-feedback/di.config';
+import paletteModule from './features/tool-palette/di.config';
+import toolsModule from './features/tools/di.config';
+import { markerNavigatorModule, validationModule } from './features/validation/di.config';
+import glspViewportModule from './features/viewport/di.config';
 
 export * from 'sprotty';
 export * from './base/action-dispatcher';
-export * from './base/actions/context-actions';
-export * from './base/actions/edit-mode-action';
-export * from './base/actions/edit-validation-actions';
-export * from './base/actions/protocol-actions';
-export * from './base/args';
+export * from './base/actions/focus-change-action';
+export * from './base/argumentable';
 export * from './base/auto-complete/auto-complete-actions';
 export * from './base/auto-complete/auto-complete-widget';
 export * from './base/auto-complete/validation-decorator';
 export * from './base/command-stack';
+export * from './base/container-modules';
+export { configureServerActions } from './base/di.config';
 export * from './base/drag-aware-mouse-listener';
-export * from './base/editor-context';
+export * from './base/editor-context-service';
+export * from './base/focus-tracker';
 export * from './base/model-initialization-constraint';
+export * from './base/model/model-registry';
 export * from './base/model/update-model-command';
-export * from './base/operations/operation';
 export * from './base/selection-clearing-mouse-listener';
 export * from './base/source-uri-aware';
 export * from './base/types';
+export * from './base/view/view-registry';
 export * from './features/change-bounds/model';
 export * from './features/change-bounds/movement-restrictor';
 export * from './features/change-bounds/snap';
@@ -58,15 +60,12 @@ export * from './features/command-palette/server-command-palette-provider';
 export * from './features/context-menu/delete-element-context-menu';
 export * from './features/copy-paste/copy-paste-handler';
 export * from './features/decoration/decoration-placer';
-export * from './features/decoration/view';
 export * from './features/edit-label/edit-label-tool';
 export * from './features/edit-label/edit-label-validator';
 export * from './features/hints/model';
-export * from './features/hints/request-type-hints-action';
 export * from './features/hints/type-hints';
 export * from './features/hover/hover';
 export * from './features/layout/layout-commands';
-export * from './features/model-source-watcher/model-source-changed-action';
 export * from './features/model-source-watcher/model-source-changed-action-handler';
 export * from './features/mouse-tool/mouse-tool';
 export * from './features/navigation/navigation-action-handler';
@@ -74,7 +73,7 @@ export * from './features/navigation/navigation-target-resolver';
 export * from './features/rank/model';
 export * from './features/reconnect/model';
 export * from './features/save/model';
-export * from './features/save/save';
+export * from './features/save/save-keylistener';
 export * from './features/tool-feedback/change-bounds-tool-feedback';
 export * from './features/tool-feedback/creation-tool-feedback';
 export * from './features/tool-feedback/css-feedback';
@@ -83,24 +82,45 @@ export * from './features/tool-feedback/feedback-action-dispatcher';
 export * from './features/tool-feedback/model';
 export * from './features/tool-palette/palette-item';
 export * from './features/tool-palette/tool-palette';
+export * from './features/tools/base-glsp-tool';
 export * from './features/tools/change-bounds-tool';
 export * from './features/tools/delete-tool';
 export * from './features/tools/edge-creation-tool';
 export * from './features/tools/edge-edit-tool';
 export * from './features/tools/node-creation-tool';
-export * from './features/undo-redo/model';
+export * from './features/tools/marquee-behavior';
 export * from './features/validation/issue-marker';
-export * from './features/validation/validate';
 export * from './features/validation/marker-navigator';
+export * from './features/validation/validate';
+export * from './features/viewport/glsp-scroll-mouse-listener';
 export * from './lib/model';
-export * from './model-source/glsp-server-status';
 export * from './model-source/glsp-diagram-server';
-export * from './utils/array-utils';
+export * from './protocol-reexport';
+export * from './utils/argument-utils';
 export * from './utils/marker';
 export * from './utils/smodel-util';
 export * from './utils/viewpoint-util';
+export * from './views';
 export {
-    validationModule, saveModule, paletteModule, toolFeedbackModule, defaultGLSPModule, modelHintsModule, glspCommandPaletteModule,
-    glspContextMenuModule, glspServerCopyPasteModule, copyPasteContextMenuModule, glspSelectModule, glspMouseToolModule, layoutCommandsModule, glspEditLabelModule,
-    glspHoverModule, toolsModule, navigationModule, markerNavigatorModule, glspDecorationModule, modelSourceWatcherModule
+    validationModule,
+    saveModule,
+    paletteModule,
+    toolFeedbackModule,
+    defaultGLSPModule,
+    modelHintsModule,
+    glspCommandPaletteModule,
+    glspContextMenuModule,
+    glspServerCopyPasteModule,
+    copyPasteContextMenuModule,
+    glspSelectModule,
+    glspMouseToolModule,
+    layoutCommandsModule,
+    glspEditLabelModule,
+    glspHoverModule,
+    toolsModule,
+    navigationModule,
+    markerNavigatorModule,
+    glspDecorationModule,
+    modelSourceWatcherModule,
+    glspViewportModule
 };

package/src/lib/model.ts

@@ -13,14 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { exportFeature, SGraph, SModelElement, SModelElementSchema, viewportFeature } from "sprotty/lib";
+import { exportFeature, SGraph, SModelElement, SModelElementSchema, viewportFeature } from 'sprotty/lib';
 
-import { Containable, containerFeature } from "../features/hints/model";
-import { Saveable, saveFeature } from "../features/save/model";
+import { Containable, containerFeature } from '../features/hints/model';
+import { Saveable, saveFeature } from '../features/save/model';
 
 export class GLSPGraph extends SGraph implements Saveable, Containable {
     static readonly DEFAULT_FEATURES = [viewportFeature, exportFeature, saveFeature, containerFeature];
-    dirty: boolean = false;
+    dirty = false;
     isContainableElement(input: string | SModelElement | SModelElementSchema): boolean {
         return true;
     }

package/src/model-source/glsp-diagram-server.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,26 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GLSPClient } from "@eclipse-glsp/protocol";
-import { injectable } from "inversify";
 import {
     Action,
-    ActionHandlerRegistry,
-    ActionMessage,
     ComputedBoundsAction,
-    DiagramServer,
-    ICommand,
-    RequestModelAction,
-    ServerStatusAction,
-    SwitchEditModeCommand
-} from "sprotty";
-
-import { RequestContextActions } from "../base/actions/context-actions";
-import { isSetEditModeAction, SetEditModeAction } from "../base/actions/edit-mode-action";
-import { InitializeClientSessionAction } from "../base/actions/protocol-actions";
-import { SourceUriAware } from "../base/source-uri-aware";
-import { RequestTypeHintsAction } from "../features/hints/request-type-hints-action";
-import { isServerMessageAction, ServerMessageAction } from "./glsp-server-status";
+    GLSPClient,
+    isRequestModelAction,
+    isServerMessageAction,
+    isSetEditModeAction,
+    ServerMessageAction,
+    SetEditModeAction
+} from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { ActionHandlerRegistry, ActionMessage, DiagramServer, ICommand, ServerStatusAction, SwitchEditModeCommand } from 'sprotty';
+import { SourceUriAware } from '../base/source-uri-aware';
 
 const receivedFromServerProperty = '__receivedFromServer';
 
@@ -63,13 +56,15 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
 
     initialize(registry: ActionHandlerRegistry): void {
         registerDefaultGLSPServerActions(registry, this);
-        if (!this.clientId)
+        if (!this.clientId) {
             this.clientId = this.viewerOptions.baseDiv;
+        }
     }
 
     handle(action: Action): void | ICommand | Action {
-        if (action instanceof RequestModelAction && action.options !== undefined)
-            this._sourceUri = <string>action.options.sourceUri;
+        if (isRequestModelAction(action) && action.options) {
+            this._sourceUri = action.options.sourceUri as string;
+        }
         return super.handle(action);
     }
 
@@ -101,21 +96,12 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
     }
 }
 
-export function isReceivedFromServer(action: Action) {
+export function isReceivedFromServer(action: Action): boolean {
     return (action as any)[receivedFromServerProperty] === true;
 }
 
-export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServer) {
-    // Register the InitializeClientSessionAction as a server action. Then, the server will
-    // notify us about all actions it handles (Via ConfigureServerHandlersAction/Handler)
-    registry.register(InitializeClientSessionAction.KIND, diagramServer);
-
-    // Register some additional early actions, that will happen before the server can tell us
-    // which actions it handles
-    registry.register(RequestTypeHintsAction.KIND, diagramServer);
-    registry.register(RequestModelAction.KIND, diagramServer);
-    registry.register(RequestContextActions.KIND, diagramServer);
-
+export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServer): void {
+    registry.register(ServerMessageAction.KIND, diagramServer);
     registry.register(ServerStatusAction.KIND, diagramServer);
 
     // Register an empty handler for SwitchEditMode, to avoid runtime exceptions.

package/src/protocol-reexport.ts

@@ -0,0 +1,64 @@
+/********************************************************************************
+ * Copyright (c) 2021 STMicroelectronics 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
+ ********************************************************************************/
+
+/**
+ * Workaround for now to solve ambiguous exports in glsp-client. This module provides all glsp-only components.
+ * i.e. typings that are not defined in sprotty
+ */
+
+export {
+    CompoundOperation,
+    isActionKind,
+    isCompoundOperation,
+    isRejectAction,
+    Operation
+} from '@eclipse-glsp/protocol/lib/action-protocol/base-protocol';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/client-notification';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/clipboard';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/contexts';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/edge-modification';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-creation';
+export { isRequestPopupModelAction, isSetPopupModelAction } from '@eclipse-glsp/protocol/lib/action-protocol/element-hover';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-navigation';
+export { isSelectAction, isSelectAllAction } from '@eclipse-glsp/protocol/lib/action-protocol/element-selection';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-text-editing';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-type-hints';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-validation';
+export { LayoutOperation } from '@eclipse-glsp/protocol/lib/action-protocol/mode-layout';
+export {
+    isModelSourceChangedAction,
+    isRequestModelAction,
+    isSetModelAction,
+    ModelSourceChangedAction
+} from '@eclipse-glsp/protocol/lib/action-protocol/model-data';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/model-edit-mode';
+export {
+    DirtyStateChangeReason,
+    isExportSvgAction,
+    isSaveModelAction,
+    isSetDirtyStateAction,
+    SaveModelAction,
+    SetDirtyStateAction
+} from '@eclipse-glsp/protocol/lib/action-protocol/model-saving';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/node-modification';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/tool-palette';
+export { Args, EditorContext, ElementAndRoutingPoints } from '@eclipse-glsp/protocol/lib/action-protocol/types';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/undo-redo';
+export * from '@eclipse-glsp/protocol/lib/glsp-client';
+export * from '@eclipse-glsp/protocol/lib/jsonrpc/base-jsonrpc-glsp-client';
+export * from '@eclipse-glsp/protocol/lib/jsonrpc/glsp-jsonrpc-client';
+export * from '@eclipse-glsp/protocol/lib/utils/array-util';
+export * from '@eclipse-glsp/protocol/lib/utils/launch-util';