@eclipse-glsp/client 0.10.0-next.6bee8eb.163 → 0.10.0-next.88e4725.166

package/lib/utils/viewpoint-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewpoint-util.js","sourceRoot":"","sources":["../../src/utils/viewpoint-util.ts"],"names":[],"mappings":";;;AAgBA,qCAUiB;AAEjB;;;;;;;;;;;;GAYG;AACH,SAAgB,mBAAmB,CAAC,MAAqB,EAAE,UAAsB;IAC7E,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC;IAC5B,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC;IAC5B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;IAC9C,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC;IACvB,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC;IAEvB,MAAM,QAAQ,GAAyB,IAAA,6BAAmB,EAAC,MAAM,EAAE,oBAAU,CAAC,CAAC;IAC/E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,IAAI,QAAQ,EAAE;QACV,MAAM,MAAM,GAAU,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACrE,IAAI,IAAI,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;QACxB,IAAI,IAAI,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;QAExB,IAAI,IAAI,IAAI,CAAC;QACb,IAAI,IAAI,IAAI,CAAC;KAChB;IAED,OAAO;QACH,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;KACV,CAAC;AACN,CAAC;AAtBD,kDAsBC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,OAAoC;IACjE,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAY,CAAC;IACzE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACrB,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACnC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,IAAA,yBAAe,EAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3E,CAAC;AAPD,4CAOC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,MAAmC;IAClE,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAFD,gDAEC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,MAAmC;IAC9D,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"viewpoint-util.js","sourceRoot":"","sources":["../../src/utils/viewpoint-util.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAC5E,qCAAoH;AAEpH;;;;;;;;;;;;GAYG;AACH,SAAgB,mBAAmB,CAAC,MAAqB,EAAE,UAAsB;IAC7E,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC;IAC5B,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC;IAC5B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;IAC9C,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC;IACvB,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC;IAEvB,MAAM,QAAQ,GAAyB,IAAA,6BAAmB,EAAC,MAAM,EAAE,oBAAU,CAAC,CAAC;IAC/E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,IAAI,QAAQ,EAAE;QACV,MAAM,MAAM,GAAU,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACrE,IAAI,IAAI,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;QACxB,IAAI,IAAI,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;QAExB,IAAI,IAAI,IAAI,CAAC;QACb,IAAI,IAAI,IAAI,CAAC;KAChB;IAED,OAAO;QACH,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;KACV,CAAC;AACN,CAAC;AAtBD,kDAsBC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,OAAoC;IACjE,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAK,CAAC,MAAM,CAAC;IACzE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACrB,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACnC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,IAAA,yBAAe,EAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3E,CAAC;AAPD,4CAOC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,MAAmC;IAClE,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAFD,gDAEC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,MAAmC;IAC9D,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAFD,wCAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "0.10.0-next.6bee8eb.163+6bee8eb",
+  "version": "0.10.0-next.88e4725.166+88e4725",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -34,12 +34,13 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.10.0-next.6bee8eb.163+6bee8eb",
+    "@eclipse-glsp/protocol": "0.10.0-next.88e4725.166+88e4725",
     "autocompleter": "5.1.0",
-    "sprotty": "0.10.0"
+    "sprotty": "next"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",
+    "eslint-import-resolver-typescript": "2.7.0",
     "typescript": "^4.5.5"
   },
   "scripts": {
@@ -56,5 +57,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "6bee8ebad7771ab470b4e7299fc8f2c0856b54b5"
+  "gitHead": "88e4725bd27f2ebf0fcd925c3e9be16437725159"
 }

package/src/base/action-dispatcher.ts

@@ -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';
@@ -46,7 +46,7 @@ export class GLSPActionDispatcher extends ActionDispatcher {
     }
 
     protected override handleAction(action: Action): Promise<void> {
-        if (isResponseAction(action)) {
+        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 {
@@ -158,18 +158,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 +244,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 +312,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

@@ -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>;
 
     override undo(): Promise<SModelRoot> {
-        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(new UndoOperation()));
+        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(UndoOperation.create()));
         return this.thenUpdate();
     }
 
     override redo(): Promise<SModelRoot> {
-        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(new RedoOperation()));
+        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/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,12 +13,12 @@
  *
  * 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;
@@ -26,12 +26,12 @@ export interface EditModeListener {
 
 @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 +58,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/update-model-command.ts

@@ -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()

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, isSetModelAction, isUpdateModelAction } 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.
@@ -86,7 +85,7 @@ export class DefaultModelInitializationConstraint extends ModelInitializationCon
     }
 
     protected isNonEmptyModelAction(action: Action): boolean {
-        if (isSetModelAction(action) || isUpdateModelAction(action)) {
+        if (SetModelAction.is(action) || UpdateModelAction.is(action)) {
             return action.newRoot.type !== 'NONE';
         }
         return false;

package/src/base/tool-manager/glsp-tool-manager.ts

@@ -17,7 +17,7 @@ import { distinctAdd, EditMode } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
 import { Tool, ToolManager } from 'sprotty';
 import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
-import { GLSP_TYPES } from '../types';
+import { TYPES } from '../types';
 
 export interface IGLSPToolManager extends ToolManager {
     /* Disables all actives tools and activates only default tool with non-edit function*/
@@ -28,9 +28,9 @@ export interface IGLSPToolManager extends ToolManager {
 export class GLSPToolManager extends ToolManager implements IGLSPToolManager, EditModeListener {
     protected editorContext?: EditorContextService;
 
-    @multiInject(GLSP_TYPES.ITool) @optional() override tools: Tool[];
-    @multiInject(GLSP_TYPES.IDefaultTool) @optional() override defaultTools: Tool[];
-    @inject(GLSP_TYPES.IEditorContextServiceProvider) contextServiceProvider: EditorContextServiceProvider;
+    @multiInject(TYPES.ITool) @optional() override tools: Tool[];
+    @multiInject(TYPES.IDefaultTool) @optional() override defaultTools: Tool[];
+    @inject(TYPES.IEditorContextServiceProvider) contextServiceProvider: EditorContextServiceProvider;
 
     @postConstruct()
     protected initialize(): void {

package/src/base/tool-manager/tool-actions.ts

@@ -0,0 +1,37 @@
+/********************************************************************************
+ * 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
+ * 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, hasArrayProp } from '@eclipse-glsp/protocol';
+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
+ */
+declare module 'sprotty/lib/base/tool-manager/tool' {
+    export namespace EnableDefaultToolsAction {
+        export function is(object: any): object is EnableDefaultToolsAction;
+    }
+    export namespace EnableToolsAction {
+        export function is(object: any): object is EnableToolsAction;
+    }
+}
+
+EnableDefaultToolsAction.is = (object: any): object is EnableDefaultToolsAction => Action.hasKind(object, EnableDefaultToolsAction.KIND);
+
+EnableToolsAction.is = (object: any): object is EnableToolsAction =>
+    Action.hasKind(object, EnableToolsAction.KIND) && hasArrayProp(object, 'toolIds');
+
+export { EnableDefaultToolsAction, EnableToolsAction };

package/src/base/types.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,27 +13,34 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export const GLSP_TYPES = {
-    IAsyncClipboardService: Symbol.for('IAsyncClipboardService'),
-    ICommandPaletteActionProviderRegistry: Symbol.for('ICommandPaletteActionProviderRegistry'),
-    IEditorContextServiceProvider: Symbol.for('IEditorContextProvider'),
-    IFeedbackActionDispatcher: Symbol.for('IFeedbackActionDispatcher'),
-    IToolFactory: Symbol.for('Factory<Tool>'),
-    ITypeHintProvider: Symbol.for('ITypeHintProvider'),
-    IMovementRestrictor: Symbol.for('IMovmementRestrictor'),
-    SelectionService: Symbol.for('SelectionService'),
-    SelectionListener: Symbol.for('SelectionListener'),
-    SModelRootListener: Symbol.for('SModelRootListener'),
-    MouseTool: Symbol.for('MouseTool'),
-    IContextMenuService: Symbol.for('IContextMenuService'),
-    IContextMenuServiceProvider: Symbol.for('IContextMenuServiceProvider'),
-    IContextMenuProviderRegistry: Symbol.for('IContextMenuProviderRegistry'),
-    IContextMenuProvider: Symbol.for('IContextMenuProvider'),
-    ICopyPasteHandler: Symbol.for('ICopyPasteHandler'),
-    IGLSPToolManager: Symbol.for('IGLSPToolManager'),
-    ITool: Symbol.for('ITool'),
-    IDefaultTool: Symbol.for('IDefaultTool'),
-    IEditModeListener: Symbol.for('IEditModeListener'),
-    LayoutRegistration: Symbol.for('LayoutRegistration'),
-    IMarqueeBehavior: Symbol.for('IMarqueeBehavior')
+import { TYPES as SprottyTYPES } from 'sprotty';
+/**
+ * Reexport of the TYPES namespace of sprotty augments with additional GLSP specific service
+ * identifiers.
+ */
+export const TYPES = {
+    ...SprottyTYPES,
+    IAsyncClipboardService: Symbol('IAsyncClipboardService'),
+    IEditorContextServiceProvider: Symbol('IEditorContextProvider'),
+    IFeedbackActionDispatcher: Symbol('IFeedbackActionDispatcher'),
+    IToolFactory: Symbol('Factory<Tool>'),
+    ITypeHintProvider: Symbol('ITypeHintProvider'),
+    IMovementRestrictor: Symbol('IMovementRestrictor'),
+    SelectionService: Symbol('SelectionService'),
+    SelectionListener: Symbol('SelectionListener'),
+    SModelRootListener: Symbol('SModelRootListener'),
+    MouseTool: Symbol('MouseTool'),
+    IContextMenuProvider: Symbol('IContextMenuProvider'),
+    ICopyPasteHandler: Symbol('ICopyPasteHandler'),
+    ITool: Symbol('ITool'),
+    IDefaultTool: Symbol('IDefaultTool'),
+    IEditModeListener: Symbol('IEditModeListener'),
+    IMarqueeBehavior: Symbol('IMarqueeBehavior')
 };
+
+/**
+ * Keep a reexport under the old deprecated namespace to avoid hard API breaks.
+ * This gives adopters a grace period but all deprecated API will be removed before the 1.0.0 release.
+ * @deprecated Please use `TYPES` from `@eclipse-glsp/client` instead
+ */
+export const GLSP_TYPES = TYPES;

package/src/features/change-bounds/movement-restrictor.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
@@ -33,7 +33,7 @@ export function createMovementRestrictionFeedback(
     if (element instanceof SParentElement) {
         element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
     }
-    return new ModifyCSSFeedbackAction(elements, movementRestrictor.cssClasses);
+    return ModifyCSSFeedbackAction.create({ elements, add: movementRestrictor.cssClasses });
 }
 
 export function removeMovementRestrictionFeedback(
@@ -45,7 +45,7 @@ export function removeMovementRestrictionFeedback(
         element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
     }
 
-    return new ModifyCSSFeedbackAction(elements, undefined, movementRestrictor.cssClasses);
+    return ModifyCSSFeedbackAction.create({ elements, remove: movementRestrictor.cssClasses });
 }
 
 @injectable()