@eclipse-glsp/client 1.1.0-RC09 → 1.1.0-RC10

package/lib/features/tools/enable-default-tools-on-focus-loss.js

@@ -7,8 +7,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnableDefaultToolsOnFocusLossHandler = void 0;
+/********************************************************************************
+ * Copyright (c) 2022-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 sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const focus_change_action_1 = require("../../base/actions/focus-change-action");
 /**
  * Action handler that enables the default tools when the diagram lost focus.
@@ -18,7 +33,7 @@ const focus_change_action_1 = require("../../base/actions/focus-change-action");
 let EnableDefaultToolsOnFocusLossHandler = class EnableDefaultToolsOnFocusLossHandler {
     handle(action) {
         if (focus_change_action_1.FocusStateChangedAction.is(action) && !action.hasFocus) {
-            return sprotty_1.EnableDefaultToolsAction.create();
+            return _glsp_sprotty_1.EnableDefaultToolsAction.create();
         }
     }
 };

package/lib/features/tools/enable-default-tools-on-focus-loss.js.map

@@ -1 +1 @@
-{"version":3,"file":"enable-default-tools-on-focus-loss.js","sourceRoot":"","sources":["../../../src/features/tools/enable-default-tools-on-focus-loss.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AACvC,qCAA6E;AAC7E,gFAAiF;AAEjF;;;;GAIG;AAEI,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAC7C,MAAM,CAAC,MAAc;QACjB,IAAI,6CAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxD,OAAO,kCAAwB,CAAC,MAAM,EAAE,CAAC;SAC5C;IACL,CAAC;CACJ,CAAA;AANY,oCAAoC;IADhD,IAAA,sBAAU,GAAE;GACA,oCAAoC,CAMhD;AANY,oFAAoC"}
+{"version":3,"file":"enable-default-tools-on-focus-loss.js","sourceRoot":"","sources":["../../../src/features/tools/enable-default-tools-on-focus-loss.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,iDAA2F;AAC3F,gFAAiF;AAEjF;;;;GAIG;AAEH,IAAa,oCAAoC,GAAjD,MAAa,oCAAoC;IAC7C,MAAM,CAAC,MAAc;QACjB,IAAI,6CAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxD,OAAO,wCAAwB,CAAC,MAAM,EAAE,CAAC;SAC5C;IACL,CAAC;CACJ,CAAA;AANY,oCAAoC;IADhD,IAAA,sBAAU,GAAE;GACA,oCAAoC,CAMhD;AANY,oFAAoC"}

package/lib/features/tools/glsp-manhattan-edge-router.d.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ManhattanEdgeRouter, ResolvedHandleMove, SRoutableElement } from 'sprotty';
+import { ManhattanEdgeRouter, ResolvedHandleMove, SRoutableElement } from '../../glsp-sprotty/index';
 export declare class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
     protected applyInnerHandleMoves(edge: SRoutableElement, moves: ResolvedHandleMove[]): void;
 }

package/lib/features/tools/glsp-manhattan-edge-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-manhattan-edge-router.d.ts","sourceRoot":"","sources":["../../../src/features/tools/glsp-manhattan-edge-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEpF,qBAAa,uBAAwB,SAAQ,mBAAmB;cACzC,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,IAAI;CAuCtG"}
+{"version":3,"file":"glsp-manhattan-edge-router.d.ts","sourceRoot":"","sources":["../../../src/features/tools/glsp-manhattan-edge-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,gBAAgB,EAAgB,MAAM,eAAe,CAAC;AAExG,qBAAa,uBAAwB,SAAQ,mBAAmB;cACzC,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,IAAI;CAuCtG"}

package/lib/features/tools/glsp-manhattan-edge-router.js

@@ -16,9 +16,8 @@
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPManhattanEdgeRouter = void 0;
-const protocol_1 = require("@eclipse-glsp/protocol");
-const sprotty_1 = require("sprotty");
-class GLSPManhattanEdgeRouter extends sprotty_1.ManhattanEdgeRouter {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+class GLSPManhattanEdgeRouter extends _glsp_sprotty_1.ManhattanEdgeRouter {
     applyInnerHandleMoves(edge, moves) {
         const route = this.route(edge);
         const routingPoints = edge.routingPoints;
@@ -35,7 +34,7 @@ class GLSPManhattanEdgeRouter extends sprotty_1.ManhattanEdgeRouter {
                             routingPoints.push({ x: correctedX, y: correctedY });
                             move.handle.pointIndex = 0;
                         }
-                        else if ((0, protocol_1.almostEquals)(route[0].x, route[1].x)) {
+                        else if ((0, _glsp_sprotty_1.almostEquals)(route[0].x, route[1].x)) {
                             this.alignX(routingPoints, 0, correctedX);
                         }
                         else {
@@ -43,7 +42,7 @@ class GLSPManhattanEdgeRouter extends sprotty_1.ManhattanEdgeRouter {
                         }
                     }
                     else if (index < routingPoints.length - 1) {
-                        if ((0, protocol_1.almostEquals)(routingPoints[index].x, routingPoints[index + 1].x)) {
+                        if ((0, _glsp_sprotty_1.almostEquals)(routingPoints[index].x, routingPoints[index + 1].x)) {
                             this.alignX(routingPoints, index, correctedX);
                             this.alignX(routingPoints, index + 1, correctedX);
                         }
@@ -53,7 +52,7 @@ class GLSPManhattanEdgeRouter extends sprotty_1.ManhattanEdgeRouter {
                         }
                     }
                     else {
-                        if ((0, protocol_1.almostEquals)(route[route.length - 2].x, route[route.length - 1].x)) {
+                        if ((0, _glsp_sprotty_1.almostEquals)(route[route.length - 2].x, route[route.length - 1].x)) {
                             this.alignX(routingPoints, routingPoints.length - 1, correctedX);
                         }
                         else {

package/lib/features/tools/glsp-manhattan-edge-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-manhattan-edge-router.js","sourceRoot":"","sources":["../../../src/features/tools/glsp-manhattan-edge-router.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAAsD;AACtD,qCAAoF;AAEpF,MAAa,uBAAwB,SAAQ,6BAAmB;IACzC,qBAAqB,CAAC,IAAsB,EAAE,KAA2B;QACxF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,MAAM,oBAAoB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC;QACxE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAChG,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAChG,QAAQ,MAAM,CAAC,IAAI,EAAE;gBACjB,KAAK,eAAe;oBAChB,IAAI,KAAK,GAAG,CAAC,EAAE;wBACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC5B,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;4BACrD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;yBAC9B;6BAAM,IAAI,IAAA,uBAAY,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;4BAC7C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;yBAC7C;6BAAM;4BACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;yBAC7C;qBACJ;yBAAM,IAAI,KAAK,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzC,IAAI,IAAA,uBAAY,EAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;4BAClE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;4BAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACrD;6BAAM;4BACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;4BAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACrD;qBACJ;yBAAM;wBACH,IAAI,IAAA,uBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;4BACpE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACpE;6BAAM;4BACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACpE;qBACJ;oBACD,MAAM;aACb;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxCD,0DAwCC"}
+{"version":3,"file":"glsp-manhattan-edge-router.js","sourceRoot":"","sources":["../../../src/features/tools/glsp-manhattan-edge-router.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,iDAAwG;AAExG,MAAa,uBAAwB,SAAQ,mCAAmB;IACzC,qBAAqB,CAAC,IAAsB,EAAE,KAA2B;QACxF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,MAAM,oBAAoB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC;QACxE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAChG,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAChG,QAAQ,MAAM,CAAC,IAAI,EAAE;gBACjB,KAAK,eAAe;oBAChB,IAAI,KAAK,GAAG,CAAC,EAAE;wBACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC5B,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;4BACrD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;yBAC9B;6BAAM,IAAI,IAAA,4BAAY,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;4BAC7C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;yBAC7C;6BAAM;4BACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;yBAC7C;qBACJ;yBAAM,IAAI,KAAK,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzC,IAAI,IAAA,4BAAY,EAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;4BAClE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;4BAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACrD;6BAAM;4BACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;4BAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACrD;qBACJ;yBAAM;wBACH,IAAI,IAAA,4BAAY,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;4BACpE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACpE;6BAAM;4BACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yBACpE;qBACJ;oBACD,MAAM;aACb;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxCD,0DAwCC"}

package/lib/features/tools/marquee-behavior.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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Bounds, Point } from '@eclipse-glsp/protocol';
+import { Bounds, Point } from '../../glsp-sprotty/index';
 import { DrawMarqueeAction } from '../tool-feedback/marquee-tool-feedback';
 export interface IMarqueeBehavior {
     readonly entireElement: boolean;

package/lib/features/tools/marquee-behavior.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marquee-behavior.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-behavior.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAChC;AAED,qBAAa,WAAW;IACpB,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC;IAC5B,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC;IAC9B,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;gBAEhC,eAAe,CAAC,EAAE,gBAAgB;IAQ9C,gBAAgB,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAIvC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAIzC,iBAAiB,IAAI,iBAAiB;IAItC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IAc9C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO;IAItC,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;IAY5C,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,SAAS;CAGpB"}
+{"version":3,"file":"marquee-behavior.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-behavior.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAoB,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAChC;AAED,qBAAa,WAAW;IACpB,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC;IAC5B,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC;IAC9B,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;gBAEhC,eAAe,CAAC,EAAE,gBAAgB;IAQ9C,gBAAgB,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAIvC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAIzC,iBAAiB,IAAI,iBAAiB;IAItC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IAc9C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO;IAItC,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;IAY5C,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,SAAS;CAGpB"}

package/lib/features/tools/marquee-behavior.js

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * 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
@@ -16,7 +16,7 @@
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarqueeUtil = void 0;
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const marquee_tool_feedback_1 = require("../tool-feedback/marquee-tool-feedback");
 class MarqueeUtil {
     constructor(marqueeBehavior) {
@@ -78,7 +78,7 @@ class MarqueeUtil {
         return false;
     }
     isLineMarked(point1, point2) {
-        const line = new sprotty_1.PointToPointLine(point1, point2);
+        const line = new _glsp_sprotty_1.PointToPointLine(point1, point2);
         return (this.pointInRect(point1) ||
             this.pointInRect(point2) ||
             this.lineIntersect(line, this.startPoint, { x: this.startPoint.x, y: this.currentPoint.y }) ||
@@ -87,7 +87,7 @@ class MarqueeUtil {
             this.lineIntersect(line, { x: this.startPoint.x, y: this.currentPoint.y }, this.currentPoint));
     }
     lineIntersect(line, p1, p2) {
-        return line.intersection(new sprotty_1.PointToPointLine(p1, p2)) !== undefined;
+        return line.intersection(new _glsp_sprotty_1.PointToPointLine(p1, p2)) !== undefined;
     }
     pointInRect(point) {
         const boolX = this.startPoint.x <= this.currentPoint.x

package/lib/features/tools/marquee-behavior.js.map

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

package/lib/features/tools/marquee-mouse-tool.d.ts

@@ -1,21 +1,4 @@
-/********************************************************************************
- * Copyright (c) 2021-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 } from '@eclipse-glsp/protocol';
-import { BoundsAware, KeyListener, SModelElement, SModelRoot } from 'sprotty';
-import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
+import { Action, BoundsAware, DOMHelper, KeyListener, SModelElement, SModelRoot } from '../../glsp-sprotty/index';
 import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
 import { BaseGLSPTool } from './base-glsp-tool';
 import { IMarqueeBehavior, MarqueeUtil } from './marquee-behavior';

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

@@ -1 +1 @@
-{"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EACH,WAAW,EAIX,WAAW,EAEX,aAAa,EACb,UAAU,EAEb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAK9E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnE,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IACZ,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAExF,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACjD,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,GAAG,SAAS;IAqBxF,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQpE,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;CAS7C;AAED,qBACa,gBAAiB,SAAQ,WAAW;IACpC,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMzE"}
+{"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,WAAW,EACX,SAAS,EAET,WAAW,EAEX,aAAa,EACb,UAAU,EAMb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnE,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IACZ,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAExF,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACjD,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,GAAG,SAAS;IAqBxF,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQpE,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;CAS7C;AAED,qBACa,gBAAiB,SAAQ,WAAW;IACpC,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMzE"}

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

@@ -12,7 +12,7 @@ var MarqueeMouseTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShiftKeyListener = exports.MarqueeMouseListener = exports.MarqueeMouseTool = 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
@@ -26,12 +26,9 @@ exports.ShiftKeyListener = exports.MarqueeMouseListener = exports.MarqueeMouseTo
  *
  * 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 dom_helper_1 = require("sprotty/lib/base/views/dom-helper");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const drag_aware_mouse_listener_1 = require("../../base/drag-aware-mouse-listener");
-const types_1 = require("../../base/types");
 const viewpoint_util_1 = require("../../utils/viewpoint-util");
 const css_feedback_1 = require("../tool-feedback/css-feedback");
 const marquee_tool_feedback_1 = require("../tool-feedback/marquee-tool-feedback");
@@ -59,11 +56,11 @@ let MarqueeMouseTool = MarqueeMouseTool_1 = class MarqueeMouseTool extends base_
 };
 MarqueeMouseTool.ID = 'glsp.marquee-mouse-tool';
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.DOMHelper),
-    __metadata("design:type", dom_helper_1.DOMHelper)
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.DOMHelper),
+    __metadata("design:type", _glsp_sprotty_1.DOMHelper)
 ], MarqueeMouseTool.prototype, "domHelper", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IMarqueeBehavior),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IMarqueeBehavior),
     (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], MarqueeMouseTool.prototype, "marqueeBehavior", void 0);
@@ -80,12 +77,12 @@ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
         this.nodes = Array.from(root.index
             .all()
             .map(e => e)
-            .filter(e => (0, sprotty_1.isSelectable)(e))
-            .filter(e => e instanceof sprotty_1.SNode));
+            .filter(e => (0, _glsp_sprotty_1.isSelectable)(e))
+            .filter(e => e instanceof _glsp_sprotty_1.SNode));
         const sEdges = Array.from(root.index
             .all()
-            .filter(e => e instanceof sprotty_1.SEdge)
-            .filter(e => (0, sprotty_1.isSelectable)(e))
+            .filter(e => e instanceof _glsp_sprotty_1.SEdge)
+            .filter(e => (0, _glsp_sprotty_1.isSelectable)(e))
             .map(e => e.id));
         this.edges = Array.from(document.querySelectorAll('g')).filter(e => sEdges.includes(this.domHelper.findSModelIdByDOMElement(e)));
     }
@@ -96,7 +93,7 @@ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
             this.previouslySelected = Array.from(target.root.index
                 .all()
                 .map(e => e)
-                .filter(e => (0, sprotty_1.isSelected)(e))
+                .filter(e => (0, _glsp_sprotty_1.isSelected)(e))
                 .map(e => e.id));
         }
         return [];
@@ -108,8 +105,8 @@ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
             const edgeIdsSelected = this.edges.filter(e => this.isEdgeMarked(e)).map(e => this.domHelper.findSModelIdByDOMElement(e));
             const selected = nodeIdsSelected.concat(edgeIdsSelected);
             return [
-                protocol_1.SelectAction.create({ deselectedElementsIDs: Array.from(target.root.index.all().map(e => e.id)) }),
-                protocol_1.SelectAction.create({ selectedElementsIDs: selected.concat(this.previouslySelected) }),
+                _glsp_sprotty_1.SelectAction.create({ deselectedElementsIDs: Array.from(target.root.index.all().map(e => e.id)) }),
+                _glsp_sprotty_1.SelectAction.create({ selectedElementsIDs: selected.concat(this.previouslySelected) }),
                 this.marqueeUtil.drawMarqueeAction()
             ];
         }
@@ -120,7 +117,7 @@ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
         if (event.shiftKey) {
             return [marquee_tool_feedback_1.RemoveMarqueeAction.create()];
         }
-        return [marquee_tool_feedback_1.RemoveMarqueeAction.create(), sprotty_1.EnableDefaultToolsAction.create()];
+        return [marquee_tool_feedback_1.RemoveMarqueeAction.create(), _glsp_sprotty_1.EnableDefaultToolsAction.create()];
     }
     isEdgeMarked(element) {
         if (!element.getAttribute('transform')) {
@@ -133,12 +130,12 @@ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
     }
 }
 exports.MarqueeMouseListener = MarqueeMouseListener;
-let ShiftKeyListener = class ShiftKeyListener extends sprotty_1.KeyListener {
+let ShiftKeyListener = class ShiftKeyListener extends _glsp_sprotty_1.KeyListener {
     keyUp(element, event) {
         if (event.shiftKey) {
             return [];
         }
-        return [marquee_tool_feedback_1.RemoveMarqueeAction.create(), sprotty_1.EnableDefaultToolsAction.create()];
+        return [marquee_tool_feedback_1.RemoveMarqueeAction.create(), _glsp_sprotty_1.EnableDefaultToolsAction.create()];
     }
 };
 ShiftKeyListener = __decorate([

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

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

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

@@ -1,20 +1,4 @@
-/********************************************************************************
- * Copyright (c) 2021-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 } from '@eclipse-glsp/protocol';
-import { KeyListener, KeyTool, SModelElement } from 'sprotty';
+import { Action, KeyListener, KeyTool, SModelElement } from '../../glsp-sprotty/index';
 import { BaseGLSPTool } from '../tools/base-glsp-tool';
 export declare class MarqueeTool extends BaseGLSPTool {
     static ID: string;

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

@@ -1 +1 @@
-{"version":3,"file":"marquee-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAqB,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,qBACa,WAAY,SAAQ,YAAY;IACzC,MAAM,CAAC,EAAE,SAAuB;IAEhC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAA4B;IAE3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAErD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAId,OAAO,IAAI,IAAI;CAGlB;AAED,qBACa,kBAAmB,SAAQ,WAAW;IACtC,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAM3E"}
+{"version":3,"file":"marquee-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAqB,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,qBACa,WAAY,SAAQ,YAAY;IACzC,MAAM,CAAC,EAAE,SAAuB;IAEhC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAA4B;IAE3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAErD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAId,OAAO,IAAI,IAAI;CAGlB;AAED,qBACa,kBAAmB,SAAQ,WAAW;IACtC,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAM3E"}

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

@@ -11,8 +11,23 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 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 sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const base_glsp_tool_1 = require("../tools/base-glsp-tool");
 const marquee_mouse_tool_1 = require("./marquee-mouse-tool");
 let MarqueeTool = MarqueeTool_1 = class MarqueeTool extends base_glsp_tool_1.BaseGLSPTool {
@@ -32,17 +47,17 @@ let MarqueeTool = MarqueeTool_1 = class MarqueeTool extends base_glsp_tool_1.Bas
 };
 MarqueeTool.ID = 'glsp.marquee-tool';
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.KeyTool),
-    __metadata("design:type", sprotty_1.KeyTool)
+    (0, inversify_1.inject)(_glsp_sprotty_1.KeyTool),
+    __metadata("design:type", _glsp_sprotty_1.KeyTool)
 ], MarqueeTool.prototype, "keytool", void 0);
 MarqueeTool = MarqueeTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], MarqueeTool);
 exports.MarqueeTool = MarqueeTool;
-let MarqueeKeyListener = class MarqueeKeyListener extends sprotty_1.KeyListener {
+let MarqueeKeyListener = class MarqueeKeyListener extends _glsp_sprotty_1.KeyListener {
     keyDown(element, event) {
         if (event.shiftKey) {
-            return [sprotty_1.EnableToolsAction.create([marquee_mouse_tool_1.MarqueeMouseTool.ID])];
+            return [_glsp_sprotty_1.EnableToolsAction.create([marquee_mouse_tool_1.MarqueeMouseTool.ID])];
         }
         return [];
     }

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

@@ -1 +1 @@
-{"version":3,"file":"marquee-tool.js","sourceRoot":"","sources":["../../../src/features/tools/marquee-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAgBA,yCAA+C;AAC/C,qCAAiF;AACjF,4DAAuD;AACvD,6DAAwD;AAGjD,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,6BAAY;IAAtC;;QAGO,uBAAkB,GAAuB,IAAI,kBAAkB,EAAE,CAAC;IAehF,CAAC;IAXG,IAAI,EAAE;QACF,OAAO,aAAW,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM;QACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;;AAhBM,cAAE,GAAG,mBAAmB,CAAC;AAIhC;IAAC,IAAA,kBAAM,EAAC,iBAAO,CAAC;8BAA6B,iBAAO;4CAAC;AAL5C,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAkBvB;AAlBY,kCAAW;AAqBjB,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,qBAAW;IACtC,OAAO,CAAC,OAAsB,EAAE,KAAoB;QACzD,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,OAAO,CAAC,2BAAiB,CAAC,MAAM,CAAC,CAAC,qCAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC5D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAPY,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAO9B;AAPY,gDAAkB"}
+{"version":3,"file":"marquee-tool.js","sourceRoot":"","sources":["../../../src/features/tools/marquee-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,iDAA+F;AAC/F,4DAAuD;AACvD,6DAAwD;AAGxD,IAAa,WAAW,mBAAxB,MAAa,WAAY,SAAQ,6BAAY;IAA7C;;QAGc,uBAAkB,GAAuB,IAAI,kBAAkB,EAAE,CAAC;IAehF,CAAC;IAXG,IAAI,EAAE;QACF,OAAO,aAAW,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM;QACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;;AAhBM,cAAE,GAAG,mBAAmB,AAAtB,CAAuB;AAII;IAAnC,IAAA,kBAAM,EAAC,uBAAO,CAAC;8BAA6B,uBAAO;4CAAC;AAL5C,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAkBvB;AAlBY,kCAAW;AAqBxB,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,2BAAW;IACtC,OAAO,CAAC,OAAsB,EAAE,KAAoB;QACzD,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;AAPY,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAO9B;AAPY,gDAAkB"}

package/lib/features/tools/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/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/tools/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAiB,eAAe,EAAE,MAAM,SAAS,CAAC;AAEzD,qBAAa,WAAY,SAAQ,eAAe;IAC5C,gBAAyB,gBAAgB,WAAmB;IAC5D,UAAU,EAAE,KAAK,CAAC;IAClB,QAAQ,EAAE,KAAK,CAAC;CACnB"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/tools/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/features/tools/model.js

@@ -1,9 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarqueeNode = void 0;
-const sprotty_1 = require("sprotty");
-class MarqueeNode extends sprotty_1.RectangularNode {
+/********************************************************************************
+ * 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 _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+class MarqueeNode extends _glsp_sprotty_1.RectangularNode {
 }
+MarqueeNode.DEFAULT_FEATURES = [_glsp_sprotty_1.boundsFeature];
 exports.MarqueeNode = MarqueeNode;
-MarqueeNode.DEFAULT_FEATURES = [sprotty_1.boundsFeature];
 //# sourceMappingURL=model.js.map

package/lib/features/tools/model.js.map

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

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

@@ -1,20 +1,4 @@
-/********************************************************************************
- * 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, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
-import { IActionHandler, ISnapper, SModelElement } from 'sprotty';
+import { Action, IActionHandler, ISnapper, SModelElement, TriggerNodeCreationAction } from '../../glsp-sprotty/index';
 import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
 import { Containable } from '../hints/model';
 import { BaseGLSPTool } from './base-glsp-tool';

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

@@ -1 +1 @@
-{"version":3,"file":"node-creation-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/node-creation-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAuB,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEhG,OAAO,EAIH,cAAc,EAEd,QAAQ,EACR,aAAa,EAGhB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBACa,gBAAiB,SAAQ,YAAa,YAAW,cAAc;IACxE,MAAM,CAAC,EAAE,SAAsB;IAEK,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEhE,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;IACnE,SAAS,CAAC,aAAa,EAAE,yBAAyB,CAAC;IAEnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IASd,OAAO,IAAI,IAAI;IAKf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAMxC;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"}
+{"version":3,"file":"node-creation-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/node-creation-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EAIN,cAAc,EACd,QAAQ,EACR,aAAa,EAGb,yBAAyB,EAG5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBACa,gBAAiB,SAAQ,YAAa,YAAW,cAAc;IACxE,MAAM,CAAC,EAAE,SAAsB;IAEK,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEhE,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;IACnE,SAAS,CAAC,aAAa,EAAE,yBAAyB,CAAC;IAEnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IASd,OAAO,IAAI,IAAI;IAKf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAMxC;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

@@ -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,9 +26,8 @@ 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 _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 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");
@@ -51,15 +50,15 @@ let NodeCreationTool = NodeCreationTool_1 = class NodeCreationTool extends base_
         this.deregisterFeedback([(0, css_feedback_1.cursorFeedbackAction)()]);
     }
     handle(action) {
-        if (protocol_1.TriggerNodeCreationAction.is(action)) {
+        if (_glsp_sprotty_1.TriggerNodeCreationAction.is(action)) {
             this.triggerAction = action;
-            return sprotty_1.EnableToolsAction.create([this.id]);
+            return _glsp_sprotty_1.EnableToolsAction.create([this.id]);
         }
     }
 };
 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);
@@ -86,19 +85,19 @@ 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)

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

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