@eclipse-glsp/client 1.1.0-next.35bf56e.230 → 1.1.0-next.383e4e9.264

package/src/index.ts

@@ -13,50 +13,40 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import defaultGLSPModule from './base/di.config';
-import glspCommandPaletteModule from './features/command-palette/di.config';
-import glspContextMenuModule from './features/context-menu/di.config';
-import { copyPasteContextMenuModule, glspServerCopyPasteModule } from './features/copy-paste/di.config';
-import glspDecorationModule from './features/decoration/di.config';
-import glspEditLabelModule from './features/edit-label/di.config';
-import modelHintsModule from './features/hints/di.config';
-import glspHoverModule from './features/hover/di.config';
-import layoutModule from './features/layout/di.config';
-import glspMouseToolModule from './features/mouse-tool/di.config';
-import navigationModule from './features/navigation/di.config';
-import saveModule from './features/save/di.config';
-import glspSelectModule from './features/select/di.config';
-import sourceModelWatcherModule from './features/source-model-watcher/di.config';
-import toolFeedbackModule from './features/tool-feedback/di.config';
-import paletteModule from './features/tool-palette/di.config';
-import { enableDefaultToolsOnFocusLossModule, toolsModule } from './features/tools/di.config';
-import { markerNavigatorContextMenuModule, markerNavigatorModule, validationModule } from './features/validation/di.config';
-import glspViewportModule from './features/viewport/di.config';
 
 // ------------------ Base ------------------
 export * from './base/action-dispatcher';
-export * from './base/actions/focus-change-action';
 export * from './base/argumentable';
 export * from './base/auto-complete/auto-complete-actions';
 export * from './base/auto-complete/auto-complete-widget';
 export * from './base/auto-complete/validation-decorator';
 export * from './base/command-stack';
-export * from './base/container-modules';
-export { configureServerActions } from './base/di.config';
 export * from './base/drag-aware-mouse-listener';
 export * from './base/editor-context-service';
-export * from './base/focus-tracker';
+export * from './base/feedback/feedback-action-dispatcher';
+export * from './base/feedback/feedback-command';
+export * from './base/feedback/update-model-command';
+export * from './base/focus/focus-state-change-action';
+export * from './base/focus/focus-tracker';
 export * from './base/model-initialization-constraint';
 export * from './base/model/model-registry';
-export * from './base/model/update-model-command';
+export * from './base/ranked';
 export * from './base/selection-clearing-mouse-listener';
+export * from './base/selection-service';
 export * from './base/source-uri-aware';
 export * from './base/tool-manager/glsp-tool-manager';
-export * from './base/tool-manager/tool-actions';
-export * from './base/types';
+export * from './base/view/mouse-tool';
 export * from './base/view/view-registry';
+
 //
 // ------------------ Features ------------------
+export * from './base/feedback/css-feedback';
+export * from './base/view/mouse-tool';
+export * from './features/accessibility/resize-key-tool/resize-key-tool';
+export * from './features/accessibility/view-key-tools/deselect-key-tool';
+export * from './features/accessibility/view-key-tools/movement-key-tool';
+export * from './features/accessibility/view-key-tools/zoom-key-tool';
+export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
 export * from './features/bounds/freeform-layout';
 export * from './features/bounds/glsp-hidden-bounds-updater';
 export * from './features/bounds/hbox-layout';
@@ -73,53 +63,53 @@ export * from './features/context-menu/server-context-menu-provider';
 export * from './features/copy-paste/copy-paste-context-menu';
 export * from './features/copy-paste/copy-paste-handler';
 export * from './features/decoration/decoration-placer';
-export * from './features/edit-label/edit-label-tool';
-export * from './features/edit-label/edit-label-validator';
 export * from './features/export/glsp-svg-exporter';
 export * from './features/hints/model';
 export * from './features/hints/type-hints';
 export * from './features/hover/hover';
+export * from './features/label-edit/edit-label-tool';
+export * from './features/label-edit/edit-label-validator';
 export * from './features/layout/layout-elements-action';
-export * from './features/mouse-tool/mouse-tool';
 export * from './features/navigation/navigation-action-handler';
 export * from './features/navigation/navigation-target-resolver';
-export * from './features/rank/model';
 export * from './features/reconnect/model';
-export * from './features/save/model';
+export * from './features/routing/glsp-manhattan-edge-router';
 export * from './features/save/save-keylistener';
-export * from './features/select/select-feedback-action';
+export * from './features/select/select-feedback-command';
 export * from './features/select/select-mouse-listener';
-export * from './features/select/selection-service';
 export * from './features/source-model-watcher/source-model-changed-action-handler';
-export * from './features/tool-feedback/change-bounds-tool-feedback';
-export * from './features/tool-feedback/creation-tool-feedback';
-export * from './features/tool-feedback/css-feedback';
-export * from './features/tool-feedback/edge-edit-tool-feedback';
-export * from './features/tool-feedback/feedback-action-dispatcher';
-export * from './features/tool-feedback/marquee-tool-feedback';
-export * from './features/tool-feedback/model';
-export * from './features/tool-feedback/view';
+export * from './features/svg-metadata/metadata-placer';
 export * from './features/tool-palette/tool-palette';
 export * from './features/tools/base-glsp-tool';
-export * from './features/tools/change-bounds-tool';
-export * from './features/tools/delete-tool';
-export { configureMarqueeTool } from './features/tools/di.config';
-export * from './features/tools/edge-creation-tool';
-export * from './features/tools/edge-edit-tool';
-export * from './features/tools/enable-default-tools-on-focus-loss';
-export * from './features/tools/glsp-manhattan-edge-router';
-export * from './features/tools/marquee-behavior';
-export * from './features/tools/model';
-export * from './features/tools/node-creation-tool';
+export * from './features/tools/change-bounds/change-bounds-tool';
+export * from './features/tools/change-bounds/change-bounds-tool-feedback';
+export * from './features/tools/change-bounds/view';
+export * from './features/tools/deletion/delete-tool';
+export * from './features/tools/edge-creation/edge-creation-tool';
+export * from './features/tools/edge-creation/edge-creation-tool-feedback';
+export * from './features/tools/edge-creation/view';
+export * from './features/tools/edge-edit/edge-edit-tool';
+export * from './features/tools/edge-edit/edge-edit-tool-feedback';
+export * from './features/tools/marquee-selection/marquee-behavior';
+export * from './features/tools/marquee-selection/marquee-mouse-tool';
+export * from './features/tools/marquee-selection/marquee-tool';
+export * from './features/tools/marquee-selection/marquee-tool-feedback';
+export * from './features/tools/marquee-selection/model';
+export * from './features/tools/marquee-selection/view';
+export * from './features/tools/node-creation/node-creation-tool';
+export * from './features/undo-redo/undo-redo-key-listener';
 export * from './features/validation/issue-marker';
 export * from './features/validation/marker-navigator';
 export * from './features/validation/validate';
 export * from './features/viewport/glsp-scroll-mouse-listener';
+export * from './glsp-sprotty';
+export * from './glsp-sprotty/types';
 //
 // ------------------ Misc ------------------
+export * from './default-modules';
 export * from './lib/model';
 export * from './model-source/glsp-diagram-server';
-export * from './sprotty-reexport';
+export * from './standalone-modules';
 export * from './utils/argument-utils';
 export * from './utils/html-utils';
 export * from './utils/layout-utils';
@@ -128,28 +118,35 @@ export * from './utils/smodel-util';
 export * from './utils/viewpoint-util';
 export * from './views';
 // ------------------ DI Modules ------------------
-export {
-    validationModule,
-    saveModule,
-    paletteModule,
-    toolFeedbackModule,
-    defaultGLSPModule,
-    modelHintsModule,
-    glspCommandPaletteModule,
-    glspContextMenuModule,
-    glspServerCopyPasteModule,
-    copyPasteContextMenuModule,
-    glspSelectModule,
-    glspMouseToolModule,
-    layoutModule,
-    glspEditLabelModule,
-    glspHoverModule,
-    toolsModule,
-    enableDefaultToolsOnFocusLossModule,
-    navigationModule,
-    markerNavigatorModule,
-    glspDecorationModule,
-    sourceModelWatcherModule,
-    markerNavigatorContextMenuModule,
-    glspViewportModule
-};
+export * from './base/default.module';
+export * from './features/accessibility/accessibility-module';
+export * from './features/accessibility/move-zoom/move-zoom-module';
+export * from './features/accessibility/resize-key-tool/resize-key-module';
+export * from './features/accessibility/search/search-palette-module';
+export * from './features/accessibility/view-key-tools/view-key-tools-module';
+export * from './features/command-palette/command-palette-module';
+export * from './features/context-menu/context-menu-module';
+export * from './features/copy-paste/copy-paste-modules';
+export * from './features/decoration/decoration-module';
+export * from './features/export/export-modules';
+export * from './features/hints/type-hints-module';
+export * from './features/hover/hover-module';
+export * from './features/label-edit/label-edit-module';
+export * from './features/layout/layout-module';
+export * from './features/navigation/navigation-module';
+export * from './features/routing/routing-module';
+export * from './features/save/save-module';
+export * from './features/select/select-module';
+export * from './features/source-model-watcher/source-model-wacher-module';
+export * from './features/svg-metadata/svg-metadata-module';
+export * from './features/tool-palette/tool-palette-module';
+export * from './features/tools/change-bounds/change-boounds-tool-module';
+export * from './features/tools/deletion/deletion-tool-module';
+export * from './features/tools/edge-creation/edege-creation-module';
+export * from './features/tools/edge-edit/edge-edit-module';
+export * from './features/tools/marquee-selection/marquee-selection-module';
+export * from './features/tools/node-creation/node-creation-module';
+export * from './features/tools/tool-focus-loss-module';
+export * from './features/undo-redo/undo-redo-module';
+export * from './features/validation/validation-modules';
+export * from './features/viewport/viewport-modules';

package/src/lib/model.ts

@@ -13,13 +13,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Bounds, isBounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
-import { exportFeature, getRouteBounds, SEdge, SGraph, SModelElement, viewportFeature } from 'sprotty';
+import {
+    Bounds,
+    exportFeature,
+    getRouteBounds,
+    isBounds,
+    Point,
+    SEdge,
+    SGraph,
+    SModelElement,
+    SModelElementSchema,
+    viewportFeature
+} from '~glsp-sprotty';
 import { Containable, containerFeature } from '../features/hints/model';
-import { Saveable, saveFeature } from '../features/save/model';
 
-export class GLSPGraph extends SGraph implements Saveable, Containable {
-    static override readonly DEFAULT_FEATURES = [viewportFeature, exportFeature, saveFeature, containerFeature];
+export class GLSPGraph extends SGraph implements Containable {
+    static override readonly DEFAULT_FEATURES = [viewportFeature, exportFeature, containerFeature];
     dirty = false;
     isContainableElement(input: string | SModelElement | SModelElementSchema): boolean {
         return true;

package/src/model-source/glsp-diagram-server.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,17 +13,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { injectable } from 'inversify';
 import {
     Action,
+    ActionHandlerRegistry,
     ActionMessage,
     ComputedBoundsAction,
+    DiagramServerProxy,
+    EndProgressAction,
+    ExportSvgAction,
     GLSPClient,
+    ICommand,
     RequestModelAction,
     ServerMessageAction,
-    SetEditModeAction
-} from '@eclipse-glsp/protocol';
-import { injectable } from 'inversify';
-import { ActionHandlerRegistry, DiagramServerProxy, ExportSvgAction, ICommand, ServerStatusAction, SwitchEditModeCommand } from 'sprotty';
+    ServerStatusAction,
+    SetEditModeAction,
+    StartProgressAction,
+    SwitchEditModeCommand,
+    UpdateProgressAction
+} from '~glsp-sprotty';
 import { SourceUriAware } from '../base/source-uri-aware';
 
 const receivedFromServerProperty = '__receivedFromServer';
@@ -77,6 +85,10 @@ export class GLSPDiagramServer extends DiagramServerProxy implements SourceUriAw
         return super.handleLocally(action);
     }
 
+    protected override handleExportSvgAction(action: ExportSvgAction): boolean {
+        return false;
+    }
+
     protected handleServerMessageAction(action: ServerMessageAction): boolean {
         this.logger.log('GLSPDiagramServer', `[${action.severity}] -${action.message}`);
         return false;
@@ -103,6 +115,9 @@ export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry
     registry.register(ServerMessageAction.KIND, diagramServer);
     registry.register(ServerStatusAction.KIND, diagramServer);
     registry.register(ExportSvgAction.KIND, diagramServer);
+    registry.register(StartProgressAction.KIND, diagramServer);
+    registry.register(UpdateProgressAction.KIND, diagramServer);
+    registry.register(EndProgressAction.KIND, diagramServer);
 
     // Register an empty handler for SwitchEditMode, to avoid runtime exceptions.
     // We don't support SwitchEditMode, but Sprotty still sends those actions, so ignore them.

package/src/standalone-modules.ts

@@ -0,0 +1,48 @@
+/********************************************************************************
+ * 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 { ModuleConfiguration } from '~glsp-sprotty';
+import { standaloneCopyPasteModule } from './features/copy-paste/copy-paste-modules';
+import { standaloneExportModule } from './features/export/export-modules';
+import { saveModule } from './features/save/save-module';
+import { standaloneSelectModule } from './features/select/select-module';
+import { undoRedoModule } from './features/undo-redo/undo-redo-module';
+import { standaloneMarkerNavigatorModule } from './features/validation/validation-modules';
+import { standaloneViewportModule } from './features/viewport/viewport-modules';
+/**
+ * Configuration of all `standalone` modules.
+ *
+ * Standalone modules compose additional features/services that are intended for the standalone deployment of GLSP (i.e. plain webapp)
+ * When integrated into an application frame (e.g Theia/VS Code) this module is typically omitted and/or replaced
+ * with an application native module.
+ *
+ * Typically standalone modules built on top of (i.e require ) a default module and are therefore conditionally loaded if the
+ * required default modules have been loaded beforehand.
+ */
+
+export const STANDALONE_MODULES = [
+    standaloneViewportModule,
+    standaloneCopyPasteModule,
+    standaloneMarkerNavigatorModule,
+    standaloneSelectModule,
+    standaloneExportModule,
+    saveModule,
+    undoRedoModule
+] as const;
+
+export const STANDALONE_MODULE_CONFIG: ModuleConfiguration = {
+    add: [...STANDALONE_MODULES]
+};

package/src/utils/argument-utils.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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElement } from 'sprotty';
+import { SModelElement } from '~glsp-sprotty';
 import { hasArguments } from '../base/argumentable';
 
 export namespace GArgument {

package/src/utils/layout-utils.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Dimension, ElementAndBounds, Point, Writable } from '@eclipse-glsp/protocol';
-import { BoundsAware, ElementMove, ModelLayoutOptions, SModelElement } from 'sprotty';
+import { BoundsAware, Dimension, ElementAndBounds, ElementMove, ModelLayoutOptions, Point, SModelElement, Writable } from '~glsp-sprotty';
 import { IMovementRestrictor } from '../features/change-bounds/movement-restrictor';
 
 export function minWidth(element: SModelElement & BoundsAware): number {

package/src/utils/marker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { MarkerKind } from '@eclipse-glsp/protocol';
-import { SIssueMarker, SParentElement } from 'sprotty';
+import { MarkerKind, SIssueMarker, SParentElement } from '~glsp-sprotty';
 
 export namespace MarkerPredicates {
     export const ALL = (): boolean => true;

package/src/utils/smodel-util.spec.ts

@@ -0,0 +1,222 @@
+/********************************************************************************
+ * 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 { expect } from 'chai';
+import { Container } from 'inversify';
+import {
+    AbstractEdgeRouter,
+    EdgeRouterRegistry,
+    LinearRouteOptions,
+    Point,
+    ResolvedHandleMove,
+    RoutedPoint,
+    SEdge,
+    SGraph,
+    SNode,
+    SRoutableElement,
+    SRoutingHandle
+} from '~glsp-sprotty';
+import { routingModule } from '../features/routing/routing-module';
+import { ALL_ROUTING_POINTS, ROUTE_KINDS, ROUTING_POINT_KINDS, calcRoute } from './smodel-util';
+
+class TestRouter extends AbstractEdgeRouter {
+    kind = 'test-router';
+
+    route(edge: SRoutableElement): RoutedPoint[] {
+        const pureRoute = edge.routingPoints.map(
+            (point, idx) =>
+                <RoutedPoint>{
+                    kind: 'linear',
+                    ...point,
+                    pointIndex: idx
+                }
+        );
+        return [
+            { kind: 'source', ...edge.source!.position },
+            ...pureRoute,
+            { kind: 'bezier-control-after', x: 999, y: 999, pointIndex: pureRoute.length },
+            { kind: 'target', ...edge.target!.position }
+        ];
+    }
+
+    createRoutingHandles(edge: SRoutableElement): void {
+        // do nothing
+    }
+
+    protected getOptions(edge: SRoutableElement): LinearRouteOptions {
+        return {
+            minimalPointDistance: 0,
+            selfEdgeOffset: 0,
+            standardDistance: 0
+        };
+    }
+
+    protected getInnerHandlePosition(edge: SRoutableElement, route: RoutedPoint[], handle: SRoutingHandle): Point | undefined {
+        return undefined;
+    }
+
+    protected applyInnerHandleMoves(edge: SRoutableElement, moves: ResolvedHandleMove[]): void {
+        // do nothing
+    }
+}
+
+describe('SModel Util', () => {
+    describe('calcRoute', () => {
+        const graph = new SGraph();
+
+        const source = new SNode();
+        source.id = 'node0';
+        source.position = { x: 0, y: 0 };
+        source.size = { width: 0, height: 0 };
+        graph.add(source);
+
+        const target = new SNode();
+        target.id = 'node1';
+        target.position = { x: 100, y: 100 };
+        target.size = { width: 0, height: 0 };
+        graph.add(target);
+
+        const edge = new SEdge();
+        edge.id = 'edge0';
+        edge.sourceId = 'node0';
+        edge.targetId = 'node1';
+        graph.add(edge);
+
+        edge.routerKind = 'test-router';
+
+        const container = new Container();
+        container.load(routingModule);
+
+        const routerRegistry = container.get<EdgeRouterRegistry>(EdgeRouterRegistry);
+        routerRegistry.register('test-router', new TestRouter());
+
+        it('should return complete route', () => {
+            edge.source!.position = { x: 0, y: 0 };
+            edge.target!.position = { x: 100, y: 100 };
+            edge.routingPoints = [
+                { x: 20, y: 20 },
+                { x: 30, y: 30 },
+                { x: 40, y: 40 }
+            ];
+            const route = calcRoute(edge, routerRegistry);
+            expect(route).to.deep.equal(<RoutedPoint[]>[
+                { x: 0, y: 0, kind: 'source' },
+                { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
+                { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
+                { x: 40, y: 40, kind: 'linear', pointIndex: 2 },
+                { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 3 },
+                { x: 100, y: 100, kind: 'target' }
+            ]);
+        });
+
+        it('should filter duplicates with same coordinates', () => {
+            edge.source!.position = { x: 0, y: 0 };
+            edge.target!.position = { x: 100, y: 100 };
+            edge.routingPoints = [
+                { x: 20, y: 20 },
+                { x: 20, y: 20 },
+                { x: 30, y: 30 },
+                { x: 40, y: 40 }
+            ];
+
+            const route = calcRoute(edge, routerRegistry);
+            expect(route).to.deep.equal(<RoutedPoint[]>[
+                { x: 0, y: 0, kind: 'source' },
+                { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
+                { x: 30, y: 30, kind: 'linear', pointIndex: 2 },
+                { x: 40, y: 40, kind: 'linear', pointIndex: 3 },
+                { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 4 },
+                { x: 100, y: 100, kind: 'target' }
+            ]);
+        });
+
+        it('should not filter source and target even if duplicate coordinates', () => {
+            edge.source!.position = { x: 0, y: 0 };
+            edge.target!.position = { x: 0, y: 0 };
+            edge.routingPoints = [
+                { x: 20, y: 20 },
+                { x: 30, y: 30 },
+                { x: 40, y: 40 }
+            ];
+
+            const route = calcRoute(edge, routerRegistry);
+            expect(route).to.deep.equal(<RoutedPoint[]>[
+                { x: 0, y: 0, kind: 'source' },
+                { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
+                { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
+                { x: 40, y: 40, kind: 'linear', pointIndex: 2 },
+                { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 3 },
+                { x: 0, y: 0, kind: 'target' }
+            ]);
+        });
+
+        it('should filter duplicates with same coordinates but allow tolerance', () => {
+            edge.source!.position = { x: 0, y: 0 };
+            edge.target!.position = { x: 100, y: 100 };
+            edge.routingPoints = [
+                { x: 20, y: 20 },
+                { x: 25, y: 25 },
+                { x: 30, y: 30 },
+                { x: 40, y: 40 }
+            ];
+
+            const route = calcRoute(edge, routerRegistry, ALL_ROUTING_POINTS, 10);
+            expect(route).to.deep.equal(<RoutedPoint[]>[
+                { x: 0, y: 0, kind: 'source' },
+                { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
+                { x: 30, y: 30, kind: 'linear', pointIndex: 2 },
+                { x: 40, y: 40, kind: 'linear', pointIndex: 3 },
+                { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 4 },
+                { x: 100, y: 100, kind: 'target' }
+            ]);
+        });
+
+        it('should allow filtering based on point type: ROUTE_KINDS', () => {
+            edge.source!.position = { x: 0, y: 0 };
+            edge.target!.position = { x: 100, y: 100 };
+            edge.routingPoints = [
+                { x: 20, y: 20 },
+                { x: 30, y: 30 },
+                { x: 40, y: 40 }
+            ];
+
+            const route = calcRoute(edge, routerRegistry, ROUTE_KINDS);
+            expect(route).to.deep.equal(<RoutedPoint[]>[
+                { x: 0, y: 0, kind: 'source' },
+                { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
+                { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
+                { x: 40, y: 40, kind: 'linear', pointIndex: 2 },
+                { x: 100, y: 100, kind: 'target' }
+            ]);
+        });
+
+        it('should allow filtering based on point type: ROUTING_POINT_KINDS', () => {
+            edge.source!.position = { x: 0, y: 0 };
+            edge.target!.position = { x: 100, y: 100 };
+            edge.routingPoints = [
+                { x: 20, y: 20 },
+                { x: 30, y: 30 },
+                { x: 40, y: 40 }
+            ];
+
+            const route = calcRoute(edge, routerRegistry, ROUTING_POINT_KINDS);
+            expect(route).to.deep.equal(<RoutedPoint[]>[
+                { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
+                { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
+                { x: 40, y: 40, kind: 'linear', pointIndex: 2 }
+            ]);
+        });
+    });
+});