@eclipse-glsp/server 1.1.0-next.3d7585d.42 → 1.1.0-next.44bd1e0.43

package/lib/common/operations/create-operation-handler.js

@@ -1,90 +1,31 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateNodeOperationHandler = exports.CreateOperationHandler = void 0;
+exports.CreateOperationHandler = void 0;
+/********************************************************************************
+ * 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
+ * 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
+ ********************************************************************************/
 const protocol_1 = require("@eclipse-glsp/protocol");
-const inversify_1 = require("inversify");
-const model_state_1 = require("../features/model/model-state");
-const layout_util_1 = require("../utils/layout-util");
-/**
- * A special {@link OperationHandler} that is responsible for the handling of {@link CreateOperation}s. Depending on its
- * operation type the triggered actions are {@link TriggerNodeCreationAction} or {@link TriggerEdgeCreationAction}s.
- */
-let CreateOperationHandler = class CreateOperationHandler {
-    /**
-     * Returns a list of {@link TriggerElementCreationAction}s for registered element types.
-     *
-     * @returns A list of {@link TriggerElementCreationAction}s.
-     */
-    getTriggerActions() {
-        if (this.operationType === protocol_1.CreateNodeOperation.KIND) {
-            return this.elementTypeIds.map(typeId => protocol_1.TriggerNodeCreationAction.create(typeId));
-        }
-        else if (this.operationType === protocol_1.CreateEdgeOperation.KIND) {
-            return this.elementTypeIds.map(typeId => protocol_1.TriggerEdgeCreationAction.create(typeId));
-        }
-        return [];
+const operation_handler_1 = require("./operation-handler");
+var CreateOperationHandler;
+(function (CreateOperationHandler) {
+    function is(object) {
+        return (object instanceof operation_handler_1.OperationHandler &&
+            (0, protocol_1.hasStringProp)(object, 'label') &&
+            (0, protocol_1.hasArrayProp)(object, 'elementTypeIds') &&
+            (0, protocol_1.hasFunctionProp)(object, 'getTriggerActions'));
     }
-    handles(operation) {
-        return this.elementTypeIds.includes(operation.elementTypeId);
-    }
-};
-CreateOperationHandler = __decorate([
-    (0, inversify_1.injectable)()
-], CreateOperationHandler);
-exports.CreateOperationHandler = CreateOperationHandler;
-/**
- * Abstract base implementation for {@link CreateOperationHandler} that
- * create an element that is represented with a {@link GNode} in the graphical model.
- */
-let CreateNodeOperationHandler = class CreateNodeOperationHandler extends CreateOperationHandler {
-    get operationType() {
-        return protocol_1.CreateNodeOperation.KIND;
-    }
-    /**
-     * Retrieve the graphical model element that should contain the newly created {@link GNode}.
-     * If `undefined` is returned the {@link GNode} should be added directly to the diagram root.
-     * @param operation The currently handled operation.
-     * @returns The container {@link GModeElement} or `undefined`.
-     */
-    getContainer(operation) {
-        const index = this.modelState.index;
-        return operation.containerId ? index.get(operation.containerId) : undefined;
-    }
-    getLocation(operation) {
-        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) {
-        var _a, _b;
-        const container = (_a = this.getContainer(operation)) !== null && _a !== void 0 ? _a : this.modelState.root;
-        const absoluteLocation = (_b = this.getLocation(operation)) !== null && _b !== void 0 ? _b : protocol_1.Point.ORIGIN;
-        return (0, layout_util_1.getRelativeLocation)(absoluteLocation, container);
-    }
-};
-__decorate([
-    (0, inversify_1.inject)(model_state_1.ModelState),
-    __metadata("design:type", Object)
-], CreateNodeOperationHandler.prototype, "modelState", void 0);
-CreateNodeOperationHandler = __decorate([
-    (0, inversify_1.injectable)()
-], CreateNodeOperationHandler);
-exports.CreateNodeOperationHandler = CreateNodeOperationHandler;
+    CreateOperationHandler.is = is;
+})(CreateOperationHandler = exports.CreateOperationHandler || (exports.CreateOperationHandler = {}));
 //# sourceMappingURL=create-operation-handler.js.map

package/lib/common/operations/create-operation-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDASgC;AAChC,yCAA+C;AAC/C,+DAA2D;AAC3D,sDAA2D;AAG3D;;;GAGG;AAEI,IAAe,sBAAsB,GAArC,MAAe,sBAAsB;IAOxC;;;;OAIG;IACH,iBAAiB;QACb,IAAI,IAAI,CAAC,aAAa,KAAK,8BAAmB,CAAC,IAAI,EAAE;YACjD,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,oCAAyB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;SACtF;aAAM,IAAI,IAAI,CAAC,aAAa,KAAK,8BAAmB,CAAC,IAAI,EAAE;YACxD,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,oCAAyB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;SACtF;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,CAAC,SAA0B;QAC9B,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACjE,CAAC;CACJ,CAAA;AAxBqB,sBAAsB;IAD3C,IAAA,sBAAU,GAAE;GACS,sBAAsB,CAwB3C;AAxBqB,wDAAsB;AA0B5C;;;GAGG;AAEI,IAAe,0BAA0B,GAAzC,MAAe,0BAA2B,SAAQ,sBAAsB;IAI3E,IAAI,aAAa;QACb,OAAO,8BAAmB,CAAC,IAAI,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,SAA8B;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,OAAO,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,CAAC;IAED,WAAW,CAAC,SAA8B;QACtC,OAAO,SAAS,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;;;;;;OASG;IACH,mBAAmB,CAAC,SAA8B;;QAC9C,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,mCAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACvE,MAAM,gBAAgB,GAAG,MAAA,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,mCAAI,gBAAK,CAAC,MAAM,CAAC;QACrE,OAAO,IAAA,iCAAmB,EAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AArCG;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;8DACc;AAFf,0BAA0B;IAD/C,IAAA,sBAAU,GAAE;GACS,0BAA0B,CAsC/C;AAtCqB,gEAA0B"}
+{"version":3,"file":"create-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAQgC;AAChC,2DAAuD;AAevD,IAAiB,sBAAsB,CAStC;AATD,WAAiB,sBAAsB;IACnC,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,CACH,MAAM,YAAY,oCAAgB;YAClC,IAAA,wBAAa,EAAC,MAAM,EAAE,OAAO,CAAC;YAC9B,IAAA,uBAAY,EAAC,MAAM,EAAE,gBAAgB,CAAC;YACtC,IAAA,0BAAe,EAAC,MAAM,EAAE,mBAAmB,CAAC,CAC/C,CAAC;IACN,CAAC;IAPe,yBAAE,KAOjB,CAAA;AACL,CAAC,EATgB,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAStC"}

package/lib/common/operations/operation-action-handler.d.ts

@@ -15,6 +15,8 @@
  ********************************************************************************/
 import { Action, MaybePromise, Operation } from '@eclipse-glsp/protocol';
 import { ActionHandler } from '../actions/action-handler';
+import { Command } from '../command/command';
+import { CommandStack } from '../command/command-stack';
 import { ModelState } from '../features/model/model-state';
 import { ModelSubmissionHandler } from '../features/model/model-submission-handler';
 import { OperationHandler } from './operation-handler';
@@ -24,10 +26,17 @@ export declare class OperationActionHandler implements ActionHandler {
     protected operationHandlerRegistry: OperationHandlerRegistry;
     protected modelSubmissionHandler: ModelSubmissionHandler;
     protected modelState: ModelState;
+    protected commandStack: CommandStack;
     constructor(actionKinds: string[]);
     execute(action: Operation): MaybePromise<Action[]>;
-    executeHandler(operation: Operation, handler: OperationHandler): Promise<Action[]>;
+    protected executeOperation(operation: Operation): MaybePromise<Action[]>;
+    protected executeHandler(operation: Operation, handler: OperationHandler): Promise<Action[]>;
+    protected executeCommand(command: Command): void;
+    protected submitModel(): MaybePromise<Action[]>;
     handles(action: Action): boolean;
+    /**
+     *  @Deprecated Use {@link OperationHandlerRegistry#getOperationHandler(Operation) instead}.
+     */
     static getOperationHandler(operation: Operation, registry: OperationHandlerRegistry): OperationHandler | undefined;
 }
 //# sourceMappingURL=operation-action-handler.d.ts.map

package/lib/common/operations/operation-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operation-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAmB,YAAY,EAAE,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAE/G,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,sBAAuB,YAAW,aAAa;IAKxB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAJ5B,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAC/D,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IACrE,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;gBAEZ,WAAW,EAAE,MAAM,EAAE;IAE9D,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAiB5C,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASxF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAOhC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,SAAS;CAGrH"}
+{"version":3,"file":"operation-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,sBAAuB,YAAW,aAAa;IAaxB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAX9D,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAG7D,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,MAAM,EAAE;IAE9D,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAclD,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;cAQxD,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQlG,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhD,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIhC;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,SAAS;CAGrH"}

package/lib/common/operations/operation-action-handler.js

@@ -31,46 +31,57 @@ exports.OperationActionHandler = void 0;
  ********************************************************************************/
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
+const command_stack_1 = require("../command/command-stack");
 const service_identifiers_1 = require("../di/service-identifiers");
 const model_state_1 = require("../features/model/model-state");
 const model_submission_handler_1 = require("../features/model/model-submission-handler");
+const glsp_server_error_1 = require("../utils/glsp-server-error");
 const operation_handler_registry_1 = require("./operation-handler-registry");
 let OperationActionHandler = OperationActionHandler_1 = class OperationActionHandler {
     constructor(actionKinds) {
         this.actionKinds = actionKinds;
     }
     execute(action) {
-        if (this.handles(action)) {
-            if (this.modelState.isReadonly) {
-                return [
-                    protocol_1.ServerMessageAction.create(`Server is in readonly-mode! Could not execute operation: ${action.kind}`, {
-                        severity: 'WARNING'
-                    })
-                ];
-            }
-            const operationHandler = OperationActionHandler_1.getOperationHandler(action, this.operationHandlerRegistry);
-            if (operationHandler) {
-                return this.executeHandler(action, operationHandler);
-            }
+        if (!this.handles(action)) {
+            throw new glsp_server_error_1.GLSPServerError(`Unhandled operation kind: ${action.kind}`);
+        }
+        if (this.modelState.isReadonly) {
+            return [
+                protocol_1.ServerMessageAction.create(`Server is in readonly-mode! Could not execute operation: ${action.kind}`, {
+                    severity: 'WARNING'
+                })
+            ];
+        }
+        return this.executeOperation(action);
+    }
+    executeOperation(operation) {
+        const operationHandler = OperationActionHandler_1.getOperationHandler(operation, this.operationHandlerRegistry);
+        if (operationHandler) {
+            return this.executeHandler(operation, operationHandler);
         }
         return [];
     }
     async executeHandler(operation, handler) {
-        // TODO: Create GModelRecordingCommand;
-        await handler.execute(operation);
-        this.modelState.index.indexRoot(this.modelState.root);
-        this.modelState.isDirty = true;
-        // TODO: this.modelState.execute(command)
+        const command = await handler.execute(operation);
+        if (command) {
+            this.executeCommand(command);
+        }
+        return this.modelSubmissionHandler.submitModel('operation');
+    }
+    executeCommand(command) {
+        this.commandStack.execute(command);
+    }
+    submitModel() {
         return this.modelSubmissionHandler.submitModel('operation');
     }
     handles(action) {
-        if (this.actionKinds.includes(action.kind)) {
-            return true;
-        }
-        return false;
+        return this.actionKinds.includes(action.kind);
     }
+    /**
+     *  @Deprecated Use {@link OperationHandlerRegistry#getOperationHandler(Operation) instead}.
+     */
     static getOperationHandler(operation, registry) {
-        return protocol_1.CreateOperation.is(operation) ? registry.get(`${operation.kind}_${operation.elementTypeId}`) : registry.get(operation.kind);
+        return registry.getOperationHandler(operation);
     }
 };
 __decorate([
@@ -85,6 +96,10 @@ __decorate([
     (0, inversify_1.inject)(model_state_1.ModelState),
     __metadata("design:type", Object)
 ], OperationActionHandler.prototype, "modelState", void 0);
+__decorate([
+    (0, inversify_1.inject)(command_stack_1.CommandStack),
+    __metadata("design:type", Object)
+], OperationActionHandler.prototype, "commandStack", void 0);
 OperationActionHandler = OperationActionHandler_1 = __decorate([
     (0, inversify_1.injectable)(),
     __param(0, (0, inversify_1.inject)(service_identifiers_1.Operations)),

package/lib/common/operations/operation-action-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA+G;AAC/G,yCAA+C;AAE/C,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AAEpF,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAK/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACtB,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;gBAC5B,OAAO;oBACH,8BAAmB,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;wBAClG,QAAQ,EAAE,SAAS;qBACtB,CAAC;iBACL,CAAC;aACL;YACD,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC3G,IAAI,gBAAgB,EAAE;gBAClB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;aACxD;SACJ;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAChE,uCAAuC;QACvC,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC/B,yCAAyC;QACzC,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACxC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,0BAAe,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACvI,CAAC;CACJ,CAAA;AA1CG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BAAqC,qDAAwB;wEAAC;AAC/F;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BAAmC,iDAAsB;sEAAC;AACzF;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DAAkC;AAH5C,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAMI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GALtB,sBAAsB,CA2ClC;AA3CY,wDAAsB"}
+{"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA8F;AAC9F,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACzE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YAC5B,OAAO;gBACH,8BAAmB,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAClG,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;SACL;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE;YAClB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;SAC3D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAES,cAAc,CAAC,OAAgB;QACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAES,WAAW;QACjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AA/DG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;wEAAC;AAE7D;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;sEAAC;AAEzD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;AAX5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAcI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GAbtB,sBAAsB,CAgElC;AAhEY,wDAAsB"}

package/lib/common/operations/operation-handler-registry.d.ts

@@ -13,17 +13,26 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args } from '@eclipse-glsp/protocol';
+import { Args, MaybePromise, Operation } from '@eclipse-glsp/protocol';
+import { Command } from '../command/command';
 import { ClientSessionInitializer } from '../session/client-session-initializer';
 import { Registry } from '../utils/registry';
 import { OperationHandler, OperationHandlerConstructor, OperationHandlerFactory } from './operation-handler';
 export declare class OperationHandlerRegistry extends Registry<string, OperationHandler> {
     registerHandler(handler: OperationHandler): boolean;
+    getOperationHandler(operation: Operation): OperationHandler | undefined;
+    /**
+     * 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>;
 }
 export declare class OperationHandlerRegistryInitializer implements ClientSessionInitializer {
     protected factory: OperationHandlerFactory;
     protected handlerConstructors: OperationHandlerConstructor[];
     protected registry: OperationHandlerRegistry;
-    initialize(args?: Args): void;
+    initialize(_args?: Args): void;
 }
 //# sourceMappingURL=operation-handler-registry.d.ts.map

package/lib/common/operations/operation-handler-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operation-handler-registry.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-handler-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE7G,qBACa,wBAAyB,SAAQ,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAC5E,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;CAQtD;AAED,qBACa,mCAAoC,YAAW,wBAAwB;IAEhF,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAC;IAI3C,SAAS,CAAC,mBAAmB,EAAE,2BAA2B,EAAE,CAAM;IAGlE,SAAS,CAAC,QAAQ,EAAE,wBAAwB,CAAC;IAE7C,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI;CAIhC"}
+{"version":3,"file":"operation-handler-registry.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-handler-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,IAAI,EAAmB,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExF,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE7G,qBACa,wBAAyB,SAAQ,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAC5E,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IASnD,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS;IAIvE;;;;;OAKG;IACH,oBAAoB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;CAGhF;AAED,qBACa,mCAAoC,YAAW,wBAAwB;IAEhF,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAC;IAI3C,SAAS,CAAC,mBAAmB,EAAE,2BAA2B,EAAE,CAAM;IAGlE,SAAS,CAAC,QAAQ,EAAE,wBAAwB,CAAC;IAE7C,UAAU,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI;CAIjC"}

package/lib/common/operations/operation-handler-registry.js

@@ -10,13 +10,29 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationHandlerRegistryInitializer = exports.OperationHandlerRegistry = void 0;
+/********************************************************************************
+ * 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
+ * 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
+ ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const registry_1 = require("../utils/registry");
 const create_operation_handler_1 = require("./create-operation-handler");
 const operation_handler_1 = require("./operation-handler");
 let OperationHandlerRegistry = class OperationHandlerRegistry extends registry_1.Registry {
     registerHandler(handler) {
-        if (handler instanceof create_operation_handler_1.CreateOperationHandler) {
+        if (create_operation_handler_1.CreateOperationHandler.is(handler)) {
             handler.elementTypeIds.forEach(typeId => this.register(`${handler.operationType}_${typeId}`, handler));
             return true;
         }
@@ -24,6 +40,19 @@ let OperationHandlerRegistry = class OperationHandlerRegistry extends registry_1
             return this.register(handler.operationType, handler);
         }
     }
+    getOperationHandler(operation) {
+        return protocol_1.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) {
+        var _a;
+        return (_a = this.getOperationHandler(operation)) === null || _a === void 0 ? void 0 : _a.createCommand(operation);
+    }
 };
 OperationHandlerRegistry = __decorate([
     (0, inversify_1.injectable)()
@@ -33,7 +62,7 @@ let OperationHandlerRegistryInitializer = class OperationHandlerRegistryInitiali
     constructor() {
         this.handlerConstructors = [];
     }
-    initialize(args) {
+    initialize(_args) {
         const handlers = this.handlerConstructors.map(constructor => this.factory(constructor));
         handlers.forEach(handler => this.registry.registerHandler(handler));
     }

package/lib/common/operations/operation-handler-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"operation-handler-registry.js","sourceRoot":"","sources":["../../../src/common/operations/operation-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAA6C;AAC7C,yEAAoE;AACpE,2DAA6G;AAGtG,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,mBAAkC;IAC5E,eAAe,CAAC,OAAyB;QACrC,IAAI,OAAO,YAAY,iDAAsB,EAAE;YAC3C,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,aAAa,IAAI,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YACvG,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SACxD;IACL,CAAC;CACJ,CAAA;AATY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CASpC;AATY,4DAAwB;AAY9B,IAAM,mCAAmC,GAAzC,MAAM,mCAAmC;IAAzC;QAMO,wBAAmB,GAAkC,EAAE,CAAC;IAStE,CAAC;IAJG,UAAU,CAAC,IAAW;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACxF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AAdG;IAAC,IAAA,kBAAM,EAAC,2CAAuB,CAAC;;oEACW;AAE3C;IAAC,IAAA,kBAAM,EAAC,+CAA2B,CAAC;IACnC,IAAA,oBAAQ,GAAE;;gFACuD;AAElE;IAAC,IAAA,kBAAM,EAAC,wBAAwB,CAAC;8BACb,wBAAwB;qEAAC;AATpC,mCAAmC;IAD/C,IAAA,sBAAU,GAAE;GACA,mCAAmC,CAe/C;AAfY,kFAAmC"}
+{"version":3,"file":"operation-handler-registry.js","sourceRoot":"","sources":["../../../src/common/operations/operation-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAAyD;AAGzD,gDAA6C;AAC7C,yEAAoE;AACpE,2DAA6G;AAGtG,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,mBAAkC;IAC5E,eAAe,CAAC,OAAyB;QACrC,IAAI,iDAAsB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,aAAa,IAAI,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YACvG,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SACxD;IACL,CAAC;IAED,mBAAmB,CAAC,SAAoB;QACpC,OAAO,0BAAe,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/H,CAAC;IAED;;;;;OAKG;IACH,oBAAoB,CAAC,SAAoB;;QACrC,OAAO,MAAA,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,0CAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC;CACJ,CAAA;AAvBY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAuBpC;AAvBY,4DAAwB;AA0B9B,IAAM,mCAAmC,GAAzC,MAAM,mCAAmC;IAAzC;QAMO,wBAAmB,GAAkC,EAAE,CAAC;IAStE,CAAC;IAJG,UAAU,CAAC,KAAY;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACxF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AAdG;IAAC,IAAA,kBAAM,EAAC,2CAAuB,CAAC;;oEACW;AAE3C;IAAC,IAAA,kBAAM,EAAC,+CAA2B,CAAC;IACnC,IAAA,oBAAQ,GAAE;;gFACuD;AAElE;IAAC,IAAA,kBAAM,EAAC,wBAAwB,CAAC;8BACb,wBAAwB;qEAAC;AATpC,mCAAmC;IAD/C,IAAA,sBAAU,GAAE;GACA,mCAAmC,CAe/C;AAfY,kFAAmC"}

package/lib/common/operations/operation-handler.d.ts

@@ -15,33 +15,50 @@
  ********************************************************************************/
 import { MaybePromise, Operation } from '@eclipse-glsp/protocol';
 import { interfaces } from 'inversify';
-export declare const OperationHandler: unique symbol;
+import { Command } from '../command/command';
+import { ModelState } from '../features/model/model-state';
 /**
  * An operation handler can execute {@link Operation}s of a certain type (subclass).
  * The operation handler processes the operation in the {@link OperationHandler.execute()} method. The result
- * of the execution is an update of the `ModelState` state.
- * This update is reversible (undo) and can be reapplied (redo). For basic diagram languages these updates are typically
- * applied directly on the `ModelState` using EMF `Command`s and the
- * `ModelState.execute()` method. For more complex diagram languages the
- * GModel state might be updated indirectly and the operation handler manipulates a custom model representation.
+ * of the execution is a {@link Command} that captures the corresponding source model changes.
+ * This command can be applied on the `CommandStack` and is reversible (undo) and can be reapplied (redo).
  *
  * The `OperationActionHandler` is responsible for retrieving all available (valid) operation handlers for an
  * operation that is dispatched via `ActionDispatcher`.
  */
-export interface OperationHandler {
+export declare abstract class OperationHandler {
+    protected modelState: ModelState;
     /**
      * Returns the operation type that can be handled by this operation handler.
      *
      * @returns the operation type that can be handled.
      */
-    readonly operationType: string;
+    abstract operationType: string;
     readonly label?: string;
     /**
-     * Executes the operation handler for the given {@link Operation}.
+     * Creates a command that performs the operation in the source model(s). If `undefined` is  returned, no update
+     * is performed on the model(s).
      *
-     * @param operation The operation that should be executed.
+     * @param operation The operation to process.
+     * @return The created command to be executed on the command stack or `undefined` nothing should be done.
      */
-    execute(operation: Operation): MaybePromise<void>;
+    abstract createCommand(operation: Operation): MaybePromise<Command | undefined>;
+    /**
+     * Executes the operation handler for the given {@link Operation} and returns the corresponding {@link Command}.
+     * If the given operation cannot be handled by this handler or the handler execution did not result in any changes
+     * `undefined` is returned.
+     *
+     * @param operation The operation that should be executed or empty if nothing should be done.
+     * @returns The command capturing the execution changes or `undefined`
+     */
+    execute(operation: Operation): MaybePromise<Command | undefined>;
+    /**
+     * Validates whether the given {@link Operation} can be handled by this operation handler.
+     *
+     * @param operation The operation that should be validated.
+     * @returns `true` if the given operation can be handled, `false` otherwise.
+     */
+    handles(operation: Operation): boolean;
 }
 export declare const OperationHandlerConstructor: unique symbol;
 export type OperationHandlerConstructor = interfaces.Newable<OperationHandler>;

package/lib/common/operations/operation-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IACH,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF,MAAM,MAAM,2BAA2B,GAAG,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE/E,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,MAAM,uBAAuB,GAAG,CAAC,WAAW,EAAE,2BAA2B,KAAK,gBAAgB,CAAC"}
+{"version":3,"file":"operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAsB,UAAU,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;GAQG;AACH,8BACsB,gBAAgB;IAElC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAEjC;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAE/E;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAIhE;;;;;OAKG;IACH,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO;CAGzC;AAED,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF,MAAM,MAAM,2BAA2B,GAAG,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE/E,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,MAAM,uBAAuB,GAAG,CAAC,WAAW,EAAE,2BAA2B,KAAK,gBAAgB,CAAC"}

package/lib/common/operations/operation-handler.js

@@ -1,7 +1,56 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationHandlerFactory = exports.OperationHandlerConstructor = exports.OperationHandler = void 0;
-exports.OperationHandler = Symbol('OperationHandler');
+const inversify_1 = require("inversify");
+const model_state_1 = require("../features/model/model-state");
+/**
+ * An operation handler can execute {@link Operation}s of a certain type (subclass).
+ * The operation handler processes the operation in the {@link OperationHandler.execute()} method. The result
+ * of the execution is a {@link Command} that captures the corresponding source model changes.
+ * This command can be applied on the `CommandStack` and is reversible (undo) and can be reapplied (redo).
+ *
+ * The `OperationActionHandler` is responsible for retrieving all available (valid) operation handlers for an
+ * operation that is dispatched via `ActionDispatcher`.
+ */
+let OperationHandler = class OperationHandler {
+    /**
+     * Executes the operation handler for the given {@link Operation} and returns the corresponding {@link Command}.
+     * If the given operation cannot be handled by this handler or the handler execution did not result in any changes
+     * `undefined` is returned.
+     *
+     * @param operation The operation that should be executed or empty if nothing should be done.
+     * @returns The command capturing the execution changes or `undefined`
+     */
+    execute(operation) {
+        return this.handles(operation) ? this.createCommand(operation) : undefined;
+    }
+    /**
+     * Validates whether the given {@link Operation} can be handled by this operation handler.
+     *
+     * @param operation The operation that should be validated.
+     * @returns `true` if the given operation can be handled, `false` otherwise.
+     */
+    handles(operation) {
+        return this.modelState.root && operation.kind === this.operationType;
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(model_state_1.ModelState),
+    __metadata("design:type", Object)
+], OperationHandler.prototype, "modelState", void 0);
+OperationHandler = __decorate([
+    (0, inversify_1.injectable)()
+], OperationHandler);
+exports.OperationHandler = OperationHandler;
 exports.OperationHandlerConstructor = Symbol('OperationHandlerConstructor');
 exports.OperationHandlerFactory = Symbol('OperationHandlerFactory');
 //# sourceMappingURL=operation-handler.js.map

package/lib/common/operations/operation-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-handler.ts"],"names":[],"mappings":";;;AAkBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAgC9C,QAAA,2BAA2B,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAIpE,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA2D;AAE3D,+DAA2D;AAE3D;;;;;;;;GAQG;AAEI,IAAe,gBAAgB,GAA/B,MAAe,gBAAgB;IAsBlC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAoB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,SAAoB;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC;IACzE,CAAC;CACJ,CAAA;AA1CG;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;oDACc;AAFf,gBAAgB;IADrC,IAAA,sBAAU,GAAE;GACS,gBAAgB,CA2CrC;AA3CqB,4CAAgB;AA6CzB,QAAA,2BAA2B,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAIpE,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}

package/lib/common/test/mock-util.d.ts

@@ -19,6 +19,7 @@ import { Container } from 'inversify';
 import { MessageConnection } from 'vscode-jsonrpc';
 import { ActionDispatcher } from '../actions/action-dispatcher';
 import { ActionHandler, ActionHandlerFactory } from '../actions/action-handler';
+import { Command } from '../command/command';
 import { DiagramConfiguration, ServerLayoutKind } from '../diagram/diagram-configuration';
 import { ContextEditValidator } from '../features/directediting/context-edit-validator';
 import { LabelEditValidator } from '../features/directediting/label-edit-validator';
@@ -107,4 +108,10 @@ export declare const stubActionHandlerFactory: ActionHandlerFactory;
 export declare class StubClientSessionInitializer implements ClientSessionInitializer {
     initialize(args?: Args): void;
 }
+export declare class StubCommand implements Command {
+    execute(): void;
+    undo(): void;
+    redo(): void;
+    canUndo?(): boolean;
+}
 //# sourceMappingURL=mock-util.d.ts.map

package/lib/common/test/mock-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-util.d.ts","sourceRoot":"","sources":["../../../src/common/test/mock-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EACH,MAAM,EACN,aAAa,EACb,IAAI,EACJ,mBAAmB,EACnB,YAAY,EACZ,iCAAiC,EACjC,UAAU,EACV,KAAK,EACL,2BAA2B,EAC3B,aAAa,EACb,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;AAED,wBAAgB,mBAAmB,CAC/B,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,EACnB,SAAS,YAAkB,EAC3B,gBAAgB,uBAA6B,GAC9C,aAAa,CAUf;AAED,qBAAa,iBAAkB,YAAW,aAAa;IAChC,WAAW,EAAE,MAAM,EAAE;gBAArB,WAAW,EAAE,MAAM,EAAE;IAExC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,gCAAgC;IAGpE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAFlC,cAAc,EAAE,MAAM,EAAE,CAAC;gBAEJ,KAAK,EAAE,MAAM;IAKlC,UAAU,CAAC,SAAS,EAAE,mBAAmB,EAAE,gBAAgB,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;CAG1F;AAED,qBAAa,8BAA+B,SAAQ,gCAAgC;IAGpE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAFlC,cAAc,EAAE,MAAM,EAAE,CAAC;gBAEJ,KAAK,EAAE,MAAM;IAKlC,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS;CAG9E;AAED,qBAAa,oBAAqB,YAAW,gBAAgB;IACzD,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAI/D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG/D;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;CAInE;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;IAKlF,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAIvD,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAItD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO;IAIpF,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAIxD,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI;CAGvD;AAED,qBAAa,UAAW,SAAQ,MAAM;IAClC,QAAQ,WAAiB;IACzB,MAAM,YAAa;IAEnB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAI7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAI7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAI9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAGjD;AAED,qBAAa,yBAA0B,YAAW,qBAAqB;IACnE,cAAc,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAIlD,eAAe,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;CAGtD;AAED,qBAAa,mBAAoB,YAAW,sBAAsB;IAC9D,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI;IAI5C,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI;CAGhD;AAED,qBAAa,sBAAuB,YAAW,kBAAkB;IAC7D,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAI3C,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAG3C;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,WAAW,uDAA+C;IAE1D,cAAc,EAAE,aAAa,EAAE,CAAM;IAErC,aAAa,EAAE,YAAY,EAAE,CAAM;IAEnC,UAAU,mBAAyB;IAEnC,iBAAiB,UAAQ;IAEzB,cAAc,UAAQ;CACzB;AAED,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC1D,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,gBAAgB;CASpE;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,QAAQ,CAAC,MAAM,EAAE,2BAA2B,GAAG,gBAAgB;CASlE;AAED,eAAO,MAAM,wBAAwB,EAAE,oBAAuD,CAAC;AAE/F,qBAAa,4BAA6B,YAAW,wBAAwB;IACzE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI;CAGhC"}
+{"version":3,"file":"mock-util.d.ts","sourceRoot":"","sources":["../../../src/common/test/mock-util.ts"],"names":[],"mappings":"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"}