@eclipse-glsp/client 1.1.0-next.697cc23.237 → 1.1.0-next.69a77b0.259

package/lib/features/tools/marquee-selection/marquee-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"marquee-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/marquee-selection/marquee-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAqB,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,qBACa,WAAY,SAAQ,YAAY;IACzC,MAAM,CAAC,EAAE,SAAuB;IAEhC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAA4B;IAE5E,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;CAGjB;AAED,qBACa,kBAAmB,SAAQ,WAAW;IACtC,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAM5E"}

package/lib/features/tools/marquee-selection/marquee-tool.js

@@ -0,0 +1,57 @@
+"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;
+};
+var MarqueeTool_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MarqueeKeyListener = exports.MarqueeTool = void 0;
+/********************************************************************************
+ * Copyright (c) 2021-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");
+const base_glsp_tool_1 = require("../base-glsp-tool");
+const marquee_mouse_tool_1 = require("./marquee-mouse-tool");
+let MarqueeTool = exports.MarqueeTool = MarqueeTool_1 = class MarqueeTool extends base_glsp_tool_1.BaseGLSPTool {
+    constructor() {
+        super(...arguments);
+        this.marqueeKeyListener = new MarqueeKeyListener();
+    }
+    get id() {
+        return MarqueeTool_1.ID;
+    }
+    enable() {
+        this.toDisposeOnDisable.push(this.keyTool.registerListener(this.marqueeKeyListener));
+    }
+};
+MarqueeTool.ID = 'glsp.marquee-tool';
+exports.MarqueeTool = MarqueeTool = MarqueeTool_1 = __decorate([
+    (0, inversify_1.injectable)()
+], MarqueeTool);
+let MarqueeKeyListener = exports.MarqueeKeyListener = class MarqueeKeyListener extends _glsp_sprotty_1.KeyListener {
+    keyDown(_element, event) {
+        if (event.shiftKey) {
+            return [_glsp_sprotty_1.EnableToolsAction.create([marquee_mouse_tool_1.MarqueeMouseTool.ID])];
+        }
+        return [];
+    }
+};
+exports.MarqueeKeyListener = MarqueeKeyListener = __decorate([
+    (0, inversify_1.injectable)()
+], MarqueeKeyListener);
+//# sourceMappingURL=marquee-tool.js.map

package/lib/features/tools/marquee-selection/marquee-tool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"marquee-tool.js","sourceRoot":"","sources":["../../../../src/features/tools/marquee-selection/marquee-tool.ts"],"names":[],"mappings":";;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,iDAAsF;AACtF,sDAAiD;AACjD,6DAAwD;AAGjD,IAAM,WAAW,yCAAjB,MAAM,WAAY,SAAQ,6BAAY;IAAtC;;QAGO,uBAAkB,GAAuB,IAAI,kBAAkB,EAAE,CAAC;IAShF,CAAC;IAPG,IAAI,EAAE;QACF,OAAO,aAAW,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM;QACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzF,CAAC;;AAVM,cAAE,GAAG,mBAAmB,AAAtB,CAAuB;sBADvB,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAYvB;AAGM,IAAM,kBAAkB,gCAAxB,MAAM,kBAAmB,SAAQ,2BAAW;IACtC,OAAO,CAAC,QAAuB,EAAE,KAAoB;QAC1D,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,OAAO,CAAC,iCAAiB,CAAC,MAAM,CAAC,CAAC,qCAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC5D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;6BAPY,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAO9B"}

package/lib/features/tools/{model.d.ts → marquee-selection/model.d.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-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
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point } from '@eclipse-glsp/protocol';
-import { RectangularNode } from 'sprotty';
+import { Point, RectangularNode } from '../../../glsp-sprotty/index';
 export declare class MarqueeNode extends RectangularNode {
     static readonly DEFAULT_FEATURES: symbol[];
     startPoint: Point;

package/lib/features/tools/marquee-selection/model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/marquee-selection/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAiB,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEtE,qBAAa,WAAY,SAAQ,eAAe;IAC5C,gBAAyB,gBAAgB,WAAmB;IAC5D,UAAU,EAAE,KAAK,CAAC;IAClB,QAAQ,EAAE,KAAK,CAAC;CACnB"}

package/lib/{base/actions/sprotty-actions.js → features/tools/marquee-selection/model.js}

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MarqueeNode = void 0;
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2021-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
@@ -15,7 +16,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
-const actions_1 = require("sprotty-protocol/lib/actions");
-actions_1.SetBoundsAction.is = (object) => protocol_1.Action.hasKind(object, actions_1.SetBoundsAction.KIND) && (0, protocol_1.hasArrayProp)(object, 'bounds');
-//# sourceMappingURL=sprotty-actions.js.map
+const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
+class MarqueeNode extends _glsp_sprotty_1.RectangularNode {
+}
+exports.MarqueeNode = MarqueeNode;
+MarqueeNode.DEFAULT_FEATURES = [_glsp_sprotty_1.boundsFeature];
+//# sourceMappingURL=model.js.map

package/lib/features/tools/marquee-selection/model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/features/tools/marquee-selection/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAsE;AAEtE,MAAa,WAAY,SAAQ,+BAAe;;AAAhD,kCAIC;AAH4B,4BAAgB,GAAG,CAAC,6BAAa,CAAC,CAAC"}

package/lib/features/tools/{view.d.ts → marquee-selection/view.d.ts}

@@ -1,5 +1,5 @@
 import { VNode } from 'snabbdom';
-import { RectangularNodeView, RenderingContext } from 'sprotty';
+import { RectangularNodeView, RenderingContext } from '../../../glsp-sprotty/index';
 import { MarqueeNode } from './model';
 export declare class MarqueeView extends RectangularNodeView {
     render(node: MarqueeNode, context: RenderingContext): VNode;

package/lib/features/tools/marquee-selection/view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/marquee-selection/view.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAO,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBACa,WAAY,SAAQ,mBAAmB;IACvC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAiBvE"}

package/lib/features/tools/{view.js → marquee-selection/view.js}

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarqueeView = void 0;
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-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,18 +23,17 @@ exports.MarqueeView = 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");
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: sprotty_1.svg };
-let MarqueeView = class MarqueeView extends sprotty_1.RectangularNodeView {
+const JSX = { createElement: _glsp_sprotty_1.svg };
+let MarqueeView = exports.MarqueeView = class MarqueeView extends _glsp_sprotty_1.RectangularNodeView {
     render(node, context) {
         const graph = (JSX.createElement("g", null,
             JSX.createElement("rect", { "class-sprotty-node": true, "class-marquee": true, x: node.startPoint.x - node.endPoint.x <= 0 ? node.startPoint.x : node.endPoint.x, y: node.startPoint.y - node.endPoint.y <= 0 ? node.startPoint.y : node.endPoint.y, rx: 0, ry: 0, width: Math.abs(node.startPoint.x - node.endPoint.x), height: Math.abs(node.startPoint.y - node.endPoint.y) })));
         return graph;
     }
 };
-MarqueeView = __decorate([
+exports.MarqueeView = MarqueeView = __decorate([
     (0, inversify_1.injectable)()
 ], MarqueeView);
-exports.MarqueeView = MarqueeView;
 //# sourceMappingURL=view.js.map

package/lib/features/tools/marquee-selection/view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/features/tools/marquee-selection/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,iDAA2E;AAG3E,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,mBAAG,EAAE,CAAC;AAG5B,IAAM,WAAW,yBAAjB,MAAM,WAAY,SAAQ,mCAAmB;IACvC,MAAM,CAAC,IAAiB,EAAE,OAAyB;QACxD,MAAM,KAAK,GAAG,CACV;YACI,kDACwB,IAAI,mBACT,IAAI,EACnB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACjF,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACjF,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EACpD,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GACjD,CACR,CACP,CAAC;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;sBAlBY,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAkBvB"}

package/lib/features/tools/node-creation/di.config.d.ts

@@ -0,0 +1,19 @@
+/********************************************************************************
+ * 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
+ * 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 { ContainerModule } from 'inversify';
+declare const nodeCreationToolModule: ContainerModule;
+export default nodeCreationToolModule;
+//# sourceMappingURL=di.config.d.ts.map

package/lib/features/tools/node-creation/di.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/node-creation/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,QAAA,MAAM,sBAAsB,iBAI1B,CAAC;AAEH,eAAe,sBAAsB,CAAC"}

package/lib/features/{rank/model.js → tools/node-creation/di.config.js}

@@ -1,6 +1,7 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2019-2021 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
@@ -14,15 +15,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRank = exports.isRanked = exports.DEFAULT_RANK = void 0;
-exports.DEFAULT_RANK = 0;
-function isRanked(arg) {
-    return arg !== undefined && arg.rank !== undefined && typeof arg.rank === 'number';
-}
-exports.isRanked = isRanked;
-function getRank(arg) {
-    return isRanked(arg) ? arg.rank : exports.DEFAULT_RANK;
-}
-exports.getRank = getRank;
-//# sourceMappingURL=model.js.map
+const inversify_1 = require("inversify");
+const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
+const node_creation_tool_1 = require("./node-creation-tool");
+const nodeCreationToolModule = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
+    const context = { bind, unbind, isBound, rebind };
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.ITool, node_creation_tool_1.NodeCreationTool);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.TriggerNodeCreationAction.KIND, node_creation_tool_1.NodeCreationTool);
+});
+exports.default = nodeCreationToolModule;
+//# sourceMappingURL=di.config.js.map

package/lib/features/tools/node-creation/di.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../../src/features/tools/node-creation/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,iDAAwG;AACxG,6DAAwD;AAExD,MAAM,sBAAsB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,KAAK,EAAE,qCAAgB,CAAC,CAAC;IACtD,IAAA,sCAAsB,EAAC,OAAO,EAAE,yCAAyB,CAAC,IAAI,EAAE,qCAAgB,CAAC,CAAC;AACtF,CAAC,CAAC,CAAC;AAEH,kBAAe,sBAAsB,CAAC"}

package/lib/features/tools/node-creation/node-creation-tool.d.ts

@@ -0,0 +1,22 @@
+import { Action, ISnapper, SModelElement, TriggerNodeCreationAction } from '../../../glsp-sprotty/index';
+import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
+import { Containable } from '../../hints/model';
+import { BaseGLSPCreationTool } from '../base-glsp-creation-tool';
+export declare class NodeCreationTool extends BaseGLSPCreationTool<TriggerNodeCreationAction> {
+    static ID: string;
+    protected isTriggerAction: typeof TriggerNodeCreationAction.is;
+    readonly snapper?: ISnapper;
+    get id(): string;
+    doEnable(): void;
+}
+export declare class NodeCreationToolMouseListener extends DragAwareMouseListener {
+    protected triggerAction: TriggerNodeCreationAction;
+    protected tool: NodeCreationTool;
+    protected container?: SModelElement & Containable;
+    constructor(triggerAction: TriggerNodeCreationAction, tool: NodeCreationTool);
+    protected creationAllowed(elementTypeId: string): boolean | undefined;
+    get elementTypeId(): string;
+    nonDraggingMouseUp(target: SModelElement, event: MouseEvent): Action[];
+    mouseOver(target: SModelElement, event: MouseEvent): Action[];
+}
+//# sourceMappingURL=node-creation-tool.d.ts.map

package/lib/features/tools/node-creation/node-creation-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-creation-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/node-creation/node-creation-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EAGN,QAAQ,EACR,aAAa,EAGb,yBAAyB,EAG5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBACa,gBAAiB,SAAQ,oBAAoB,CAAC,yBAAyB,CAAC;IACjF,MAAM,CAAC,EAAE,SAAsB;IAE/B,SAAS,CAAC,eAAe,sCAAgC;IAErB,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEhE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,QAAQ,IAAI,IAAI;CAMnB;AAED,qBACa,6BAA8B,SAAQ,sBAAsB;IAGzD,SAAS,CAAC,aAAa,EAAE,yBAAyB;IAAE,SAAS,CAAC,IAAI,EAAE,gBAAgB;IAFhG,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;gBAE5B,aAAa,EAAE,yBAAyB,EAAY,IAAI,EAAE,gBAAgB;IAIhG,SAAS,CAAC,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIrE,IAAI,aAAa,IAAI,MAAM,CAE1B;IAEQ,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAmBtE,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;CAWzE"}

package/lib/features/tools/{node-creation-tool.js → node-creation/node-creation-tool.js}

@@ -12,7 +12,7 @@ var NodeCreationTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeCreationToolMouseListener = exports.NodeCreationTool = 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
@@ -26,48 +26,35 @@ exports.NodeCreationToolMouseListener = exports.NodeCreationTool = 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 drag_aware_mouse_listener_1 = require("../../base/drag-aware-mouse-listener");
-const viewpoint_util_1 = require("../../utils/viewpoint-util");
-const model_1 = require("../hints/model");
-const css_feedback_1 = require("../tool-feedback/css-feedback");
-const base_glsp_tool_1 = require("./base-glsp-tool");
-let NodeCreationTool = NodeCreationTool_1 = class NodeCreationTool extends base_glsp_tool_1.BaseGLSPTool {
+const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
+const drag_aware_mouse_listener_1 = require("../../../base/drag-aware-mouse-listener");
+const css_feedback_1 = require("../../../base/feedback/css-feedback");
+const viewpoint_util_1 = require("../../../utils/viewpoint-util");
+const model_1 = require("../../hints/model");
+const base_glsp_creation_tool_1 = require("../base-glsp-creation-tool");
+let NodeCreationTool = exports.NodeCreationTool = NodeCreationTool_1 = class NodeCreationTool extends base_glsp_creation_tool_1.BaseGLSPCreationTool {
+    constructor() {
+        super(...arguments);
+        this.isTriggerAction = _glsp_sprotty_1.TriggerNodeCreationAction.is;
+    }
     get id() {
         return NodeCreationTool_1.ID;
     }
-    enable() {
-        if (this.triggerAction === undefined) {
-            throw new TypeError(`Could not enable tool ${this.id}.The triggerAction cannot be undefined.`);
-        }
-        this.creationToolMouseListener = new NodeCreationToolMouseListener(this.triggerAction, this);
-        this.mouseTool.register(this.creationToolMouseListener);
-        this.dispatchFeedback([(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.NODE_CREATION)]);
-    }
-    disable() {
-        this.mouseTool.deregister(this.creationToolMouseListener);
-        this.deregisterFeedback([(0, css_feedback_1.cursorFeedbackAction)()]);
-    }
-    handle(action) {
-        if (protocol_1.TriggerNodeCreationAction.is(action)) {
-            this.triggerAction = action;
-            return sprotty_1.EnableToolsAction.create([this.id]);
-        }
+    doEnable() {
+        this.toDisposeOnDisable.push(this.mouseTool.registerListener(new NodeCreationToolMouseListener(this.triggerAction, this)), this.registerFeedback([(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.NODE_CREATION)], this, [(0, css_feedback_1.cursorFeedbackAction)()]));
     }
 };
 NodeCreationTool.ID = 'tool_create_node';
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.ISnapper),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.ISnapper),
     (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], NodeCreationTool.prototype, "snapper", void 0);
-NodeCreationTool = NodeCreationTool_1 = __decorate([
+exports.NodeCreationTool = NodeCreationTool = NodeCreationTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], NodeCreationTool);
-exports.NodeCreationTool = NodeCreationTool;
-let NodeCreationToolMouseListener = class NodeCreationToolMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
+let NodeCreationToolMouseListener = exports.NodeCreationToolMouseListener = class NodeCreationToolMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
     constructor(triggerAction, tool) {
         super();
         this.triggerAction = triggerAction;
@@ -86,32 +73,31 @@ let NodeCreationToolMouseListener = class NodeCreationToolMouseListener extends
             let location = (0, viewpoint_util_1.getAbsolutePosition)(target, event);
             if (this.tool.snapper) {
                 // Create a 0-bounds proxy element for snapping
-                const elementProxy = new sprotty_1.SNode();
+                const elementProxy = new _glsp_sprotty_1.SNode();
                 elementProxy.size = { width: 0, height: 0 };
                 location = this.tool.snapper.snap(location, elementProxy);
             }
-            result.push(protocol_1.CreateNodeOperation.create(this.elementTypeId, { location, containerId, args: this.triggerAction.args }));
-            if (!(0, sprotty_1.isCtrlOrCmd)(event)) {
-                result.push(sprotty_1.EnableDefaultToolsAction.create());
+            result.push(_glsp_sprotty_1.CreateNodeOperation.create(this.elementTypeId, { location, containerId, args: this.triggerAction.args }));
+            if (!(0, _glsp_sprotty_1.isCtrlOrCmd)(event)) {
+                result.push(_glsp_sprotty_1.EnableDefaultToolsAction.create());
             }
         }
         return result;
     }
     mouseOver(target, event) {
-        const currentContainer = (0, sprotty_1.findParentByFeature)(target, model_1.isContainable);
+        const currentContainer = (0, _glsp_sprotty_1.findParentByFeature)(target, model_1.isContainable);
         if (!this.container || currentContainer !== this.container) {
             this.container = currentContainer;
             const feedback = this.creationAllowed(this.elementTypeId)
                 ? (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.NODE_CREATION)
                 : (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.OPERATION_NOT_ALLOWED);
-            this.tool.dispatchFeedback([feedback]);
+            this.tool.registerFeedback([feedback]);
         }
         return [];
     }
 };
-NodeCreationToolMouseListener = __decorate([
+exports.NodeCreationToolMouseListener = NodeCreationToolMouseListener = __decorate([
     (0, inversify_1.injectable)(),
     __metadata("design:paramtypes", [Object, NodeCreationTool])
 ], NodeCreationToolMouseListener);
-exports.NodeCreationToolMouseListener = NodeCreationToolMouseListener;
 //# sourceMappingURL=node-creation-tool.js.map

package/lib/features/tools/node-creation/node-creation-tool.js.map

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

package/lib/features/validation/di.config.d.ts

@@ -1,3 +1,18 @@
+/********************************************************************************
+ * 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
+ * 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 { ContainerModule } from 'inversify';
 export declare const validationModule: ContainerModule;
 export declare const markerNavigatorModule: ContainerModule;

package/lib/features/validation/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAc5C,eAAO,MAAM,gBAAgB,iBAM3B,CAAC;AAEH,eAAO,MAAM,qBAAqB,iBAIhC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,iBAG3C,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAa5C,eAAO,MAAM,gBAAgB,iBAM3B,CAAC;AAEH,eAAO,MAAM,qBAAqB,iBAIhC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,iBAG3C,CAAC"}

package/lib/features/validation/di.config.js

@@ -16,23 +16,21 @@ exports.markerNavigatorContextMenuModule = exports.markerNavigatorModule = expor
  *
  * 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 _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const marker_navigator_1 = require("./marker-navigator");
 const validate_1 = require("./validate");
 exports.validationModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
-    (0, sprotty_1.configureActionHandler)(context, protocol_1.SetMarkersAction.KIND, validate_1.SetMarkersActionHandler);
-    (0, sprotty_1.configureCommand)(context, validate_1.ApplyMarkersCommand);
-    (0, sprotty_1.configureCommand)(context, validate_1.DeleteMarkersCommand);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetMarkersAction.KIND, validate_1.SetMarkersActionHandler);
+    (0, _glsp_sprotty_1.configureCommand)(context, validate_1.ApplyMarkersCommand);
+    (0, _glsp_sprotty_1.configureCommand)(context, validate_1.DeleteMarkersCommand);
     bind(validate_1.ValidationFeedbackEmitter).toSelf().inSingletonScope();
 });
 exports.markerNavigatorModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
     bind(marker_navigator_1.SModelElementComparator).to(marker_navigator_1.LeftToRightTopToBottomComparator).inSingletonScope();
     bind(marker_navigator_1.MarkerNavigator).toSelf().inSingletonScope();
-    (0, sprotty_1.configureActionHandler)({ bind, isBound }, marker_navigator_1.NavigateToMarkerAction.KIND, marker_navigator_1.NavigateToMarkerActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)({ bind, isBound }, marker_navigator_1.NavigateToMarkerAction.KIND, marker_navigator_1.NavigateToMarkerActionHandler);
 });
 /**
  * This module is not required if the diagram is deployed in Theia but only intended to be used
@@ -40,7 +38,7 @@ exports.markerNavigatorModule = new inversify_1.ContainerModule((bind, _unbind,
  * `registerMarkerNavigationCommands()` in `glsp-theia-integration` instead.
  */
 exports.markerNavigatorContextMenuModule = new inversify_1.ContainerModule(bind => {
-    (0, protocol_1.bindAsService)(bind, types_1.TYPES.IContextMenuProvider, marker_navigator_1.MarkerNavigatorContextMenuItemProvider);
-    (0, protocol_1.bindAsService)(bind, types_1.TYPES.KeyListener, marker_navigator_1.MarkerNavigatorKeyListener);
+    (0, _glsp_sprotty_1.bindAsService)(bind, _glsp_sprotty_1.TYPES.IContextMenuProvider, marker_navigator_1.MarkerNavigatorContextMenuItemProvider);
+    (0, _glsp_sprotty_1.bindAsService)(bind, _glsp_sprotty_1.TYPES.KeyListener, marker_navigator_1.MarkerNavigatorKeyListener);
 });
 //# sourceMappingURL=di.config.js.map

package/lib/features/validation/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAyE;AACzE,yCAA4C;AAC5C,qCAAmE;AACnE,4CAAyC;AACzC,yDAQ4B;AAC5B,yCAA2H;AAE9G,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3E,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,gCAAsB,EAAC,OAAO,EAAE,2BAAgB,CAAC,IAAI,EAAE,kCAAuB,CAAC,CAAC;IAChF,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAmB,CAAC,CAAC;IAC/C,IAAA,0BAAgB,EAAC,OAAO,EAAE,+BAAoB,CAAC,CAAC;IAChD,IAAI,CAAC,oCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,0CAAuB,CAAC,CAAC,EAAE,CAAC,mDAAgC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,yCAAsB,CAAC,IAAI,EAAE,gDAA6B,CAAC,CAAC;AAC1G,CAAC,CAAC,CAAC;AAEH;;;;GAIG;AACU,QAAA,gCAAgC,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACvE,IAAA,wBAAa,EAAC,IAAI,EAAE,aAAK,CAAC,oBAAoB,EAAE,yDAAsC,CAAC,CAAC;IACxF,IAAA,wBAAa,EAAC,IAAI,EAAE,aAAK,CAAC,WAAW,EAAE,6CAA0B,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,iDAAiH;AACjH,yDAQ4B;AAC5B,yCAA2H;AAE9G,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3E,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,sCAAsB,EAAC,OAAO,EAAE,gCAAgB,CAAC,IAAI,EAAE,kCAAuB,CAAC,CAAC;IAChF,IAAA,gCAAgB,EAAC,OAAO,EAAE,8BAAmB,CAAC,CAAC;IAC/C,IAAA,gCAAgB,EAAC,OAAO,EAAE,+BAAoB,CAAC,CAAC;IAChD,IAAI,CAAC,oCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,0CAAuB,CAAC,CAAC,EAAE,CAAC,mDAAgC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,IAAA,sCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,yCAAsB,CAAC,IAAI,EAAE,gDAA6B,CAAC,CAAC;AAC1G,CAAC,CAAC,CAAC;AAEH;;;;GAIG;AACU,QAAA,gCAAgC,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACvE,IAAA,6BAAa,EAAC,IAAI,EAAE,qBAAK,CAAC,oBAAoB,EAAE,yDAAsC,CAAC,CAAC;IACxF,IAAA,6BAAa,EAAC,IAAI,EAAE,qBAAK,CAAC,WAAW,EAAE,6CAA0B,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC"}

package/lib/features/validation/issue-marker.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Bounds, Marker } from '@eclipse-glsp/protocol';
-import { Projectable, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
+import { Bounds, Marker, Projectable, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from '../../glsp-sprotty/index';
 export declare class GIssueMarker extends SIssueMarker implements Projectable {
     constructor();
     projectionCssClasses: string[];

package/lib/features/validation/issue-marker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAiB,WAAW,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAExH,qBAAa,YAAa,SAAQ,YAAa,YAAW,WAAW;;IAKjE,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,IAAI,SAAY;IAEzB,2BAA2B,IAAI,IAAI;CAItC;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,CAclF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAUtF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,MAAM,CAmB5E;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}
+{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAEN,WAAW,EAEX,MAAM,EACN,YAAY,EACZ,cAAc,EACd,cAAc,EAEjB,MAAM,eAAe,CAAC;AAEvB,qBAAa,YAAa,SAAQ,YAAa,YAAW,WAAW;;IAKjE,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,IAAI,SAAY;IAEzB,2BAA2B,IAAI,IAAI;CAItC;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,CAclF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAUtF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,MAAM,CAmB5E;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}

package/lib/features/validation/issue-marker.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSeverity = exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = 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
@@ -16,14 +16,13 @@ exports.getSeverity = exports.createSIssue = exports.getSIssueMarker = exports.g
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
-const sprotty_1 = require("sprotty");
-class GIssueMarker extends sprotty_1.SIssueMarker {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+class GIssueMarker extends _glsp_sprotty_1.SIssueMarker {
     constructor() {
         super();
         this.issues = [];
         this.type = 'marker';
-        this.features = new Set(sprotty_1.SDecoration.DEFAULT_FEATURES);
+        this.features = new Set(_glsp_sprotty_1.SDecoration.DEFAULT_FEATURES);
     }
     computeProjectionCssClasses() {
         const severityCss = getSeverity(this);
@@ -43,7 +42,7 @@ function getOrCreateSIssueMarker(modelElement) {
     issueMarker = getSIssueMarker(modelElement);
     if (issueMarker === undefined) {
         issueMarker = new GIssueMarker();
-        if ((0, sprotty_1.isBoundsAware)(modelElement)) {
+        if ((0, _glsp_sprotty_1.isBoundsAware)(modelElement)) {
             issueMarker.projectedBounds = modelElement.parentToLocal(modelElement.bounds);
         }
         modelElement.add(issueMarker);
@@ -74,18 +73,18 @@ exports.getSIssueMarker = getSIssueMarker;
  * @returns the created `SIssue`.
  */
 function createSIssue(marker, parent) {
-    const issue = new sprotty_1.SIssue();
+    const issue = new _glsp_sprotty_1.SIssue();
     issue.message = marker.description;
     switch (marker.kind) {
-        case protocol_1.MarkerKind.ERROR: {
+        case _glsp_sprotty_1.MarkerKind.ERROR: {
             issue.severity = 'error';
             break;
         }
-        case protocol_1.MarkerKind.INFO: {
+        case _glsp_sprotty_1.MarkerKind.INFO: {
             issue.severity = 'info';
             break;
         }
-        case protocol_1.MarkerKind.WARNING: {
+        case _glsp_sprotty_1.MarkerKind.WARNING: {
             issue.severity = 'warning';
             break;
         }

package/lib/features/validation/issue-marker.js.map

@@ -1 +1 @@
-{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoE;AACpE,qCAAwH;AAExH,MAAa,YAAa,SAAQ,sBAAY;IAC1C;QACI,KAAK,EAAE,CAAC;QAKH,WAAM,GAAa,EAAE,CAAC;QACtB,SAAI,GAAG,QAAQ,CAAC;QALrB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAS,qBAAW,CAAC,gBAAgB,CAAC,CAAC;IAClE,CAAC;IAMD,2BAA2B;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,GAAG,CAAC,eAAe,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;IAC5E,CAAC;CACJ;AAdD,oCAcC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,YAA4B;IAChE,IAAI,WAAqC,CAAC;IAE1C,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,IAAA,uBAAa,EAAC,YAAY,CAAC,EAAE;YAC7B,WAAW,CAAC,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACjF;QACD,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAdD,0DAcC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,YAA4B;IACxD,IAAI,WAAqC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;QACvC,IAAI,KAAK,YAAY,YAAY,EAAE;YAC/B,WAAW,GAAG,KAAK,CAAC;SACvB;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,MAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,gBAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IAEnC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,qBAAU,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,OAAO,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;SACT;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAnBD,oCAmBC;AAED,SAAgB,WAAW,CAAC,MAAoB;IAC5C,IAAI,eAAe,GAAmB,MAAM,CAAC;IAC7C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;QACvD,IAAI,QAAQ,KAAK,OAAO,EAAE;YACtB,OAAO,QAAQ,CAAC;SACnB;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,eAAe,KAAK,MAAM,EAAE;YACtD,eAAe,GAAG,QAAQ,CAAC;SAC9B;KACJ;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAXD,kCAWC"}
+{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAWuB;AAEvB,MAAa,YAAa,SAAQ,4BAAY;IAC1C;QACI,KAAK,EAAE,CAAC;QAKH,WAAM,GAAa,EAAE,CAAC;QACtB,SAAI,GAAG,QAAQ,CAAC;QALrB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAS,2BAAW,CAAC,gBAAgB,CAAC,CAAC;IAClE,CAAC;IAMD,2BAA2B;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,GAAG,CAAC,eAAe,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;IAC5E,CAAC;CACJ;AAdD,oCAcC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,YAA4B;IAChE,IAAI,WAAqC,CAAC;IAE1C,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,IAAA,6BAAa,EAAC,YAAY,CAAC,EAAE;YAC7B,WAAW,CAAC,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACjF;QACD,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAdD,0DAcC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,YAA4B;IACxD,IAAI,WAAqC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;QACvC,IAAI,KAAK,YAAY,YAAY,EAAE;YAC/B,WAAW,GAAG,KAAK,CAAC;SACvB;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,MAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,sBAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IAEnC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,0BAAU,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;SACT;QACD,KAAK,0BAAU,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;SACT;QACD,KAAK,0BAAU,CAAC,OAAO,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;SACT;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAnBD,oCAmBC;AAED,SAAgB,WAAW,CAAC,MAAoB;IAC5C,IAAI,eAAe,GAAmB,MAAM,CAAC;IAC7C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;QACvD,IAAI,QAAQ,KAAK,OAAO,EAAE;YACtB,OAAO,QAAQ,CAAC;SACnB;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,eAAe,KAAK,MAAM,EAAE;YACtD,eAAe,GAAG,QAAQ,CAAC;SAC9B;KACJ;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAXD,kCAWC"}

package/lib/features/validation/marker-navigator.d.ts

@@ -1,21 +1,6 @@
-/********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * 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, Point } from '@eclipse-glsp/protocol';
-import { ActionDispatcher, BoundsAware, IActionHandler, IContextMenuItemProvider, KeyListener, MenuItem, Selectable, SIssueMarker, SIssueSeverity, SModelElement, SModelRoot } from 'sprotty';
-import { SelectionService } from '../select/selection-service';
+import { Action, BoundsAware, IActionHandler, IContextMenuItemProvider, KeyListener, MenuItem, Point, SIssueMarker, SIssueSeverity, SModelElement, SModelRoot, Selectable } from '../../glsp-sprotty/index';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { SelectionService } from '../../base/selection-service';
 export interface NavigateToMarkerAction extends Action {
     kind: typeof NavigateToMarkerAction.KIND;
     direction: MarkerNavigationDirection;
@@ -57,7 +42,7 @@ export declare class NavigateToMarkerActionHandler implements IActionHandler {
     protected markerComparator: SModelElementComparator;
     protected markerNavigator: MarkerNavigator;
     protected selectionService: SelectionService;
-    protected actionDispatcher: ActionDispatcher;
+    protected actionDispatcher: GLSPActionDispatcher;
     handle(action: NavigateToMarkerAction): void;
     protected getSelectedElements(action: NavigateToMarkerAction): (SModelElement & Selectable)[];
     protected getTarget(action: NavigateToMarkerAction, selected: SModelElement[]): SIssueMarker | undefined;

package/lib/features/validation/marker-navigator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marker-navigator.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marker-navigator.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,WAAW,EAEX,cAAc,EACd,wBAAwB,EACxB,WAAW,EACX,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,cAAc,EACd,aAAa,EACb,UAAU,EAEV,UAAU,EAQb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAIhE,MAAM,WAAW,sBAAuB,SAAQ,MAAM;IAClD,IAAI,EAAE,OAAO,sBAAsB,CAAC,IAAI,CAAC;IAEzC,SAAS,EAAE,yBAAyB,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,UAAU,EAAE,cAAc,EAAE,CAAC;CAChC;AAED,MAAM,MAAM,yBAAyB,GAAG,MAAM,GAAG,UAAU,CAAC;AAE5D,yBAAiB,sBAAsB,CAAC;IAC7B,MAAM,IAAI,qBAAqB,CAAC;IAEvC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,sBAAsB,CAEhE;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE;QAC5B,SAAS,CAAC,EAAE,yBAAyB,CAAC;QACtC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC9B,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;KACjC,GAAG,sBAAsB,CAOzB;CACJ;AACD,qBAAa,uBAAuB;IAChC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM;CAG9D;AAED,uGAAuG;AACvG,qBACa,gCAAgC;IACzC,OAAO,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM;CAa5D;AAED;;;;GAIG;AACH,qBACa,eAAe;IACxB,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,EAAE,CAAgC;IAGhF,SAAS,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;IAEpD,IAAI,CACA,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,EACrC,SAAS,GAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAA8B,GACpE,YAAY,GAAG,SAAS;IAQ3B,QAAQ,CACJ,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,EACrC,SAAS,GAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAA8B,GACpE,YAAY,GAAG,SAAS;IAQ3B,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,GAAG,YAAY,EAAE;IAK9G,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM;IAS7F,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM;CAQpG;AAED,qBACa,6BAA8B,YAAW,cAAc;IAEhE,SAAS,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;IAGpD,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAG3C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAEjD,MAAM,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAY5C,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,GAAG,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE;IAO7F,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,YAAY,GAAG,SAAS;IAUxG,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO;CAG7F;AAED,qBACa,sCAAuC,YAAW,wBAAwB;IACzD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEvE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CA4BvF;AAED,qBACa,0BAA2B,SAAQ,WAAW;IAC9C,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAQ5E"}