@eclipse-glsp/client 1.1.0-next.6ec1da0.211 → 1.1.0-next.6efef44.226

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

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-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

package/lib/lib/model.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,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { SGraph, SModelElement } from 'sprotty';
+import { Bounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
+import { SEdge, SGraph, SModelElement } from 'sprotty';
 import { Containable } from '../features/hints/model';
 import { Saveable } from '../features/save/model';
 export declare class GLSPGraph extends SGraph implements Saveable, Containable {
@@ -22,4 +22,8 @@ export declare class GLSPGraph extends SGraph implements Saveable, Containable {
     dirty: boolean;
     isContainableElement(input: string | SModelElement | SModelElementSchema): boolean;
 }
+export declare class GEdge extends SEdge {
+    localToParent(point: Point | Bounds): Bounds;
+    parentToLocal(point: Point | Bounds): Bounds;
+}
 //# sourceMappingURL=model.d.ts.map

package/lib/lib/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAiB,MAAM,EAAE,aAAa,EAAmB,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,WAAW,EAAoB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAE/D,qBAAa,SAAU,SAAQ,MAAO,YAAW,QAAQ,EAAE,WAAW;IAClE,gBAAyB,gBAAgB,WAAmE;IAC5G,KAAK,UAAS;IACd,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,mBAAmB,GAAG,OAAO;CAGrF"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAiC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAmB,MAAM,SAAS,CAAC;AACvG,OAAO,EAAE,WAAW,EAAoB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAE/D,qBAAa,SAAU,SAAQ,MAAO,YAAW,QAAQ,EAAE,WAAW;IAClE,gBAAyB,gBAAgB,WAAmE;IAC5G,KAAK,UAAS;IACd,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,mBAAmB,GAAG,OAAO;CAGrF;AAED,qBAAa,KAAM,SAAQ,KAAK;IACnB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;IAe5C,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;CAcxD"}

package/lib/lib/model.js

@@ -1,6 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLSPGraph = void 0;
+exports.GEdge = exports.GLSPGraph = void 0;
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
 const sprotty_1 = require("sprotty");
 const model_1 = require("../features/hints/model");
 const model_2 = require("../features/save/model");
@@ -15,4 +31,35 @@ class GLSPGraph extends sprotty_1.SGraph {
 }
 exports.GLSPGraph = GLSPGraph;
 GLSPGraph.DEFAULT_FEATURES = [sprotty_1.viewportFeature, sprotty_1.exportFeature, model_2.saveFeature, model_1.containerFeature];
+class GEdge extends sprotty_1.SEdge {
+    localToParent(point) {
+        const bounds = (0, sprotty_1.getRouteBounds)(this.routingPoints);
+        const result = {
+            x: point.x + bounds.x,
+            y: point.y + bounds.y,
+            width: -1,
+            height: -1
+        };
+        if ((0, protocol_1.isBounds)(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+    parentToLocal(point) {
+        const bounds = (0, sprotty_1.getRouteBounds)(this.routingPoints);
+        const result = {
+            x: point.x - bounds.x,
+            y: point.y - bounds.y,
+            width: -1,
+            height: -1
+        };
+        if ((0, protocol_1.isBounds)(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+}
+exports.GEdge = GEdge;
 //# sourceMappingURL=model.js.map

package/lib/lib/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":";;;AAgBA,qCAAgF;AAChF,mDAAwE;AACxE,kDAA+D;AAE/D,MAAa,SAAU,SAAQ,gBAAM;IAArC;;QAEI,UAAK,GAAG,KAAK,CAAC;IAIlB,CAAC;IAHG,oBAAoB,CAAC,KAAmD;QACpE,OAAO,IAAI,CAAC;IAChB,CAAC;;AALL,8BAMC;AAL4B,0BAAgB,GAAG,CAAC,yBAAe,EAAE,uBAAa,EAAE,mBAAW,EAAE,wBAAgB,CAAC,CAAC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsF;AACtF,qCAAuG;AACvG,mDAAwE;AACxE,kDAA+D;AAE/D,MAAa,SAAU,SAAQ,gBAAM;IAArC;;QAEI,UAAK,GAAG,KAAK,CAAC;IAIlB,CAAC;IAHG,oBAAoB,CAAC,KAAmD;QACpE,OAAO,IAAI,CAAC;IAChB,CAAC;;AALL,8BAMC;AAL4B,0BAAgB,GAAG,CAAC,yBAAe,EAAE,uBAAa,EAAE,mBAAW,EAAE,wBAAgB,CAAC,CAAC;AAOhH,MAAa,KAAM,SAAQ,eAAK;IACnB,aAAa,CAAC,KAAqB;QACxC,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG;YACX,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,CAAC,CAAC;SACb,CAAC;QACF,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAAE;YACjB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC3B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;SAChC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,aAAa,CAAC,KAAqB;QACxC,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG;YACX,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,CAAC,CAAC;SACb,CAAC;QACF,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAAE;YACjB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC3B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;SAChC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA9BD,sBA8BC"}

package/lib/utils/html-utils.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2020 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

package/lib/utils/html-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createElementFromHTML = void 0;
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2020 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

package/lib/views/base-view-module.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureDefaultModelElements = void 0;
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * 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

package/lib/views/glsp-projection-view.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2017-2018 TypeFox and others.
+ * Copyright (c) 2017-2022 TypeFox 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

package/lib/views/glsp-projection-view.js

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * Copyright (c) 2017-2018 TypeFox and others.
+ * Copyright (c) 2017-2022 TypeFox 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

package/lib/views/index.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/lib/views/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "1.1.0-next.6ec1da0.211+6ec1da0",
+  "version": "1.1.0-next.6efef44.226+6efef44",
   "description": "A sprotty-based client for GLSP",
-  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
     "eclipse",
     "graphics",
@@ -12,15 +11,16 @@
     "glsp",
     "diagram editor"
   ],
-  "author": {
-    "name": "Eclipse GLSP"
-  },
   "homepage": "https://www.eclipse.org/glsp/",
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-client.git"
   },
-  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
+  "author": {
+    "name": "Eclipse GLSP"
+  },
   "contributors": [
     {
       "name": "Eclipse GLSP Project",
@@ -28,19 +28,13 @@
       "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
+  "main": "lib/index",
+  "types": "lib/index",
   "files": [
     "lib",
     "src",
     "css"
   ],
-  "dependencies": {
-    "@eclipse-glsp/protocol": "1.1.0-next.6ec1da0.211+6ec1da0",
-    "autocompleter": "5.1.0",
-    "sprotty": "0.13.0-next.f4445dd.342"
-  },
-  "devDependencies": {
-    "@vscode/codicons": "^0.0.25"
-  },
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf lib tsconfig.tsbuildinfo  coverage .nyc_output",
@@ -52,10 +46,16 @@
     "test:coverage": "nyc yarn test",
     "watch": "tsc -w"
   },
+  "dependencies": {
+    "@eclipse-glsp/protocol": "1.1.0-next.6efef44.226+6efef44",
+    "autocompleter": "5.1.0",
+    "sprotty": "0.13.0-next.f4445dd.342"
+  },
+  "devDependencies": {
+    "@vscode/codicons": "^0.0.25"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "main": "lib/index",
-  "types": "lib/index",
-  "gitHead": "6ec1da0e9ac292b05d1cc77790a2d063aae8f281"
+  "gitHead": "6efef44234a98cafc891ecefc015b6f6578d2f47"
 }

package/src/base/container-modules.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 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
@@ -14,6 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { remove } from '@eclipse-glsp/protocol';
 import { Container, ContainerModule } from 'inversify';
 import {
     buttonModule,
@@ -21,7 +22,6 @@ import {
     edgeIntersectionModule,
     edgeLayoutModule,
     expandModule,
-    exportModule,
     fadeModule,
     labelEditUiModule,
     modelSourceModule,
@@ -35,6 +35,7 @@ import glspContextMenuModule from '../features/context-menu/di.config';
 import { glspServerCopyPasteModule } from '../features/copy-paste/di.config';
 import glspDecorationModule from '../features/decoration/di.config';
 import glspEditLabelModule from '../features/edit-label/di.config';
+import glspExportModule from '../features/export/di.config';
 import modelHintsModule from '../features/hints/di.config';
 import glspHoverModule from '../features/hover/di.config';
 import layoutModule from '../features/layout/di.config';
@@ -56,7 +57,7 @@ export const DEFAULT_MODULES = [
     edgeIntersectionModule,
     edgeLayoutModule,
     expandModule,
-    exportModule,
+    glspExportModule,
     fadeModule,
     glspBoundsModule,
     glspCommandPaletteModule,
@@ -83,7 +84,51 @@ export const DEFAULT_MODULES = [
     enableDefaultToolsOnFocusLossModule,
     validationModule,
     zorderModule
-];
+] as const;
+
+/**
+ *  Creates a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
+ *  Default modules can be excluded using {@link ExcludeDescription}s.
+ *
+ *  This means, you can still customize the default modules in two ways.
+ *
+ * First, you can exclude default modules and add a module with your custom code.
+ *
+ * ```typescript
+ * const container = createDiagramContainer(myModule1, {exclude: modelSourceWatcherModule},myModelSourceWatcherModule );
+ * ```
+ *
+ * Second, you can unbind or rebind implementations that are originally bound in one of the default modules.
+ *
+ * ```typescript
+ * rebind(NavigationTargetResolver).to(MyNavigationTargetResolver);
+ * ```
+ *
+ * @param customModules Custom modules to be loaded in addition to the default modules and/or default modules that should be excluded.
+ * @param options Options to customize the module loading
+ * @returns The created container.
+ */
+export function createDiagramContainer(...customModules: Array<ContainerModule | ExcludeDescription>): Container {
+    const container = new Container();
+
+    const modules = [...DEFAULT_MODULES];
+    customModules.forEach(customModule => {
+        if (customModule instanceof ContainerModule) {
+            modules.push(customModule);
+        } else {
+            remove(modules, customModule.exclude);
+        }
+    });
+    container.load(...modules);
+    return container;
+}
+
+/**
+ * Can be passed to the {@link createDiagramContainer} utility function to exclude (i.e. not load) a specific default module.
+ */
+export interface ExcludeDescription {
+    exclude: ContainerModule;
+}
 
 /**
  * Creates a GLSP Client container with the GLSP default modules and the specified custom `modules`.
@@ -105,9 +150,8 @@ export const DEFAULT_MODULES = [
  * ```
  * @param modules Custom modules to be loaded in addition to the default modules.
  * @returns The created container.
+ * @deprecated Please use `createDiagramContainer` from `@eclipse-glsp/client` instead
  */
 export function createClientContainer(...modules: ContainerModule[]): Container {
-    const container = new Container();
-    container.load(...DEFAULT_MODULES, ...modules);
-    return container;
+    return createDiagramContainer(...modules);
 }

package/src/base/selection-clearing-mouse-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * 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

package/src/features/command-palette/command-palette-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2019-2021 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

package/src/features/export/di.config.ts

@@ -0,0 +1,28 @@
+/********************************************************************************
+ * Copyright (c) 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';
+import { configureCommand, ExportSvgCommand, ExportSvgKeyListener, ExportSvgPostprocessor, TYPES } from 'sprotty';
+import { GLSPSvgExporter } from './glsp-svg-exporter';
+
+const glspExportSvgModule = new ContainerModule((bind, _unbind, isBound) => {
+    bind(ExportSvgKeyListener).toSelf().inSingletonScope();
+    bind(TYPES.KeyListener).toService(ExportSvgKeyListener);
+    bind(TYPES.HiddenVNodePostprocessor).to(ExportSvgPostprocessor).inSingletonScope();
+    configureCommand({ bind, isBound }, ExportSvgCommand);
+    bind(TYPES.SvgExporter).to(GLSPSvgExporter).inSingletonScope();
+});
+
+export default glspExportSvgModule;

package/src/features/layout/tests/layouter-test-util.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 STMicroelectronics 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
@@ -30,7 +30,7 @@ import {
     SParentElement,
     TYPES
 } from 'sprotty';
-import { createClientContainer } from '../../../base/container-modules';
+import { createDiagramContainer } from '../../../base/container-modules';
 import { GLSPGraph } from '../../../lib/model';
 import { StatefulLayouterExt } from '../layouter';
 
@@ -117,6 +117,6 @@ export function layout(
 export function setupLayoutRegistry(): LayoutRegistry {
     // Generic Test setup
     // create client container that registers all default modules including the layoutModule
-    const layoutContainer = createClientContainer();
+    const layoutContainer = createDiagramContainer();
     return layoutContainer.get<LayoutRegistry>(TYPES.LayoutRegistry);
 }

package/src/features/save/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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

package/src/features/source-model-watcher/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/src/features/tool-feedback/creation-tool-feedback.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, Bounds, Point } from '@eclipse-glsp/protocol';
+import { Action, Bounds, Point, SEdgeSchema } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
     AnchorComputerRegistry,
@@ -28,7 +28,6 @@ import {
     SChildElement,
     SConnectableElement,
     SDanglingAnchor,
-    SEdge as SEdgeSchema,
     SModelElement,
     SModelRoot,
     SRoutableElement,
@@ -69,8 +68,7 @@ export class DrawFeedbackEdgeCommand extends FeedbackCommand {
     }
 
     execute(context: CommandExecutionContext): CommandReturn {
-        const feedbackEdgeSchema = this.action.edgeSchema ? this.action.edgeSchema : defaultFeedbackEdgeSchema;
-        drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, feedbackEdgeSchema);
+        drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, this.action.edgeSchema);
         return context.root;
     }
 }
@@ -195,16 +193,16 @@ export function feedbackEdgeEndId(root: SModelRoot): string {
     return root.id + '_feedback_anchor';
 }
 
-export const defaultFeedbackEdgeSchema: SEdgeSchema = {
+export const defaultFeedbackEdgeSchema: Partial<SEdgeSchema> = {
     cssClasses: ['feedback-edge'],
     opacity: 0.3
-} as SEdgeSchema;
+};
 
 export function drawFeedbackEdge(
     context: CommandExecutionContext,
     sourceId: string,
     elementTypeId: string,
-    feedbackEdgeSchema: SEdgeSchema
+    edgeTemplate?: Partial<SEdgeSchema>
 ): void {
     const root = context.root;
     const sourceChild = root.index.getById(sourceId);
@@ -221,12 +219,16 @@ export function drawFeedbackEdge(
     edgeEnd.id = feedbackEdgeEndId(root);
     edgeEnd.position = toAbsolutePosition(source);
 
-    feedbackEdgeSchema.id = feedbackEdgeId(root);
-    feedbackEdgeSchema.type = elementTypeId;
-    feedbackEdgeSchema.sourceId = source.id;
-    feedbackEdgeSchema.targetId = edgeEnd.id;
+    const edgeSchema: SEdgeSchema = {
+        id: feedbackEdgeId(root),
+        type: elementTypeId,
+        sourceId: source.id,
+        targetId: edgeEnd.id,
+        ...defaultFeedbackEdgeSchema,
+        ...edgeTemplate
+    };
 
-    const feedbackEdge = context.modelFactory.createElement(feedbackEdgeSchema);
+    const feedbackEdge = context.modelFactory.createElement(edgeSchema);
     if (isRoutable(feedbackEdge)) {
         edgeEnd.feedbackEdge = feedbackEdge;
         root.add(edgeEnd);

package/src/features/tool-feedback/edge-edit-tool-feedback.ts

@@ -32,7 +32,6 @@ import {
     PolylineEdgeRouter,
     SConnectableElement,
     SModelElement,
-    SModelRoot,
     SRoutingHandle,
     SwitchEditModeAction,
     SwitchEditModeCommand,
@@ -326,14 +325,7 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         return undefined;
     }
 
-    override mouseEnter(target: SModelElement, event: MouseEvent): Action[] {
-        if (target instanceof SModelRoot && event.buttons === 0) {
-            this.mouseUp(target, event);
-        }
-        return [];
-    }
-
-    override mouseUp(_target: SModelElement, event: MouseEvent): Action[] {
+    override mouseUp(_target: SModelElement, _event: MouseEvent): Action[] {
         this.pointPositionUpdater.resetPosition();
         return [];
     }

package/src/features/tools/di.config.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
@@ -18,7 +18,6 @@ import { ContainerModule, interfaces } from 'inversify';
 import { configureActionHandler, configureModelElement, ManhattanEdgeRouter } from 'sprotty';
 import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
 import { TYPES } from '../../base/types';
-import { GLSPSvgExporter } from '../export/glsp-svg-exporter';
 import { MARQUEE } from '../tool-feedback/marquee-tool-feedback';
 import { ChangeBoundsTool } from './change-bounds-tool';
 import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
@@ -53,9 +52,6 @@ export const toolsModule = new ContainerModule((bind, _unbind, isBound, rebind)
     configureActionHandler({ bind, isBound }, TriggerNodeCreationAction.KIND, NodeCreationTool);
     configureActionHandler({ bind, isBound }, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
 
-    bind(GLSPSvgExporter).toSelf().inSingletonScope();
-    rebind(TYPES.SvgExporter).toService(GLSPSvgExporter);
-
     bind(GSLPManhattanEdgeRouter).toSelf().inSingletonScope();
     rebind(ManhattanEdgeRouter).toService(GSLPManhattanEdgeRouter);
 });

package/src/features/validation/issue-marker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/src/lib/model.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,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { exportFeature, SGraph, SModelElement, viewportFeature } from 'sprotty';
+import { Bounds, isBounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
+import { exportFeature, getRouteBounds, SEdge, SGraph, SModelElement, viewportFeature } from 'sprotty';
 import { Containable, containerFeature } from '../features/hints/model';
 import { Saveable, saveFeature } from '../features/save/model';
 
@@ -25,3 +25,35 @@ export class GLSPGraph extends SGraph implements Saveable, Containable {
         return true;
     }
 }
+
+export class GEdge extends SEdge {
+    override localToParent(point: Point | Bounds): Bounds {
+        const bounds = getRouteBounds(this.routingPoints);
+        const result = {
+            x: point.x + bounds.x,
+            y: point.y + bounds.y,
+            width: -1,
+            height: -1
+        };
+        if (isBounds(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+
+    override parentToLocal(point: Point | Bounds): Bounds {
+        const bounds = getRouteBounds(this.routingPoints);
+        const result = {
+            x: point.x - bounds.x,
+            y: point.y - bounds.y,
+            width: -1,
+            height: -1
+        };
+        if (isBounds(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+}

package/src/utils/html-utils.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2020 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

package/src/views/base-view-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * 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

package/src/views/glsp-projection-view.tsx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2017-2018 TypeFox and others.
+ * Copyright (c) 2017-2022 TypeFox 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