@eclipse-glsp/server 1.1.0-next.146ae06.49 → 1.1.0-next.2ae7567.68

package/src/common/features/model/request-model-action-handler.ts

@@ -13,11 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, RequestModelAction, ServerMessageAction, ServerStatusAction } from '@eclipse-glsp/protocol';
+import { Action, RequestModelAction, StatusAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { ActionDispatcher } from '../../actions/action-dispatcher';
 import { ActionHandler } from '../../actions/action-handler';
+import { ClientOptionsUtil } from '../../utils/client-options-util';
 import { Logger } from '../../utils/logger';
+import { ProgressMonitor, ProgressService } from '../progress/progress-service';
 import { ModelState } from './model-state';
 import { ModelSubmissionHandler } from './model-submission-handler';
 import { SourceModelStorage } from './source-model-storage';
@@ -41,27 +43,45 @@ export class RequestModelActionHandler implements ActionHandler {
     @inject(ModelSubmissionHandler)
     protected submissionHandler: ModelSubmissionHandler;
 
+    @inject(ProgressService)
+    protected progressService: ProgressService;
+
     async execute(action: RequestModelAction): Promise<Action[]> {
         this.logger.debug('Execute RequestModelAction:', action);
         this.modelState.setAll(action.options ?? {});
 
-        this.notifyClient('Model loading in progress');
-        await this.sourceModelStorage.loadSourceModel(action);
-        // Clear the previous notification.
-        this.notifyClient();
-        return this.submissionHandler.submitModel();
+        const isReconnecting = ClientOptionsUtil.isReconnecting(action.options);
+
+        const progress = this.reportModelLoading('Model loading in progress');
+
+        if (isReconnecting) {
+            await this.handleReconnect(action);
+        } else {
+            await this.sourceModelStorage.loadSourceModel(action);
+        }
+        this.reportModelLoadingFinished(progress);
+
+        return this.submissionHandler.submitInitialModel(action);
+    }
+
+    protected async handleReconnect(action: RequestModelAction): Promise<void> {
+        const oldModelRoot = this.modelState.root;
+        if (oldModelRoot) {
+            // decrease revision by one, as each submit will increase it by one;
+            // the next save would produce warning that source model was changed otherwise
+            this.modelState.root.revision = (this.modelState.root.revision ?? 0) - 1;
+        } else {
+            await this.sourceModelStorage.loadSourceModel(action);
+        }
+    }
+
+    protected reportModelLoading(message: string): ProgressMonitor {
+        this.actionDispatcher.dispatch(StatusAction.create(message, { severity: 'INFO' }));
+        return this.progressService.start(message);
     }
 
-    /**
-     * Send a message and status notification with the given message to the client.
-     * An empty message is an indication for the client to clear previously received notifications.
-     * @param message The message that should be sent to the client
-     */
-    protected notifyClient(message = ''): void {
-        const severity = message.length > 0 ? 'INFO' : 'NONE';
-        this.actionDispatcher.dispatchAll(
-            ServerMessageAction.create(message, { severity }),
-            ServerStatusAction.create(message, { severity })
-        );
+    protected reportModelLoadingFinished(monitor: ProgressMonitor): void {
+        this.actionDispatcher.dispatch(StatusAction.create('', { severity: 'NONE' }));
+        monitor.end();
     }
 }

package/src/common/features/progress/progress-service.ts

@@ -0,0 +1,74 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { EndProgressAction, StartProgressAction, UpdateProgressAction } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import * as uuid from 'uuid';
+import { ActionDispatcher } from '../../actions/action-dispatcher';
+
+export const ProgressService = Symbol('ProgressService');
+
+/**
+ * Service for starting and monitoring progress reporting to the client.
+ */
+export interface ProgressService {
+    /**
+     * Start a progress reporting.
+     * @param title The title shown in the UI for the progress reporting.
+     * @param options Additional optional options for the progress reporting.
+     * @returns a monitor to update and end the progress reporting later.
+     */
+    start(title: string, options?: ProgressOptions): ProgressMonitor;
+}
+
+/**
+ * Optional progress reporting options.
+ */
+export interface ProgressOptions {
+    /** A message shown in the UI. */
+    message?: string;
+    /* The percentage (value range: 0 to 100) to show in the progress reporting. */
+    percentage?: number;
+}
+
+/**
+ * The monitor of a progress reporting, which can be used to update and end the reporting.
+ */
+export interface ProgressMonitor {
+    /**
+     * Updates an ongoing progress reporting.
+     * @param options Updated message and/or percentage (value range: 0 to 100).
+     */
+    update(options: { message?: string; percentage?: number }): void;
+    /**
+     * Ends an ongoing progress reporting.
+     */
+    end(): void;
+}
+
+@injectable()
+export class DefaultProgressService implements ProgressService {
+    @inject(ActionDispatcher)
+    protected actionDispatcher: ActionDispatcher;
+
+    start(title: string, options?: ProgressOptions): ProgressMonitor {
+        const progressId = uuid.v4();
+        this.actionDispatcher.dispatch(StartProgressAction.create({ progressId, title, ...options }));
+        return {
+            update: updateOptions => this.actionDispatcher.dispatch(UpdateProgressAction.create(progressId, updateOptions)),
+            end: () => this.actionDispatcher.dispatch(EndProgressAction.create(progressId))
+        };
+    }
+}

package/src/common/features/type-hints/edge-creation-checker.ts

@@ -0,0 +1,44 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { GModelElement } from '@eclipse-glsp/graph';
+
+/**
+ * Optional service used to check the validity of an edge being created. Used in combination with `dynamic`
+ * `EdgeTypeHints`.
+ * A dynamic edge type hint is used for cases where a plain list of allowed source and target element ids is not enough
+ * to determine wether an edge being created is valid. In this cases the client will query the server to determine wether the edge
+ * is valid. The `EdgeCreationChecker` then checks the given edge information and returns wether the edge being created is
+ * valid.
+ */
+export interface EdgeCreationChecker {
+    /**
+     * Checks wether the given source element for an edge being created is valid i.e. if the
+     * given source is and allowed source element for the given edge type.
+     *
+     * @returns `true` if the edge source is valid, `false` otherwise
+     */
+    isValidSource(edgeType: string, sourceElement: GModelElement): boolean;
+
+    /**
+     * Checks wether the given information for an edge being created is valid i.e. if the
+     * given target is an allowed target for the given source and edge type.
+     *
+     * @return `true` if the edge target is valid, `false` otherwise
+     */
+    isValidTarget(edgeType: string, sourceElement: GModelElement, targetElement: GModelElement): boolean;
+}
+export const EdgeCreationChecker = Symbol('EdgeCreationChecker');

package/src/common/features/type-hints/request-check-edge-action-handler.ts

@@ -0,0 +1,62 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { Action, CheckEdgeResultAction, MaybePromise, RequestCheckEdgeAction } from '@eclipse-glsp/protocol';
+import { inject, injectable, optional } from 'inversify';
+import { ActionHandler } from '../../actions/action-handler';
+import { DiagramConfiguration } from '../../diagram/diagram-configuration';
+import { GLSPServerError, getOrThrow } from '../../utils/glsp-server-error';
+import { ModelState } from '../model/model-state';
+import { EdgeCreationChecker } from './edge-creation-checker';
+
+@injectable()
+export class RequestCheckEdgeActionHandler implements ActionHandler {
+    @inject(ModelState)
+    protected modelState: ModelState;
+
+    @inject(DiagramConfiguration)
+    protected diagramConfiguration: DiagramConfiguration;
+
+    @inject(EdgeCreationChecker)
+    @optional()
+    protected edgeCreationChecker?: EdgeCreationChecker;
+
+    readonly actionKinds: string[] = [RequestCheckEdgeAction.KIND];
+
+    execute(action: RequestCheckEdgeAction): MaybePromise<Action[]> {
+        const hasDynamicHint = this.diagramConfiguration.edgeTypeHints.some(hint => hint.elementTypeId === action.edgeType && hint.dynamic);
+        const { edgeType, sourceElementId, targetElementId } = action;
+        const isValid = this.edgeCreationChecker && hasDynamicHint ? this.validate(action) : true;
+
+        return [CheckEdgeResultAction.create({ edgeType, isValid, sourceElementId, targetElementId })];
+    }
+
+    protected validate(action: RequestCheckEdgeAction): boolean {
+        const sourceElement = getOrThrow(
+            this.modelState.index.get(action.sourceElementId),
+            'Invalid `RequestCheckEdgeTargetAction`!. Could not find a source element with id: ' + action.sourceElementId
+        );
+        const targetElement = action.targetElementId ? this.modelState.index.get(action.targetElementId) : undefined;
+
+        if (action.targetElementId && !targetElement) {
+            throw new GLSPServerError(
+                'Invalid `RequestCheckEdgeTargetAction`! Could not find a target element with id: ' + action.targetElementId
+            );
+        }
+        return targetElement
+            ? this.edgeCreationChecker!.isValidTarget(action.edgeType, sourceElement, targetElement)
+            : this.edgeCreationChecker!.isValidSource(action.edgeType, sourceElement);
+    }
+}

package/src/common/{diagram → features/type-hints}/request-type-hints-action-handler.spec.ts

@@ -16,8 +16,8 @@
 import { EdgeTypeHint, RequestTypeHintsAction, SetTypeHintsAction, ShapeTypeHint } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
-import * as mock from '../test/mock-util';
-import { DiagramConfiguration } from './diagram-configuration';
+import { DiagramConfiguration } from '../../diagram/diagram-configuration';
+import * as mock from '../../test/mock-util';
 import { RequestTypeHintsActionHandler } from './request-type-hints-action-handler';
 
 describe('test RequestTypeHintsActionHandler', () => {

package/src/common/{diagram → features/type-hints}/request-type-hints-action-handler.ts

@@ -15,13 +15,12 @@
  ********************************************************************************/
 import { Action, MaybePromise, RequestTypeHintsAction, SetTypeHintsAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { ActionHandler } from '../actions/action-handler';
-import { DiagramConfiguration } from './diagram-configuration';
+import { ActionHandler } from '../../actions/action-handler';
+import { DiagramConfiguration } from '../../diagram/diagram-configuration';
 
 @injectable()
 export class RequestTypeHintsActionHandler implements ActionHandler {
     @inject(DiagramConfiguration) protected diagramConfiguration: DiagramConfiguration;
-    static KINDS = [RequestTypeHintsAction.KIND];
 
     execute(action: RequestTypeHintsAction): MaybePromise<Action[]> {
         return [

package/src/common/gmodel/gmodel-create-edge-operation-handler.ts

@@ -19,7 +19,7 @@ import { GNode } from '@eclipse-glsp/graph/lib/gnode';
 import { CreateEdgeOperation, MaybePromise, TriggerEdgeCreationAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import { Command } from '../command/command';
-import { CreateOperationHandler, CreateOperationKind } from '../operations/create-operation-handler';
+import { CreateEdgeOperationHandler } from '../operations/create-operation-handler';
 import { GModelOperationHandler } from './gmodel-operation-handler';
 
 /**
@@ -28,8 +28,8 @@ import { GModelOperationHandler } from './gmodel-operation-handler';
  * (i.e. all operation handlers directly modify the graphical model).
  */
 @injectable()
-export abstract class GModelCreateEdgeOperationHandler extends GModelOperationHandler implements CreateOperationHandler {
-    override readonly operationType: CreateOperationKind = CreateEdgeOperation.KIND;
+export abstract class GModelCreateEdgeOperationHandler extends GModelOperationHandler implements CreateEdgeOperationHandler {
+    override readonly operationType = CreateEdgeOperation.KIND;
     abstract override label: string;
     abstract elementTypeIds: string[];
 

package/src/common/gmodel/gmodel-create-node-operation-handler.ts

@@ -19,7 +19,7 @@ import { CreateNodeOperation, MaybePromise, Point, SelectAction, TriggerNodeCrea
 import { inject, injectable } from 'inversify';
 import { ActionDispatcher } from '../actions/action-dispatcher';
 import { Command } from '../command/command';
-import { CreateOperationHandler, CreateOperationKind } from '../operations/create-operation-handler';
+import { CreateNodeOperationHandler } from '../operations/create-operation-handler';
 import { getRelativeLocation } from '../utils/layout-util';
 import { GModelOperationHandler } from './gmodel-operation-handler';
 
@@ -29,7 +29,7 @@ import { GModelOperationHandler } from './gmodel-operation-handler';
  * (i.e. all operation handlers directly modify the graphical model).
  */
 @injectable()
-export abstract class GModelCreateNodeOperationHandler extends GModelOperationHandler implements CreateOperationHandler {
+export abstract class GModelCreateNodeOperationHandler extends GModelOperationHandler implements CreateNodeOperationHandler {
     @inject(ActionDispatcher)
     protected actionDispatcher: ActionDispatcher;
 
@@ -37,7 +37,7 @@ export abstract class GModelCreateNodeOperationHandler extends GModelOperationHa
 
     abstract override label: string;
 
-    override operationType: CreateOperationKind = CreateNodeOperation.KIND;
+    override readonly operationType = CreateNodeOperation.KIND;
 
     override createCommand(operation: CreateNodeOperation): MaybePromise<Command | undefined> {
         return this.commandOf(() => this.executeCreation(operation));

package/src/common/gmodel/paste-operation-handler.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { GBoundsAware, GEdge, GModelElement, isGBoundsAware } from '@eclipse-glsp/graph';
-import { EditorContext, MaybePromise, PasteOperation, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
+import { EditorContext, GModelElementSchema, MaybePromise, PasteOperation, Point } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import * as uuid from 'uuid';
 import { Command } from '../command/command';
@@ -38,7 +38,7 @@ export class GModelPasteOperationHandler extends GModelOperationHandler {
     }
 
     protected getCopiedElements(jsonString: string): GModelElement[] {
-        const schemas: SModelElementSchema[] = JSON.parse(jsonString);
+        const schemas: GModelElementSchema[] = JSON.parse(jsonString);
         return schemas.map(schema => this.modelSerializer.createElement(schema, this.modelState.root));
     }
 

package/src/common/index.ts

@@ -33,7 +33,6 @@ export * from './di/multi-binding';
 export * from './di/server-module';
 export * from './di/service-identifiers';
 export * from './diagram/diagram-configuration';
-export * from './diagram/request-type-hints-action-handler';
 export * from './features/clipboard/request-clipboard-data-action-handler';
 export * from './features/contextactions/command-palette-action-provider';
 export * from './features/contextactions/context-actions-provider';
@@ -65,12 +64,15 @@ export * from './features/navigation/request-navigation-targets-action-handler';
 export * from './features/navigation/resolve-navigation-targets-action-handler';
 export * from './features/popup/popup-model-factory';
 export * from './features/popup/request-popup-model-action-handler';
+export * from './features/type-hints/edge-creation-checker';
+export * from './features/type-hints/request-type-hints-action-handler';
 export * from './features/validation/model-validator';
 export * from './features/validation/request-markers-handler';
 export * from './gmodel/index';
 export * from './launch/glsp-server-launcher';
 export * from './operations/compound-operation-handler';
 export * from './operations/create-operation-handler';
+export * from './operations/json-operation-handler';
 export * from './operations/operation-action-handler';
 export * from './operations/operation-handler';
 export * from './operations/operation-handler-registry';

package/src/common/operations/compound-operation-handler.ts

@@ -19,6 +19,11 @@ import { Command, CompoundCommand } from '../command/command';
 import { OperationHandler } from './operation-handler';
 import { OperationHandlerRegistry } from './operation-handler-registry';
 
+/**
+ * Generic {@link OperationHandler} from {@link CompoundOperations}.
+ * Retrieves the corresponding execution commands for the list of (sub) operations
+ * and constructs a {@link CompoundCommand} for them.
+ */
 @injectable()
 export class CompoundOperationHandler extends OperationHandler {
     @inject(OperationHandlerRegistry)
@@ -27,7 +32,7 @@ export class CompoundOperationHandler extends OperationHandler {
     operationType = CompoundOperation.KIND;
 
     async createCommand(operation: CompoundOperation): Promise<Command | undefined> {
-        const maybeCommands = operation.operationList.map(op => this.operationHandlerRegistry.getExecutableCommand(op));
+        const maybeCommands = operation.operationList.map(op => this.operationHandlerRegistry.getOperationHandler(op)?.execute(op));
         const commands: Command[] = [];
 
         for await (const command of maybeCommands) {

package/src/common/operations/create-operation-handler.ts

@@ -19,21 +19,37 @@ import {
     hasArrayProp,
     hasFunctionProp,
     hasStringProp,
+    MaybePromise,
     TriggerEdgeCreationAction,
     TriggerNodeCreationAction
 } from '@eclipse-glsp/protocol';
+import { Command } from '../command/command';
 import { OperationHandler } from './operation-handler';
 
 /**
- * A special {@link OperationHandler} that is responsible for the handling of {@link CreateOperation}s. Depending on its
+ * A special {@link OperationHandler} that is responsible for the handling of (a subset of) {@link CreateEdgeOperation}s. Depending on its
  * operation type the triggered actions are {@link TriggerNodeCreationAction} or {@link TriggerEdgeCreationAction}s.
  */
-export interface CreateOperationHandler extends OperationHandler {
+export interface CreateEdgeOperationHandler extends OperationHandler {
+    label: string;
+    elementTypeIds: string[];
+    operationType: typeof CreateEdgeOperation.KIND;
+    getTriggerActions(): TriggerEdgeCreationAction[];
+    createCommand(operation: CreateEdgeOperation): MaybePromise<Command | undefined>;
+}
+
+export interface CreateNodeOperationHandler extends OperationHandler {
     readonly label: string;
     elementTypeIds: string[];
-    operationType: CreateOperationKind;
-    getTriggerActions(): (TriggerEdgeCreationAction | TriggerNodeCreationAction)[];
+    operationType: typeof CreateNodeOperation.KIND;
+    getTriggerActions(): TriggerNodeCreationAction[];
+    createCommand(operation: CreateNodeOperation): MaybePromise<Command | undefined>;
 }
+/**
+ * A special {@link OperationHandler} that is responsible for the handling of a node or edge creation operation. Depending on its
+ * operation type the triggered actions are {@link TriggerNodeCreationAction} or {@link TriggerEdgeCreationAction}s.
+ */
+export type CreateOperationHandler = CreateNodeOperationHandler | CreateEdgeOperationHandler;
 
 export type CreateOperationKind = typeof CreateNodeOperation.KIND | typeof CreateEdgeOperation.KIND;
 
@@ -41,9 +57,10 @@ export namespace CreateOperationHandler {
     export function is(object: unknown): object is CreateOperationHandler {
         return (
             object instanceof OperationHandler &&
+            hasStringProp(object, 'operationType') &&
             hasStringProp(object, 'label') &&
             hasArrayProp(object, 'elementTypeIds') &&
-            hasFunctionProp(object, 'getTriggerActions')
+            hasFunctionProp(object, 'getTriggerActions', true)
         );
     }
 }

package/src/common/operations/json-operation-handler.ts

@@ -0,0 +1,147 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { GModelElement } from '@eclipse-glsp/graph';
+import {
+    AnyObject,
+    CreateEdgeOperation,
+    CreateNodeOperation,
+    MaybePromise,
+    Point,
+    TriggerEdgeCreationAction,
+    TriggerNodeCreationAction,
+    hasFunctionProp,
+    hasObjectProp
+} from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { Command } from '../command/command';
+import { AbstractRecordingCommand } from '../command/recording-command';
+import { ModelState } from '../features/model/model-state';
+import { getRelativeLocation } from '../utils/layout-util';
+import { CreateEdgeOperationHandler, CreateNodeOperationHandler } from './create-operation-handler';
+import { OperationHandler } from './operation-handler';
+
+/**
+ * Helper interface for {@link ModelState} implementations of diagram languages that use a (serializable) JSON-based source model.
+ * Has to be implemented in order to reuse the {@link JsonOperationHandler} API.
+ */
+export interface JsonModelState<JsonObject extends AnyObject = AnyObject> extends ModelState {
+    readonly sourceModel: JsonObject;
+    updateSourceModel(sourceModel: JsonObject): void;
+}
+
+export namespace JsonModelState {
+    export function is(modelState: ModelState): modelState is JsonModelState {
+        return hasObjectProp(modelState, 'sourceModel') && hasFunctionProp(modelState, 'updateSourceModel');
+    }
+}
+
+/**
+ * Simple base implementation of {@link AbstractRecordingCommand} that allows recording of changes made
+ * to the `sourceModel` of the given {@link JsonModelState} during the given `doExecute` function
+ */
+export class JsonRecordingCommand<JsonObject extends AnyObject = AnyObject> extends AbstractRecordingCommand<JsonObject> {
+    constructor(protected modelState: JsonModelState<JsonObject>, protected doExecute: () => MaybePromise<void>) {
+        super();
+    }
+
+    protected override getJsonObject(): MaybePromise<JsonObject> {
+        return this.modelState.sourceModel;
+    }
+
+    protected override postChange(newModel: JsonObject): MaybePromise<void> {
+        this.modelState.updateSourceModel(newModel);
+    }
+}
+
+/**
+ * Reusable {@link OperationHandler} base implementation for diagram languages that use a (serializable) JSON-based source model.
+ * To use this class (or its subclasses) the injected {@link ModelState} has to implement the {@link JsonModelState} interface.
+ *
+ */
+@injectable()
+export abstract class JsonOperationHandler extends OperationHandler {
+    protected commandOf(runnable: () => void): Command {
+        if (!JsonModelState.is(this.modelState)) {
+            throw new Error('Cannot create command. The underlying model state does not implement the `JsonModelState` interface');
+        }
+        return new JsonRecordingCommand(this.modelState, runnable);
+    }
+}
+
+/**
+ * Reusable {@link CreateNodeOperationHandler} base implementation for diagram languages that use a (serializable) JSON-based source model.
+ */
+@injectable()
+export abstract class JsonCreateNodeOperationHandler extends JsonOperationHandler implements CreateNodeOperationHandler {
+    abstract elementTypeIds: string[];
+    abstract override label: string;
+    override readonly operationType = CreateNodeOperation.KIND;
+
+    abstract override createCommand(operation: CreateNodeOperation): MaybePromise<Command | undefined>;
+
+    getTriggerActions(): TriggerNodeCreationAction[] {
+        return this.elementTypeIds.map(typeId => TriggerNodeCreationAction.create(typeId));
+    }
+
+    /**
+     * Return the GModelElement that will contain the newly created node. It is usually
+     * the target element ({@link CreateNodeOperation.containerId}), but could also
+     * be e.g. an intermediate compartment, or even a different Node.
+     *
+     * @param operation
+     * @return the GModelElement that will contain the newly created node.
+     */
+    getContainer(operation: CreateNodeOperation): GModelElement | undefined {
+        const index = this.modelState.index;
+        return operation.containerId ? index.get(operation.containerId) : undefined;
+    }
+
+    getLocation(operation: CreateNodeOperation): Point | undefined {
+        return operation.location;
+    }
+
+    /**
+     * Retrieves the diagram absolute location and the target container from the given {@link CreateNodeOperation}
+     * and converts the absolute location to coordinates relative to the given container.
+     *  Relative coordinates can only be retrieved if the given container element is part of
+     * a hierarchy of {@link GBoundsAware} elements. This means each (recursive) parent element need to
+     * implement {@link GBoundsAware}. If that is not the case this method returns `undefined`.
+     * @param absoluteLocation The diagram absolute position.
+     * @param container The container element.
+     * @returns The relative position or `undefined`.
+     */
+    getRelativeLocation(operation: CreateNodeOperation): Point | undefined {
+        const container = this.getContainer(operation) ?? this.modelState.root;
+        const absoluteLocation = this.getLocation(operation) ?? Point.ORIGIN;
+        return getRelativeLocation(absoluteLocation, container);
+    }
+}
+
+/**
+ * Reusable {@link CreateEdgeOperationHandler} base implementation for diagram languages that use a (serializable) JSON-based source model.
+ */
+@injectable()
+export abstract class JsonCreateEdgeOperationHandler extends JsonOperationHandler implements CreateEdgeOperationHandler {
+    abstract elementTypeIds: string[];
+    abstract override label: string;
+    override readonly operationType = CreateEdgeOperation.KIND;
+
+    abstract override createCommand(operation: CreateEdgeOperation): MaybePromise<Command | undefined>;
+
+    getTriggerActions(): TriggerEdgeCreationAction[] {
+        return this.elementTypeIds.map(typeId => TriggerEdgeCreationAction.create(typeId));
+    }
+}

package/src/common/operations/operation-action-handler.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, MaybePromise, Operation, ServerMessageAction } from '@eclipse-glsp/protocol';
+import { Action, MaybePromise, MessageAction, Operation } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { ActionHandler } from '../actions/action-handler';
 import { Command } from '../command/command';
@@ -47,7 +47,7 @@ export class OperationActionHandler implements ActionHandler {
         }
         if (this.modelState.isReadonly) {
             return [
-                ServerMessageAction.create(`Server is in readonly-mode! Could not execute operation: ${action.kind}`, {
+                MessageAction.create(`Server is in readonly-mode! Could not execute operation: ${action.kind}`, {
                     severity: 'WARNING'
                 })
             ];

package/src/common/operations/operation-handler-registry.ts

@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, CreateOperation, MaybePromise, Operation } from '@eclipse-glsp/protocol';
+import { Args, CreateOperation, Operation } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
-import { Command } from '../command/command';
 import { ClientSessionInitializer } from '../session/client-session-initializer';
 import { Registry } from '../utils/registry';
 import { CreateOperationHandler } from './create-operation-handler';
@@ -35,16 +34,6 @@ export class OperationHandlerRegistry extends Registry<string, OperationHandler>
     getOperationHandler(operation: Operation): OperationHandler | undefined {
         return CreateOperation.is(operation) ? this.get(`${operation.kind}_${operation.elementTypeId}`) : this.get(operation.kind);
     }
-
-    /**
-     * Returns the matching command for the given operation.
-     *
-     * @param operation operation
-     * @return the matching command for the given operation
-     */
-    getExecutableCommand(operation: Operation): MaybePromise<Command | undefined> {
-        return this.getOperationHandler(operation)?.createCommand(operation);
-    }
 }
 
 @injectable()