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

package/lib/features/tools/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/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/features/tools/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAqE;AAGrE,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,6BAAmB;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;AAlBY,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAkBvB;AAlBY,kCAAW"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/features/tools/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/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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.markerNavigatorContextMenuModule = exports.markerNavigatorModule = exports.validationModule = 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,31 +16,29 @@ 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
  * in a standalone deployment of GLSP. If the GLSP diagram is in Theia use the Theia-native
  * `registerMarkerNavigationCommands()` in `glsp-theia-integration` instead.
  */
-exports.markerNavigatorContextMenuModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
-    bind(types_1.TYPES.IContextMenuProvider).to(marker_navigator_1.MarkerNavigatorContextMenuItemProvider).inSingletonScope();
-    bind(types_1.TYPES.KeyListener).to(marker_navigator_1.MarkerNavigatorKeyListener).inSingletonScope();
+exports.markerNavigatorContextMenuModule = new inversify_1.ContainerModule(bind => {
+    (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,qDAA0D;AAC1D,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,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3F,IAAI,CAAC,aAAK,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,yDAAsC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/F,IAAI,CAAC,aAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,6CAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC9E,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-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
@@ -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-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
@@ -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,5 @@
-/********************************************************************************
- * 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, ActionDispatcher, BoundsAware, IActionHandler, IContextMenuItemProvider, KeyListener, MenuItem, Point, SIssueMarker, SIssueSeverity, SModelElement, SModelRoot, Selectable } from '../../glsp-sprotty/index';
+import { SelectionService } from '../../base/selection-service';
 export interface NavigateToMarkerAction extends Action {
     kind: typeof NavigateToMarkerAction.KIND;
     direction: MarkerNavigationDirection;

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":"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"}

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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvider = exports.NavigateToMarkerActionHandler = exports.MarkerNavigator = exports.LeftToRightTopToBottomComparator = exports.SModelElementComparator = exports.NavigateToMarkerAction = 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,26 +25,23 @@ exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvi
  *
  * 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 keyboard_1 = require("sprotty/lib/utils/keyboard");
-const types_1 = require("../../base/types");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const selection_service_1 = require("../../base/selection-service");
 const marker_1 = require("../../utils/marker");
 const smodel_util_1 = require("../../utils/smodel-util");
-const selection_service_1 = require("../select/selection-service");
 var NavigateToMarkerAction;
 (function (NavigateToMarkerAction) {
     NavigateToMarkerAction.KIND = 'navigateToMarker';
     function is(object) {
-        return protocol_1.Action.hasKind(object, NavigateToMarkerAction.KIND) && (0, protocol_1.hasStringProp)(object, 'direction') && (0, protocol_1.hasArrayProp)(object, 'severities');
+        return _glsp_sprotty_1.Action.hasKind(object, NavigateToMarkerAction.KIND) && (0, _glsp_sprotty_1.hasStringProp)(object, 'direction') && (0, _glsp_sprotty_1.hasArrayProp)(object, 'severities');
     }
     NavigateToMarkerAction.is = is;
     function create(options) {
         return Object.assign({ kind: NavigateToMarkerAction.KIND, direction: 'next', severities: MarkerNavigator.ALL_SEVERITIES }, options);
     }
     NavigateToMarkerAction.create = create;
-})(NavigateToMarkerAction = exports.NavigateToMarkerAction || (exports.NavigateToMarkerAction = {}));
+})(NavigateToMarkerAction || (exports.NavigateToMarkerAction = NavigateToMarkerAction = {}));
 class SModelElementComparator {
     compare(_one, _other) {
         return 0;
@@ -52,10 +49,10 @@ class SModelElementComparator {
 }
 exports.SModelElementComparator = SModelElementComparator;
 /** Specifies the order of two selectable and bounds-aware elements left-to-right and top-to-bottom. */
-let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
+let LeftToRightTopToBottomComparator = exports.LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
     compare(one, other) {
-        const boundsOne = (0, sprotty_1.findParentByFeature)(one, smodel_util_1.isSelectableAndBoundsAware);
-        const boundsOther = (0, sprotty_1.findParentByFeature)(other, smodel_util_1.isSelectableAndBoundsAware);
+        const boundsOne = (0, _glsp_sprotty_1.findParentByFeature)(one, smodel_util_1.isSelectableAndBoundsAware);
+        const boundsOther = (0, _glsp_sprotty_1.findParentByFeature)(other, smodel_util_1.isSelectableAndBoundsAware);
         if (boundsOne && boundsOther) {
             if (boundsOne.bounds.y !== boundsOther.bounds.y) {
                 return boundsOne.bounds.y - boundsOther.bounds.y;
@@ -67,16 +64,15 @@ let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
         return 0;
     }
 };
-LeftToRightTopToBottomComparator = __decorate([
+exports.LeftToRightTopToBottomComparator = LeftToRightTopToBottomComparator = __decorate([
     (0, inversify_1.injectable)()
 ], LeftToRightTopToBottomComparator);
-exports.LeftToRightTopToBottomComparator = LeftToRightTopToBottomComparator;
 /**
  * Specifies the next/previous marker in a graph model.
  *
  * This navigator uses a `MarkerComparator` to determine the order of markers. It can also return next/previous
  */
-let MarkerNavigator = class MarkerNavigator {
+let MarkerNavigator = exports.MarkerNavigator = class MarkerNavigator {
     next(root, current, predicate = marker_1.MarkerPredicates.ALL) {
         const markers = this.getMarkers(root, predicate);
         if (current === undefined) {
@@ -117,30 +113,29 @@ __decorate([
     (0, inversify_1.inject)(SModelElementComparator),
     __metadata("design:type", SModelElementComparator)
 ], MarkerNavigator.prototype, "markerComparator", void 0);
-MarkerNavigator = __decorate([
+exports.MarkerNavigator = MarkerNavigator = __decorate([
     (0, inversify_1.injectable)()
 ], MarkerNavigator);
-exports.MarkerNavigator = MarkerNavigator;
-let NavigateToMarkerActionHandler = class NavigateToMarkerActionHandler {
+let NavigateToMarkerActionHandler = exports.NavigateToMarkerActionHandler = class NavigateToMarkerActionHandler {
     handle(action) {
         const selected = this.getSelectedElements(action);
         const target = this.getTarget(action, selected);
-        const selectableTarget = target ? (0, sprotty_1.findParentByFeature)(target, sprotty_1.isSelectable) : undefined;
+        const selectableTarget = target ? (0, _glsp_sprotty_1.findParentByFeature)(target, _glsp_sprotty_1.isSelectable) : undefined;
         if (selectableTarget) {
             const deselectedElementsIDs = selected.map(e => e.id).filter(id => id !== selectableTarget.id);
-            this.actionDispatcher.dispatch(protocol_1.SelectAction.create({ selectedElementsIDs: [selectableTarget.id], deselectedElementsIDs }));
-            this.actionDispatcher.dispatch(protocol_1.CenterAction.create([selectableTarget.id]));
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.SelectAction.create({ selectedElementsIDs: [selectableTarget.id], deselectedElementsIDs }));
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.CenterAction.create([selectableTarget.id]));
         }
     }
     getSelectedElements(action) {
         if (action.selectedElementIds && action.selectedElementIds.length > 0) {
-            return (0, smodel_util_1.getElements)(this.selectionService.getModelRoot().index, action.selectedElementIds, sprotty_1.isSelectable);
+            return (0, smodel_util_1.getElements)(this.selectionService.getModelRoot().index, action.selectedElementIds, _glsp_sprotty_1.isSelectable);
         }
         return this.selectionService.getSelectedElements();
     }
     getTarget(action, selected) {
         const root = this.selectionService.getModelRoot();
-        const target = selected.sort(this.markerComparator.compare).find(sprotty_1.isBoundsAware);
+        const target = selected.sort(this.markerComparator.compare).find(_glsp_sprotty_1.isBoundsAware);
         if (action.direction === 'previous') {
             return this.markerNavigator.previous(root, target, marker => this.matchesSeverities(action, marker));
         }
@@ -161,18 +156,17 @@ __decorate([
     __metadata("design:type", MarkerNavigator)
 ], NavigateToMarkerActionHandler.prototype, "markerNavigator", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.SelectionService),
+    (0, inversify_1.inject)(selection_service_1.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], NavigateToMarkerActionHandler.prototype, "selectionService", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
-    __metadata("design:type", sprotty_1.ActionDispatcher)
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
+    __metadata("design:type", _glsp_sprotty_1.ActionDispatcher)
 ], NavigateToMarkerActionHandler.prototype, "actionDispatcher", void 0);
-NavigateToMarkerActionHandler = __decorate([
+exports.NavigateToMarkerActionHandler = NavigateToMarkerActionHandler = __decorate([
     (0, inversify_1.injectable)()
 ], NavigateToMarkerActionHandler);
-exports.NavigateToMarkerActionHandler = NavigateToMarkerActionHandler;
-let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuItemProvider {
+let MarkerNavigatorContextMenuItemProvider = exports.MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuItemProvider {
     getItems(root, lastMousePosition) {
         const selectedElementIds = Array.from(this.selectionService.getSelectedElementIDs());
         const hasMarkers = (0, marker_1.collectIssueMarkers)(root).length > 0;
@@ -203,26 +197,24 @@ let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuIte
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.SelectionService),
+    (0, inversify_1.inject)(selection_service_1.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], MarkerNavigatorContextMenuItemProvider.prototype, "selectionService", void 0);
-MarkerNavigatorContextMenuItemProvider = __decorate([
+exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider = __decorate([
     (0, inversify_1.injectable)()
 ], MarkerNavigatorContextMenuItemProvider);
-exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider;
-let MarkerNavigatorKeyListener = class MarkerNavigatorKeyListener extends sprotty_1.KeyListener {
+let MarkerNavigatorKeyListener = exports.MarkerNavigatorKeyListener = class MarkerNavigatorKeyListener extends _glsp_sprotty_1.KeyListener {
     keyDown(_element, event) {
-        if ((0, keyboard_1.matchesKeystroke)(event, 'Period', 'ctrl')) {
+        if ((0, _glsp_sprotty_1.matchesKeystroke)(event, 'Period', 'ctrl')) {
             return [NavigateToMarkerAction.create({ direction: 'next' })];
         }
-        else if ((0, keyboard_1.matchesKeystroke)(event, 'Comma', 'ctrl')) {
+        else if ((0, _glsp_sprotty_1.matchesKeystroke)(event, 'Comma', 'ctrl')) {
             return [NavigateToMarkerAction.create({ direction: 'previous' })];
         }
         return [];
     }
 };
-MarkerNavigatorKeyListener = __decorate([
+exports.MarkerNavigatorKeyListener = MarkerNavigatorKeyListener = __decorate([
     (0, inversify_1.injectable)()
 ], MarkerNavigatorKeyListener);
-exports.MarkerNavigatorKeyListener = MarkerNavigatorKeyListener;
 //# sourceMappingURL=marker-navigator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"marker-navigator.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marker-navigator.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"marker-navigator.spec.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"AAmBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}
+{"version":3,"file":"marker-navigator.spec.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"AAiBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}

package/lib/features/validation/marker-navigator.spec.js

@@ -1,21 +1,34 @@
 "use strict";
 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");
 require("mocha");
 require("reflect-metadata");
-const sprotty_1 = require("sprotty");
-const di_config_1 = require("sprotty/lib/base/di.config");
-const sgraph_factory_1 = require("sprotty/lib/graph/sgraph-factory");
-const di_config_2 = require("./di.config");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const di_config_1 = require("./di.config");
 const marker_navigator_1 = require("./marker-navigator");
 describe('MarkerNavigator', () => {
     const container = new inversify_1.Container();
-    container.load(di_config_1.default, sprotty_1.decorationModule, di_config_2.markerNavigatorModule);
+    container.load(_glsp_sprotty_1.defaultModule, _glsp_sprotty_1.decorationModule, di_config_1.markerNavigatorModule);
     // eslint-disable-next-line deprecation/deprecation
-    container.rebind(sprotty_1.TYPES.IModelFactory).to(sgraph_factory_1.SGraphFactory).inSingletonScope();
+    container.rebind(_glsp_sprotty_1.TYPES.IModelFactory).to(_glsp_sprotty_1.SGraphFactory).inSingletonScope();
     // eslint-disable-next-line deprecation/deprecation
-    const graphFactory = container.get(sprotty_1.TYPES.IModelFactory);
+    const graphFactory = container.get(_glsp_sprotty_1.TYPES.IModelFactory);
     const markerNavigator = container.get(marker_navigator_1.MarkerNavigator);
     const rootWithoutAnyMarkers = graphFactory.createRoot({
         id: 'root',
@@ -148,7 +161,7 @@ function setIssues(elem, issues) {
 }
 function getOrCreateMarker(elem) {
     const marker = findMarker(elem);
-    if (marker instanceof sprotty_1.SIssueMarker) {
+    if (marker instanceof _glsp_sprotty_1.SIssueMarker) {
         return marker;
     }
     return createMarker(elem);
@@ -157,10 +170,10 @@ function findMarker(elem) {
     return elem.children.find(isMarker);
 }
 function isMarker(element) {
-    return element instanceof sprotty_1.SIssueMarker;
+    return element instanceof _glsp_sprotty_1.SIssueMarker;
 }
 function createMarker(elem) {
-    const newMarker = new sprotty_1.SIssueMarker();
+    const newMarker = new _glsp_sprotty_1.SIssueMarker();
     newMarker.type = 'marker';
     newMarker.id = `${elem.id}_marker`;
     elem.add(newMarker);

package/lib/features/validation/marker-navigator.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"marker-navigator.spec.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marker-navigator.spec.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+BAA8B;AAC9B,yCAAsC;AACtC,iBAAe;AACf,4BAA0B;AAC1B,iDAauB;AACvB,2CAAoD;AACpD,yDAAqD;AAErD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC,6BAAa,EAAE,gCAAgB,EAAE,iCAAqB,CAAC,CAAC;IACvE,mDAAmD;IACnD,SAAS,CAAC,MAAM,CAAC,qBAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,6BAAa,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC3E,mDAAmD;IACnD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAgB,qBAAK,CAAC,aAAa,CAAC,CAAC;IACvE,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAkB,kCAAe,CAAC,CAAC;IAExE,MAAM,qBAAqB,GAAG,YAAY,CAAC,UAAU,CAAC;QAClD,EAAE,EAAE,MAAM;QACV,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE;YACN;gBACI,EAAE,EAAE,GAAG;gBACP,IAAI,EAAE,MAAM;aACA;SACnB;KACJ,CAAe,CAAC;IAEjB,MAAM,eAAe,GAAG,YAAY,CAAC,UAAU,CAAC;QAC5C,EAAE,EAAE,MAAM;QACV,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE;YACN;gBACI,EAAE,EAAE,cAAc;gBAClB,IAAI,EAAE,MAAM;aACA;YAChB;gBACI,EAAE,EAAE,WAAW;gBACf,IAAI,EAAE,MAAM;aACA;YAChB;gBACI,EAAE,EAAE,UAAU;gBACd,IAAI,EAAE,MAAM;aACA;YAChB;gBACI,EAAE,EAAE,aAAa;gBACjB,IAAI,EAAE,MAAM;aACA;SACnB;KACJ,CAAe,CAAC;IAEjB,MAAM,cAAc,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAgC,CAAC;IAClF,cAAc,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;IAClE,MAAM,eAAe,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAgC,CAAC;IACnF,eAAe,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;IACnE,MAAM,iBAAiB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAgC,CAAC;IACrF,iBAAiB,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;IACrE,MAAM,kBAAkB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAgC,CAAC;IACtF,kBAAkB,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;IAEtE,UAAU,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,CAAC,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,IAAA,aAAM,EAAC,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACjE,IAAA,aAAM,EAAC,eAAe,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC7E,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,sBAAsB;QACtB,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACjF,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACnE,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,sBAAsB;QACtB,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAC7E,IAAA,aAAM,EAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;QACvF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,sBAAsB;QACtB,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC3F,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAChE,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,sBAAsB;QACtB,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACjE,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC7E,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACtF,MAAM,OAAO,GAAG,SAAS,CAAC,kBAAkB,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC7D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACjF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACtF,MAAM,OAAO,GAAG,SAAS,CAAC,kBAAkB,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACjE,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,IAAoB;IACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,SAAS,CAAC,IAAoB,EAAE,MAAgB;IACrD,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAoB;IAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM,YAAY,4BAAY,EAAE;QAChC,OAAO,MAAM,CAAC;KACjB;IACD,OAAO,YAAY,CAAC,IAAsB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB;IACpC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,QAAQ,CAAC,OAAsB;IACpC,OAAO,OAAO,YAAY,4BAAY,CAAC;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,IAAoB;IACtC,MAAM,SAAS,GAAG,IAAI,4BAAY,EAAE,CAAC;IACrC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC;IAC1B,SAAS,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,EAAE,SAAS,CAAC;IACnC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpB,OAAO,SAAS,CAAC;AACrB,CAAC"}