@eclipse-glsp/client 1.1.0-next.9fabd84.216 → 1.1.0-next.a6b28e7.258

package/src/{sprotty-reexport.ts → glsp-sprotty/index.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,14 +19,32 @@
  * The deprecated definitions are planned to be removed with Sprotty 1.0.0.
  * Until then we have to manually reexport the sprotty main index and exclude the clashing types.
  */
+/* eslint-disable no-restricted-imports */
 
+/**
+ * @eclipse-glsp/protocol
+ */
 export * from '@eclipse-glsp/protocol';
-// sprotty-protocol
+/*
+ * sprotty-protocol
+ */
 export {
-    BringToFrontAction, CollapseExpandAction, CollapseExpandAllAction,
-    ElementAndAlignment, HoverFeedbackAction, MoveAction, SetBoundsAction
+    BringToFrontAction,
+    CollapseExpandAction,
+    CollapseExpandAllAction,
+    ElementAndAlignment,
+    GetSelectionAction,
+    GetViewportAction,
+    HoverFeedbackAction,
+    MoveAction,
+    SelectionResult,
+    SetBoundsAction,
+    ViewportResult
 } from 'sprotty-protocol/lib/actions';
 export { Viewport } from 'sprotty-protocol/lib/model';
+/*
+ * sprotty
+ */
 // ------------------ Base ------------------
 export * from 'sprotty/lib/base/actions/action-dispatcher';
 export * from 'sprotty/lib/base/actions/action-handler';
@@ -41,15 +59,15 @@ export * from 'sprotty/lib/base/commands/command-stack-options';
 export * from 'sprotty/lib/base/features/initialize-canvas';
 export { SetModelCommand } from 'sprotty/lib/base/features/set-model';
 export {
-    createRandomId,
     FeatureSet,
     IModelIndex,
-    isParent,
     ModelIndexImpl,
-    SChildElement,
-    SModelElement,
-    SModelRoot,
-    SParentElement
+    SChildElementImpl as SChildElement,
+    SModelElementImpl as SModelElement,
+    SModelRootImpl as SModelRoot,
+    SParentElementImpl as SParentElement,
+    createRandomId,
+    isParent
 } from 'sprotty/lib/base/model/smodel';
 export * from 'sprotty/lib/base/model/smodel-extension';
 export * from 'sprotty/lib/base/model/smodel-factory';
@@ -65,6 +83,7 @@ export * from 'sprotty/lib/base/tool-manager/tool';
 export * from 'sprotty/lib/base/tool-manager/tool-manager';
 export * from 'sprotty/lib/base/ui-extensions/ui-extension';
 export * from 'sprotty/lib/base/ui-extensions/ui-extension-registry';
+export * from 'sprotty/lib/base/views/dom-helper';
 export * from 'sprotty/lib/base/views/key-tool';
 export * from 'sprotty/lib/base/views/mouse-tool';
 export * from 'sprotty/lib/base/views/thunk-view';
@@ -74,6 +93,7 @@ export * from 'sprotty/lib/base/views/viewer-cache';
 export * from 'sprotty/lib/base/views/viewer-options';
 export * from 'sprotty/lib/base/views/vnode-postprocessor';
 export * from 'sprotty/lib/base/views/vnode-utils';
+export * from 'sprotty/lib/features/bounds/abstract-layout';
 // ------------------ Features ------------------
 export {
     RequestBoundsCommand,
@@ -84,36 +104,37 @@ export {
 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 {
     Alignable,
-    alignFeature,
     BoundsAware,
+    LayoutContainer,
+    LayoutableChild,
+    ModelLayoutOptions,
+    SShapeElementImpl as SShapeElement,
+    alignFeature,
     boundsFeature,
     findChildrenAtPosition,
     getAbsoluteBounds,
     getAbsoluteClientBounds,
     isAlignable,
     isBoundsAware,
-    isLayoutableChild,
     isLayoutContainer,
+    isLayoutableChild,
     isSizeable,
-    LayoutableChild,
-    layoutableChildFeature,
-    LayoutContainer,
     layoutContainerFeature,
-    ModelLayoutOptions,
-    SShapeElement
+    layoutableChildFeature
 } from 'sprotty/lib/features/bounds/model';
 export * from 'sprotty/lib/features/bounds/stack-layout';
 export * from 'sprotty/lib/features/bounds/vbox-layout';
 export * from 'sprotty/lib/features/bounds/views';
 export {
     ButtonHandlerRegistry,
-    configureButtonHandler,
     IButtonHandler,
-    IButtonHandlerRegistration
+    IButtonHandlerRegistration,
+    configureButtonHandler
 } from 'sprotty/lib/features/button/button-handler';
-export * from 'sprotty/lib/features/button/model';
+export { SButtonImpl as SButton, SButtonSchema } from 'sprotty/lib/features/button/model';
 export * from 'sprotty/lib/features/command-palette/action-providers';
 export * from 'sprotty/lib/features/command-palette/command-palette';
 export { Anchor, IContextMenuService, IContextMenuServiceProvider } from 'sprotty/lib/features/context-menu/context-menu-service';
@@ -141,7 +162,7 @@ export * from 'sprotty/lib/features/expand/model';
 export * from 'sprotty/lib/features/expand/views';
 export { ExportSvgCommand, ExportSvgKeyListener, ExportSvgPostprocessor, RequestExportSvgAction } from 'sprotty/lib/features/export/export';
 export * from 'sprotty/lib/features/export/model';
-export { SvgExporter } from 'sprotty/lib/features/export/svg-exporter';
+export { ExportSvgAction, SvgExporter } from 'sprotty/lib/features/export/svg-exporter';
 export * from 'sprotty/lib/features/fade/fade';
 export * from 'sprotty/lib/features/fade/model';
 export {
@@ -155,10 +176,17 @@ export {
     SetPopupModelCommand
 } from 'sprotty/lib/features/hover/hover';
 export * from 'sprotty/lib/features/hover/model';
+export { PopupPositionUpdater } from 'sprotty/lib/features/hover/popup-position-updater';
 export * from 'sprotty/lib/features/move/model';
 export {
-    ElementMove, LocationPostprocessor, MorphEdgesAnimation, MoveAnimation,
-    MoveCommand, MoveMouseListener, ResolvedElementMove, ResolvedHandleMove
+    ElementMove,
+    LocationPostprocessor,
+    MorphEdgesAnimation,
+    MoveAnimation,
+    MoveCommand,
+    MoveMouseListener,
+    ResolvedElementMove,
+    ResolvedHandleMove
 } from 'sprotty/lib/features/move/move';
 export * from 'sprotty/lib/features/move/snap';
 export * from 'sprotty/lib/features/nameable/model';
@@ -172,20 +200,31 @@ export * from 'sprotty/lib/features/routing/bezier-anchors';
 export * from 'sprotty/lib/features/routing/bezier-edge-router';
 export * from 'sprotty/lib/features/routing/manhattan-anchors';
 export * from 'sprotty/lib/features/routing/manhattan-edge-router';
-export * from 'sprotty/lib/features/routing/model';
+export {
+    Connectable,
+    RoutingHandleKind,
+    SConnectableElementImpl as SConnectableElement,
+    SDanglingAnchorImpl as SDanglingAnchor,
+    SRoutableElementImpl as SRoutableElement,
+    SRoutingHandleImpl as SRoutingHandle,
+    connectableFeature,
+    edgeInProgressID,
+    edgeInProgressTargetHandleID,
+    getAbsoluteRouteBounds,
+    getRouteBounds,
+    isConnectable
+} from 'sprotty/lib/features/routing/model';
 export * from 'sprotty/lib/features/routing/polyline-anchors';
 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 {
-    GetSelectionAction,
     GetSelectionCommand,
-    SelectAllCommand,
-    SelectCommand,
-    SelectionResult,
     SelectKeyboardListener,
-    SelectMouseListener
+    SelectMouseListener,
+    SelectAllCommand as SprottySelectAllCommand,
+    SelectCommand as SprottySelectCommand
 } from 'sprotty/lib/features/select/select';
 export { UndoRedoKeyListener } from 'sprotty/lib/features/undo-redo/undo-redo';
 export * from 'sprotty/lib/features/update/model-matching';
@@ -198,17 +237,20 @@ export {
 } from 'sprotty/lib/features/viewport/center-fit';
 export * from 'sprotty/lib/features/viewport/model';
 export * from 'sprotty/lib/features/viewport/scroll';
-export {
-    GetViewportAction,
-    GetViewportCommand,
-    SetViewportCommand,
-    ViewportAnimation,
-    ViewportResult
-} from 'sprotty/lib/features/viewport/viewport';
+export { GetViewportCommand, SetViewportCommand, ViewportAnimation } from 'sprotty/lib/features/viewport/viewport';
 export * from 'sprotty/lib/features/viewport/viewport-root';
 export * from 'sprotty/lib/features/viewport/zoom';
 export { BringToFrontCommand, ZOrderElement } from 'sprotty/lib/features/zorder/zorder';
-export { SCompartment, SEdge, SGraph, SGraphIndex, SLabel, SNode, SPort } from 'sprotty/lib/graph/sgraph';
+export {
+    SCompartmentImpl as SCompartment,
+    SEdgeImpl as SEdge,
+    SGraphImpl as SGraph,
+    SGraphIndex,
+    SLabelImpl as SLabel,
+    SNodeImpl as SNode,
+    SPortImpl as SPort
+} from 'sprotty/lib/graph/sgraph';
+export * from 'sprotty/lib/lib/virtualize';
 // ------------------ Graph ------------------
 export * from 'sprotty/lib/graph/sgraph-factory';
 export * from 'sprotty/lib/graph/views';
@@ -219,12 +261,12 @@ export {
     CircularNode,
     CircularPort,
     DiamondNode,
-    ForeignObjectElement,
-    HtmlRoot,
-    PreRenderedElement,
+    ForeignObjectElementImpl as ForeignObjectElement,
+    HtmlRootImpl as HtmlRoot,
+    PreRenderedElementImpl as PreRenderedElement,
     RectangularNode,
     RectangularPort,
-    ShapedPreRenderedElement
+    ShapedPreRenderedElementImpl as ShapedPreRenderedElement
 } from 'sprotty/lib/lib/model';
 // ------------------ Library ------------------
 export * from 'sprotty/lib/lib/modules';
@@ -240,24 +282,35 @@ export * from 'sprotty/lib/model-source/websocket';
 export * from 'sprotty/lib/utils/browser';
 export * from 'sprotty/lib/utils/codicon';
 export * from 'sprotty/lib/utils/color';
-export { Diamond, Insets, intersection, Line, Orientation, PointToPointLine } from 'sprotty/lib/utils/geometry';
+export { Diamond, Insets, Line, Orientation, PointToPointLine, intersection } from 'sprotty/lib/utils/geometry';
 export * from 'sprotty/lib/utils/inversify';
+export * from 'sprotty/lib/utils/iterable';
+export * from 'sprotty/lib/utils/keyboard';
 export * from 'sprotty/lib/utils/logging';
 export * from 'sprotty/lib/utils/registry';
-export { defaultModule };
+/**
+ * Misc glsp adaptions/augmentations
+ */
+export * from './augmented-actions';
+export * from './types';
+/**
+ * Modules
+ */
 export {
-    graphModule,
     boundsModule,
     buttonModule,
     commandPaletteModule,
     contextMenuModule,
     decorationModule,
+    defaultModule,
     edgeIntersectionModule,
     edgeLayoutModule,
     expandModule,
     exportModule,
     fadeModule,
+    graphModule,
     hoverModule,
+    modelSourceModule,
     moveModule,
     openModule,
     routingModule,
@@ -267,8 +320,6 @@ export {
     viewportModule,
     zorderModule
 };
-export { modelSourceModule };
-
 import defaultModule from 'sprotty/lib/base/di.config';
 import boundsModule from 'sprotty/lib/features/bounds/di.config';
 import buttonModule from 'sprotty/lib/features/button/di.config';
@@ -291,4 +342,3 @@ import viewportModule from 'sprotty/lib/features/viewport/di.config';
 import zorderModule from 'sprotty/lib/features/zorder/di.config';
 import graphModule from 'sprotty/lib/graph/di.config';
 import modelSourceModule from 'sprotty/lib/model-source/di.config';
-

package/src/{base → glsp-sprotty}/types.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,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+// eslint-disable-next-line no-restricted-imports
 import { TYPES as SprottyTYPES } from 'sprotty';
 /**
  * Reexport of the TYPES namespace of sprotty augments with additional GLSP specific service
@@ -26,10 +27,8 @@ export const TYPES = {
     IToolFactory: Symbol('Factory<Tool>'),
     ITypeHintProvider: Symbol('ITypeHintProvider'),
     IMovementRestrictor: Symbol('IMovementRestrictor'),
-    SelectionService: Symbol('SelectionService'),
-    SelectionListener: Symbol('SelectionListener'),
-    SModelRootListener: Symbol('SModelRootListener'),
-    MouseTool: Symbol('MouseTool'),
+    ISelectionListener: Symbol('ISelectionListener'),
+    ISModelRootListener: Symbol('ISModelRootListener'),
     IContextMenuProvider: Symbol('IContextMenuProvider'),
     ICopyPasteHandler: Symbol('ICopyPasteHandler'),
     ITool: Symbol('ITool'),

package/src/index.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
@@ -14,6 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import defaultGLSPModule from './base/di.config';
+import { glspAccessibilityModule } from './features/accessibility/di.config';
+import { glspMoveZoomModule } from './features/accessibility/move-zoom/di.config';
+import { glspResizeKeyModule } from './features/accessibility/resize-key-tool/di.config';
+import { glspSearchPaletteModule } from './features/accessibility/search/di.config';
+import { glspViewKeyToolsModule } from './features/accessibility/view-key-tools/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';
@@ -22,17 +27,24 @@ 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 navigationModule from './features/navigation/di.config';
+import glspRoutingModule from './features/routing/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 svgMetadataModule from './features/svg-metadata/di.config';
 import paletteModule from './features/tool-palette/di.config';
-import { enableDefaultToolsOnFocusLossModule, toolsModule } from './features/tools/di.config';
-import { markerNavigatorModule, validationModule } from './features/validation/di.config';
+import changeBoundsToolModule from './features/tools/change-bounds/di.config';
+import deletionToolModule from './features/tools/deletion/di.config';
+import edgeCreationToolModule from './features/tools/edge-creation/di.config';
+import edgeEditToolModule from './features/tools/edge-edit/di.config';
+import enableDefaultToolsOnFocusLossModule from './features/tools/enable-default-tools-on-focus-loss';
+import marqueeSelectionToolModule from './features/tools/marquee-selection/di.config';
+import nodeCreationToolModule from './features/tools/node-creation/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';
@@ -40,87 +52,134 @@ 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/feedback/feedback-action-dispatcher';
+export * from './base/feedback/feedback-command';
+export * from './base/feedback/update-model-command';
 export * from './base/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/tool-actions';
-export * from './base/types';
+export * from './base/tool-manager/glsp-tool-manager';
+export * from './base/view/mouse-tool';
 export * from './base/view/view-registry';
+export * from './container-modules';
+
+//
+// ------------------ 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/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/selection-service-aware-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/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/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/routing/glsp-manhattan-edge-router';
 export * from './features/save/model';
 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/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/model';
+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 * from './features/tools/edge-creation-tool';
-export * from './features/tools/edge-edit-tool';
-export * from './features/tools/marquee-behavior';
-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/enable-default-tools-on-focus-loss';
+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/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 './lib/model';
 export * from './model-source/glsp-diagram-server';
-export * from './sprotty-reexport';
 export * from './utils/argument-utils';
+export * from './utils/html-utils';
+export * from './utils/layout-utils';
 export * from './utils/marker';
 export * from './utils/smodel-util';
 export * from './utils/viewpoint-util';
 export * from './views';
+// ------------------ DI Modules ------------------
 export {
-    validationModule,
-    saveModule,
-    paletteModule,
-    toolFeedbackModule,
+    changeBoundsToolModule,
+    copyPasteContextMenuModule,
     defaultGLSPModule,
-    modelHintsModule,
+    deletionToolModule,
+    edgeCreationToolModule,
+    edgeEditToolModule,
+    enableDefaultToolsOnFocusLossModule,
+    glspAccessibilityModule,
     glspCommandPaletteModule,
     glspContextMenuModule,
-    glspServerCopyPasteModule,
-    copyPasteContextMenuModule,
-    glspSelectModule,
-    glspMouseToolModule,
-    layoutModule,
+    glspDecorationModule,
     glspEditLabelModule,
     glspHoverModule,
-    toolsModule,
-    enableDefaultToolsOnFocusLossModule,
-    navigationModule,
+    glspMoveZoomModule,
+    glspResizeKeyModule,
+    glspRoutingModule,
+    glspSearchPaletteModule,
+    glspSelectModule,
+    glspServerCopyPasteModule,
+    glspViewKeyToolsModule,
+    glspViewportModule,
+    layoutModule,
+    markerNavigatorContextMenuModule,
     markerNavigatorModule,
-    glspDecorationModule,
-    sourceModelWatcherModule as modelSourceWatcherModule,
-    glspViewportModule
+    marqueeSelectionToolModule,
+    modelHintsModule,
+    navigationModule,
+    nodeCreationToolModule,
+    paletteModule,
+    saveModule,
+    sourceModelWatcherModule,
+    svgMetadataModule,
+    validationModule
 };

package/src/lib/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,8 +13,18 @@
  *
  * 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';
 

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,22 @@
  *
  * 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,
+    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,
+    SwitchEditModeCommand
+} from '~glsp-sprotty';
 import { SourceUriAware } from '../base/source-uri-aware';
 
 const receivedFromServerProperty = '__receivedFromServer';

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/html-utils.ts

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

package/src/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;