@eclipse-glsp/sprotty 2.3.0-next.322 → 2.3.0-next.366

package/lib/svg-views-override.d.ts

@@ -0,0 +1,47 @@
+/********************************************************************************
+ * Copyright (c) 2024 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
+ ********************************************************************************/
+/** @jsx svg */
+import { Hoverable, Selectable } from '@eclipse-glsp/protocol';
+import { VNode } from 'snabbdom';
+import { InternalBoundsAware as BoundsAware, IViewArgs, RenderingContext, SShapeElementImpl, CircularNodeView as SprottyCircularNodeView, DiamondNodeView as SprottyDiamondNodeView } from 'sprotty';
+export declare class DiamondNodeView extends SprottyDiamondNodeView {
+    render(node: Readonly<SShapeElementImpl & Hoverable & Selectable>, context: RenderingContext, args?: IViewArgs): VNode | undefined;
+}
+export declare class CircularNodeView extends SprottyCircularNodeView {
+    render(node: Readonly<SShapeElementImpl & Hoverable & Selectable>, context: RenderingContext, args?: IViewArgs): VNode | undefined;
+}
+/**
+ * Creates a hidden rectangle with the bounds of the given element.
+ * This is typically used to fixate the size of an element and avoid size changes that may happen during rendering.
+ * Changes can happen if the resulting bounding box (BBox) of the rendered element is different form the given bounds.
+ * The created bounding rect needs to be placed within a root SVG group (g) element to take effect.
+ *
+ * @param withBounds The element to create the hidden rectangle for.
+ * @param context The rendering context. If provided, a rect is only created if the context is 'hidden'.
+ * @returns The hidden rectangle.
+ */
+export declare function hiddenBoundingRect(withBounds: BoundsAware): VNode;
+export declare function hiddenBoundingRect(withBounds: BoundsAware, context: RenderingContext): VNode | undefined;
+/**
+ * Applies a hidden bounding rectangle to the given view if we are in the hidden rendering context where sizes are being determined.
+ *
+ * @param withBounds The element to apply the hidden bounding rectangle to.
+ * @param context The rendering context.
+ * @param view The view to apply the hidden bounding rectangle to.
+ * @returns The view with the hidden bounding rectangle applied, wrapped in a group element if necessary.
+ */
+export declare function applyHiddenBoundingRect<V extends VNode | undefined>(withBounds: BoundsAware, context: RenderingContext, view: V): V;
+//# sourceMappingURL=svg-views-override.d.ts.map

package/lib/svg-views-override.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"svg-views-override.d.ts","sourceRoot":"","sources":["../src/svg-views-override.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,eAAe;AACf,OAAO,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEvE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAEH,mBAAmB,IAAI,WAAW,EAClC,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,IAAI,uBAAuB,EAC3C,eAAe,IAAI,sBAAsB,EAE5C,MAAM,SAAS,CAAC;AAEjB,qBACa,eAAgB,SAAQ,sBAAsB;IAC9C,MAAM,CACX,IAAI,EAAE,QAAQ,CAAC,iBAAiB,GAAG,SAAS,GAAG,UAAU,CAAC,EAC1D,OAAO,EAAE,gBAAgB,EACzB,IAAI,CAAC,EAAE,SAAS,GACjB,KAAK,GAAG,SAAS;CAKvB;AAED,qBACa,gBAAiB,SAAQ,uBAAuB;IAChD,MAAM,CACX,IAAI,EAAE,QAAQ,CAAC,iBAAiB,GAAG,SAAS,GAAG,UAAU,CAAC,EAC1D,OAAO,EAAE,gBAAgB,EACzB,IAAI,CAAC,EAAE,SAAS,GACjB,KAAK,GAAG,SAAS;CAKvB;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW,GAAG,KAAK,CAAC;AACnE,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS,CAAC;AAS1G;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,KAAK,GAAG,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAOnI"}

package/lib/svg-views-override.js

@@ -0,0 +1,75 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyHiddenBoundingRect = exports.hiddenBoundingRect = exports.CircularNodeView = exports.DiamondNodeView = void 0;
+/********************************************************************************
+ * Copyright (c) 2024 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
+ ********************************************************************************/
+/** @jsx svg */
+const protocol_1 = require("@eclipse-glsp/protocol");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+let DiamondNodeView = class DiamondNodeView extends sprotty_1.DiamondNodeView {
+    render(node, context, args) {
+        // The super class may change the bounds of the given node as browsers may calculate larger bounds for the rendered node (BBox).
+        // To ensure that the node's bounds remains unchanged, we render a rectangle with the correct bounds during hidden rendering.
+        return applyHiddenBoundingRect(node, context, super.render(node, context, args));
+    }
+};
+exports.DiamondNodeView = DiamondNodeView;
+exports.DiamondNodeView = DiamondNodeView = __decorate([
+    (0, inversify_1.injectable)()
+], DiamondNodeView);
+let CircularNodeView = class CircularNodeView extends sprotty_1.CircularNodeView {
+    render(node, context, args) {
+        // The super class may change the bounds of the given node as browsers may calculate larger bounds for the rendered node (BBox).
+        // To ensure that the node's bounds remains unchanged, we render a rectangle with the correct bounds during hidden rendering.
+        return applyHiddenBoundingRect(node, context, super.render(node, context, args));
+    }
+};
+exports.CircularNodeView = CircularNodeView;
+exports.CircularNodeView = CircularNodeView = __decorate([
+    (0, inversify_1.injectable)()
+], CircularNodeView);
+function hiddenBoundingRect(withBounds, context) {
+    // an element with attribute ATTR_BBOX_ELEMENT is used by the hidden bounds updater to determine the bounds if it is within a g-element
+    // we set the fill to transparent since the SVG export uses the hidden rendering to generate the image and we do not want to be seen
+    return !context || context.targetKind === 'hidden' ? ((0, sprotty_1.svg)("rect", Object.assign({ attrs: { [sprotty_1.ATTR_BBOX_ELEMENT]: true } }, protocol_1.Bounds.dimension(withBounds.bounds), { style: { fill: 'transparent' } }))) : undefined;
+}
+exports.hiddenBoundingRect = hiddenBoundingRect;
+/**
+ * Applies a hidden bounding rectangle to the given view if we are in the hidden rendering context where sizes are being determined.
+ *
+ * @param withBounds The element to apply the hidden bounding rectangle to.
+ * @param context The rendering context.
+ * @param view The view to apply the hidden bounding rectangle to.
+ * @returns The view with the hidden bounding rectangle applied, wrapped in a group element if necessary.
+ */
+function applyHiddenBoundingRect(withBounds, context, view) {
+    var _a;
+    if (view && context.targetKind === 'hidden') {
+        const parent = view.sel === 'g' ? view : (0, sprotty_1.svg)("g", null, view);
+        (_a = parent.children) === null || _a === void 0 ? void 0 : _a.unshift(hiddenBoundingRect(withBounds));
+        return parent;
+    }
+    return view;
+}
+exports.applyHiddenBoundingRect = applyHiddenBoundingRect;
+//# sourceMappingURL=svg-views-override.js.map

package/lib/svg-views-override.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"svg-views-override.js","sourceRoot":"","sources":["../src/svg-views-override.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,eAAe;AACf,qDAAuE;AACvE,yCAAuC;AAEvC,qCASiB;AAGV,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,yBAAsB;IAC9C,MAAM,CACX,IAA0D,EAC1D,OAAyB,EACzB,IAAgB;QAEhB,gIAAgI;QAChI,6HAA6H;QAC7H,OAAO,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACrF,CAAC;CACJ,CAAA;AAVY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CAU3B;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,0BAAuB;IAChD,MAAM,CACX,IAA0D,EAC1D,OAAyB,EACzB,IAAgB;QAEhB,gIAAgI;QAChI,6HAA6H;QAC7H,OAAO,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACrF,CAAC;CACJ,CAAA;AAVY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAU5B;AAcD,SAAgB,kBAAkB,CAAC,UAAuB,EAAE,OAA0B;IAClF,uIAAuI;IACvI,oIAAoI;IACpI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CACjD,2CAAM,KAAK,EAAE,EAAE,CAAC,2BAAiB,CAAC,EAAE,IAAI,EAAE,IAAM,iBAAM,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAE,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAC1H,CAAC,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC;AAND,gDAMC;AAED;;;;;;;GAOG;AACH,SAAgB,uBAAuB,CAA8B,UAAuB,EAAE,OAAyB,EAAE,IAAO;;IAC5H,IAAI,IAAI,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,8BAAI,IAAI,CAAK,CAAC;QACvD,MAAA,MAAM,CAAC,QAAQ,0CAAE,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAPD,0DAOC"}

package/lib/types.d.ts

@@ -22,7 +22,7 @@ export declare const TYPES: {
     IDiagramOptions: symbol;
     IDiagramStartup: symbol;
     IToolManager: symbol;
-    IContributionProvider: symbol;
+    Grid: symbol;
     Action: symbol;
     IActionDispatcher: symbol;
     IActionDispatcherProvider: symbol;

package/lib/types.js

@@ -25,5 +25,5 @@ const IGModelRootListener = Symbol('IGModelRootListener');
 exports.TYPES = Object.assign(Object.assign({}, sprotty_1.TYPES), { IAsyncClipboardService: Symbol('IAsyncClipboardService'), IEditorContextServiceProvider: Symbol('IEditorContextProvider'), IFeedbackActionDispatcher: Symbol('IFeedbackActionDispatcher'), IToolFactory: Symbol('Factory<Tool>'), ITypeHintProvider: Symbol('ITypeHintProvider'), IMovementRestrictor: Symbol('IMovementRestrictor'), ISelectionListener: Symbol('ISelectionListener'), 
     /** @deprecated Use {@link TYPES.IGModelRootListener} instead */
     // eslint-disable-next-line deprecation/deprecation
-    ISModelRootListener: IGModelRootListener, IGModelRootListener: IGModelRootListener, IContextMenuProvider: Symbol('IContextMenuProvider'), ICopyPasteHandler: Symbol('ICopyPasteHandler'), ITool: Symbol('ITool'), IDefaultTool: Symbol('IDefaultTool'), IEditModeListener: Symbol('IEditModeListener'), IMarqueeBehavior: Symbol('IMarqueeBehavior'), IHelperLineManager: Symbol('IHelperLineManager'), IHelperLineOptions: Symbol('IHelperLineOptions'), IElementNavigator: Symbol('IElementNavigator'), ILocalElementNavigator: Symbol('ILocalElementNavigator'), IDiagramOptions: Symbol('IDiagramOptions'), IDiagramStartup: Symbol('IDiagramStartup'), IToolManager: Symbol('IToolManager'), IContributionProvider: Symbol('IContributionProvider') });
+    ISModelRootListener: IGModelRootListener, IGModelRootListener: IGModelRootListener, IContextMenuProvider: Symbol('IContextMenuProvider'), ICopyPasteHandler: Symbol('ICopyPasteHandler'), ITool: Symbol('ITool'), IDefaultTool: Symbol('IDefaultTool'), IEditModeListener: Symbol('IEditModeListener'), IMarqueeBehavior: Symbol('IMarqueeBehavior'), IHelperLineManager: Symbol('IHelperLineManager'), IHelperLineOptions: Symbol('IHelperLineOptions'), IElementNavigator: Symbol('IElementNavigator'), ILocalElementNavigator: Symbol('ILocalElementNavigator'), IDiagramOptions: Symbol('IDiagramOptions'), IDiagramStartup: Symbol('IDiagramStartup'), IToolManager: Symbol('IToolManager'), Grid: Symbol('Grid') });
 //# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qCAAgD;AAEhD;;;GAGG;AAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAE7C,QAAA,KAAK,mCACX,eAAY,KACf,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC,EACxD,6BAA6B,EAAE,MAAM,CAAC,wBAAwB,CAAC,EAC/D,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC,EAC9D,YAAY,EAAE,MAAM,CAAC,eAAe,CAAC,EACrC,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,EAClD,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,gEAAgE;IAChE,mDAAmD;IACnD,mBAAmB,EAAE,mBAAmB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC,EACpD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,EACtB,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,EACpC,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC,EAC5C,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,EAChD,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,EAChD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC,EACxD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAC1C,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAC1C,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,EACpC,qBAAqB,EAAE,MAAM,CAAC,uBAAuB,CAAC,IACxD"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qCAAgD;AAEhD;;;GAGG;AAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAE7C,QAAA,KAAK,mCACX,eAAY,KACf,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC,EACxD,6BAA6B,EAAE,MAAM,CAAC,wBAAwB,CAAC,EAC/D,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC,EAC9D,YAAY,EAAE,MAAM,CAAC,eAAe,CAAC,EACrC,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,EAClD,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,gEAAgE;IAChE,mDAAmD;IACnD,mBAAmB,EAAE,mBAAmB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC,EACpD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,EACtB,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,EACpC,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC,EAC5C,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,EAChD,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,EAChD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAC9C,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC,EACxD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAC1C,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAC1C,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,EACpC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IACtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/sprotty",
-  "version": "2.3.0-next.322+39671a2",
+  "version": "2.3.0-next.366+b0e3022",
   "description": "Augmented reexport of the sprotty API for GLSP",
   "homepage": "https://www.eclipse.org/glsp/",
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
@@ -28,23 +28,28 @@
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf lib *.tsbuildinfo",
+    "generate:index": "glsp generateIndex src -f -s",
     "lint": "eslint --ext .ts,.tsx ./src",
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/protocol": "2.3.0-next.322+39671a2",
+    "@eclipse-glsp/protocol": "2.3.0-next.366+b0e3022",
     "autocompleter": "^9.1.0",
-    "snabbdom": "^3.5.1",
-    "sprotty": "1.0.0",
-    "sprotty-protocol": "1.0.0"
+    "snabbdom": "~3.5.1",
+    "sprotty": "1.2.0",
+    "sprotty-protocol": "1.2.0",
+    "vscode-jsonrpc": "8.2.0"
   },
   "devDependencies": {
     "@types/jsdom": "^21.1.3",
     "@vscode/codicons": "^0.0.25",
     "snabbdom-to-html": "^7.1.0"
   },
+  "peerDependencies": {
+    "inversify": "~6.0.2"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "39671a2e6b30c52428182c06d815583485eb5b1d"
+  "gitHead": "b0e3022fbd2df727a7604e530a27fa92ace29900"
 }

package/src/feature-modules.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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,35 +14,32 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable no-restricted-imports */
-
-import { FeatureModule } from '@eclipse-glsp/protocol';
+import { FeatureModule } from '@eclipse-glsp/protocol/lib/di';
+import sprottyDefaultModule from 'sprotty/lib/base/di.config';
 import sprottyButtonModule from 'sprotty/lib/features/button/di.config';
 import sprottyEdgeIntersectionModule from 'sprotty/lib/features/edge-intersection/di.config';
+import sprottyEdgeJunctionModule from 'sprotty/lib/features/edge-junction/di.config';
 import sprottyEdgeLayoutModule from 'sprotty/lib/features/edge-layout/di.config';
-import {
-    edgeEditModule as sprottyEdgeEditModule,
-    labelEditUiModule as sprottyLabelEditUiModule
-} from 'sprotty/lib/features/edit/di.config';
+import { edgeEditModule as sprottyEdgeEditModule } from 'sprotty/lib/features/edit/di.config';
 import sprottyExpandModule from 'sprotty/lib/features/expand/di.config';
 import sprottyFadeModule from 'sprotty/lib/features/fade/di.config';
 import sprottyMoveModule from 'sprotty/lib/features/move/di.config';
+import sprottyOpenModule from 'sprotty/lib/features/open/di.config';
 import sprottyUpdateModule from 'sprotty/lib/features/update/di.config';
 import sprottyZorderModule from 'sprotty/lib/features/zorder/di.config';
 import sprottyModelSourceModule from 'sprotty/lib/model-source/di.config';
-import sprottyDefaultModule from 'sprotty/lib/base/di.config';
-import sprottyOpenModule from 'sprotty/lib/features/open/di.config';
 
-export const buttonModule = new FeatureModule(sprottyButtonModule.registry);
-export const edgeEditModule = new FeatureModule(sprottyEdgeEditModule.registry);
-export const edgeIntersectionModule = new FeatureModule(sprottyEdgeIntersectionModule.registry);
-export const edgeLayoutModule = new FeatureModule(sprottyEdgeLayoutModule.registry);
-export const expandModule = new FeatureModule(sprottyExpandModule.registry);
-export const fadeModule = new FeatureModule(sprottyFadeModule.registry);
-export const labelEditUiModule = new FeatureModule(sprottyLabelEditUiModule.registry);
-export const modelSourceModule = new FeatureModule(sprottyModelSourceModule.registry);
-export const moveModule = new FeatureModule(sprottyMoveModule.registry);
-export const openModule = new FeatureModule(sprottyOpenModule.registry);
-export const updateModule = new FeatureModule(sprottyUpdateModule.registry);
-export const zorderModule = new FeatureModule(sprottyZorderModule.registry);
+export const buttonModule = new FeatureModule(sprottyButtonModule.registry, { featureId: Symbol('button') });
+export const edgeEditModule = new FeatureModule(sprottyEdgeEditModule.registry, { featureId: Symbol('edgeEdit') });
+export const edgeIntersectionModule = new FeatureModule(sprottyEdgeIntersectionModule.registry, { featureId: Symbol('edgeIntersection') });
+export const edgeLayoutModule = new FeatureModule(sprottyEdgeLayoutModule.registry, { featureId: Symbol('edgeLayout') });
+export const expandModule = new FeatureModule(sprottyExpandModule.registry, { featureId: Symbol('expand') });
+export const fadeModule = new FeatureModule(sprottyFadeModule.registry, { featureId: Symbol('fade') });
+export const modelSourceModule = new FeatureModule(sprottyModelSourceModule.registry, { featureId: Symbol('modelSource') });
+export const moveModule = new FeatureModule(sprottyMoveModule.registry, { featureId: Symbol('move') });
+export const openModule = new FeatureModule(sprottyOpenModule.registry, { featureId: Symbol('open') });
+export const updateModule = new FeatureModule(sprottyUpdateModule.registry, { featureId: Symbol('update') });
+export const zorderModule = new FeatureModule(sprottyZorderModule.registry, { featureId: Symbol('zorder') });
+export const edgeJunctionModule = new FeatureModule(sprottyEdgeJunctionModule.registry, { featureId: Symbol('edgeJunction') });
 
 export { sprottyDefaultModule };

package/src/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2024 EclipseSource and others.
+ * Copyright (c) 2024 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,5 +16,5 @@
 export * from './action-override';
 export * from './feature-modules';
 export * from './re-exports';
-export * from './routing-override';
+export * from './svg-views-override';
 export * from './types';

package/src/re-exports.ts

@@ -18,6 +18,7 @@
  * @eclipse-glsp/protocol
  */
 export * from '@eclipse-glsp/protocol';
+export * from '@eclipse-glsp/protocol/lib/di';
 
 /*
  * sprotty
@@ -96,14 +97,14 @@ export * from 'sprotty/lib/features/bounds/bounds-manipulation';
 export * from 'sprotty/lib/features/bounds/hbox-layout';
 export * from 'sprotty/lib/features/bounds/hidden-bounds-updater';
 export * from 'sprotty/lib/features/bounds/layout';
-export * from 'sprotty/lib/features/bounds/layout-options';
+export { AbstractLayoutOptions } from 'sprotty/lib/features/bounds/layout-options';
 export {
-    Alignable,
-    BoundsAware,
+    InternalBoundsAware as BoundsAware,
     SShapeElementImpl as GShapeElement,
-    LayoutContainer,
-    LayoutableChild,
+    InternalLayoutContainer as LayoutContainer,
+    InternalLayoutableChild as LayoutableChild,
     ModelLayoutOptions,
+    alignFeature,
     boundsFeature,
     findChildrenAtPosition,
     getAbsoluteBounds,
@@ -122,7 +123,7 @@ export * from 'sprotty/lib/features/bounds/vbox-layout';
 export * from 'sprotty/lib/features/bounds/views';
 
 export { ButtonHandlerRegistry, IButtonHandlerRegistration, configureButtonHandler } from 'sprotty/lib/features/button/button-handler';
-export { SButtonImpl as GButton, SButtonSchema as GButtonSchema } from 'sprotty/lib/features/button/model';
+export { SButtonImpl as GButton } from 'sprotty/lib/features/button/model';
 
 export {
     CommandPaletteActionProviderRegistry,
@@ -130,14 +131,14 @@ export {
 } from 'sprotty/lib/features/command-palette/action-providers';
 export * from 'sprotty/lib/features/command-palette/command-palette';
 
-// Exclude menu item. Aready provided by glsp-protocol
+// Exclude menu item. Already provided by glsp-protocol
 export { Anchor, IContextMenuService, IContextMenuServiceProvider } from 'sprotty/lib/features/context-menu/context-menu-service';
 export { ContextMenuProviderRegistry, DeleteContextMenuItemProvider } from 'sprotty/lib/features/context-menu/menu-providers';
 export * from 'sprotty/lib/features/context-menu/mouse-listener';
 
 export * from 'sprotty/lib/features/edge-layout/di.config';
 export * from 'sprotty/lib/features/edge-layout/edge-layout';
-export * from 'sprotty/lib/features/edge-layout/model';
+export { DEFAULT_EDGE_PLACEMENT, checkEdgePlacement, edgeLayoutFeature, isEdgeLayoutable } from 'sprotty/lib/features/edge-layout/model';
 // Exclude client-side creation features (not supported in GLSP)
 // export * from 'sprotty/lib/features/edit/create';
 // export * from 'sprotty/lib/features/edit/create-on-drag';
@@ -149,7 +150,7 @@ export * from 'sprotty/lib/features/edit/model';
 // export * from 'sprotty/lib/features/edit/reconnect';
 
 export * from 'sprotty/lib/features/expand/expand';
-export * from 'sprotty/lib/features/expand/model';
+export { expandFeature, isExpandable } from 'sprotty/lib/features/expand/model';
 export * from 'sprotty/lib/features/expand/views';
 // Exclude RequestExportSvgAction. Already provided by glsp-protocol
 export { ExportSvgCommand, ExportSvgKeyListener, ExportSvgPostprocessor } from 'sprotty/lib/features/export/export';
@@ -158,10 +159,10 @@ export * from 'sprotty/lib/features/export/model';
 export { SvgExporter } from 'sprotty/lib/features/export/svg-exporter';
 
 export * from 'sprotty/lib/features/fade/fade';
-export * from 'sprotty/lib/features/fade/model';
+export { fadeFeature, isFadeable } from 'sprotty/lib/features/fade/model';
 
 export * from 'sprotty/lib/features/hover/hover';
-export * from 'sprotty/lib/features/hover/model';
+export { hasPopupFeature, hoverFeedbackFeature, isHoverable, popupFeature } from 'sprotty/lib/features/hover/model';
 export * from 'sprotty/lib/features/hover/popup-position-updater';
 
 // Alias SModel types
@@ -169,10 +170,7 @@ export * from 'sprotty/lib/features/decoration/decoration-placer';
 export {
     Decoration,
     SDecoration as GDecoration,
-    SIssue as GIssue,
-    SIssueSeverity as GIssueSeverity,
-    // Export as is, we extend it glsp-client to `GIssueMarker`
-    SIssueMarker,
+    SIssueMarkerImpl,
     decorationFeature,
     isDecoration
 } from 'sprotty/lib/features/decoration/model';
@@ -181,7 +179,9 @@ export * from 'sprotty/lib/features/decoration/views';
 export * from 'sprotty/lib/features/edge-intersection/intersection-finder';
 export * from 'sprotty/lib/features/edge-intersection/sweepline';
 
-export * from 'sprotty/lib/features/move/model';
+export * from 'sprotty/lib/features/edge-junction/junction-finder';
+
+export { isLocateable, isMoveable, moveFeature } from 'sprotty/lib/features/move/model';
 export * from 'sprotty/lib/features/move/move';
 export * from 'sprotty/lib/features/move/snap';
 
@@ -190,28 +190,15 @@ export * from 'sprotty/lib/features/nameable/model';
 export * from 'sprotty/lib/features/open/model';
 export * from 'sprotty/lib/features/open/open';
 
-export * from 'sprotty/lib/features/projection/model';
+export { ViewProjection, getModelBounds, getProjectedBounds, getProjections, isProjectable } from 'sprotty/lib/features/projection/model';
 export * from 'sprotty/lib/features/projection/views';
 
-export {
-    DefaultAnchors,
-    LinearRouteOptions,
-    Side,
-    AbstractEdgeRouter as SprottyAbstractEdgeRouter
-} from 'sprotty/lib/features/routing/abstract-edge-router';
+export * from 'sprotty/lib/features/routing/abstract-edge-router';
 export * from 'sprotty/lib/features/routing/anchor';
 export * from 'sprotty/lib/features/routing/bezier-anchors';
-export {
-    AddRemoveBezierSegmentAction,
-    AddRemoveBezierSegmentCommand,
-    BezierMouseListener,
-    BezierEdgeRouter as SprottyBezierEdgeRouter
-} from 'sprotty/lib/features/routing/bezier-edge-router';
+export * from 'sprotty/lib/features/routing/bezier-edge-router';
 export * from 'sprotty/lib/features/routing/manhattan-anchors';
-export {
-    ManhattanRouterOptions,
-    ManhattanEdgeRouter as SprottyManhattanEdgeRouter
-} from 'sprotty/lib/features/routing/manhattan-edge-router';
+export * from 'sprotty/lib/features/routing/manhattan-edge-router';
 
 // Alias SModel types
 export {
@@ -229,11 +216,11 @@ export {
     isConnectable
 } from 'sprotty/lib/features/routing/model';
 export * from 'sprotty/lib/features/routing/polyline-anchors';
-export { PolylineRouteOptions, PolylineEdgeRouter as SprottyPolylineEdgeRouter } from 'sprotty/lib/features/routing/polyline-edge-router';
+export * from 'sprotty/lib/features/routing/polyline-edge-router';
 export * from 'sprotty/lib/features/routing/routing';
 export * from 'sprotty/lib/features/routing/views';
 
-export * from 'sprotty/lib/features/select/model';
+export { isSelectable, isSelected, selectFeature } from 'sprotty/lib/features/select/model';
 // Alias Select commands with sprotty prefix to avoid clash with glsp-client
 export {
     GetSelectionCommand,
@@ -278,12 +265,12 @@ export {
     SBezierControlHandleView as GBezierControlHandleView,
     SBezierCreateHandleView as GBezierCreateHandleView,
     SCompartmentView as GCompartmentView,
-    SGraphView as GGraphView,
     SLabelView as GLabelView,
     SRoutingHandleView as GRoutingHandleView,
     JumpingPolylineEdgeView,
     PolylineEdgeView,
-    PolylineEdgeViewWithGapsOnIntersections
+    PolylineEdgeViewWithGapsOnIntersections,
+    SGraphView
 } from 'sprotty/lib/graph/views';
 
 // ------------------ Library ------------------
@@ -304,7 +291,7 @@ export {
     RectangularPort
 } from 'sprotty/lib/lib/model';
 export * from 'sprotty/lib/lib/modules';
-export * from 'sprotty/lib/lib/svg-views';
+export { EmptyGroupView, RectangularNodeView, SvgViewportView } from 'sprotty/lib/lib/svg-views';
 
 // ------------------ Model Source ------------------
 export * from 'sprotty/lib/model-source/commit-model';

package/src/svg-views-override.tsx

@@ -0,0 +1,92 @@
+/********************************************************************************
+ * Copyright (c) 2024 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
+ ********************************************************************************/
+/** @jsx svg */
+import { Bounds, Hoverable, Selectable } from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { VNode } from 'snabbdom';
+import {
+    ATTR_BBOX_ELEMENT,
+    InternalBoundsAware as BoundsAware,
+    IViewArgs,
+    RenderingContext,
+    SShapeElementImpl,
+    CircularNodeView as SprottyCircularNodeView,
+    DiamondNodeView as SprottyDiamondNodeView,
+    svg
+} from 'sprotty';
+
+@injectable()
+export class DiamondNodeView extends SprottyDiamondNodeView {
+    override render(
+        node: Readonly<SShapeElementImpl & Hoverable & Selectable>,
+        context: RenderingContext,
+        args?: IViewArgs
+    ): VNode | undefined {
+        // The super class may change the bounds of the given node as browsers may calculate larger bounds for the rendered node (BBox).
+        // To ensure that the node's bounds remains unchanged, we render a rectangle with the correct bounds during hidden rendering.
+        return applyHiddenBoundingRect(node, context, super.render(node, context, args));
+    }
+}
+
+@injectable()
+export class CircularNodeView extends SprottyCircularNodeView {
+    override render(
+        node: Readonly<SShapeElementImpl & Hoverable & Selectable>,
+        context: RenderingContext,
+        args?: IViewArgs
+    ): VNode | undefined {
+        // The super class may change the bounds of the given node as browsers may calculate larger bounds for the rendered node (BBox).
+        // To ensure that the node's bounds remains unchanged, we render a rectangle with the correct bounds during hidden rendering.
+        return applyHiddenBoundingRect(node, context, super.render(node, context, args));
+    }
+}
+
+/**
+ * Creates a hidden rectangle with the bounds of the given element.
+ * This is typically used to fixate the size of an element and avoid size changes that may happen during rendering.
+ * Changes can happen if the resulting bounding box (BBox) of the rendered element is different form the given bounds.
+ * The created bounding rect needs to be placed within a root SVG group (g) element to take effect.
+ *
+ * @param withBounds The element to create the hidden rectangle for.
+ * @param context The rendering context. If provided, a rect is only created if the context is 'hidden'.
+ * @returns The hidden rectangle.
+ */
+export function hiddenBoundingRect(withBounds: BoundsAware): VNode;
+export function hiddenBoundingRect(withBounds: BoundsAware, context: RenderingContext): VNode | undefined;
+export function hiddenBoundingRect(withBounds: BoundsAware, context?: RenderingContext): VNode | undefined {
+    // an element with attribute ATTR_BBOX_ELEMENT is used by the hidden bounds updater to determine the bounds if it is within a g-element
+    // we set the fill to transparent since the SVG export uses the hidden rendering to generate the image and we do not want to be seen
+    return !context || context.targetKind === 'hidden' ? (
+        <rect attrs={{ [ATTR_BBOX_ELEMENT]: true }} {...Bounds.dimension(withBounds.bounds)} style={{ fill: 'transparent' }} />
+    ) : undefined;
+}
+
+/**
+ * Applies a hidden bounding rectangle to the given view if we are in the hidden rendering context where sizes are being determined.
+ *
+ * @param withBounds The element to apply the hidden bounding rectangle to.
+ * @param context The rendering context.
+ * @param view The view to apply the hidden bounding rectangle to.
+ * @returns The view with the hidden bounding rectangle applied, wrapped in a group element if necessary.
+ */
+export function applyHiddenBoundingRect<V extends VNode | undefined>(withBounds: BoundsAware, context: RenderingContext, view: V): V {
+    if (view && context.targetKind === 'hidden') {
+        const parent = view.sel === 'g' ? view : <g>{view}</g>;
+        parent.children?.unshift(hiddenBoundingRect(withBounds));
+        return parent;
+    }
+    return view;
+}

package/src/types.ts

@@ -48,5 +48,5 @@ export const TYPES = {
     IDiagramOptions: Symbol('IDiagramOptions'),
     IDiagramStartup: Symbol('IDiagramStartup'),
     IToolManager: Symbol('IToolManager'),
-    IContributionProvider: Symbol('IContributionProvider')
+    Grid: Symbol('Grid')
 };

package/lib/routing-override.d.ts

@@ -1,31 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2024 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 { Point } from '@eclipse-glsp/protocol';
-import { SConnectableElementImpl, SParentElementImpl, SRoutableElementImpl, AbstractEdgeRouter as SprottyAbstractEdgeRouter, BezierEdgeRouter as SprottyBezierEdgeRouter, ManhattanEdgeRouter as SprottyManhattanEdgeRouter, PolylineEdgeRouter as SprottyPolylineEdgeRouter } from 'sprotty';
-import { GConnectableElement, GParentElement, GRoutableElement } from './re-exports';
-export declare abstract class AbstractEdgeRouter extends SprottyAbstractEdgeRouter {
-    getTranslatedAnchor(connectable: SConnectableElementImpl, refPoint: Point, refContainer: SParentElementImpl, edge: SRoutableElementImpl, anchorCorrection?: number | undefined): Point;
-}
-export declare class PolylineEdgeRouter extends SprottyPolylineEdgeRouter {
-    getTranslatedAnchor(connectable: GConnectableElement, refPoint: Point, refContainer: GParentElement, edge: GRoutableElement, anchorCorrection?: number | undefined): Point;
-}
-export declare class ManhattanEdgeRouter extends SprottyManhattanEdgeRouter {
-    getTranslatedAnchor(connectable: GConnectableElement, refPoint: Point, refContainer: GParentElement, edge: GRoutableElement, anchorCorrection?: number | undefined): Point;
-}
-export declare class BezierEdgeRouter extends SprottyBezierEdgeRouter {
-    getTranslatedAnchor(connectable: GConnectableElement, refPoint: Point, refContainer: GParentElement, edge: GRoutableElement, anchorCorrection?: number | undefined): Point;
-}
-//# sourceMappingURL=routing-override.d.ts.map

package/lib/routing-override.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"routing-override.d.ts","sourceRoot":"","sources":["../src/routing-override.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,IAAI,yBAAyB,EAC/C,gBAAgB,IAAI,uBAAuB,EAC3C,mBAAmB,IAAI,0BAA0B,EACjD,kBAAkB,IAAI,yBAAyB,EAClD,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErF,8BACsB,kBAAmB,SAAQ,yBAAyB;IAC7D,mBAAmB,CACxB,WAAW,EAAE,uBAAuB,EACpC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,kBAAkB,EAChC,IAAI,EAAE,oBAAoB,EAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;CAKX;AAED,qBACa,kBAAmB,SAAQ,yBAAyB;IACpD,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;CAKX;AAED,qBACa,mBAAoB,SAAQ,0BAA0B;IACtD,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;CAKX;AAED,qBACa,gBAAiB,SAAQ,uBAAuB;IAChD,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;CAKX"}