@eclipse-glsp/client 2.7.0-next.2 → 2.7.0-next.21

package/lib/views/rounded-corner-manhattan-edge-view.js

@@ -0,0 +1,170 @@
+"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.RoundedCornerManhattanEdgeView = void 0;
+/********************************************************************************
+ * Copyright (c) 2022-2026 Imixs Software Solutions GmbH.
+ * Copyright (c) 2026 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 sprotty_1 = require("@eclipse-glsp/sprotty");
+const inversify_1 = require("inversify");
+const gedge_view_with_gaps_on_intersections_1 = require("./gedge-view-with-gaps-on-intersections");
+/**
+ * Manhattan edge view with rounded bends rendered as quadratic Béziers.
+ * Non-orthogonal inputs render as sharp corners. Radius is clamped per corner;
+ * override {@link cornerRadius} or {@link computeMaxRadius} to tune.
+ *
+ * Inherits gap / line-jump rendering from {@link GEdgeViewWithGapsOnIntersections}.
+ * The rendered line splices intersection fragments between points; the mouse-
+ * handle overlay skips them so the hit area stays contiguous.
+ *
+ * Based on Ralph Soika's `BPMNEdgeView`; see
+ * https://github.com/eclipse-glsp/glsp/discussions/1642.
+ */
+let RoundedCornerManhattanEdgeView = class RoundedCornerManhattanEdgeView extends gedge_view_with_gaps_on_intersections_1.GEdgeViewWithGapsOnIntersections {
+    constructor() {
+        super(...arguments);
+        /** Target corner radius in pixels. The effective radius is clamped per corner. */
+        this.cornerRadius = 10;
+        /** Lower bound for the effective radius, even on very short adjacent segments. */
+        this.minCornerRadius = 2;
+        /** Upper fraction of the shorter adjacent segment to use for the radius. */
+        this.maxRadiusFactor = 0.45;
+        /** Segment length (px) below which {@link shortSegmentRadiusFactor} tightens the radius further. */
+        this.shortSegmentThreshold = 5;
+        /** Fraction of the shorter adjacent segment to use as the radius below {@link shortSegmentThreshold}. */
+        this.shortSegmentRadiusFactor = 0.3;
+    }
+    createPathForSegments(segments, edge, addIntersectionPoints, args) {
+        if (segments.length === 0) {
+            return '';
+        }
+        let path = `M ${segments[0].x},${segments[0].y}`;
+        for (let i = 1; i < segments.length; i++) {
+            const p = segments[i];
+            if (addIntersectionPoints && (0, sprotty_1.isIntersectingRoutedPoint)(p)) {
+                const effective = this.filterCornerZoneIntersections(p, segments, i);
+                if (effective.intersections.length > 0) {
+                    path += this.intersectionPath(edge, segments, effective, args);
+                }
+            }
+            if (i < segments.length - 1) {
+                const prev = segments[i - 1];
+                const next = segments[i + 1];
+                const radius = this.computeMaxRadius(p, prev, next);
+                path += this.renderRoundedCorner(p, prev, next, radius);
+            }
+            else {
+                path += ` L ${p.x},${p.y}`;
+            }
+        }
+        return path;
+    }
+    /**
+     * Drops intersections inside either endpoint's rounded-corner zone (padded
+     * by the gap's skip-offset). The gap fragment can't be placed there without
+     * drawing backward into the curve on one side, and the crossing is hidden
+     * behind the curve anyway.
+     */
+    filterCornerZoneIntersections(intersectingPoint, segments, pointIndex) {
+        const p1 = segments[pointIndex - 1];
+        const p2 = segments[pointIndex];
+        const p1Threshold = this.getCornerRadius(segments, pointIndex - 1) + this.skipOffsetBefore;
+        const p2Threshold = this.getCornerRadius(segments, pointIndex) + this.skipOffsetAfter;
+        const filtered = intersectingPoint.intersections.filter(intersection => sprotty_1.Point.maxDistance(intersection.intersectionPoint, p1) > p1Threshold &&
+            sprotty_1.Point.maxDistance(intersection.intersectionPoint, p2) > p2Threshold);
+        return { ...intersectingPoint, intersections: filtered };
+    }
+    /** Curve radius at `segments[cornerIndex]`, or 0 for source / target. */
+    getCornerRadius(segments, cornerIndex) {
+        if (cornerIndex <= 0 || cornerIndex >= segments.length - 1) {
+            return 0;
+        }
+        const corner = segments[cornerIndex];
+        const prev = segments[cornerIndex - 1];
+        const next = segments[cornerIndex + 1];
+        return this.computeMaxRadius(corner, prev, next);
+    }
+    /** SVG fragment for one rounded corner; falls back to `L` if not a right angle. */
+    renderRoundedCorner(corner, prev, next, radius) {
+        // Round only right-angle bends; diagonal / collinear inputs render sharp.
+        const horizIn = sprotty_1.Point.isHorizontalAligned(prev, corner);
+        const vertIn = sprotty_1.Point.isVerticalAligned(prev, corner);
+        const horizOut = sprotty_1.Point.isHorizontalAligned(corner, next);
+        const vertOut = sprotty_1.Point.isVerticalAligned(corner, next);
+        const isRightAngle = (horizIn && vertOut && !vertIn) || (vertIn && horizOut && !horizIn);
+        if (!isRightAngle) {
+            return ` L ${corner.x},${corner.y}`;
+        }
+        if (prev.x < corner.x && corner.y < next.y) {
+            // right → down
+            return ` L ${corner.x - radius},${corner.y} Q ${corner.x},${corner.y} ${corner.x},${corner.y + radius}`;
+        }
+        if (prev.y < corner.y && corner.x < next.x) {
+            // down → right
+            return ` L ${corner.x},${corner.y - radius} Q ${corner.x},${corner.y} ${corner.x + radius},${corner.y}`;
+        }
+        if (prev.x < corner.x && corner.y > next.y) {
+            // right → up
+            return ` L ${corner.x - radius},${corner.y} Q ${corner.x},${corner.y} ${corner.x},${corner.y - radius}`;
+        }
+        if (prev.y > corner.y && corner.x < next.x) {
+            // up → right
+            return ` L ${corner.x},${corner.y + radius} Q ${corner.x},${corner.y} ${corner.x + radius},${corner.y}`;
+        }
+        if (prev.y < corner.y && corner.x > next.x) {
+            // down → left
+            return ` L ${corner.x},${corner.y - radius} Q ${corner.x},${corner.y} ${corner.x - radius},${corner.y}`;
+        }
+        if (prev.x > corner.x && corner.y < next.y) {
+            // left → down
+            return ` L ${corner.x + radius},${corner.y} Q ${corner.x},${corner.y} ${corner.x},${corner.y + radius}`;
+        }
+        if (prev.y > corner.y && corner.x > next.x) {
+            // up → left
+            return ` L ${corner.x},${corner.y + radius} Q ${corner.x},${corner.y} ${corner.x - radius},${corner.y}`;
+        }
+        if (prev.x > corner.x && corner.y > next.y) {
+            // left → up
+            return ` L ${corner.x + radius},${corner.y} Q ${corner.x},${corner.y} ${corner.x},${corner.y - radius}`;
+        }
+        return ` L ${corner.x},${corner.y}`;
+    }
+    /** Clamps {@link cornerRadius} to a fraction of the shorter adjacent segment. */
+    computeMaxRadius(corner, prev, next) {
+        const segBefore = sprotty_1.Point.maxDistance(corner, prev);
+        const segAfter = sprotty_1.Point.maxDistance(next, corner);
+        if (segBefore === 0 || segAfter === 0) {
+            return this.minCornerRadius;
+        }
+        const shortest = Math.min(segBefore, segAfter);
+        let radius = Math.min(this.cornerRadius, shortest * this.maxRadiusFactor);
+        if (shortest < this.shortSegmentThreshold) {
+            radius = Math.min(radius, shortest * this.shortSegmentRadiusFactor);
+        }
+        radius = Math.min(radius, shortest / 2);
+        return Math.max(this.minCornerRadius, radius);
+    }
+};
+exports.RoundedCornerManhattanEdgeView = RoundedCornerManhattanEdgeView;
+exports.RoundedCornerManhattanEdgeView = RoundedCornerManhattanEdgeView = __decorate([
+    (0, inversify_1.injectable)()
+], RoundedCornerManhattanEdgeView);
+//# sourceMappingURL=rounded-corner-manhattan-edge-view.js.map

package/lib/views/rounded-corner-manhattan-edge-view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rounded-corner-manhattan-edge-view.js","sourceRoot":"","sources":["../../src/views/rounded-corner-manhattan-edge-view.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "2.7.0-next.2+eaf7d17",
+  "version": "2.7.0-next.21+760b637",
   "description": "A sprotty-based client for GLSP",
   "keywords": [
     "eclipse",
@@ -46,16 +46,14 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/sprotty": "2.7.0-next.2+eaf7d17",
+    "@eclipse-glsp/sprotty": "2.7.0-next.21+760b637",
     "autocompleter": "^9.1.2",
     "file-saver": "^2.0.5",
-    "lodash": "4.17.23",
     "snabbdom": "~3.5.1",
     "vscode-jsonrpc": "8.2.0"
   },
   "devDependencies": {
-    "@types/file-saver": "^2.0.5",
-    "@types/lodash": "4.14.191"
+    "@types/file-saver": "^2.0.5"
   },
   "peerDependencies": {
     "inversify": "^6.1.3"
@@ -63,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eaf7d170b7f9f665c70146b0423261269edd2a66"
+  "gitHead": "760b637de00febf2dd2cd0b4a97cc90b7cff1bca"
 }

package/src/base/action-dispatcher.ts

@@ -195,7 +195,7 @@ export class GLSPActionDispatcher extends ActionDispatcher implements IGModelRoo
     }
 
     override request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res> {
-        if (!action.requestId && action.requestId === '') {
+        if (!action.requestId || action.requestId === '') {
             // No request id has been specified. So we use a generated one.
             action.requestId = RequestAction.generateRequestId();
         }
@@ -214,13 +214,16 @@ export class GLSPActionDispatcher extends ActionDispatcher implements IGModelRoo
      */
     requestUntil<Res extends ResponseAction>(
         action: RequestAction<Res>,
-        timeoutMs = 2000,
+        timeoutMs: number = action.timeout ?? 2000,
         rejectOnTimeout = false
     ): Promise<Res | undefined> {
-        if (!action.requestId && action.requestId === '') {
+        if (!action.requestId || action.requestId === '') {
             // No request id has been specified. So we use a generated one.
             action.requestId = RequestAction.generateRequestId();
         }
+        // Stamp the effective timeout onto the action so the receiving side
+        // (handleServerRequest/handleClientRequest) can respect it.
+        action.timeout = timeoutMs;
 
         const requestId = action.requestId;
         const timeout = setTimeout(() => {

package/src/base/default.module.ts

@@ -16,6 +16,8 @@
 import {
     ActionHandlerRegistry,
     FeatureModule,
+    GetEditorContextAction,
+    GetSelectionAction,
     KeyTool,
     LocationPostprocessor,
     MousePositionTracker,
@@ -83,6 +85,7 @@ export const defaultModule = new FeatureModule(
 
         configureActionHandler(context, SetEditModeAction.KIND, EditorContextService);
         configureActionHandler(context, SetDirtyStateAction.KIND, EditorContextService);
+        configureActionHandler(context, GetEditorContextAction.KIND, EditorContextService);
 
         bind(FocusTracker).toSelf().inSingletonScope();
         bind(TYPES.IDiagramStartup).toService(FocusTracker);
@@ -121,6 +124,7 @@ export const defaultModule = new FeatureModule(
         bind(SelectionService).toSelf().inSingletonScope();
         bind(TYPES.IGModelRootListener).toService(SelectionService);
         bind(TYPES.IDiagramStartup).toService(SelectionService);
+        configureActionHandler(context, GetSelectionAction.KIND, SelectionService);
 
         // Feedback Support ------------------------------------
         // Generic re-usable feedback modifying css classes

package/src/base/editor-context-service.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2025 EclipseSource and others.
+ * Copyright (c) 2020-2026 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
@@ -21,14 +21,14 @@ import {
     DisposableCollection,
     EditMode,
     EditorContext,
+    EditorContextResult,
     Emitter,
     Event,
-    findParentByFeature,
     GModelElement,
     GModelRoot,
+    GetEditorContextAction,
     IActionDispatcher,
     IActionHandler,
-    isViewport,
     LazyInjector,
     MaybePromise,
     MousePositionTracker,
@@ -37,7 +37,9 @@ import {
     SetEditModeAction,
     TYPES,
     ValueChange,
-    Viewport
+    Viewport,
+    findParentByFeature,
+    isViewport
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, postConstruct, preDestroy } from 'inversify';
 import { FocusChange, FocusTracker } from './focus/focus-tracker';
@@ -177,6 +179,8 @@ export class EditorContextService implements IActionHandler, Disposable, IDiagra
         return {
             selectedElementIds: Array.from(this.selectionService.getSelectedElementIDs()),
             lastMousePosition: this.mousePositionTracker.lastPositionOnDiagram,
+            viewport: this.viewportData,
+            canvasBounds: this.canvasBounds,
             args
         };
     }
@@ -185,18 +189,26 @@ export class EditorContextService implements IActionHandler, Disposable, IDiagra
         return {
             selectedElementIds,
             lastMousePosition: this.mousePositionTracker.lastPositionOnDiagram,
+            viewport: this.viewportData,
+            canvasBounds: this.canvasBounds,
             args
         };
     }
 
-    handle(action: Action): void {
+    handle(action: Action): Action | void {
         if (SetEditModeAction.is(action)) {
             this.handleSetEditModeAction(action);
         } else if (SetDirtyStateAction.is(action)) {
             this.handleSetDirtyStateAction(action);
+        } else if (GetEditorContextAction.is(action)) {
+            return this.handleGetEditorContext(action);
         }
     }
 
+    protected handleGetEditorContext(action: GetEditorContextAction): EditorContextResult {
+        return EditorContextResult.create(this.get(), { responseId: action.requestId });
+    }
+
     protected handleSetEditModeAction(action: SetEditModeAction): void {
         const oldValue = this._editMode;
         this._editMode = action.editMode;

package/src/base/model/glsp-model-source.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2024 EclipseSource and others.
+ * Copyright (c) 2023-2026 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
@@ -22,10 +22,14 @@ import {
     DisposeClientSessionParameters,
     GLSPClient,
     GModelRootSchema,
+    IActionDispatcher,
     ILogger,
     InitializeClientSessionParameters,
     InitializeResult,
     ModelSource,
+    RejectAction,
+    RequestAction,
+    ResponseAction,
     TYPES
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, preDestroy } from 'inversify';
@@ -94,6 +98,8 @@ export class GLSPModelSource extends ModelSource implements Disposable {
     @inject(TYPES.IDiagramOptions)
     protected options: IDiagramOptions;
 
+    declare readonly actionDispatcher: IActionDispatcher;
+
     protected toDispose = new DisposableCollection();
     clientId: string;
 
@@ -164,9 +170,37 @@ export class GLSPModelSource extends ModelSource implements Disposable {
         const action = message.action;
         ServerAction.mark(action);
         this.logger.log(this, 'receiving', action);
+        if (RequestAction.is(action)) {
+            this.handleServerRequest(action);
+            return;
+        }
         this.actionDispatcher.dispatch(action);
     }
 
+    // Fire-and-forget: intentionally not awaited by messageReceived()
+    protected async handleServerRequest(action: RequestAction<ResponseAction>): Promise<void> {
+        try {
+            const response =
+                action.timeout !== undefined
+                    ? await this.actionDispatcher.requestUntil(action, action.timeout, true)
+                    : await this.actionDispatcher.request(action);
+            if (response) {
+                this.sendResponseToServer(response);
+            }
+        } catch (error) {
+            this.logger.error(this, `Failed to handle server request '${action.kind}' (${action.requestId})`, error);
+            const reject = RejectAction.create(`Failed to handle request '${action.kind}' (${action.requestId})`, {
+                responseId: action.requestId,
+                detail: error?.toString?.()
+            });
+            this.sendResponseToServer(reject);
+        }
+    }
+
+    protected sendResponseToServer(response: ResponseAction): void {
+        this.forwardToServer(response);
+    }
+
     override initialize(registry: GLSPActionHandlerRegistry): void {
         // Registering actions here is discouraged and it's recommended
         // to implemented dedicated action handlers.

package/src/base/selection-service.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2024 EclipseSource and others.
+ * Copyright (c) 2019-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,12 +23,15 @@ import {
     Emitter,
     Event,
     GChildElement,
+    GetSelectionAction,
     GModelElement,
     GModelRoot,
+    IActionHandler,
     ILogger,
     LazyInjector,
     SelectAction,
     SelectAllAction,
+    SelectionResult,
     SprottySelectAllCommand,
     SprottySelectCommand,
     TYPES,
@@ -60,7 +63,7 @@ export interface SelectionChange {
 }
 
 @injectable()
-export class SelectionService implements IGModelRootListener, Disposable, IDiagramStartup {
+export class SelectionService implements IGModelRootListener, IActionHandler, Disposable, IDiagramStartup {
     @inject(TYPES.IFeedbackActionDispatcher)
     protected feedbackDispatcher: IFeedbackActionDispatcher;
 
@@ -84,6 +87,12 @@ export class SelectionService implements IGModelRootListener, Disposable, IDiagr
         this.lazyInjector.getAll<ISelectionListener>(TYPES.ISelectionListener).forEach(listener => this.addListener(listener));
     }
 
+    handle(action: Action): Action | void {
+        if (GetSelectionAction.is(action)) {
+            return SelectionResult.create(this.getSelectedElementIDs(), action.requestId);
+        }
+    }
+
     @preDestroy()
     dispose(): void {
         this.toDispose.dispose();

package/src/base/shortcuts/available-shortcuts-extension.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2025 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2026 Business Informatics Group (TU Wien) 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,9 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { GModelRoot, matchesKeystroke, TYPES } from '@eclipse-glsp/sprotty';
+import { GModelRoot, groupBy, matchesKeystroke, TYPES } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { groupBy } from 'lodash';
 import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
 import { messages } from '../messages';
 import type { IShortcutManager, ShortcutRegistration } from './shortcuts-manager';
@@ -79,7 +78,7 @@ export class AvailableShortcutsUIExtension extends GLSPAbstractUIExtension {
         headerRow.appendChild(keybindingCell);
         tableHead.appendChild(headerRow);
 
-        for (const [group, shortcuts] of Object.entries(grouped)) {
+        for (const [group, shortcuts] of grouped.entries()) {
             tableBody.appendChild(this.createGroupHeader(group));
             shortcuts.forEach(s => {
                 tableBody.appendChild(this.createEntry(s));

package/src/base/view/mouse-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2024 EclipseSource and others.
+ * Copyright (c) 2019-2026 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,6 +18,7 @@ import {
     Disposable,
     GModelElement,
     GModelRoot,
+    groupBy,
     LazyInjector,
     MaybePromise,
     MouseListener,
@@ -51,7 +52,7 @@ export class GLSPMouseTool extends MouseTool implements IDiagramStartup {
 
     override register(mouseListener: MouseListener): void {
         super.register(mouseListener);
-        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => Ranked.getRank(listener));
+        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => Ranked.getRank(listener), true);
     }
 
     registerListener(mouseListener: MouseListener): Disposable {
@@ -61,7 +62,7 @@ export class GLSPMouseTool extends MouseTool implements IDiagramStartup {
 
     override deregister(mouseListener: MouseListener): void {
         super.deregister(mouseListener);
-        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => Ranked.getRank(listener));
+        this.rankedMouseListeners = groupBy(this.mouseListeners, listener => Ranked.getRank(listener), true);
     }
 
     protected override handleEvent<K extends MouseListenerMethods>(methodName: K, model: GModelRoot, event: MouseEvent): void {
@@ -104,19 +105,3 @@ export class GLSPMouseTool extends MouseTool implements IDiagramStartup {
         }
     }
 }
-
-function groupBy<K, T>(array: Array<T>, keyFunction: (x: T) => K): Map<K, T[]> {
-    const unsortedMap = array.reduce((result: Map<K, T[]>, item: T) => {
-        const key = keyFunction(item);
-        if (!result.has(key)) {
-            result.set(key, [item]);
-        } else {
-            const entries = result.get(key);
-            if (entries) {
-                entries.push(item);
-            }
-        }
-        return result;
-    }, new Map<K, T[]>());
-    return new Map<K, T[]>([...unsortedMap.entries()].sort());
-}

package/src/features/change-bounds/move-element-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2025 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2026 Business Informatics Group (TU Wien) 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
@@ -17,6 +17,7 @@
 import {
     Action,
     ChangeBoundsOperation,
+    DebouncedFunc,
     ElementAndBounds,
     ElementMove,
     IActionDispatcher,
@@ -27,10 +28,10 @@ import {
     MoveViewportAction,
     Point,
     TYPES,
+    debounce,
     isBoundsAware
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional, postConstruct } from 'inversify';
-import { DebouncedFunc, debounce } from 'lodash';
 import { EditorContextService } from '../../base/editor-context-service';
 import { IFeedbackActionDispatcher } from '../../base/feedback/feedback-action-dispatcher';
 import { FeedbackEmitter } from '../../base/feedback/feedback-emitter';

package/src/features/change-bounds/resize/resize-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2025 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2026 Business Informatics Group (TU Wien) 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
@@ -17,6 +17,7 @@
 import {
     Action,
     ChangeBoundsOperation,
+    DebouncedFunc,
     Dimension,
     ElementAndBounds,
     GModelElement,
@@ -27,10 +28,10 @@ import {
     ISnapper,
     Point,
     SetBoundsAction,
-    TYPES
+    TYPES,
+    debounce
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional, postConstruct } from 'inversify';
-import { DebouncedFunc, debounce } from 'lodash';
 import { EditorContextService } from '../../../base/editor-context-service';
 import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
 import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';

package/src/features/helper-lines/helper-line-feedback.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2025 EclipseSource and others.
+ * Copyright (c) 2023-2026 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
@@ -30,10 +30,10 @@ import {
     equalUpTo,
     isBoundsAware,
     isDecoration,
-    isViewport
+    isViewport,
+    partition
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { partition } from 'lodash';
 import '../../../css/helper-lines.css';
 import { EditorContextService } from '../../base/editor-context-service';
 import { FeedbackCommand } from '../../base/feedback/feedback-command';
@@ -125,7 +125,9 @@ export class DrawHelperLinesFeedbackCommand extends FeedbackCommand {
         removeSelectionBounds(context.root);
         const alignableElements = getMatchingElements(context.root.index, this.isAlignableElementPredicate);
         this.log('All alignable elements: ', alignableElements);
-        const [referenceElements, elements] = partition(alignableElements, element => this.elementIds.includes(element.id));
+        const { match: referenceElements, rest: elements } = partition(alignableElements, (element): element is BoundsAwareModelElement =>
+            this.elementIds.includes(element.id)
+        );
         this.log('Split alignable elements into reference elements and other elements: ', referenceElements, elements);
         if (referenceElements.length === 0) {
             this.log('--> No helper lines as we do not have any reference elements.');