@eclipse-glsp/client 1.1.0-next.697cc23.237 → 1.1.0-next.69a77b0.259

package/src/features/tools/{view.tsx → marquee-selection/view.tsx}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 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
@@ -15,7 +15,7 @@
  ********************************************************************************/
 import { injectable } from 'inversify';
 import { VNode } from 'snabbdom';
-import { RectangularNodeView, RenderingContext, svg } from 'sprotty';
+import { RectangularNodeView, RenderingContext, svg } from '~glsp-sprotty';
 import { MarqueeNode } from './model';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/{lib/features/tools/di.config.d.ts → src/features/tools/node-creation/di.config.ts}

@@ -13,16 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BindingContext } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-/**
- * Registers the default tools of GLSP (node and edge creation, changing bounds, edge editing, deletion)
- * and adds the marquee selection tool.
- */
-export declare const toolsModule: ContainerModule;
-export declare function configureMarqueeTool(context: Pick<BindingContext, 'bind' | 'isBound'>): void;
-/**
- * Enables the default tools in the tool manager if the diagram looses focus.
- */
-export declare const enableDefaultToolsOnFocusLossModule: ContainerModule;
-//# sourceMappingURL=di.config.d.ts.map
+import { TYPES, TriggerNodeCreationAction, bindAsService, configureActionHandler } from '~glsp-sprotty';
+import { NodeCreationTool } from './node-creation-tool';
+
+const nodeCreationToolModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+    const context = { bind, unbind, isBound, rebind };
+    bindAsService(context, TYPES.ITool, NodeCreationTool);
+    configureActionHandler(context, TriggerNodeCreationAction.KIND, NodeCreationTool);
+});
+
+export default nodeCreationToolModule;

package/src/features/tools/{node-creation-tool.ts → node-creation/node-creation-tool.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,57 +13,42 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, CreateNodeOperation, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
 import {
+    Action,
+    CreateNodeOperation,
     EnableDefaultToolsAction,
-    EnableToolsAction,
-    findParentByFeature,
-    IActionHandler,
-    isCtrlOrCmd,
     ISnapper,
     SModelElement,
     SNode,
-    TYPES
-} from 'sprotty';
-import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
-import { getAbsolutePosition } from '../../utils/viewpoint-util';
-import { Containable, isContainable } from '../hints/model';
-import { CursorCSS, cursorFeedbackAction } from '../tool-feedback/css-feedback';
-import { BaseGLSPTool } from './base-glsp-tool';
+    TYPES,
+    TriggerNodeCreationAction,
+    findParentByFeature,
+    isCtrlOrCmd
+} from '~glsp-sprotty';
+import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
+import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
+import { getAbsolutePosition } from '../../../utils/viewpoint-util';
+import { Containable, isContainable } from '../../hints/model';
+import { BaseGLSPCreationTool } from '../base-glsp-creation-tool';
 
 @injectable()
-export class NodeCreationTool extends BaseGLSPTool implements IActionHandler {
+export class NodeCreationTool extends BaseGLSPCreationTool<TriggerNodeCreationAction> {
     static ID = 'tool_create_node';
 
-    @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
+    protected isTriggerAction = TriggerNodeCreationAction.is;
 
-    protected creationToolMouseListener: NodeCreationToolMouseListener;
-    protected triggerAction: TriggerNodeCreationAction;
+    @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
 
     get id(): string {
         return NodeCreationTool.ID;
     }
 
-    enable(): void {
-        if (this.triggerAction === undefined) {
-            throw new TypeError(`Could not enable tool ${this.id}.The triggerAction cannot be undefined.`);
-        }
-        this.creationToolMouseListener = new NodeCreationToolMouseListener(this.triggerAction, this);
-        this.mouseTool.register(this.creationToolMouseListener);
-        this.dispatchFeedback([cursorFeedbackAction(CursorCSS.NODE_CREATION)]);
-    }
-
-    disable(): void {
-        this.mouseTool.deregister(this.creationToolMouseListener);
-        this.deregisterFeedback([cursorFeedbackAction()]);
-    }
-
-    handle(action: Action): Action | void {
-        if (TriggerNodeCreationAction.is(action)) {
-            this.triggerAction = action;
-            return EnableToolsAction.create([this.id]);
-        }
+    doEnable(): void {
+        this.toDisposeOnDisable.push(
+            this.mouseTool.registerListener(new NodeCreationToolMouseListener(this.triggerAction, this)),
+            this.registerFeedback([cursorFeedbackAction(CursorCSS.NODE_CREATION)], this, [cursorFeedbackAction()])
+        );
     }
 }
 
@@ -109,7 +94,7 @@ export class NodeCreationToolMouseListener extends DragAwareMouseListener {
             const feedback = this.creationAllowed(this.elementTypeId)
                 ? cursorFeedbackAction(CursorCSS.NODE_CREATION)
                 : cursorFeedbackAction(CursorCSS.OPERATION_NOT_ALLOWED);
-            this.tool.dispatchFeedback([feedback]);
+            this.tool.registerFeedback([feedback]);
         }
         return [];
     }

package/src/features/validation/di.config.ts

@@ -13,10 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService, SetMarkersAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureActionHandler, configureCommand } from 'sprotty';
-import { TYPES } from '../../base/types';
+import { SetMarkersAction, TYPES, bindAsService, configureActionHandler, configureCommand } from '~glsp-sprotty';
 import {
     LeftToRightTopToBottomComparator,
     MarkerNavigator,

package/src/features/validation/issue-marker.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, Marker, MarkerKind } from '@eclipse-glsp/protocol';
-import { isBoundsAware, Projectable, SDecoration, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
+import {
+    Bounds,
+    Marker,
+    MarkerKind,
+    Projectable,
+    SDecoration,
+    SIssue,
+    SIssueMarker,
+    SIssueSeverity,
+    SParentElement,
+    isBoundsAware
+} from '~glsp-sprotty';
 
 export class GIssueMarker extends SIssueMarker implements Projectable {
     constructor() {

package/src/features/validation/marker-navigator.spec.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,25 +13,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-/* eslint-disable import/no-deprecated,no-unused-expressions */
-import { SNodeSchema } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import { Container } from 'inversify';
 import 'mocha';
 import 'reflect-metadata';
 import {
     BoundsAware,
-    decorationModule,
     SChildElement,
+    SGraphFactory,
     SIssue,
     SIssueMarker,
     SModelElement,
     SModelRoot,
+    SNodeSchema,
     SParentElement,
-    TYPES
-} from 'sprotty';
-import defaultModule from 'sprotty/lib/base/di.config';
-import { SGraphFactory } from 'sprotty/lib/graph/sgraph-factory';
+    TYPES,
+    decorationModule,
+    defaultModule
+} from '~glsp-sprotty';
 import { markerNavigatorModule } from './di.config';
 import { MarkerNavigator } from './marker-navigator';
 

package/src/features/validation/marker-navigator.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,29 +13,34 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, CenterAction, hasArrayProp, hasStringProp, Point, SelectAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
-    ActionDispatcher,
+    Action,
     BoundsAware,
-    findParentByFeature,
+    CenterAction,
     IActionHandler,
     IContextMenuItemProvider,
-    isBoundsAware,
-    isSelectable,
     KeyListener,
     MenuItem,
-    Selectable,
+    Point,
     SIssueMarker,
     SIssueSeverity,
     SModelElement,
-    SModelRoot
-} from 'sprotty';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-import { TYPES } from '../../base/types';
-import { collectIssueMarkers, MarkerPredicates } from '../../utils/marker';
+    SModelRoot,
+    SelectAction,
+    Selectable,
+    TYPES,
+    findParentByFeature,
+    hasArrayProp,
+    hasStringProp,
+    isBoundsAware,
+    isSelectable,
+    matchesKeystroke
+} from '~glsp-sprotty';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { SelectionService } from '../../base/selection-service';
+import { MarkerPredicates, collectIssueMarkers } from '../../utils/marker';
 import { getElements, isSelectableAndBoundsAware } from '../../utils/smodel-util';
-import { SelectionService } from '../select/selection-service';
 
 export interface NavigateToMarkerAction extends Action {
     kind: typeof NavigateToMarkerAction.KIND;
@@ -159,11 +164,11 @@ export class NavigateToMarkerActionHandler implements IActionHandler {
     @inject(MarkerNavigator)
     protected markerNavigator: MarkerNavigator;
 
-    @inject(TYPES.SelectionService)
+    @inject(SelectionService)
     protected selectionService: SelectionService;
 
     @inject(TYPES.IActionDispatcher)
-    protected actionDispatcher: ActionDispatcher;
+    protected actionDispatcher: GLSPActionDispatcher;
 
     handle(action: NavigateToMarkerAction): void {
         const selected = this.getSelectedElements(action);
@@ -201,7 +206,7 @@ export class NavigateToMarkerActionHandler implements IActionHandler {
 
 @injectable()
 export class MarkerNavigatorContextMenuItemProvider implements IContextMenuItemProvider {
-    @inject(TYPES.SelectionService) protected selectionService: SelectionService;
+    @inject(SelectionService) protected selectionService: SelectionService;
 
     getItems(root: Readonly<SModelRoot>, lastMousePosition?: Point): Promise<MenuItem[]> {
         const selectedElementIds = Array.from(this.selectionService.getSelectedElementIDs());

package/src/features/validation/validate.ts

@@ -13,15 +13,27 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, DeleteMarkersAction, hasArrayProp, Marker, SetMarkersAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
-import { CommandExecutionContext, CommandReturn, IActionDispatcher, IActionHandler, ICommand, SIssueMarker, SParentElement } from 'sprotty';
+import {
+    Action,
+    CommandExecutionContext,
+    CommandReturn,
+    DeleteMarkersAction,
+    IActionDispatcher,
+    IActionHandler,
+    ICommand,
+    Marker,
+    SIssueMarker,
+    SParentElement,
+    SetMarkersAction,
+    TYPES,
+    hasArrayProp
+} from '~glsp-sprotty';
 import { EditorContextService } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
+import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../../base/feedback/feedback-action-dispatcher';
+import { FeedbackCommand } from '../../base/feedback/feedback-command';
 import { removeCssClasses } from '../../utils/smodel-util';
-import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
-import { FeedbackCommand } from '../tool-feedback/model';
-import { createSIssue, getOrCreateSIssueMarker, getSeverity, getSIssueMarker, GIssueMarker } from './issue-marker';
+import { GIssueMarker, createSIssue, getOrCreateSIssueMarker, getSIssueMarker, getSeverity } from './issue-marker';
 
 /**
  * Feedback emitter sending actions for visualizing model validation feedback and

package/src/features/viewport/di.config.ts

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import {
+    bindAsService,
     CenterCommand,
     CenterKeyboardListener,
     configureActionHandler,
@@ -27,7 +27,7 @@ import {
     SetViewportCommand,
     TYPES,
     ZoomMouseListener
-} from 'sprotty';
+} from '~glsp-sprotty';
 import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
 
 const glspViewportModule = new ContainerModule((bind, _unbind, isBound) => {

package/src/features/viewport/glsp-scroll-mouse-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 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,10 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { EnableDefaultToolsAction, EnableToolsAction, IActionHandler, ICommand, ScrollMouseListener, SModelElement } from 'sprotty';
-import { MarqueeMouseTool } from '../tools/marquee-mouse-tool';
+import {
+    Action,
+    EnableDefaultToolsAction,
+    EnableToolsAction,
+    IActionHandler,
+    ICommand,
+    ScrollMouseListener,
+    SModelElement
+} from '~glsp-sprotty';
+import { MarqueeMouseTool } from '../tools/marquee-selection/marquee-mouse-tool';
 
 @injectable()
 export class GLSPScrollMouseListener extends ScrollMouseListener implements IActionHandler {

package/src/{base/tool-manager/tool-actions.ts → glsp-sprotty/augmented-actions.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics 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,13 +13,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+/* eslint-disable @typescript-eslint/no-shadow */
+/* eslint-disable-next-line no-restricted-imports*/
 import { Action, hasArrayProp } from '@eclipse-glsp/protocol';
+import { SetBoundsAction } from 'sprotty-protocol/lib/actions';
 import { EnableDefaultToolsAction, EnableToolsAction } from 'sprotty/lib/base/tool-manager/tool';
-/* eslint-disable no-shadow */
 
 /**
- * Use module augmentation to add the `is` utility function to the tool action namespaces provided by sprotty
+ * Use module augmentation to add namespaces and  the `is` utility function to sprotty actions that directly reused by GLSP
  */
+declare module 'sprotty-protocol/lib/actions' {
+    namespace SetBoundsAction {
+        export function is(object: any): object is SetBoundsAction;
+    }
+}
+
+SetBoundsAction.is = (object: any): object is SetBoundsAction =>
+    Action.hasKind(object, SetBoundsAction.KIND) && hasArrayProp(object, 'bounds');
+
 declare module 'sprotty/lib/base/tool-manager/tool' {
     export namespace EnableDefaultToolsAction {
         export function is(object: any): object is EnableDefaultToolsAction;