@eclipse-glsp/client 1.1.0-next.6ec1da0.211 → 1.1.0-next.7be33cd.257

package/lib/base/selection-clearing-mouse-listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selection-clearing-mouse-listener.d.ts","sourceRoot":"","sources":["../../src/base/selection-clearing-mouse-listener.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvD;;;;;;;;;;;GAWG;AACH,qBACa,8BAA+B,SAAQ,aAAa;IACpD,SAAS,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,KAAK,EAAE;CAUzE"}
+{"version":3,"file":"selection-clearing-mouse-listener.d.ts","sourceRoot":"","sources":["../../src/base/selection-clearing-mouse-listener.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7D;;;;;;;;;;;GAWG;AACH,qBACa,8BAA+B,SAAQ,aAAa;IACpD,SAAS,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,KAAK,EAAE;CAUzE"}

package/lib/base/selection-clearing-mouse-listener.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectionClearingMouseListener = void 0;
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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,7 +23,7 @@ exports.SelectionClearingMouseListener = 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");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 /**
  * A mouse listener that clears the document selection on click
  *
@@ -36,7 +36,7 @@ const sprotty_1 = require("sprotty");
  * This listener helps to overcome this problem by actively clearing any existing selection in
  * the document, if the user clicks into the diagram.
  */
-let SelectionClearingMouseListener = class SelectionClearingMouseListener extends sprotty_1.MouseListener {
+let SelectionClearingMouseListener = exports.SelectionClearingMouseListener = class SelectionClearingMouseListener extends _glsp_sprotty_1.MouseListener {
     mouseDown(_target, event) {
         const selection = document.getSelection();
         // eslint-disable-next-line no-null/no-null
@@ -48,8 +48,7 @@ let SelectionClearingMouseListener = class SelectionClearingMouseListener extend
         return [];
     }
 };
-SelectionClearingMouseListener = __decorate([
+exports.SelectionClearingMouseListener = SelectionClearingMouseListener = __decorate([
     (0, inversify_1.injectable)()
 ], SelectionClearingMouseListener);
-exports.SelectionClearingMouseListener = SelectionClearingMouseListener;
 //# sourceMappingURL=selection-clearing-mouse-listener.js.map

package/lib/base/selection-clearing-mouse-listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"selection-clearing-mouse-listener.js","sourceRoot":"","sources":["../../src/base/selection-clearing-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,qCAAuD;AAEvD;;;;;;;;;;;GAWG;AAEI,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,uBAAa;IACpD,SAAS,CAAC,OAAsB,EAAE,KAAiB;QACxD,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC1C,2CAA2C;QAC3C,IAAI,SAAS,KAAK,IAAI,EAAE;YACpB,OAAO,EAAE,CAAC;SACb;QACD,SAAS,CAAC,eAAe,EAAE,CAAC;QAC5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3C,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAXY,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAW1C;AAXY,wEAA8B"}
+{"version":3,"file":"selection-clearing-mouse-listener.js","sourceRoot":"","sources":["../../src/base/selection-clearing-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,iDAA6D;AAE7D;;;;;;;;;;;GAWG;AAEI,IAAM,8BAA8B,4CAApC,MAAM,8BAA+B,SAAQ,6BAAa;IACpD,SAAS,CAAC,OAAsB,EAAE,KAAiB;QACxD,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC1C,2CAA2C;QAC3C,IAAI,SAAS,KAAK,IAAI,EAAE;YACpB,OAAO,EAAE,CAAC;SACb;QACD,SAAS,CAAC,eAAe,EAAE,CAAC;QAC5B,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3C,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;yCAXY,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAW1C"}

package/lib/{features/select → base}/selection-service.d.ts

@@ -1,38 +1,29 @@
-/********************************************************************************
- * 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
- * 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, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
-import { Command, CommandExecutionContext, ILogger, Selectable, SModelElement, SModelRoot } from 'sprotty';
-import { SModelRootListener } from '../../base/model/update-model-command';
-import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
-export interface SelectionListener {
-    selectionChanged(root: Readonly<SModelRoot>, selectedElements: string[]): void;
+import { Action, Command, CommandExecutionContext, Disposable, DisposableCollection, Emitter, Event, ILogger, SModelElement, SModelRoot, SelectAction, SelectAllAction, Selectable } from '../glsp-sprotty/index';
+import { ISModelRootListener } from './command-stack';
+import { IFeedbackActionDispatcher } from './feedback/feedback-action-dispatcher';
+export interface ISelectionListener {
+    selectionChanged(root: Readonly<SModelRoot>, selectedElements: string[], deselectedElements?: string[]): void;
 }
-export declare class SelectionService implements SModelRootListener {
-    protected selectionListeners: SelectionListener[];
-    private root;
-    private selectedElementIDs;
+export interface SelectionChange {
+    root: Readonly<SModelRoot>;
+    selectedElements: string[];
+    deselectedElements: string[];
+}
+export declare class SelectionService implements ISModelRootListener, Disposable {
+    protected root: Readonly<SModelRoot>;
+    protected selectedElementIDs: Set<string>;
     protected feedbackDispatcher: IFeedbackActionDispatcher;
     protected logger: ILogger;
-    constructor(selectionListeners?: SelectionListener[]);
-    register(selectionListener: SelectionListener): void;
-    deregister(selectionListener: SelectionListener): void;
+    protected selectionListeners: ISelectionListener[];
+    protected toDispose: DisposableCollection;
+    protected initialize(): void;
+    dispose(): void;
+    protected onSelectionChangedEmitter: Emitter<SelectionChange>;
+    get onSelectionChanged(): Event<SelectionChange>;
     modelRootChanged(root: Readonly<SModelRoot>): void;
     updateSelection(root: Readonly<SModelRoot>, select: string[], deselect: string[]): void;
     dispatchFeedback(actions: Action[]): void;
-    notifyListeners(root: SModelRoot, selectedElementIDs: Set<string>): void;
+    notifyListeners(root: SModelRoot, selectedElementIDs: Set<string>, deselectedElementIDs: Set<string>): void;
     getModelRoot(): Readonly<SModelRoot>;
     getSelectedElements(): Readonly<SModelElement & Selectable>[];
     /**
@@ -74,4 +65,18 @@ export declare class SelectAllCommand extends Command {
     undo(context: CommandExecutionContext): SModelRoot;
     redo(context: CommandExecutionContext): SModelRoot;
 }
+export interface SelectFeedbackAction extends Omit<SelectAction, 'kind'>, Action {
+    kind: typeof SelectFeedbackAction.KIND;
+}
+export declare namespace SelectFeedbackAction {
+    const KIND = "selectFeedback";
+    function is(object: any): object is SelectFeedbackAction;
+    function create(options?: {
+        selectedElementsIDs?: string[];
+        deselectedElementsIDs?: string[] | boolean;
+    }): SelectFeedbackAction;
+    function addSelection(selectedElementsIDs: string[]): SelectFeedbackAction;
+    function removeSelection(deselectedElementsIDs: string[]): SelectFeedbackAction;
+    function setSelection(selectedElementsIDs: string[]): SelectFeedbackAction;
+}
 //# sourceMappingURL=selection-service.d.ts.map

package/lib/base/selection-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,OAAO,EACP,uBAAuB,EACvB,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,KAAK,EACL,OAAO,EAEP,aAAa,EACb,UAAU,EACV,YAAY,EACZ,eAAe,EACf,UAAU,EAOb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAElF,MAAM,WAAW,kBAAkB;IAC/B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACjH;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBACa,gBAAiB,YAAW,mBAAmB,EAAE,UAAU;IACpE,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IACrC,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAGtD,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAGxD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAI1B,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,CAAM;IAExD,SAAS,CAAC,SAAS,uBAA8B;IAGjD,SAAS,CAAC,UAAU,IAAI,IAAI;IAQ5B,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,yBAAyB,2BAAkC;IACrE,IAAI,kBAAkB,IAAI,KAAK,CAAC,eAAe,CAAC,CAE/C;IAED,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAIlD,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAuDvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI;IAQ3G,YAAY,IAAI,QAAQ,CAAC,UAAU,CAAC;IAIpC,mBAAmB,IAAI,QAAQ,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE;IAI7D;;OAEG;IAEH,qBAAqB,IAAI,MAAM,EAAE;IAIjC,mBAAmB,IAAI,OAAO;IAI9B,iBAAiB,IAAI,OAAO;IAI5B,gBAAgB,IAAI,OAAO;CAG9B;AAED;;;;GAIG;AACH,qBACa,aAAc,SAAQ,OAAO;IAMG,MAAM,EAAE,YAAY;IAAmC,gBAAgB,EAAE,gBAAgB;IALlI,MAAM,CAAC,QAAQ,CAAC,IAAI,qBAA6B;IAEjD,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAM;IACzC,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,CAAM;gBAEF,MAAM,EAAE,YAAY,EAAmC,gBAAgB,EAAE,gBAAgB;IAIlI,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAarD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAKlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD;AAED;;;;GAIG;AACH,qBACa,gBAAiB,SAAQ,OAAO;IAIA,MAAM,EAAE,eAAe;IAAmC,gBAAgB,EAAE,gBAAgB;IAHrI,MAAM,CAAC,QAAQ,CAAC,IAAI,iBAAgC;IACpD,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAA8B;gBAEtC,MAAM,EAAE,eAAe,EAAmC,gBAAgB,EAAE,gBAAgB;IAIrI,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAgBrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAKlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD;AAED,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM;IAC5E,IAAI,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAC;CAC1C;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,IAAI,mBAAmB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,oBAAoB,CAE9D;IAED,SAAgB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;KAAE,GAAG,oBAAoB,CAErI;IAED,SAAgB,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAEhF;IAED,SAAgB,eAAe,CAAC,qBAAqB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAErF;IAED,SAAgB,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAEhF;CACJ"}

package/lib/{features/select → base}/selection-service.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.SelectAllCommand = exports.SelectCommand = exports.SelectionService = void 0;
+exports.SelectFeedbackAction = exports.SelectAllCommand = exports.SelectCommand = exports.SelectionService = 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,22 +28,25 @@ exports.SelectAllCommand = exports.SelectCommand = exports.SelectionService = vo
  *
  * 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 smodel_util_1 = require("../../utils/smodel-util");
-const select_feedback_action_1 = require("./select-feedback-action");
-let SelectionService = class SelectionService {
-    constructor(selectionListeners = []) {
-        this.selectionListeners = selectionListeners;
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+const smodel_util_1 = require("../utils/smodel-util");
+let SelectionService = exports.SelectionService = class SelectionService {
+    constructor() {
         this.selectedElementIDs = new Set();
+        this.selectionListeners = [];
+        this.toDispose = new _glsp_sprotty_1.DisposableCollection();
+        this.onSelectionChangedEmitter = new _glsp_sprotty_1.Emitter();
     }
-    register(selectionListener) {
-        (0, protocol_1.distinctAdd)(this.selectionListeners, selectionListener);
+    initialize() {
+        this.toDispose.push(this.onSelectionChangedEmitter);
+        this.selectionListeners.forEach(listener => this.onSelectionChanged(change => listener.selectionChanged(change.root, change.selectedElements, change.deselectedElements)));
     }
-    deregister(selectionListener) {
-        (0, protocol_1.remove)(this.selectionListeners, selectionListener);
+    dispose() {
+        this.toDispose.dispose();
+    }
+    get onSelectionChanged() {
+        return this.onSelectionChangedEmitter.event;
     }
     modelRootChanged(root) {
         this.updateSelection(root, [], []);
@@ -84,7 +87,7 @@ let SelectionService = class SelectionService {
         if (selectionChanged) {
             // aggregate to feedback action handling all elements as only the last feedback is restored
             this.dispatchFeedback([
-                select_feedback_action_1.SelectFeedbackAction.create({
+                SelectFeedbackAction.create({
                     selectedElementsIDs: [...this.selectedElementIDs],
                     deselectedElementsIDs: [...deselectedElementIDs]
                 })
@@ -93,20 +96,24 @@ let SelectionService = class SelectionService {
         const rootChanged = prevRoot !== root;
         if (rootChanged || selectionChanged) {
             // notify listeners after the feedback action
-            this.notifyListeners(this.root, this.selectedElementIDs);
+            this.notifyListeners(this.root, this.selectedElementIDs, deselectedElementIDs);
         }
     }
     dispatchFeedback(actions) {
         this.feedbackDispatcher.registerFeedback(this, actions);
     }
-    notifyListeners(root, selectedElementIDs) {
-        this.selectionListeners.forEach(listener => listener.selectionChanged(root, Array.from(selectedElementIDs)));
+    notifyListeners(root, selectedElementIDs, deselectedElementIDs) {
+        this.onSelectionChangedEmitter.fire({
+            root,
+            selectedElements: Array.from(selectedElementIDs),
+            deselectedElements: Array.from(deselectedElementIDs)
+        });
     }
     getModelRoot() {
         return this.root;
     }
     getSelectedElements() {
-        return (0, smodel_util_1.getElements)(this.root.index, Array.from(this.selectedElementIDs), sprotty_1.isSelectable);
+        return !this.root ? [] : (0, smodel_util_1.getElements)(this.root.index, Array.from(this.selectedElementIDs), _glsp_sprotty_1.isSelectable);
     }
     /**
      * QUERY METHODS
@@ -125,26 +132,39 @@ let SelectionService = class SelectionService {
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IFeedbackActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher),
     __metadata("design:type", Object)
 ], SelectionService.prototype, "feedbackDispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ILogger),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.ILogger),
     __metadata("design:type", Object)
 ], SelectionService.prototype, "logger", void 0);
-SelectionService = __decorate([
-    (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.multiInject)(types_1.TYPES.SelectionListener)),
-    __param(0, (0, inversify_1.optional)()),
-    __metadata("design:paramtypes", [Array])
+__decorate([
+    (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.ISelectionListener),
+    (0, inversify_1.optional)(),
+    __metadata("design:type", Array)
+], SelectionService.prototype, "selectionListeners", void 0);
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], SelectionService.prototype, "initialize", null);
+__decorate([
+    (0, inversify_1.preDestroy)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], SelectionService.prototype, "dispose", null);
+exports.SelectionService = SelectionService = __decorate([
+    (0, inversify_1.injectable)()
 ], SelectionService);
-exports.SelectionService = SelectionService;
 /**
  * Handles a {@link SelectAction} and propagates the new selection to the {@link SelectionService}.
  * Other tools might be selection-sensitive which means {@link SelectAction}s must be processed as fast as possible.
  * Handling the action with a command ensures that the action is processed before the next render tick.
  */
-let SelectCommand = class SelectCommand extends sprotty_1.Command {
+let SelectCommand = exports.SelectCommand = class SelectCommand extends _glsp_sprotty_1.Command {
     constructor(action, selectionService) {
         super();
         this.action = action;
@@ -154,10 +174,12 @@ let SelectCommand = class SelectCommand extends sprotty_1.Command {
     }
     execute(context) {
         const model = context.root;
-        const selectionGuard = (element) => element instanceof sprotty_1.SChildElement && (0, sprotty_1.isSelectable)(element);
+        const selectionGuard = (element) => element instanceof _glsp_sprotty_1.SChildElement && (0, _glsp_sprotty_1.isSelectable)(element);
         const selectedElements = (0, smodel_util_1.getElements)(model.index, this.action.selectedElementsIDs, selectionGuard);
-        const deselectedElements = (0, smodel_util_1.getElements)(model.index, this.action.deselectedElementsIDs, selectionGuard);
-        this.selectionService.updateSelection(model, (0, protocol_1.pluck)(selectedElements, 'id'), (0, protocol_1.pluck)(deselectedElements, 'id'));
+        const deselectedElements = this.action.deselectAll
+            ? this.selectionService.getSelectedElements()
+            : (0, smodel_util_1.getElements)(model.index, this.action.deselectedElementsIDs, selectionGuard);
+        this.selectionService.updateSelection(model, (0, _glsp_sprotty_1.pluck)(selectedElements, 'id'), (0, _glsp_sprotty_1.pluck)(deselectedElements, 'id'));
         return model;
     }
     // Basically no-op since client-side undo is not supported in GLSP.
@@ -169,20 +191,19 @@ let SelectCommand = class SelectCommand extends sprotty_1.Command {
         return context.root;
     }
 };
-SelectCommand.KIND = sprotty_1.SelectCommand.KIND;
-SelectCommand = __decorate([
+SelectCommand.KIND = _glsp_sprotty_1.SprottySelectCommand.KIND;
+exports.SelectCommand = SelectCommand = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
-    __param(1, (0, inversify_1.inject)(types_1.TYPES.SelectionService)),
+    __param(0, (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action)),
+    __param(1, (0, inversify_1.inject)(SelectionService)),
     __metadata("design:paramtypes", [Object, SelectionService])
 ], SelectCommand);
-exports.SelectCommand = SelectCommand;
 /**
  * Handles a {@link SelectAllAction} and propagates the new selection to the {@link SelectionService}.
  * Other tools might be selection-sensitive which means {@link SelectionAllAction}s must be processed as fast as possible.
  * Handling the action with a command ensures that the action is processed before the next render tick.
  */
-let SelectAllCommand = class SelectAllCommand extends sprotty_1.Command {
+let SelectAllCommand = exports.SelectAllCommand = class SelectAllCommand extends _glsp_sprotty_1.Command {
     constructor(action, selectionService) {
         super();
         this.action = action;
@@ -191,9 +212,9 @@ let SelectAllCommand = class SelectAllCommand extends sprotty_1.Command {
     }
     execute(context) {
         const model = context.root;
-        const selectionGuard = (element) => element instanceof sprotty_1.SChildElement && (0, sprotty_1.isSelectable)(element);
+        const selectionGuard = (element) => element instanceof _glsp_sprotty_1.SChildElement && (0, _glsp_sprotty_1.isSelectable)(element);
         const selectables = (0, smodel_util_1.getMatchingElements)(model.index, selectionGuard);
-        const selectableIds = (0, protocol_1.pluck)(selectables, 'id');
+        const selectableIds = (0, _glsp_sprotty_1.pluck)(selectables, 'id');
         if (this.action.select) {
             this.selectionService.updateSelection(model, selectableIds, []);
         }
@@ -211,12 +232,35 @@ let SelectAllCommand = class SelectAllCommand extends sprotty_1.Command {
         return context.root;
     }
 };
-SelectAllCommand.KIND = sprotty_1.SelectAllCommand.KIND;
-SelectAllCommand = __decorate([
+SelectAllCommand.KIND = _glsp_sprotty_1.SprottySelectAllCommand.KIND;
+exports.SelectAllCommand = SelectAllCommand = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
-    __param(1, (0, inversify_1.inject)(types_1.TYPES.SelectionService)),
+    __param(0, (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action)),
+    __param(1, (0, inversify_1.inject)(SelectionService)),
     __metadata("design:paramtypes", [Object, SelectionService])
 ], SelectAllCommand);
-exports.SelectAllCommand = SelectAllCommand;
+var SelectFeedbackAction;
+(function (SelectFeedbackAction) {
+    SelectFeedbackAction.KIND = 'selectFeedback';
+    function is(object) {
+        return _glsp_sprotty_1.Action.hasKind(object, SelectFeedbackAction.KIND) && (0, _glsp_sprotty_1.hasArrayProp)(object, 'selectedElementsIDs') && (0, _glsp_sprotty_1.hasArrayProp)(object, 'deselectedElementsIDs');
+    }
+    SelectFeedbackAction.is = is;
+    function create(options) {
+        return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.create(options)), { kind: SelectFeedbackAction.KIND });
+    }
+    SelectFeedbackAction.create = create;
+    function addSelection(selectedElementsIDs) {
+        return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.addSelection(selectedElementsIDs)), { kind: SelectFeedbackAction.KIND });
+    }
+    SelectFeedbackAction.addSelection = addSelection;
+    function removeSelection(deselectedElementsIDs) {
+        return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.removeSelection(deselectedElementsIDs)), { kind: SelectFeedbackAction.KIND });
+    }
+    SelectFeedbackAction.removeSelection = removeSelection;
+    function setSelection(selectedElementsIDs) {
+        return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.setSelection(selectedElementsIDs)), { kind: SelectFeedbackAction.KIND });
+    }
+    SelectFeedbackAction.setSelection = setSelection;
+})(SelectFeedbackAction || (exports.SelectFeedbackAction = SelectFeedbackAction = {}));
 //# sourceMappingURL=selection-service.js.map

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

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

package/lib/base/selection-service.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"selection-service.spec.d.ts","sourceRoot":"","sources":["../../src/base/selection-service.spec.ts"],"names":[],"mappings":""}

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

@@ -6,10 +6,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/********************************************************************************
+ * Copyright (c) 2020-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 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 selection_service_1 = require("./selection-service");
 let MockFeedbackActionDispatcher = class MockFeedbackActionDispatcher {
     constructor() {
@@ -35,33 +50,16 @@ 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 = new inversify_1.Container();
-    container.load(sprotty_1.defaultModule);
+    const container = (0, _glsp_sprotty_1.initializeContainer)(new inversify_1.Container(), _glsp_sprotty_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.rebind(_glsp_sprotty_1.TYPES.IModelFactory).to(_glsp_sprotty_1.SGraphFactory).inSingletonScope();
+    container.bind(_glsp_sprotty_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);
     return container;
 }
 describe('SelectionService', () => {
@@ -73,10 +71,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.', () => {
@@ -178,7 +176,7 @@ describe('SelectionService', () => {
             selectionService.modelRootChanged(newRoot);
             assertSelectionAndFeedback(['node1'], ['node2']);
         });
-        it('Changing root with new selection correctly selects matchting elements and deselects not matching elements.', () => {
+        it('Changing root with new selection correctly selects matching elements and deselects not matching elements.', () => {
             assertSelectionAndFeedback([], []);
             selectionService.updateSelection(root, ['node1', 'node2'], []);
             assertSelectionAndFeedback(['node1', 'node2'], []);
@@ -188,116 +186,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) {
@@ -337,11 +270,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