@eclipse-glsp/client 1.1.0-next.cb7168a.239 → 1.1.0-next.cc57a50.267

package/lib/{features/select → base}/selection-service.spec.js

@@ -21,12 +21,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-/* eslint-disable import/no-deprecated,no-unused-expressions */
-const protocol_1 = require("@eclipse-glsp/protocol");
 const chai_1 = require("chai");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const types_1 = require("../../base/types");
+const sinon = require("sinon");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+const default_module_1 = require("./default.module");
 const selection_service_1 = require("./selection-service");
 let MockFeedbackActionDispatcher = class MockFeedbackActionDispatcher {
     constructor() {
@@ -34,8 +33,9 @@ let MockFeedbackActionDispatcher = class MockFeedbackActionDispatcher {
     }
     registerFeedback(feedbackEmitter, actions) {
         this.feedbackEmitters.set(feedbackEmitter, actions);
+        return _glsp_sprotty_1.Disposable.create(() => this.deregisterFeedback(feedbackEmitter));
     }
-    deregisterFeedback(feedbackEmitter, actions) {
+    deregisterFeedback(feedbackEmitter, _actions) {
         this.feedbackEmitters.delete(feedbackEmitter);
     }
     getRegisteredFeedback() {
@@ -52,32 +52,15 @@ MockFeedbackActionDispatcher = __decorate([
     (0, inversify_1.injectable)()
 ], MockFeedbackActionDispatcher);
 class MockSelectionListener {
-    constructor() {
-        this.called = 0;
-        this.selectedElements = [];
-    }
-    selectionChanged(newRoot, selectedElements) {
-        this.called++;
-        this.root = newRoot;
-        this.selectedElements = selectedElements;
-    }
-    getRoot() {
-        return this.root;
-    }
-    getSelectedElements() {
-        return this.selectedElements;
-    }
-    getCalled() {
-        return this.called;
+    selectionChanged(root, selectedElements, deselectedElements) {
+        // no.op
     }
 }
 function createContainer() {
-    const container = (0, protocol_1.initializeContainer)(new inversify_1.Container(), sprotty_1.defaultModule);
+    const container = (0, _glsp_sprotty_1.initializeContainer)(new inversify_1.Container(), default_module_1.defaultModule);
     // eslint-disable-next-line deprecation/deprecation
-    container.rebind(types_1.TYPES.IModelFactory).to(sprotty_1.SGraphFactory).inSingletonScope();
-    container.bind(types_1.TYPES.IFeedbackActionDispatcher).to(MockFeedbackActionDispatcher).inSingletonScope();
-    container.bind(selection_service_1.SelectionService).toSelf().inSingletonScope();
-    container.bind(types_1.TYPES.SelectionService).toService(selection_service_1.SelectionService);
+    container.rebind(_glsp_sprotty_1.TYPES.IModelFactory).to(_glsp_sprotty_1.SGraphFactory).inSingletonScope();
+    container.rebind(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher).to(MockFeedbackActionDispatcher).inSingletonScope();
     return container;
 }
 describe('SelectionService', () => {
@@ -89,10 +72,10 @@ describe('SelectionService', () => {
     beforeEach(() => {
         const container = createContainer();
         // eslint-disable-next-line deprecation/deprecation
-        graphFactory = container.get(types_1.TYPES.IModelFactory);
+        graphFactory = container.get(_glsp_sprotty_1.TYPES.IModelFactory);
         root = createRoot('node1', 'node2', 'node3', 'node4', 'node5');
-        selectionService = container.get(types_1.TYPES.SelectionService);
-        feedbackDispatcher = container.get(types_1.TYPES.IFeedbackActionDispatcher);
+        selectionService = container.get(selection_service_1.SelectionService);
+        feedbackDispatcher = container.get(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher);
     });
     describe('Initial State', () => {
         it('On creation nothing should be selected and no feedback should be dispatched.', () => {
@@ -204,116 +187,51 @@ describe('SelectionService', () => {
         });
     });
     describe('Listeners', () => {
+        const sandbox = sinon.createSandbox();
+        const listener = sandbox.createStubInstance(MockSelectionListener);
+        beforeEach(() => {
+            selectionService.onSelectionChanged(change => listener.selectionChanged(change.root, change.selectedElements, change.deselectedElements));
+        });
+        afterEach(() => {
+            selectionService.dispose();
+            sandbox.reset();
+        });
         it('A registered listener should be notified of a single selection change.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
             selectionService.updateSelection(root, ['node1', 'node1'], []);
-            assertListener(listener, root, ['node1'], 1);
+            assertListener(listener, root, ['node1'], [], 1);
         });
         it('A registered listener should be notified of a multi-selection change.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
             selectionService.updateSelection(root, ['node1', 'node2', 'node3'], []);
-            assertListener(listener, root, ['node1', 'node2', 'node3'], 1);
+            assertListener(listener, root, ['node1', 'node2', 'node3'], [], 1);
         });
         it('A registered listener should be notified of series of selection changes.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
             selectionService.updateSelection(root, ['node1'], []);
-            assertListener(listener, root, ['node1'], 1);
+            assertListener(listener, root, ['node1'], [], 1);
             selectionService.updateSelection(root, ['node2'], ['node1']);
-            assertListener(listener, root, ['node2'], 2);
+            assertListener(listener, root, ['node2'], ['node1'], 2);
             selectionService.updateSelection(root, ['node3', 'node4'], []);
-            assertListener(listener, root, ['node2', 'node3', 'node4'], 3);
+            assertListener(listener, root, ['node2', 'node3', 'node4'], [], 3);
             selectionService.updateSelection(root, [], ['node4']);
-            assertListener(listener, root, ['node2', 'node3'], 4);
-        });
-        it('A registered listener should receive the selected elements in the right order.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
-            selectionService.updateSelection(root, ['node2', 'node1'], []);
-            (0, chai_1.expect)(() => assertListener(listener, root, ['node1', 'node2'], 1)).to.throw(chai_1.AssertionError, 'ordered members');
+            assertListener(listener, root, ['node2', 'node3'], ['node4'], 4);
         });
         it('A registered listener should be notified of root changes.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
             selectionService.updateSelection(root, [], []);
-            assertListener(listener, root, [], 1);
+            assertListener(listener, root, [], [], 1);
             const newRoot = createRoot('node1', 'newNode2', 'newNode3');
             selectionService.updateSelection(newRoot, [], []);
-            assertListener(listener, newRoot, [], 2);
-        });
-        it('Registering an already registered listener should have no effect.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            selectionService.register(listener);
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
-            selectionService.updateSelection(root, ['node1', 'node2', 'node3'], []);
-            assertListener(listener, root, ['node1', 'node2', 'node3'], 1);
-            selectionService.register(listener);
-            selectionService.updateSelection(root, [], ['node2']);
-            assertListener(listener, root, ['node1', 'node3'], 2);
+            assertListener(listener, newRoot, [], [], 2);
         });
         it('Selecting the same elements consecutively should not trigger a listener update.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
             selectionService.updateSelection(root, ['node1'], []);
-            assertListener(listener, root, ['node1'], 1);
+            assertListener(listener, root, ['node1'], [], 1);
             selectionService.updateSelection(root, ['node1'], []);
-            assertListener(listener, root, ['node1'], 1);
+            assertListener(listener, root, ['node1'], [], 1);
         });
         it('Selecting a not-existing elements should not trigger a listener update.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
             selectionService.updateSelection(root, ['node1'], []);
-            assertListener(listener, root, ['node1'], 1);
+            assertListener(listener, root, ['node1'], [], 1);
             selectionService.updateSelection(root, ['not-existing'], []);
-            assertListener(listener, root, ['node1'], 1);
-        });
-        it('All registered listeners should be called on selection changes.', () => {
-            const listener = new MockSelectionListener();
-            const listener2 = new MockSelectionListener();
-            selectionService.register(listener);
-            selectionService.register(listener2);
-            assertListener(listener, undefined, [], 0);
-            assertListener(listener2, undefined, [], 0);
-            selectionService.updateSelection(root, ['node1'], []);
-            assertListener(listener, root, ['node1'], 1);
-            assertListener(listener2, root, ['node1'], 1);
-            selectionService.updateSelection(root, ['node2'], ['node1']);
-            assertListener(listener, root, ['node2'], 2);
-            assertListener(listener2, root, ['node2'], 2);
-            selectionService.updateSelection(root, ['node3', 'node4'], []);
-            assertListener(listener, root, ['node2', 'node3', 'node4'], 3);
-            assertListener(listener2, root, ['node2', 'node3', 'node4'], 3);
-            selectionService.updateSelection(root, [], ['node4']);
-            assertListener(listener, root, ['node2', 'node3'], 4);
-            assertListener(listener2, root, ['node2', 'node3'], 4);
-        });
-        it('A deregistered listener should not receive further updates.', () => {
-            const listener = new MockSelectionListener();
-            selectionService.register(listener);
-            assertListener(listener, undefined, [], 0);
-            selectionService.updateSelection(root, ['node1'], []);
-            assertListener(listener, root, ['node1'], 1);
-            selectionService.deregister(listener);
-            selectionService.updateSelection(root, ['node2'], ['node1']);
-            assertListener(listener, root, ['node1'], 1);
-            selectionService.updateSelection(root, ['node3', 'node4'], []);
-            assertListener(listener, root, ['node1'], 1);
-            selectionService.updateSelection(root, [], ['node4']);
-            assertListener(listener, root, ['node1'], 1);
-            const newRoot = createRoot('node1', 'newNode2', 'newNode3');
-            selectionService.updateSelection(newRoot, [], []);
-            assertListener(listener, root, ['node1'], 1);
+            assertListener(listener, root, ['node1'], [], 1);
         });
     });
     function createRoot(...nodes) {
@@ -353,11 +271,11 @@ describe('SelectionService', () => {
             (0, chai_1.expect)(feedbackDispatcher.getSingleFeedbackAction()).to.be.undefined;
         }
     }
-    function assertListener(listener, expectedRoot, expectedSelection, expectedCalled) {
-        (0, chai_1.expect)(listener.getRoot()).to.equal(expectedRoot);
-        (0, chai_1.expect)(listener.getSelectedElements()).to.have.lengthOf(expectedSelection.length);
-        (0, chai_1.expect)(listener.getSelectedElements()).to.have.ordered.members(expectedSelection);
-        (0, chai_1.expect)(listener.getCalled()).to.equal(expectedCalled);
+    function assertListener(listener, expectedRoot, expectedSelection, expectedDeselection, expectedCalled) {
+        (0, chai_1.expect)(listener.selectionChanged.callCount).to.be.equal(expectedCalled);
+        (0, chai_1.expect)(listener.selectionChanged.lastCall.args[0]).to.be.deep.equals(expectedRoot);
+        (0, chai_1.expect)(listener.selectionChanged.lastCall.args[1]).to.be.deep.equals(expectedSelection);
+        (0, chai_1.expect)(listener.selectionChanged.lastCall.args[2]).to.be.deep.equals(expectedDeselection);
     }
 });
 //# sourceMappingURL=selection-service.spec.js.map

package/lib/base/selection-service.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selection-service.spec.js","sourceRoot":"","sources":["../../src/base/selection-service.spec.ts"],"names":[],"mappings":"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"}

package/lib/base/tool-manager/glsp-tool-manager.d.ts

@@ -1,6 +1,6 @@
-import { Tool, ToolManager } from 'sprotty';
-import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
-export declare class GLSPToolManager extends ToolManager implements EditModeListener {
+import { Tool, ToolManager } from '../../glsp-sprotty/index';
+import { EditorContextService, EditorContextServiceProvider, IEditModeListener } from '../editor-context-service';
+export declare class GLSPToolManager extends ToolManager implements IEditModeListener {
     protected editorContext?: EditorContextService;
     tools: Tool[];
     defaultTools: Tool[];
@@ -10,7 +10,7 @@ export declare class GLSPToolManager extends ToolManager implements EditModeList
     registerTools(...tools: Tool[]): void;
     enable(toolIds: string[]): void;
     disableEditTools(): void;
-    editModeChanged(oldValue: string, newValue: string): void;
+    editModeChanged(newValue: string, oldValue: string): void;
 }
 export interface GLSPTool extends Tool {
     isEditTool: boolean;

package/lib/base/tool-manager/glsp-tool-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-tool-manager.d.ts","sourceRoot":"","sources":["../../../src/base/tool-manager/glsp-tool-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAGjH,qBACa,eAAgB,SAAQ,WAAY,YAAW,gBAAgB;IACxE,SAAS,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IAEA,KAAK,EAAE,IAAI,EAAE,CAAC;IACP,YAAY,EAAE,IAAI,EAAE,CAAC;IAC9B,sBAAsB,EAAE,4BAA4B,CAAC;IAGlG,SAAS,CAAC,UAAU,IAAI,IAAI;IAUnB,oBAAoB,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAM5C,aAAa,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMrC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAcxC,gBAAgB,IAAI,IAAI;IAKxB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAU5D;AAED,MAAM,WAAW,QAAS,SAAQ,IAAI;IAClC,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,yBAAiB,QAAQ,CAAC;IACtB,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,QAAQ,CAQtD;CACJ"}
+{"version":3,"file":"glsp-tool-manager.d.ts","sourceRoot":"","sources":["../../../src/base/tool-manager/glsp-tool-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAA8B,IAAI,EAAE,WAAW,EAA+D,MAAM,eAAe,CAAC;AAC3I,OAAO,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAElH,qBACa,eAAgB,SAAQ,WAAY,YAAW,iBAAiB;IACzE,SAAS,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IAEA,KAAK,EAAE,IAAI,EAAE,CAAC;IACP,YAAY,EAAE,IAAI,EAAE,CAAC;IAC9B,sBAAsB,EAAE,4BAA4B,CAAC;IAGlG,SAAS,CAAC,UAAU,IAAI,IAAI;IAUnB,oBAAoB,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAM5C,aAAa,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMrC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAcxC,gBAAgB,IAAI,IAAI;IAKxB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAU5D;AAED,MAAM,WAAW,QAAS,SAAQ,IAAI;IAClC,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,yBAAiB,QAAQ,CAAC;IACtB,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,QAAQ,CAQtD;CACJ"}

package/lib/base/tool-manager/glsp-tool-manager.js

@@ -25,28 +25,26 @@ exports.GLSPTool = exports.GLSPToolManager = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const types_1 = require("../types");
-let GLSPToolManager = class GLSPToolManager extends sprotty_1.ToolManager {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+let GLSPToolManager = exports.GLSPToolManager = class GLSPToolManager extends _glsp_sprotty_1.ToolManager {
     initialize() {
         this.registerTools(...this.tools);
         this.registerDefaultTools(...this.defaultTools);
         this.enableDefaultTools();
         this.contextServiceProvider().then(editorContext => {
-            editorContext.register(this);
+            editorContext.onEditModeChanged(change => this.editModeChanged(change.newValue, change.oldValue));
             this.editorContext = editorContext;
         });
     }
     registerDefaultTools(...tools) {
         for (const tool of tools) {
-            (0, protocol_1.distinctAdd)(this.defaultTools, tool);
+            (0, _glsp_sprotty_1.distinctAdd)(this.defaultTools, tool);
         }
     }
     registerTools(...tools) {
         for (const tool of tools) {
-            (0, protocol_1.distinctAdd)(this.tools, tool);
+            (0, _glsp_sprotty_1.distinctAdd)(this.tools, tool);
         }
     }
     enable(toolIds) {
@@ -66,30 +64,30 @@ let GLSPToolManager = class GLSPToolManager extends sprotty_1.ToolManager {
         this.disableActiveTools();
         this.enable(this.defaultTools.filter(tool => !GLSPTool.is(tool) || tool.isEditTool === false).map(tool => tool.id));
     }
-    editModeChanged(oldValue, newValue) {
+    editModeChanged(newValue, oldValue) {
         if (oldValue === newValue) {
             return;
         }
-        if (newValue === protocol_1.EditMode.READONLY) {
+        if (newValue === _glsp_sprotty_1.EditMode.READONLY) {
             this.disableEditTools();
         }
-        else if (newValue === protocol_1.EditMode.EDITABLE) {
+        else if (newValue === _glsp_sprotty_1.EditMode.EDITABLE) {
             this.enableDefaultTools();
         }
     }
 };
 __decorate([
-    (0, inversify_1.multiInject)(types_1.TYPES.ITool),
+    (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.ITool),
     (0, inversify_1.optional)(),
     __metadata("design:type", Array)
 ], GLSPToolManager.prototype, "tools", void 0);
 __decorate([
-    (0, inversify_1.multiInject)(types_1.TYPES.IDefaultTool),
+    (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.IDefaultTool),
     (0, inversify_1.optional)(),
     __metadata("design:type", Array)
 ], GLSPToolManager.prototype, "defaultTools", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IEditorContextServiceProvider),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IEditorContextServiceProvider),
     __metadata("design:type", Function)
 ], GLSPToolManager.prototype, "contextServiceProvider", void 0);
 __decorate([
@@ -98,19 +96,18 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], GLSPToolManager.prototype, "initialize", null);
-GLSPToolManager = __decorate([
+exports.GLSPToolManager = GLSPToolManager = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPToolManager);
-exports.GLSPToolManager = GLSPToolManager;
 var GLSPTool;
 (function (GLSPTool) {
     function is(object) {
-        return (protocol_1.AnyObject.is(object) &&
-            (0, protocol_1.hasStringProp)(object, 'id') &&
-            (0, protocol_1.hasFunctionProp)(object, 'enable') &&
-            (0, protocol_1.hasFunctionProp)(object, 'disable') &&
-            (0, protocol_1.hasBooleanProp)(object, 'isEditTool'));
+        return (_glsp_sprotty_1.AnyObject.is(object) &&
+            (0, _glsp_sprotty_1.hasStringProp)(object, 'id') &&
+            (0, _glsp_sprotty_1.hasFunctionProp)(object, 'enable') &&
+            (0, _glsp_sprotty_1.hasFunctionProp)(object, 'disable') &&
+            (0, _glsp_sprotty_1.hasBooleanProp)(object, 'isEditTool'));
     }
     GLSPTool.is = is;
-})(GLSPTool = exports.GLSPTool || (exports.GLSPTool = {}));
+})(GLSPTool || (exports.GLSPTool = GLSPTool = {}));
 //# sourceMappingURL=glsp-tool-manager.js.map

package/lib/base/tool-manager/glsp-tool-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-tool-manager.js","sourceRoot":"","sources":["../../../src/base/tool-manager/glsp-tool-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-tool-manager.js","sourceRoot":"","sources":["../../../src/base/tool-manager/glsp-tool-manager.ts"],"names":[],"mappings":"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"}

package/lib/base/view/key-tool.d.ts

@@ -0,0 +1,5 @@
+import { Disposable, KeyListener, KeyTool } from '../../glsp-sprotty/index';
+export declare class GLSPKeyTool extends KeyTool {
+    registerListener(keyListener: KeyListener): Disposable;
+}
+//# sourceMappingURL=key-tool.d.ts.map

package/lib/base/view/key-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"key-tool.d.ts","sourceRoot":"","sources":["../../../src/base/view/key-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAEjE,qBACa,WAAY,SAAQ,OAAO;IACpC,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,UAAU;CAIzD"}

package/lib/base/view/key-tool.js

@@ -0,0 +1,36 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLSPKeyTool = void 0;
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * 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
+ ********************************************************************************/
+const inversify_1 = require("inversify");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+let GLSPKeyTool = exports.GLSPKeyTool = class GLSPKeyTool extends _glsp_sprotty_1.KeyTool {
+    registerListener(keyListener) {
+        super.register(keyListener);
+        return _glsp_sprotty_1.Disposable.create(() => this.deregister(keyListener));
+    }
+};
+exports.GLSPKeyTool = GLSPKeyTool = __decorate([
+    (0, inversify_1.injectable)()
+], GLSPKeyTool);
+//# sourceMappingURL=key-tool.js.map

package/lib/base/view/key-tool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"key-tool.js","sourceRoot":"","sources":["../../../src/base/view/key-tool.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,iDAAiE;AAG1D,IAAM,WAAW,yBAAjB,MAAM,WAAY,SAAQ,uBAAO;IACpC,gBAAgB,CAAC,WAAwB;QACrC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC5B,OAAO,0BAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IACjE,CAAC;CACJ,CAAA;sBALY,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAKvB"}

package/lib/base/view/mouse-tool.d.ts

@@ -0,0 +1,19 @@
+import { Disposable, MouseListener, MouseTool, SModelElement, SModelRoot } from '../../glsp-sprotty/index';
+/**
+ * Custom helper type to declare the explicit mouse listener methods
+ * of {@link MouseListener} i.e. omitting the `decorate` method.
+ */
+type MouseListenerMethods = keyof Omit<MouseListener, 'decorate'>;
+export declare class GLSPMouseTool extends MouseTool {
+    protected mouseListeners: MouseListener[];
+    protected rankedMouseListeners: Map<number, MouseListener[]>;
+    constructor(mouseListeners?: MouseListener[]);
+    register(mouseListener: MouseListener): void;
+    registerListener(mouseListener: MouseListener): Disposable;
+    deregister(mouseListener: MouseListener): void;
+    protected handleEvent<K extends MouseListenerMethods>(methodName: K, model: SModelRoot, event: MouseEvent): void;
+    protected notifyListenersByRank<K extends MouseListenerMethods>(element: SModelElement, methodName: K, event: MouseEvent): Promise<void>;
+    protected dispatchActions<K extends MouseListenerMethods>(mouseListeners: MouseListener[], methodName: K, element: SModelElement, event: MouseEvent): Promise<void>;
+}
+export {};
+//# sourceMappingURL=mouse-tool.d.ts.map

package/lib/base/view/mouse-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/base/view/mouse-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAU,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAS,MAAM,eAAe,CAAC;AAG/G;;;GAGG;AACH,KAAK,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;AAElE,qBACa,aAAc,SAAQ,SAAS;cAGqC,cAAc,EAAE,aAAa,EAAE;IAF5G,SAAS,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;gBAEgB,cAAc,GAAE,aAAa,EAAO;IAKxG,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAKrD,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,UAAU;IAKjD,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;cAKpC,WAAW,CAAC,CAAC,SAAS,oBAAoB,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;cASzG,qBAAqB,CAAC,CAAC,SAAS,oBAAoB,EAChE,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,CAAC,EACb,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC;cAMA,eAAe,CAAC,CAAC,SAAS,oBAAoB,EAC1D,cAAc,EAAE,aAAa,EAAE,EAC/B,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC;CAenB"}

package/lib/{features/mouse-tool → base/view}/mouse-tool.js

@@ -12,9 +12,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RankingMouseTool = void 0;
+exports.GLSPMouseTool = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,24 +28,26 @@ exports.RankingMouseTool = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const types_1 = require("../../base/types");
-const model_1 = require("../rank/model");
-let RankingMouseTool = class RankingMouseTool extends sprotty_1.MouseTool {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const ranked_1 = require("../ranked");
+let GLSPMouseTool = exports.GLSPMouseTool = class GLSPMouseTool extends _glsp_sprotty_1.MouseTool {
     constructor(mouseListeners = []) {
         super(mouseListeners);
         this.mouseListeners = mouseListeners;
-        this.rankedMouseListeners = groupBy(mouseListeners, listener => (0, model_1.getRank)(listener));
+        this.rankedMouseListeners = groupBy(mouseListeners, listener => ranked_1.Ranked.getRank(listener));
     }
     register(mouseListener) {
         super.register(mouseListener);
-        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => (0, model_1.getRank)(listener));
+        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => ranked_1.Ranked.getRank(listener));
+    }
+    registerListener(mouseListener) {
+        this.register(mouseListener);
+        return _glsp_sprotty_1.Disposable.create(() => this.deregister(mouseListener));
     }
     deregister(mouseListener) {
         super.deregister(mouseListener);
-        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => (0, model_1.getRank)(listener));
+        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => ranked_1.Ranked.getRank(listener));
     }
     handleEvent(methodName, model, event) {
         this.focusOnMouseEvent(methodName, model);
@@ -53,9 +55,9 @@ let RankingMouseTool = class RankingMouseTool extends sprotty_1.MouseTool {
         if (!element) {
             return;
         }
-        this.notifyListenersByRank(element, methodName, model, event);
+        this.notifyListenersByRank(element, methodName, event);
     }
-    async notifyListenersByRank(element, methodName, model, event) {
+    async notifyListenersByRank(element, methodName, event) {
         for (const rank of this.rankedMouseListeners) {
             await this.dispatchActions(rank[1], methodName, element, event);
         }
@@ -65,7 +67,7 @@ let RankingMouseTool = class RankingMouseTool extends sprotty_1.MouseTool {
         if (actions.length > 0) {
             event.preventDefault();
             for (const actionOrPromise of actions) {
-                if (protocol_1.Action.is(actionOrPromise)) {
+                if (_glsp_sprotty_1.Action.is(actionOrPromise)) {
                     await this.actionDispatcher.dispatch(actionOrPromise);
                 }
                 else {
@@ -77,13 +79,12 @@ let RankingMouseTool = class RankingMouseTool extends sprotty_1.MouseTool {
         }
     }
 };
-RankingMouseTool = __decorate([
+exports.GLSPMouseTool = GLSPMouseTool = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.multiInject)(types_1.TYPES.MouseListener)),
+    __param(0, (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.MouseListener)),
     __param(0, (0, inversify_1.optional)()),
     __metadata("design:paramtypes", [Array])
-], RankingMouseTool);
-exports.RankingMouseTool = RankingMouseTool;
+], GLSPMouseTool);
 function groupBy(array, keyFunction) {
     const unsortedMap = array.reduce((result, item) => {
         const key = keyFunction(item);

package/lib/base/view/mouse-tool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mouse-tool.js","sourceRoot":"","sources":["../../../src/base/view/mouse-tool.ts"],"names":[],"mappings":"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"}

package/lib/base/view/view-registry.d.ts

@@ -1,4 +1,4 @@
-import { IView, ViewRegistry } from 'sprotty';
+import { IView, ViewRegistry } from '../../glsp-sprotty/index';
 export declare class GLSPViewRegistry extends ViewRegistry {
     register(key: string, instance: IView): void;
 }

package/lib/base/view/view-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-registry.d.ts","sourceRoot":"","sources":["../../../src/base/view/view-registry.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9C,qBACa,gBAAiB,SAAQ,YAAY;IACrC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;CAUxD"}
+{"version":3,"file":"view-registry.d.ts","sourceRoot":"","sources":["../../../src/base/view/view-registry.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEpD,qBACa,gBAAiB,SAAQ,YAAY;IACrC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;CAUxD"}

package/lib/base/view/view-registry.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPViewRegistry = void 0;
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@ exports.GLSPViewRegistry = void 0;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-let GLSPViewRegistry = class GLSPViewRegistry extends sprotty_1.ViewRegistry {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+let GLSPViewRegistry = exports.GLSPViewRegistry = class GLSPViewRegistry extends _glsp_sprotty_1.ViewRegistry {
     register(key, instance) {
         if (key === undefined) {
             throw new Error('Key is undefined');
@@ -36,8 +36,7 @@ let GLSPViewRegistry = class GLSPViewRegistry extends sprotty_1.ViewRegistry {
         this.elements.set(key, instance);
     }
 };
-GLSPViewRegistry = __decorate([
+exports.GLSPViewRegistry = GLSPViewRegistry = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPViewRegistry);
-exports.GLSPViewRegistry = GLSPViewRegistry;
 //# sourceMappingURL=view-registry.js.map

package/lib/base/view/view-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-registry.js","sourceRoot":"","sources":["../../../src/base/view/view-registry.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,qCAA8C;AAGvC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAY;IACrC,QAAQ,CAAC,GAAW,EAAE,QAAe;QAC1C,IAAI,GAAG,KAAK,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACvC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAClB,yCAAyC;YACzC,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,wBAAwB,CAAC,CAAC;SACvE;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AAXY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAW5B;AAXY,4CAAgB"}
+{"version":3,"file":"view-registry.js","sourceRoot":"","sources":["../../../src/base/view/view-registry.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,iDAAoD;AAG7C,IAAM,gBAAgB,8BAAtB,MAAM,gBAAiB,SAAQ,4BAAY;IACrC,QAAQ,CAAC,GAAW,EAAE,QAAe;QAC1C,IAAI,GAAG,KAAK,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACvC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAClB,yCAAyC;YACzC,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,wBAAwB,CAAC,CAAC;SACvE;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;2BAXY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAW5B"}