@eclipse-glsp/client 2.1.0-next.301 → 2.1.0-next.303

package/src/features/tools/change-bounds/index.ts

@@ -0,0 +1,19 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './change-bounds-tool-feedback';
+export * from './change-bounds-tool-module';
+export * from './change-bounds-tool';
+export * from './view';

package/src/features/tools/deletion/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './delete-tool';
+export * from './deletion-tool-module';

package/src/features/tools/edge-creation/index.ts

@@ -0,0 +1,20 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './dangling-edge-feedback';
+export * from './edege-creation-module';
+export * from './edge-creation-tool-feedback';
+export * from './edge-creation-tool';
+export * from './view';

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

@@ -13,8 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
-import { VNode } from 'snabbdom';
 import {
     Action,
     AnchorComputerRegistry,
@@ -24,14 +22,13 @@ import {
     Disposable,
     EdgeRouterRegistry,
     ElementMove,
-    ISnapper,
+    GConnectableElement,
+    GModelElement,
+    GRoutingHandle,
     MouseListener,
     MoveAction,
     Point,
     PolylineEdgeRouter,
-    GConnectableElement,
-    GModelElement,
-    GRoutingHandle,
     SwitchEditModeAction,
     SwitchEditModeCommand,
     TYPES,
@@ -42,14 +39,17 @@ import {
     isConnectable,
     isSelected
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
 import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../../base/feedback/feedback-command';
 import { forEachElement, isRoutable, isRoutingHandle } from '../../../utils/gmodel-util';
 import { getAbsolutePosition, toAbsoluteBounds } from '../../../utils/viewpoint-util';
-import { PointPositionUpdater } from '../../change-bounds/snap';
+import { PositionSnapper } from '../../change-bounds/position-snapper';
+import { useSnap } from '../../change-bounds/snap';
 import { addReconnectHandles, removeReconnectHandles } from '../../reconnect/model';
 import { FeedbackEdgeEnd, feedbackEdgeEndId, feedbackEdgeId } from '../edge-creation/dangling-edge-feedback';
 import { FeedbackEdgeEndMovingMouseListener } from '../edge-creation/edge-creation-tool-feedback';
+import { PointPositionUpdater } from '../../change-bounds/point-position-updater';
 
 /**
  * RECONNECT HANDLES FEEDBACK
@@ -198,7 +198,10 @@ export class FeedbackEdgeTargetMovingMouseListener extends FeedbackEdgeEndMoving
 }
 
 export class FeedbackEdgeSourceMovingMouseListener extends MouseListener implements Disposable {
-    constructor(protected anchorRegistry: AnchorComputerRegistry, protected feedbackDispatcher: IFeedbackActionDispatcher) {
+    constructor(
+        protected anchorRegistry: AnchorComputerRegistry,
+        protected feedbackDispatcher: IFeedbackActionDispatcher
+    ) {
         super();
     }
 
@@ -254,9 +257,12 @@ export class FeedbackEdgeSourceMovingMouseListener extends MouseListener impleme
 export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
     protected pointPositionUpdater: PointPositionUpdater;
 
-    constructor(protected edgeRouterRegistry?: EdgeRouterRegistry, protected snapper?: ISnapper) {
+    constructor(
+        protected positionSnapper: PositionSnapper,
+        protected edgeRouterRegistry?: EdgeRouterRegistry
+    ) {
         super();
-        this.pointPositionUpdater = new PointPositionUpdater(snapper);
+        this.pointPositionUpdater = new PointPositionUpdater(positionSnapper);
     }
 
     override mouseDown(target: GModelElement, event: MouseEvent): Action[] {
@@ -265,7 +271,7 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
             const routingHandle = findParentByFeature(target, isRoutingHandle);
             if (routingHandle !== undefined) {
                 result.push(SwitchRoutingModeAction.create({ elementsToActivate: [target.id] }));
-                this.pointPositionUpdater.updateLastDragPosition({ x: event.pageX, y: event.pageY });
+                this.pointPositionUpdater.updateLastDragPosition(event);
             } else {
                 this.pointPositionUpdater.resetPosition();
             }
@@ -278,9 +284,9 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         if (event.buttons === 0) {
             return this.mouseUp(target, event);
         }
-        const positionUpdate = this.pointPositionUpdater.updatePosition(target, { x: event.pageX, y: event.pageY }, !event.altKey);
+        const positionUpdate = this.pointPositionUpdater.updatePosition(target, event);
         if (positionUpdate) {
-            const moveActions = this.handleMoveOnClient(target, positionUpdate, !event.altKey);
+            const moveActions = this.handleMoveOnClient(target, positionUpdate, useSnap(event));
             result.push(...moveActions);
         }
         return result;
@@ -322,10 +328,7 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
     }
 
     protected getSnappedHandlePosition(element: GRoutingHandle, point: Point, isSnap: boolean): Point {
-        if (this.snapper && isSnap) {
-            return this.snapper.snap(point, element);
-        }
-        return point;
+        return this.positionSnapper?.snapPosition(point, element, isSnap);
     }
 
     protected getHandlePosition(handle: GRoutingHandle): Point | undefined {
@@ -345,10 +348,6 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         this.pointPositionUpdater.resetPosition();
         return [];
     }
-
-    override decorate(vnode: VNode, _element: GModelElement): VNode {
-        return vnode;
-    }
 }
 
 /**

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

@@ -13,7 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable, optional } from 'inversify';
 import {
     Action,
     AnchorComputerRegistry,
@@ -21,22 +20,22 @@ import {
     Connectable,
     Disposable,
     EdgeRouterRegistry,
-    ISnapper,
-    ReconnectEdgeOperation,
     GModelElement,
     GModelRoot,
     GRoutableElement,
     GRoutingHandle,
-    TYPES,
+    ReconnectEdgeOperation,
     canEditRouting,
     findParentByFeature,
     isConnectable,
     isSelected
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable, optional } from 'inversify';
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
 import { ISelectionListener, SelectionService } from '../../../base/selection-service';
 import { calcElementAndRoutingPoints, isRoutable, isRoutingHandle } from '../../../utils/gmodel-util';
+import { PositionSnapper } from '../../change-bounds/position-snapper';
 import { GReconnectHandle, isReconnectHandle, isReconnectable, isSourceRoutingHandle, isTargetRoutingHandle } from '../../reconnect/model';
 import { BaseEditTool } from '../base-tools';
 import { DrawFeedbackEdgeAction, RemoveFeedbackEdgeAction, feedbackEdgeId } from '../edge-creation/dangling-edge-feedback';
@@ -57,7 +56,7 @@ export class EdgeEditTool extends BaseEditTool {
     @inject(SelectionService) protected selectionService: SelectionService;
     @inject(AnchorComputerRegistry) protected anchorRegistry: AnchorComputerRegistry;
     @inject(EdgeRouterRegistry) @optional() readonly edgeRouterRegistry?: EdgeRouterRegistry;
-    @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
+    @inject(PositionSnapper) readonly positionSnapper: PositionSnapper;
 
     protected feedbackEdgeSourceMovingListener: FeedbackEdgeSourceMovingMouseListener;
     protected feedbackEdgeTargetMovingListener: FeedbackEdgeTargetMovingMouseListener;
@@ -74,7 +73,7 @@ export class EdgeEditTool extends BaseEditTool {
         // install feedback move mouse listener for client-side move updates
         this.feedbackEdgeSourceMovingListener = new FeedbackEdgeSourceMovingMouseListener(this.anchorRegistry, this.feedbackDispatcher);
         this.feedbackEdgeTargetMovingListener = new FeedbackEdgeTargetMovingMouseListener(this.anchorRegistry, this.feedbackDispatcher);
-        this.feedbackMovingListener = new FeedbackEdgeRouteMovingMouseListener(this.edgeRouterRegistry, this.snapper);
+        this.feedbackMovingListener = new FeedbackEdgeRouteMovingMouseListener(this.positionSnapper, this.edgeRouterRegistry);
 
         this.toDisposeOnDisable.push(
             Disposable.create(() => this.edgeEditListener.reset()),

package/src/features/tools/edge-edit/index.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './edge-edit-module';
+export * from './edge-edit-tool-feedback';
+export * from './edge-edit-tool';

package/src/features/tools/index.ts

@@ -0,0 +1,23 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './base-tools';
+export * from './change-bounds';
+export * from './deletion';
+export * from './edge-creation';
+export * from './edge-edit';
+export * from './marquee-selection';
+export * from './node-creation';
+export * from './tool-focus-loss-module';

package/src/features/tools/marquee-selection/index.ts

@@ -0,0 +1,22 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './marquee-behavior';
+export * from './marquee-mouse-tool';
+export * from './marquee-selection-module';
+export * from './marquee-tool-feedback';
+export * from './marquee-tool';
+export * from './model';
+export * from './view';

package/src/features/tools/marquee-selection/marquee-tool.ts

@@ -13,8 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from 'inversify';
-import { Action, KeyListener, GModelElement } from '@eclipse-glsp/sprotty';
+import { Action, GModelElement, KeyListener } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
+import { SelectionService } from '../../../base/selection-service';
 import { EnableToolsAction } from '../../../base/tool-manager/tool';
 import { BaseEditTool } from '../base-tools';
 import { MarqueeMouseTool } from './marquee-mouse-tool';
@@ -23,21 +24,30 @@ import { MarqueeMouseTool } from './marquee-mouse-tool';
 export class MarqueeTool extends BaseEditTool {
     static ID = 'glsp.marquee-tool';
 
-    protected marqueeKeyListener: MarqueeKeyListener = new MarqueeKeyListener();
+    @inject(SelectionService) protected selectionService: SelectionService;
+
+    protected marqueeKeyListener: MarqueeKeyListener;
 
     get id(): string {
         return MarqueeTool.ID;
     }
 
     enable(): void {
+        if (!this.marqueeKeyListener) {
+            this.marqueeKeyListener = new MarqueeKeyListener(this.selectionService);
+        }
         this.toDisposeOnDisable.push(this.keyTool.registerListener(this.marqueeKeyListener));
     }
 }
 
 @injectable()
 export class MarqueeKeyListener extends KeyListener {
+    constructor(protected selectionService: SelectionService) {
+        super();
+    }
+
     override keyDown(_element: GModelElement, event: KeyboardEvent): Action[] {
-        if (event.shiftKey) {
+        if (event.shiftKey && !this.selectionService.hasSelectedElements()) {
             return [EnableToolsAction.create([MarqueeMouseTool.ID])];
         }
         return [];

package/src/features/tools/node-creation/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './node-creation-module';
+export * from './node-creation-tool';

package/src/features/tools/node-creation/node-creation-tool.ts

@@ -18,7 +18,6 @@ import {
     CreateNodeOperation,
     GModelElement,
     GNode,
-    ISnapper,
     Point,
     TYPES,
     TriggerNodeCreationAction,
@@ -32,9 +31,9 @@ import { CSS_GHOST_ELEMENT, CSS_HIDDEN, CursorCSS, cursorFeedbackAction } from '
 import { EnableDefaultToolsAction } from '../../../base/tool-manager/tool';
 import { getAbsolutePosition } from '../../../utils/viewpoint-util';
 import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
+import { PositionSnapper } from '../../change-bounds/position-snapper';
 import { AddTemplateElementsAction, getTemplateElementId } from '../../element-template/add-template-element';
 import { MouseTrackingElementPositionListener, PositioningTool } from '../../element-template/mouse-tracking-element-position-listener';
-import { RemoveTemplateElementsAction } from '../../element-template/remove-template-element';
 import { Containable, isContainable } from '../../hints/model';
 import { BaseCreationTool } from '../base-tools';
 
@@ -44,8 +43,8 @@ export class NodeCreationTool extends BaseCreationTool<TriggerNodeCreationAction
 
     protected isTriggerAction = TriggerNodeCreationAction.is;
 
-    @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
     @inject(TYPES.IMovementRestrictor) @optional() readonly movementRestrictor?: IMovementRestrictor;
+    @inject(PositionSnapper) readonly positionSnapper: PositionSnapper;
 
     get id(): string {
         return NodeCreationTool.ID;
@@ -59,8 +58,7 @@ export class NodeCreationTool extends BaseCreationTool<TriggerNodeCreationAction
             this.toDisposeOnDisable.push(
                 this.registerFeedback(
                     [AddTemplateElementsAction.create({ templates: [ghostElement.template], addClasses: [CSS_HIDDEN, CSS_GHOST_ELEMENT] })],
-                    ghostElement,
-                    [RemoveTemplateElementsAction.create({ templates: [ghostElement.template] })]
+                    ghostElement
                 ),
                 this.mouseTool.registerListener(trackingListener)
             );
@@ -119,14 +117,12 @@ export class NodeCreationToolMouseListener extends DragAwareMouseListener {
                 return trackedPosition;
             }
         }
-        let location = getAbsolutePosition(target, event);
-        if (this.tool.snapper) {
-            // Create a 0-bounds proxy element for snapping
-            const elementProxy = new GNode();
-            elementProxy.size = { width: 0, height: 0 };
-            location = this.tool.snapper.snap(location, elementProxy);
-        }
-        return location;
+        const location = getAbsolutePosition(target, event);
+
+        // Create a 0-bounds proxy element for snapping
+        const elementProxy = new GNode();
+        elementProxy.size = { width: 0, height: 0 };
+        return this.tool.positionSnapper.snapPosition(location, elementProxy);
     }
 
     override mouseOver(target: GModelElement, event: MouseEvent): Action[] {

package/src/features/undo-redo/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './undo-redo-key-listener';
+export * from './undo-redo-module';

package/src/features/validation/index.ts

@@ -0,0 +1,19 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './issue-marker';
+export * from './marker-navigator';
+export * from './validate';
+export * from './validation-modules';

package/src/features/viewport/index.ts

@@ -0,0 +1,19 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from './glsp-scroll-mouse-listener';
+export * from './reposition';
+export * from './viewport-handler';
+export * from './viewport-modules';

package/src/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * 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
@@ -13,153 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-
-export * from '@eclipse-glsp/sprotty';
-
-// ------------------ Base ------------------
-export * from './base/action-dispatcher';
-export * from './base/action-handler-registry';
-export * from './base/args-feature';
-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/drag-aware-mouse-listener';
-export * from './base/editor-context-service';
-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/diagram-loader';
-export * from './base/model/glsp-model-source';
-export * from './base/model/model-initialization-constraint';
-export * from './base/model/model-registry';
-export * from './base/ranked';
-export * from './base/selection-clearing-mouse-listener';
-export * from './base/selection-service';
-export * from './base/tool-manager/tool';
-export * from './base/tool-manager/tool-manager';
-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/element-navigation/diagram-navigation-tool';
-export * from './features/accessibility/focus-tracker/focus-tracker-tool';
-export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
-export * from './features/accessibility/resize-key-tool/resize-key-tool';
-export * from './features/accessibility/toast/toast-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/bounds/freeform-layout';
-export * from './features/bounds/glsp-hidden-bounds-updater';
-export * from './features/bounds/hbox-layout';
-export * from './features/bounds/layouter';
-export * from './features/bounds/vbox-layout';
-export * from './features/change-bounds/model';
-export * from './features/change-bounds/movement-restrictor';
-export * from './features/change-bounds/snap';
-export * from './features/command-palette/command-palette-tool';
-export * from './features/command-palette/server-command-palette-provider';
-export * from './features/context-menu/delete-element-context-menu';
-export * from './features/context-menu/glsp-context-menu-mouse-listener';
-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/element-template/add-template-element';
-export * from './features/element-template/mouse-tracking-element-position-listener';
-export * from './features/element-template/remove-template-element';
-export * from './features/export/glsp-svg-exporter';
-export * from './features/hints/model';
-export * from './features/hints/type-hint-provider';
-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/navigation/navigation-action-handler';
-export * from './features/navigation/navigation-target-resolver';
-export * from './features/reconnect/model';
-export * from './features/routing/glsp-manhattan-edge-router';
-export * from './features/save/save-keylistener';
-export * from './features/select/select-feedback-command';
-export * from './features/select/select-mouse-listener';
-export * from './features/source-model-watcher/source-model-changed-action-handler';
-export * from './features/status/status-overlay';
-export * from './features/svg-metadata/metadata-placer';
-export * from './features/tool-palette/tool-palette';
-export * from './features/tools/base-tools';
-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';
-
-// ------------------ Misc ------------------
+export * from './base';
 export * from './default-modules';
+export * from './features';
 export * from './model';
+export * from './re-exports';
 export * from './standalone-modules';
-export * from './utils/argument-utils';
-export * from './utils/gmodel-util';
-export * from './utils/html-utils';
-export * from './utils/layout-utils';
-export * from './utils/marker';
-export * from './utils/viewpoint-util';
+export * from './utils';
 export * from './views';
-// ------------------ DI Modules ------------------
-export * from './base/default.module';
-export * from './features/accessibility/accessibility-module';
-export * from './features/accessibility/element-navigation/element-navigation-module';
-export * from './features/accessibility/focus-tracker/focus-tracker-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/toast/toast-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/element-template/element-template-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/status/status-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';