@eclipse-glsp/client 2.3.0-next.381 → 2.3.0-next.384

package/src/features/accessibility/view-key-tools/zoom-key-tool.ts

@@ -14,32 +14,32 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { inject, injectable } from 'inversify';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import {
     Action,
     CenterAction,
+    GModelElement,
+    GModelRoot,
+    IActionDispatcher,
     KeyListener,
     KeyTool,
     Point,
-    GModelElement,
-    GModelRoot,
     SetViewportAction,
     TYPES,
     Viewport,
-    isViewport
+    isViewport,
+    matchesKeystroke
 } from '@eclipse-glsp/sprotty';
-import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
+import { inject, injectable } from 'inversify';
+import { EditorContextService } from '../../../base/editor-context-service';
 import { SelectionService } from '../../../base/selection-service';
 import { Tool } from '../../../base/tool-manager/tool';
-import { SetAccessibleKeyShortcutAction } from '../key-shortcut/accessible-key-shortcut';
-import { ZoomElementAction, ZoomViewportAction } from '../move-zoom/zoom-handler';
-import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
 import { getAbsolutePositionByPoint } from '../../../utils/viewpoint-util';
-import { EditorContextService } from '../../../base/editor-context-service';
-import { HideToastAction, ShowToastMessageAction } from '../toast/toast-handler';
 import { ElementNavigatorKeyListener } from '../element-navigation/diagram-navigation-tool';
+import { SetAccessibleKeyShortcutAction } from '../key-shortcut/accessible-key-shortcut';
+import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
+import { ZoomElementAction, ZoomViewportAction } from '../move-zoom/zoom-handler';
 import * as messages from '../toast/messages.json';
+import { HideToastAction, ShowToastMessageAction } from '../toast/toast-handler';
 
 /**
  * Zoom viewport and elements when its focused and arrow keys are hit.
@@ -53,7 +53,7 @@ export class ZoomKeyTool implements Tool {
     protected readonly zoomKeyListener = new ZoomKeyListener(this);
 
     @inject(KeyTool) protected readonly keytool: KeyTool;
-    @inject(TYPES.IActionDispatcher) readonly actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) readonly actionDispatcher: IActionDispatcher;
     @inject(SelectionService) selectionService: SelectionService;
     @inject(EditorContextService)
     protected editorContextService: EditorContextService;

package/src/features/bounds/local-bounds.ts

@@ -15,7 +15,6 @@
  ********************************************************************************/
 import {
     Action,
-    ActionDispatcher,
     Command,
     CommandExecutionContext,
     CommandResult,
@@ -24,6 +23,7 @@ import {
     ComputedBoundsApplicator,
     GModelRoot,
     GModelRootSchema,
+    IActionDispatcher,
     RequestBoundsAction,
     TYPES,
     ViewerOptions,
@@ -53,7 +53,7 @@ export namespace LocalRequestBoundsAction {
 
     export function fromCommand(
         { root }: CommandExecutionContext,
-        actionDispatcher: ActionDispatcher,
+        actionDispatcher: IActionDispatcher,
         cause?: Action,
         elementIDs?: string[]
     ): CommandResult {

package/src/features/bounds/set-bounds-feedback-command.ts

@@ -18,13 +18,13 @@ import {
     CommandExecutionContext,
     CommandReturn,
     ElementAndBounds,
+    IActionDispatcher,
     SetBoundsAction,
     SetBoundsCommand,
     TYPES,
     isLayoutContainer
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { FeedbackCommand } from '../../base/feedback/feedback-command';
 import { Ranked } from '../../base/ranked';
 import { LocalRequestBoundsAction } from './local-bounds';
@@ -51,7 +51,7 @@ export class SetBoundsFeedbackCommand extends SetBoundsCommand implements Feedba
 
     readonly rank: number = Ranked.DEFAULT_RANK;
 
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
 
     override execute(context: CommandExecutionContext): CommandReturn {
         super.execute(context);

package/src/features/command-palette/server-command-palette-provider.ts

@@ -13,18 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
 import {
     Action,
+    GModelElement,
+    IActionDispatcher,
     ICommandPaletteActionProvider,
     LabeledAction,
     Point,
     RequestContextActions,
-    GModelElement,
     SetContextActions,
     TYPES
 } from '@eclipse-glsp/sprotty';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { inject, injectable } from 'inversify';
 import { EditorContextService } from '../../base/editor-context-service';
 
 export namespace ServerCommandPalette {
@@ -35,7 +35,7 @@ export namespace ServerCommandPalette {
 
 @injectable()
 export class ServerCommandPaletteActionProvider implements ICommandPaletteActionProvider {
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
     @inject(EditorContextService) protected editorContext: EditorContextService;
 
     async getActions(_root: Readonly<GModelElement>, text: string, _lastMousePosition?: Point, index?: number): Promise<LabeledAction[]> {

package/src/features/context-menu/glsp-context-menu-mouse-listener.ts

@@ -17,6 +17,7 @@ import {
     Action,
     ContextMenuProviderRegistry,
     GModelElement,
+    IActionDispatcher,
     IContextMenuService,
     IContextMenuServiceProvider,
     MouseListener,
@@ -26,7 +27,6 @@ import {
     isSelectable
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional, postConstruct } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
 
 @injectable()
@@ -39,8 +39,8 @@ export class GLSPContextMenuMouseListener extends MouseListener {
     @optional()
     protected menuProvider?: ContextMenuProviderRegistry;
 
-    @inject(GLSPActionDispatcher)
-    protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher)
+    protected actionDispatcher: IActionDispatcher;
 
     protected menuService?: IContextMenuService;
 

package/src/features/context-menu/server-context-menu-provider.ts

@@ -13,19 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
 import {
     Action,
+    GModelElement,
+    IActionDispatcher,
     IContextMenuItemProvider,
     LabeledAction,
     Point,
     RequestContextActions,
-    GModelElement,
     SetContextActions,
     TYPES,
     isSelected
 } from '@eclipse-glsp/sprotty';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { inject, injectable } from 'inversify';
 import { EditorContextService } from '../../base/editor-context-service';
 
 export namespace ServerContextMenu {
@@ -34,7 +34,7 @@ export namespace ServerContextMenu {
 
 @injectable()
 export class ServerContextMenuItemProvider implements IContextMenuItemProvider {
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
     @inject(EditorContextService) protected editorContext: EditorContextService;
 
     async getItems(root: Readonly<GModelElement>, _lastMousePosition?: Point): Promise<LabeledAction[]> {

package/src/features/copy-paste/copy-paste-handler.ts

@@ -13,18 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
-import { v4 as uuid } from 'uuid';
 import {
     ClipboardData,
     CutOperation,
+    IActionDispatcher,
     PasteOperation,
     RequestClipboardDataAction,
     SetClipboardDataAction,
     TYPES,
     ViewerOptions
 } from '@eclipse-glsp/sprotty';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { inject, injectable } from 'inversify';
+import { v4 as uuid } from 'uuid';
 import { EditorContextService } from '../../base/editor-context-service';
 
 export interface ICopyPasteHandler {
@@ -100,7 +100,7 @@ const CLIPBOARD_DATA_FORMAT = 'text/plain';
 
 @injectable()
 export class ServerCopyPasteHandler implements ICopyPasteHandler {
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
     @inject(TYPES.ViewerOptions) protected viewerOptions: ViewerOptions;
     @inject(TYPES.IAsyncClipboardService) protected clipboardService: IAsyncClipboardService;
     @inject(EditorContextService) protected editorContext: EditorContextService;

package/src/features/element-template/add-template-element.ts

@@ -21,12 +21,12 @@ import {
     ElementTemplate,
     GChildElement,
     GModelElementSchema,
+    IActionDispatcher,
     TYPES,
     distinctAdd,
     remove
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { FeedbackCommand } from '../../base/feedback/feedback-command';
 import { isNotUndefined } from '../../utils/gmodel-util';
 import { LocalRequestBoundsAction } from '../bounds/local-bounds';
@@ -57,7 +57,7 @@ export function getTemplateElementId(template: ElementTemplate): string {
 export class AddTemplateElementsFeedbackCommand extends FeedbackCommand {
     static readonly KIND = AddTemplateElementsAction.KIND;
 
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
 
     constructor(@inject(TYPES.Action) readonly action: AddTemplateElementsAction) {
         super();

package/src/features/hints/type-hint-provider.spec.ts

@@ -37,15 +37,16 @@ import { Container } from 'inversify';
 import * as sinon from 'sinon';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { FeedbackActionDispatcher } from '../../base/feedback/feedback-action-dispatcher-default';
+import { FeedbackEmitter } from '../../base/feedback/feedback-emitter';
 import { GEdge } from '../../model';
 import { isResizable } from '../change-bounds/model';
 import { isReconnectable } from '../reconnect/model';
 import { Containable, isContainable, isReparentable } from './model';
 import { ApplyTypeHintsAction, ApplyTypeHintsCommand, ITypeHintProvider, TypeHintProvider } from './type-hint-provider';
-import { FeedbackEmitter } from '../../base/feedback/feedback-emitter';
 describe('TypeHintProvider', () => {
     const container = new Container();
     container.bind(GLSPActionDispatcher).toConstantValue(sinon.createStubInstance(GLSPActionDispatcher));
+    container.bind(TYPES.IActionDispatcher).toService(GLSPActionDispatcher);
     const stub = sinon.createStubInstance(FeedbackActionDispatcher);
     stub.createEmitter.returns(new FeedbackEmitter(stub));
     container.bind(TYPES.IFeedbackActionDispatcher).toConstantValue(stub);
@@ -163,6 +164,7 @@ describe('ApplyTypeHintCommand', () => {
         getShapeTypeHint: () => undefined
     });
     container.bind(GLSPActionDispatcher).toConstantValue(sandbox.createStubInstance(GLSPActionDispatcher));
+    container.bind(TYPES.IActionDispatcher).toService(GLSPActionDispatcher);
     container.bind(TYPES.IFeedbackActionDispatcher).toConstantValue(sandbox.createStubInstance(FeedbackActionDispatcher));
     container.bind(TYPES.ITypeHintProvider).toConstantValue(typeHintProviderMock);
     bindOrRebind(container, TYPES.Action).toConstantValue(ApplyTypeHintsAction.create());

package/src/features/hints/type-hint-provider.ts

@@ -23,6 +23,7 @@ import {
     GModelRoot,
     GRoutableElement,
     GShapeElement,
+    IActionDispatcher,
     IActionHandler,
     RequestTypeHintsAction,
     SetTypeHintsAction,
@@ -37,7 +38,6 @@ import {
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, postConstruct } from 'inversify';
 
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { IFeedbackActionDispatcher } from '../../base/feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../base/feedback/feedback-command';
 import { FeedbackEmitter } from '../../base/feedback/feedback-emitter';
@@ -202,8 +202,8 @@ export class TypeHintProvider implements IActionHandler, ITypeHintProvider, IDia
     @inject(TYPES.IFeedbackActionDispatcher)
     protected feedbackActionDispatcher: IFeedbackActionDispatcher;
 
-    @inject(GLSPActionDispatcher)
-    protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher)
+    protected actionDispatcher: IActionDispatcher;
 
     protected typeHintsFeedback: FeedbackEmitter;
     protected shapeHints: Map<string, ShapeTypeHint> = new Map();

package/src/features/label-edit/edit-label-validator.ts

@@ -13,21 +13,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
 import {
     Action,
     EditLabelValidationResult,
     EditableLabel,
+    GModelElement,
+    IActionDispatcher,
     IEditLabelValidationDecorator,
     IEditLabelValidator,
     RequestEditValidationAction,
-    GModelElement,
     SetEditValidationResultAction,
     Severity,
     TYPES,
     ValidationStatus
 } from '@eclipse-glsp/sprotty';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { inject, injectable } from 'inversify';
 
 export namespace LabelEditValidation {
     export const CONTEXT_ID = 'label-edit';
@@ -50,7 +50,7 @@ export namespace LabelEditValidation {
 
 @injectable()
 export class ServerEditLabelValidator implements IEditLabelValidator {
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
 
     async validate(value: string, label: EditableLabel & GModelElement): Promise<EditLabelValidationResult> {
         const action = LabelEditValidation.createValidationRequestAction(value, label.id);

package/src/features/layout/layout-elements-action.spec.ts

@@ -57,6 +57,18 @@ import {
 
 class MockActionDispatcher implements IActionDispatcher {
     constructor(public dispatchedActions: Action[] = []) {}
+    requestUntil<Res extends ResponseAction>(
+        action: RequestAction<Res>,
+        timeoutMs?: number | undefined,
+        rejectOnTimeout?: boolean | undefined
+    ): Promise<Res | undefined> {
+        throw new Error('Method not implemented.');
+    }
+    dispatchOnceModelInitialized(...actions: Action[]): void {}
+    onceModelInitialized(): Promise<void> {
+        return Promise.resolve();
+    }
+    dispatchAfterNextUpdate(...actions: Action[]): void {}
     dispatch(action: Action): Promise<void> {
         this.dispatchedActions.push(action);
         return Promise.resolve();

package/src/features/status/status-overlay.ts

@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { IActionHandler, StatusAction, codiconCSSClasses } from '@eclipse-glsp/sprotty';
+import { IActionDispatcher, IActionHandler, StatusAction, TYPES, codiconCSSClasses } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { EditorContextService } from '../../base/editor-context-service';
 import { IDiagramStartup } from '../../base/model/diagram-loader';
 import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
@@ -27,8 +26,8 @@ import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
 export class StatusOverlay extends GLSPAbstractUIExtension implements IActionHandler, IDiagramStartup {
     static readonly ID = 'glsp.server.status.overlay';
 
-    @inject(GLSPActionDispatcher)
-    protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher)
+    protected actionDispatcher: IActionDispatcher;
 
     @inject(EditorContextService)
     protected editorContext: EditorContextService;

package/src/features/tool-palette/tool-palette.ts

@@ -16,6 +16,7 @@
 import {
     Action,
     GModelRoot,
+    IActionDispatcher,
     IActionHandler,
     ICommand,
     MarkersReason,
@@ -32,7 +33,6 @@ import {
     matchesKeystroke
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional, postConstruct } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { EditorContextService, IEditModeListener } from '../../base/editor-context-service';
 import { FocusTracker } from '../../base/focus/focus-tracker';
 import { IDiagramStartup } from '../../base/model/diagram-loader';
@@ -69,8 +69,8 @@ export namespace EnableToolPaletteAction {
 export class ToolPalette extends GLSPAbstractUIExtension implements IActionHandler, IEditModeListener, IDiagramStartup {
     static readonly ID = 'tool-palette';
 
-    @inject(GLSPActionDispatcher)
-    protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher)
+    protected actionDispatcher: IActionDispatcher;
 
     @inject(EditorContextService)
     protected editorContext: EditorContextService;

package/src/features/tools/base-tools.ts

@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, Disposable, DisposableCollection, IActionHandler, TYPES } from '@eclipse-glsp/sprotty';
+import { Action, Disposable, DisposableCollection, IActionDispatcher, IActionHandler, TYPES } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { EditorContextService } from '../../base/editor-context-service';
 import { IFeedbackActionDispatcher, IFeedbackEmitter, MaybeActions } from '../../base/feedback/feedback-action-dispatcher';
 import { FeedbackEmitter } from '../../base/feedback/feedback-emitter';
@@ -59,7 +58,7 @@ export interface FeedbackAwareTool extends Tool {
 @injectable()
 export abstract class BaseEditTool implements FeedbackAwareTool {
     @inject(TYPES.IFeedbackActionDispatcher) protected feedbackDispatcher: IFeedbackActionDispatcher;
-    @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
     @inject(GLSPMouseTool) protected mouseTool: GLSPMouseTool;
     @inject(GLSPKeyTool) protected keyTool: GLSPKeyTool;
     @inject(EditorContextService) protected readonly editorContext: EditorContextService;

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

@@ -19,6 +19,7 @@ import {
     Args,
     CreateEdgeOperation,
     GModelElement,
+    IActionDispatcher,
     RequestCheckEdgeAction,
     TYPES,
     TriggerEdgeCreationAction,
@@ -27,7 +28,6 @@ import {
     isCtrlOrCmd
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional } from 'inversify';
-import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
 import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';
@@ -98,7 +98,7 @@ export class EdgeCreationToolMouseListener extends DragAwareMouseListener {
 
     constructor(
         protected triggerAction: TriggerEdgeCreationAction,
-        protected actionDispatcher: GLSPActionDispatcher,
+        protected actionDispatcher: IActionDispatcher,
         protected typeHintProvider: ITypeHintProvider,
         protected tool: EdgeCreationTool,
         protected dragSensitivity?: number

package/src/features/validation/marker-navigator.ts

@@ -19,6 +19,7 @@ import {
     GIssueSeverity,
     GModelElement,
     GModelRoot,
+    IActionDispatcher,
     IActionHandler,
     IContextMenuItemProvider,
     KeyListener,
@@ -34,7 +35,6 @@ import {
     matchesKeystroke
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { SelectionService } from '../../base/selection-service';
 import { BoundsAwareModelElement, SelectableElement, getElements, isSelectableAndBoundsAware } from '../../utils/gmodel-util';
 import { MarkerPredicates, collectIssueMarkers } from '../../utils/marker';
@@ -166,7 +166,7 @@ export class NavigateToMarkerActionHandler implements IActionHandler {
     protected selectionService: SelectionService;
 
     @inject(TYPES.IActionDispatcher)
-    protected actionDispatcher: GLSPActionDispatcher;
+    protected actionDispatcher: IActionDispatcher;
 
     handle(action: NavigateToMarkerAction): void {
         const selected = this.getSelectedElements(action);