@eclipse-glsp/client 1.1.0-next.ee71b2a.218 → 1.1.0-next.f12aad0.255

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

@@ -1,29 +1,13 @@
-/********************************************************************************
- * 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';
+import { Action, Command, CommandExecutionContext, ILogger, SModelElement, SModelRoot, SelectAction, SelectAllAction, Selectable } from '../glsp-sprotty/index';
+import { SModelRootListener } from './command-stack';
+import { IFeedbackActionDispatcher } from './feedback/feedback-action-dispatcher';
 export interface SelectionListener {
     selectionChanged(root: Readonly<SModelRoot>, selectedElements: string[]): void;
 }
 export declare class SelectionService implements SModelRootListener {
     protected selectionListeners: SelectionListener[];
-    private root;
-    private selectedElementIDs;
+    protected root: Readonly<SModelRoot>;
+    protected selectedElementIDs: Set<string>;
     protected feedbackDispatcher: IFeedbackActionDispatcher;
     protected logger: ILogger;
     constructor(selectionListeners?: SelectionListener[]);
@@ -74,4 +58,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":"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"}

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,19 @@ 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 {
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+const smodel_util_1 = require("../utils/smodel-util");
+let SelectionService = exports.SelectionService = class SelectionService {
     constructor(selectionListeners = []) {
         this.selectionListeners = selectionListeners;
         this.selectedElementIDs = new Set();
     }
     register(selectionListener) {
-        (0, protocol_1.distinctAdd)(this.selectionListeners, selectionListener);
+        (0, _glsp_sprotty_1.distinctAdd)(this.selectionListeners, selectionListener);
     }
     deregister(selectionListener) {
-        (0, protocol_1.remove)(this.selectionListeners, selectionListener);
+        (0, _glsp_sprotty_1.remove)(this.selectionListeners, selectionListener);
     }
     modelRootChanged(root) {
         this.updateSelection(root, [], []);
@@ -84,7 +81,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]
                 })
@@ -106,7 +103,7 @@ let SelectionService = class SelectionService {
         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 +122,25 @@ 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([
+exports.SelectionService = SelectionService = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.multiInject)(types_1.TYPES.SelectionListener)),
+    __param(0, (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.SelectionListener)),
     __param(0, (0, inversify_1.optional)()),
     __metadata("design:paramtypes", [Array])
 ], 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 +150,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 +167,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 +188,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 +208,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,24 @@ 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 _glsp_sprotty_1 = require("../glsp-sprotty/index");
 const selection_service_1 = require("./selection-service");
 let MockFeedbackActionDispatcher = class MockFeedbackActionDispatcher {
     constructor() {
@@ -55,13 +69,11 @@ class MockSelectionListener {
     }
 }
 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 +85,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 +190,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'], []);

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/source-uri-aware.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSourceUriAware = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 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
@@ -16,9 +16,9 @@ exports.isSourceUriAware = 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 _glsp_sprotty_1 = require("../glsp-sprotty/index");
 function isSourceUriAware(obj) {
-    return protocol_1.AnyObject.is(obj) && (0, protocol_1.hasStringProp)(obj, 'sourceURI');
+    return _glsp_sprotty_1.AnyObject.is(obj) && (0, _glsp_sprotty_1.hasStringProp)(obj, 'sourceURI');
 }
 exports.isSourceUriAware = isSourceUriAware;
 //# sourceMappingURL=source-uri-aware.js.map

package/lib/base/source-uri-aware.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-uri-aware.js","sourceRoot":"","sources":["../../src/base/source-uri-aware.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAkE;AAKlE,SAAgB,gBAAgB,CAAC,GAAQ;IACrC,OAAO,oBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,IAAA,wBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AAChE,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"source-uri-aware.js","sourceRoot":"","sources":["../../src/base/source-uri-aware.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAyD;AAKzD,SAAgB,gBAAgB,CAAC,GAAQ;IACrC,OAAO,yBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,IAAA,6BAAa,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AAChE,CAAC;AAFD,4CAEC"}

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

@@ -1,9 +1,6 @@
-import { Tool, ToolManager } from 'sprotty';
+import { Tool, ToolManager } from '../../glsp-sprotty/index';
 import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
-export interface IGLSPToolManager extends ToolManager {
-    disableEditTools(): void;
-}
-export declare class GLSPToolManager extends ToolManager implements IGLSPToolManager, EditModeListener {
+export declare class GLSPToolManager extends ToolManager implements EditModeListener {
     protected editorContext?: EditorContextService;
     tools: Tool[];
     defaultTools: Tool[];
@@ -18,5 +15,7 @@ export declare class GLSPToolManager extends ToolManager implements IGLSPToolMan
 export interface GLSPTool extends Tool {
     isEditTool: boolean;
 }
-export declare function isGLSPTool(tool: any): tool is GLSPTool;
+export declare namespace GLSPTool {
+    function is(object: unknown): object is GLSPTool;
+}
 //# sourceMappingURL=glsp-tool-manager.d.ts.map

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,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IAEjD,gBAAgB,IAAI,IAAI,CAAC;CAC5B;AAED,qBACa,eAAgB,SAAQ,WAAY,YAAW,gBAAgB,EAAE,gBAAgB;IAC1F,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,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,QAAQ,CAEtD"}
+{"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,gBAAgB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAEjH,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"}

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

@@ -9,9 +9,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGLSPTool = exports.GLSPToolManager = void 0;
+exports.GLSPTool = exports.GLSPToolManager = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 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
@@ -25,11 +25,9 @@ exports.isGLSPTool = 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);
@@ -41,19 +39,19 @@ let GLSPToolManager = class GLSPToolManager extends sprotty_1.ToolManager {
     }
     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) {
         this.disableActiveTools();
         let tools = toolIds.map(id => this.tool(id));
         if (this.editorContext && this.editorContext.isReadonly) {
-            tools = tools.filter(tool => tool && (!isGLSPTool(tool) || tool.isEditTool === false));
+            tools = tools.filter(tool => tool && (!GLSPTool.is(tool) || tool.isEditTool === false));
         }
         tools.forEach(tool => {
             if (tool !== undefined) {
@@ -64,32 +62,32 @@ let GLSPToolManager = class GLSPToolManager extends sprotty_1.ToolManager {
     }
     disableEditTools() {
         this.disableActiveTools();
-        this.enable(this.defaultTools.filter(tool => !isGLSPTool(tool) || tool.isEditTool === false).map(tool => tool.id));
+        this.enable(this.defaultTools.filter(tool => !GLSPTool.is(tool) || tool.isEditTool === false).map(tool => tool.id));
     }
     editModeChanged(oldValue, newValue) {
         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,12 +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;
-function isGLSPTool(tool) {
-    return 'isEditTool' in tool && typeof tool['isEditTool'] === 'boolean';
-}
-exports.isGLSPTool = isGLSPTool;
+var GLSPTool;
+(function (GLSPTool) {
+    function is(object) {
+        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 = 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/{features/mouse-tool → base/view}/mouse-tool.d.ts

@@ -1,22 +1,18 @@
-import { MouseListener, MouseTool, SModelElement, SModelRoot } from 'sprotty';
-export interface IMouseTool {
-    register(mouseListener: MouseListener): void;
-    deregister(mouseListener: MouseListener): void;
-}
+import { 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 RankingMouseTool extends MouseTool implements IMouseTool {
+export declare class RankingMouseTool extends MouseTool {
     protected mouseListeners: MouseListener[];
     protected rankedMouseListeners: Map<number, MouseListener[]>;
     constructor(mouseListeners?: MouseListener[]);
     register(mouseListener: MouseListener): void;
     deregister(mouseListener: MouseListener): void;
     protected handleEvent<K extends MouseListenerMethods>(methodName: K, model: SModelRoot, event: MouseEvent): void;
-    notifyListenersByRank<K extends MouseListenerMethods>(element: SModelElement, methodName: K, model: SModelRoot, event: MouseEvent): Promise<void>;
-    dispatchActions<K extends MouseListenerMethods>(mouseListeners: MouseListener[], methodName: K, element: SModelElement, event: MouseEvent): Promise<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,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAS,MAAM,eAAe,CAAC;AAGnG;;;GAGG;AACH,KAAK,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;AAElE,qBACa,gBAAiB,SAAQ,SAAS;cAGkC,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;IAK5C,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"}