@eclipse-glsp/client 0.10.0-next.bb1c2fd.157 → 0.10.0-next.e5fcffe.169

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "0.10.0-next.bb1c2fd.157+bb1c2fd",
+  "version": "0.10.0-next.e5fcffe.169+e5fcffe",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -34,32 +34,22 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.10.0-next.bb1c2fd.157+bb1c2fd",
+    "@eclipse-glsp/protocol": "0.10.0-next.e5fcffe.169+e5fcffe",
     "autocompleter": "5.1.0",
-    "sprotty": "0.10.0"
+    "sprotty": "next"
   },
   "devDependencies": {
-    "@babel/runtime": "^7.11.2",
-    "@types/chai": "4.1.3",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "10.14.18",
     "@vscode/codicons": "^0.0.25",
-    "chai": "^4.2.0",
-    "ignore-styles": "^5.0.1",
-    "mocha": "^6.2.0",
-    "mocha-jenkins-reporter": "0.4.5",
-    "reflect-metadata": "^0.1.13",
-    "rimraf": "^2.6.1",
-    "ts-node": "^8.3.0",
-    "typescript": "^3.9.2"
+    "eslint-import-resolver-typescript": "2.7.0",
+    "typescript": "^4.5.5"
   },
   "scripts": {
     "prepare": "yarn clean && yarn build && yarn lint",
-    "clean": "rimraf lib",
+    "clean": "rimraf lib tsconfig.tsbuildinfo ",
     "build": "tsc",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "watch": "tsc -w",
-    "test": "mocha --opts ./mocha.opts \"./src/**/*.spec.?(ts|tsx)\"",
+    "test": "mocha --config ../../.mocharc.json \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter"
   },
   "publishConfig": {
@@ -67,5 +57,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "bb1c2fd0120feb99965b33b6fdf57fcb7fe0d62d"
+  "gitHead": "e5fcffe323165bf82385707b49dcc02903ac9a2b"
 }

package/src/base/action-dispatcher.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, isResponseAction, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
+import { Action, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
 import { inject } from 'inversify';
 import { ActionDispatcher } from 'sprotty';
 import { ModelInitializationConstraint } from './model-initialization-constraint';
@@ -23,7 +23,7 @@ export class GLSPActionDispatcher extends ActionDispatcher {
     protected initializedConstraint = false;
     @inject(ModelInitializationConstraint) protected initializationConstraint: ModelInitializationConstraint;
 
-    initialize(): Promise<void> {
+    override initialize(): Promise<void> {
         return super.initialize().then(() => this.startModelInitialization());
     }
 
@@ -39,14 +39,14 @@ export class GLSPActionDispatcher extends ActionDispatcher {
         return this.initializationConstraint.onInitialized();
     }
 
-    dispatch(action: Action): Promise<void> {
+    override dispatch(action: Action): Promise<void> {
         const result = super.dispatch(action);
         this.initializationConstraint.notifyDispatched(action);
         return result;
     }
 
-    protected handleAction(action: Action): Promise<void> {
-        if (isResponseAction(action)) {
+    protected override handleAction(action: Action): Promise<void> {
+        if (ResponseAction.hasValidResponseId(action)) {
             // clear timeout
             const timeout = this.timeouts.get(action.responseId);
             if (timeout !== undefined) {
@@ -64,6 +64,14 @@ export class GLSPActionDispatcher extends ActionDispatcher {
         return super.handleAction(action);
     }
 
+    override request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res> {
+        if (!action.requestId && action.requestId === '') {
+            // No request id has been specified. So we use a generated one.
+            action.requestId = RequestAction.generateRequestId();
+        }
+        return super.request(action);
+    }
+
     /**
      * Dispatch a request and waits for a response until the timeout given in `timeoutMs` has
      * been reached. The returned promise is resolved when a response with matching identifier
@@ -75,8 +83,9 @@ export class GLSPActionDispatcher extends ActionDispatcher {
      * no value, otherwise it will be rejected.
      */
     requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs = 2000, rejectOnTimeout = false): Promise<Res> {
-        if (!action.requestId) {
-            return Promise.reject(new Error('Request without requestId'));
+        if (!action.requestId && action.requestId === '') {
+            // No request id has been specified. So we use a generated one.
+            action.requestId = RequestAction.generateRequestId();
         }
 
         const requestId = action.requestId;

package/src/base/actions/focus-change-action.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 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,14 +13,31 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
+import { Action, hasBooleanProp } from '@eclipse-glsp/protocol';
 
-export class FocusStateChangedAction implements Action {
-    static KIND = 'focusStateChanged';
-    readonly kind = FocusStateChangedAction.KIND;
-    constructor(public readonly hasFocus: boolean) {}
+/**
+ * A `FocusStateChangedAction` is dispatched by the client whenever the
+ * diagram focus changes (i.e. focus loss or focus gain).
+ */
+export interface FocusStateChangedAction extends Action {
+    kind: typeof FocusStateChangedAction.KIND;
+    /**
+     * The new focus state of the diagram.
+     */
+    hasFocus: boolean;
 }
 
-export function isFocusStateChangedAction(action: Action): action is FocusStateChangedAction {
-    return action.kind === FocusStateChangedAction.KIND;
+export namespace FocusStateChangedAction {
+    export const KIND = 'focusStateChanged';
+
+    export function is(object: any): object is FocusStateChangedAction {
+        return Action.hasKind(object, KIND) && hasBooleanProp(object, 'hasFocus');
+    }
+
+    export function create(hasFocus = true): FocusStateChangedAction {
+        return {
+            kind: KIND,
+            hasFocus
+        };
+    }
 }

package/{lib/features/tool-palette/palette-item.d.ts → src/base/actions/sprotty-actions.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2022 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
@@ -13,14 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { LabeledAction, TriggerElementCreationAction } from '@eclipse-glsp/protocol';
-export interface PaletteItem extends LabeledAction {
-    readonly id: string;
-    readonly sortString: string;
-    readonly children?: PaletteItem[];
+import { Action, hasArrayProp } from '@eclipse-glsp/protocol';
+import { SetBoundsAction } from 'sprotty-protocol/lib/actions';
+declare module 'sprotty-protocol/lib/actions' {
+    // eslint-disable-next-line no-shadow
+    namespace SetBoundsAction {
+        export function is(object: any): object is SetBoundsAction;
+    }
 }
-export declare function isPaletteItem(object?: any): object is PaletteItem;
-export declare namespace PaletteItem {
-    function getTriggerAction(item?: PaletteItem): TriggerElementCreationAction | undefined;
-}
-//# sourceMappingURL=palette-item.d.ts.map
+
+SetBoundsAction.is = (object: any): object is SetBoundsAction =>
+    Action.hasKind(object, SetBoundsAction.KIND) && hasArrayProp(object, 'bounds');

package/src/base/auto-complete/auto-complete-actions.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2022 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,12 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { LabeledAction } from '@eclipse-glsp/protocol';
+import { hasStringProp, LabeledAction } from '@eclipse-glsp/protocol';
 
-export interface SetAutoCompleteValueAction extends LabeledAction {
+export interface AutoCompleteValue extends LabeledAction {
     readonly text: string;
 }
 
-export function isSetAutoCompleteValueAction(action: LabeledAction): action is SetAutoCompleteValueAction {
-    return action !== undefined && (action as SetAutoCompleteValueAction).text !== undefined;
+export namespace AutoCompleteValue {
+    export function is(object: any): object is AutoCompleteValue {
+        return LabeledAction.is(object) && hasStringProp(object, 'text');
+    }
 }

package/src/base/auto-complete/auto-complete-widget.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2022 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,12 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, isAction, isLabeledAction, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
+import { Action, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
 import { codiconCSSClasses, ILogger, SModelRoot } from 'sprotty';
 import { toArray } from 'sprotty/lib/utils/iterable';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-import { isSetAutoCompleteValueAction } from './auto-complete-actions';
+import { AutoCompleteValue } from './auto-complete-actions';
 import { IValidationDecorator } from './validation-decorator';
 
 export interface AutoCompleteSettings {
@@ -51,6 +51,13 @@ export interface TextSubmitHandler {
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const configureAutocomplete: (settings: AutocompleteSettings<LabeledAction>) => AutocompleteResult = require('autocompleter');
 
+/**
+ * The `AutoCompleteWidget` is a reusable UI element that provides a text input supporting auto-completion,
+ * validation, validation messages, etc.
+ *
+ * An example for using it is available in the workflow diagram:
+ * https://github.com/eclipse-glsp/glsp-client/blob/master/examples/workflow-glsp/src/direct-task-editing/direct-task-editor.ts
+ */
 export class AutoCompleteWidget {
     loadingIndicatorClasses = codiconCSSClasses('loading', false, true, ['loading']);
 
@@ -158,18 +165,13 @@ export class AutoCompleteWidget {
             fetch: (text: string, update: (items: LabeledAction[]) => void) => this.updateSuggestions(update, text, root),
             onSelect: (item: LabeledAction) => this.onSelect(item),
             render: (item: LabeledAction, currentValue: string): HTMLDivElement | undefined => this.renderSuggestions(item, currentValue),
-            customize: (input: HTMLInputElement, inputRect: ClientRect | DOMRect, container: HTMLDivElement, maxHeight: number) => {
+            customize: (input: HTMLInputElement, inputRect: DOMRect, container: HTMLDivElement, maxHeight: number) => {
                 this.customizeInputElement(input, inputRect, container, maxHeight);
             }
         };
     }
 
-    protected customizeInputElement(
-        input: HTMLInputElement,
-        inputRect: ClientRect | DOMRect,
-        container: HTMLDivElement,
-        maxHeight: number
-    ): void {
+    protected customizeInputElement(input: HTMLInputElement, inputRect: DOMRect, container: HTMLDivElement, maxHeight: number): void {
         // move container into our UIExtension container as this is already positioned correctly
         if (this.containerElement) {
             this.containerElement.appendChild(container);
@@ -249,7 +251,7 @@ export class AutoCompleteWidget {
     }
 
     protected onSelect(item: LabeledAction): void {
-        if (isSetAutoCompleteValueAction(item)) {
+        if (AutoCompleteValue.is(item)) {
             this.inputElement.value = item.text;
             // trigger update of suggestions with an keyup event
             window.setTimeout(() => this.inputElement.dispatchEvent(new Event('keyup')));
@@ -317,9 +319,9 @@ export class AutoCompleteWidget {
 }
 
 export function toActionArray(input: LabeledAction | Action[] | Action): Action[] {
-    if (isLabeledAction(input)) {
+    if (LabeledAction.is(input)) {
         return input.actions;
-    } else if (isAction(input)) {
+    } else if (Action.is(input)) {
         return [input];
     }
     return [];

package/src/base/command-stack.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 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
@@ -15,19 +15,20 @@
  ********************************************************************************/
 import { RedoOperation, UndoOperation } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { CommandStack, IActionDispatcher, SModelRoot, TYPES } from 'sprotty';
+import { CommandStack, IActionDispatcher, SModelRoot } from 'sprotty';
+import { TYPES } from './types';
 
 @injectable()
 export class GLSPCommandStack extends CommandStack {
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
-    undo(): Promise<SModelRoot> {
-        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(new UndoOperation()));
+    override undo(): Promise<SModelRoot> {
+        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(UndoOperation.create()));
         return this.thenUpdate();
     }
 
-    redo(): Promise<SModelRoot> {
-        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(new RedoOperation()));
+    override redo(): Promise<SModelRoot> {
+        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(RedoOperation.create()));
         return this.thenUpdate();
     }
 }

package/src/base/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 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,7 +16,7 @@
 import { InitializeResult, SetEditModeAction } from '@eclipse-glsp/protocol';
 import '@vscode/codicons/dist/codicon.css';
 import { Container, ContainerModule } from 'inversify';
-import { ActionHandlerRegistry, configureActionHandler, configureCommand, ModelSource, SetModelCommand, TYPES } from 'sprotty';
+import { ActionHandlerRegistry, configureActionHandler, configureCommand, ModelSource, SetModelCommand } from 'sprotty';
 import '../../css/glsp-sprotty.css';
 import { GLSPActionDispatcher } from './action-dispatcher';
 import { FocusStateChangedAction } from './actions/focus-change-action';
@@ -28,13 +28,13 @@ import { GLSPModelRegistry } from './model/model-registry';
 import { FeedbackAwareUpdateModelCommand, SetModelActionHandler } from './model/update-model-command';
 import { SelectionClearingMouseListener } from './selection-clearing-mouse-listener';
 import { GLSPToolManager } from './tool-manager/glsp-tool-manager';
-import { GLSP_TYPES } from './types';
+import { TYPES } from './types';
 import { GLSPViewRegistry } from './view/view-registry';
 
 const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, _unbind, isBound, rebind };
     bind(EditorContextService).toSelf().inSingletonScope();
-    bind(GLSP_TYPES.IEditorContextServiceProvider).toProvider<EditorContextService>(
+    bind(TYPES.IEditorContextServiceProvider).toProvider<EditorContextService>(
         ctx => () =>
             new Promise<EditorContextService>((resolve, reject) => {
                 if (ctx.container.isBound(EditorContextService)) {
@@ -58,7 +58,6 @@ const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) =
 
     rebind(TYPES.ICommandStack).to(GLSPCommandStack);
     bind(GLSPToolManager).toSelf().inSingletonScope();
-    bind(GLSP_TYPES.IGLSPToolManager).toService(GLSPToolManager);
     rebind(TYPES.IToolManager).toService(GLSPToolManager);
     bind(GLSPActionDispatcher).toSelf().inSingletonScope();
     rebind(TYPES.IActionDispatcher).toService(GLSPActionDispatcher);

package/src/base/drag-aware-mouse-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 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
@@ -28,19 +28,19 @@ export class DragAwareMouseListener extends MouseListener {
     private _isMouseDown = false;
     private _isMouseDrag = false;
 
-    mouseDown(target: SModelElement, event: MouseEvent): Action[] {
+    override mouseDown(target: SModelElement, event: MouseEvent): Action[] {
         this._isMouseDown = true;
         return [];
     }
 
-    mouseMove(target: SModelElement, event: MouseEvent): Action[] {
+    override mouseMove(target: SModelElement, event: MouseEvent): Action[] {
         if (this._isMouseDown) {
             this._isMouseDrag = true;
         }
         return [];
     }
 
-    mouseUp(element: SModelElement, event: MouseEvent): Action[] {
+    override mouseUp(element: SModelElement, event: MouseEvent): Action[] {
         this._isMouseDown = false;
         if (this._isMouseDrag) {
             this._isMouseDrag = false;

package/src/base/editor-context-service.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2022 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,25 +13,37 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, Args, distinctAdd, EditMode, EditorContext, isSetEditModeAction, remove } from '@eclipse-glsp/protocol';
+import { Action, Args, distinctAdd, EditMode, EditorContext, remove, SetEditModeAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
-import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot, TYPES } from 'sprotty';
+import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot } from 'sprotty';
 import { SelectionService } from '../features/select/selection-service';
 import { isSourceUriAware } from './source-uri-aware';
-import { GLSP_TYPES } from './types';
+import { TYPES } from './types';
 
 export interface EditModeListener {
     editModeChanged(newValue: string, oldvalue: string): void;
 }
 
+/**
+ * The `EditorContextService` is a central injectable component that gives read-only access to
+ * certain aspects of the diagram, such as the currently selected elements, the model root,
+ * the edit mode, the latest position of the mouse in the diagram.
+ *
+ * It has been introduced for two main reasons:
+ * 1. to simplify accessing the model root and the current selection from components that are
+ *    not commands,
+ * 2. to conveniently create an EditorContext, which is a context object sent as part of several
+ *    actions to the server to describe the current state of the editor (selection, last mouse
+ *    position, etc.).
+ */
 @injectable()
 export class EditorContextService implements IActionHandler {
-    @inject(GLSP_TYPES.SelectionService) protected selectionService: SelectionService;
+    @inject(TYPES.SelectionService) protected selectionService: SelectionService;
     @inject(MousePositionTracker) protected mousePositionTracker: MousePositionTracker;
     @inject(TYPES.ModelSourceProvider) protected modelSource: () => Promise<ModelSource>;
     protected _editMode: string;
 
-    constructor(@multiInject(GLSP_TYPES.IEditModeListener) @optional() protected editModeListeners: EditModeListener[] = []) {}
+    constructor(@multiInject(TYPES.IEditModeListener) @optional() protected editModeListeners: EditModeListener[] = []) {}
 
     register(editModeListener: EditModeListener): void {
         distinctAdd(this.editModeListeners, editModeListener);
@@ -58,7 +70,7 @@ export class EditorContextService implements IActionHandler {
     }
 
     handle(action: Action): void {
-        if (isSetEditModeAction(action)) {
+        if (SetEditModeAction.is(action)) {
             const oldValue = this._editMode;
             this._editMode = action.editMode;
             this.notifiyEditModeListeners(oldValue);

package/src/base/focus-tracker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 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
@@ -15,8 +15,9 @@
  ********************************************************************************/
 import { Action } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { IActionHandler, ICommand, TYPES, ViewerOptions } from 'sprotty';
-import { isFocusStateChangedAction } from './actions/focus-change-action';
+import { IActionHandler, ICommand, ViewerOptions } from 'sprotty';
+import { FocusStateChangedAction } from './actions/focus-change-action';
+import { TYPES } from './types';
 
 @injectable()
 export class FocusTracker implements IActionHandler {
@@ -30,7 +31,7 @@ export class FocusTracker implements IActionHandler {
     }
 
     handle(action: Action): void | Action | ICommand {
-        if (isFocusStateChangedAction(action)) {
+        if (FocusStateChangedAction.is(action)) {
             this._hasFocus = action.hasFocus;
             const placeholder = document.getElementById(this.options.baseDiv);
             if (!placeholder) {

package/src/base/model/model-registry.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 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
@@ -18,7 +18,7 @@ import { SModelElement, SModelRegistry } from 'sprotty';
 
 @injectable()
 export class GLSPModelRegistry extends SModelRegistry {
-    register(key: string, factory: (u: void) => SModelElement): void {
+    override register(key: string, factory: (u: void) => SModelElement): void {
         if (key === undefined) {
             throw new Error('Key is undefined');
         }

package/src/base/model/update-model-command.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, isSetModelAction, UpdateModelAction } from '@eclipse-glsp/protocol';
+import { Action, SetModelAction, UpdateModelAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
 import {
     ActionHandlerRegistry,
@@ -24,20 +24,19 @@ import {
     IActionHandler,
     ILogger,
     SModelRoot,
-    TYPES,
     UpdateModelCommand
 } from 'sprotty';
 import { IFeedbackActionDispatcher } from '../../features/tool-feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../features/tool-feedback/model';
-import { GLSP_TYPES } from '../types';
+import { TYPES } from '../types';
 
 /* ActionHandler that transforms a SetModelAction into an (feedback-aware) UpdateModelAction. This can be done because in sprotty
  *  UpdateModel behaves the same as SetModel if no model is present yet.*/
 @injectable()
 export class SetModelActionHandler implements IActionHandler {
     handle(action: Action): Action | void {
-        if (isSetModelAction(action)) {
-            return new UpdateModelAction(action.newRoot, false);
+        if (SetModelAction.is(action)) {
+            return UpdateModelAction.create(action.newRoot, { animate: false });
         }
     }
 }
@@ -53,14 +52,14 @@ export interface SModelRootListener {
 @injectable()
 export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {
     @inject(TYPES.ILogger) protected logger: ILogger;
-    @inject(GLSP_TYPES.IFeedbackActionDispatcher) @optional() protected readonly feedbackActionDispatcher: IFeedbackActionDispatcher;
+    @inject(TYPES.IFeedbackActionDispatcher) @optional() protected readonly feedbackActionDispatcher: IFeedbackActionDispatcher;
     @inject(TYPES.ActionHandlerRegistryProvider) protected actionHandlerRegistryProvider: () => Promise<ActionHandlerRegistry>;
-    @multiInject(GLSP_TYPES.SModelRootListener) @optional() protected modelRootListeners: SModelRootListener[] = [];
+    @multiInject(TYPES.SModelRootListener) @optional() protected modelRootListeners: SModelRootListener[] = [];
 
     protected actionHandlerRegistry?: ActionHandlerRegistry;
 
     constructor(@inject(TYPES.Action) action: UpdateModelAction) {
-        super(action);
+        super({ animate: true, ...action });
     }
 
     @postConstruct()
@@ -68,7 +67,7 @@ export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {
         this.actionHandlerRegistryProvider().then(registry => (this.actionHandlerRegistry = registry));
     }
 
-    protected performUpdate(oldRoot: SModelRoot, newRoot: SModelRoot, context: CommandExecutionContext): CommandReturn {
+    protected override performUpdate(oldRoot: SModelRoot, newRoot: SModelRoot, context: CommandExecutionContext): CommandReturn {
         if (this.feedbackActionDispatcher && this.actionHandlerRegistry) {
             // Create a temporary context wich defines the `newRoot` as `root`
             // This way we do not corrupt the redo/undo behavior of the super class

package/src/base/model-initialization-constraint.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2022 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,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, UpdateModelAction } from '@eclipse-glsp/protocol';
+import { Action, Deferred, SetModelAction, UpdateModelAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import { InitializeCanvasBoundsAction } from 'sprotty';
-import { Deferred } from 'sprotty/lib/utils/async';
 
 /**
  * The constraint defining when the initialization of the GLSP model is completed.
@@ -74,21 +73,20 @@ export abstract class ModelInitializationConstraint {
  */
 @injectable()
 export class DefaultModelInitializationConstraint extends ModelInitializationConstraint {
-    protected seenNonEmptyUpdateModel = false;
+    protected seenNonEmptyModelAction = false;
 
     isInitializedAfter(action: Action): boolean {
-        if (this.isNonEmptyUpdateModel(action)) {
-            this.seenNonEmptyUpdateModel = true;
-        } else if (this.seenNonEmptyUpdateModel && action.kind === InitializeCanvasBoundsAction.KIND) {
+        if (this.isNonEmptyModelAction(action)) {
+            this.seenNonEmptyModelAction = true;
+        } else if (this.seenNonEmptyModelAction && action.kind === InitializeCanvasBoundsAction.KIND) {
             return true;
         }
         return false;
     }
 
-    protected isNonEmptyUpdateModel(action: Action): boolean {
-        if (action && action.kind === UpdateModelAction.KIND) {
-            const updateModelAction = action as UpdateModelAction;
-            return updateModelAction.newRoot !== undefined && updateModelAction.newRoot.type !== 'NONE';
+    protected isNonEmptyModelAction(action: Action): boolean {
+        if (SetModelAction.is(action) || UpdateModelAction.is(action)) {
+            return action.newRoot.type !== 'NONE';
         }
         return false;
     }

package/src/base/selection-clearing-mouse-listener.ts

@@ -30,7 +30,7 @@ import { MouseListener, SModelElement } from 'sprotty';
  */
 @injectable()
 export class SelectionClearingMouseListener extends MouseListener {
-    mouseDown(_target: SModelElement, event: MouseEvent): never[] {
+    override mouseDown(_target: SModelElement, event: MouseEvent): never[] {
         const selection = document.getSelection();
         // eslint-disable-next-line no-null/no-null
         if (selection === null) {