@eclipse-glsp/server 1.1.0-next.f692ea4.55 → 2.0.0

package/lib/browser/launch/worker-server-launcher.js

@@ -50,8 +50,8 @@ let WorkerServerLauncher = class WorkerServerLauncher extends jsonrpc_server_lau
         return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader((_a = options.context) !== null && _a !== void 0 ? _a : self), new jsonrpc.BrowserMessageWriter((_b = options.context) !== null && _b !== void 0 ? _b : self));
     }
 };
-WorkerServerLauncher = __decorate([
+exports.WorkerServerLauncher = WorkerServerLauncher;
+exports.WorkerServerLauncher = WorkerServerLauncher = __decorate([
     (0, inversify_1.injectable)()
 ], WorkerServerLauncher);
-exports.WorkerServerLauncher = WorkerServerLauncher;
 //# sourceMappingURL=worker-server-launcher.js.map

package/lib/browser/launch/worker-server-launcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAElD,yFAA+G;AAKlG,QAAA,qBAAqB,GAAG,kCAAkC,CAAC;AAGjE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mDAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,6BAAqB,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;;YACpC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,qBAAqB,CAAC,QAA+B;QACpE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,gBAAgB,CAAC,OAA4B;;QACnD,OAAO,OAAO,CAAC,uBAAuB,CAClC,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,EACzD,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;CACJ,CAAA;AA5BY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4BhC;AA5BY,oDAAoB"}
+{"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAElD,yFAA+G;AAKlG,QAAA,qBAAqB,GAAG,kCAAkC,CAAC;AAGjE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mDAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,6BAAqB,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;;YACpC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,qBAAqB,CAAC,QAA+B;QACpE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,gBAAgB,CAAC,OAA4B;;QACnD,OAAO,OAAO,CAAC,uBAAuB,CAClC,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,EACzD,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;CACJ,CAAA;AA5BY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4BhC"}

package/lib/common/actions/action-dispatcher.d.ts

@@ -17,6 +17,7 @@ import { Action, Disposable, MaybeArray } from '@eclipse-glsp/protocol';
 import { PromiseQueue } from '../utils/promise-queue';
 import { ActionHandler } from './action-handler';
 import { ActionHandlerRegistry } from './action-handler-registry';
+import { ClientActionForwarder } from './client-action-handler';
 export declare const ActionDispatcher: unique symbol;
 /**
  * The central component that process all {@link Action}s by dispatching them to their designated
@@ -50,7 +51,7 @@ export interface ActionDispatcher {
 }
 export declare class DefaultActionDispatcher implements ActionDispatcher, Disposable {
     protected actionHandlerRegistry: ActionHandlerRegistry;
-    protected clientActionKinds: string[];
+    protected clientActionForwarder: ClientActionForwarder;
     private logger;
     protected clientId: string;
     protected actionQueue: PromiseQueue<void>;

package/lib/common/actions/action-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAY,UAAU,EAAoD,MAAM,wBAAwB,CAAC;AAKpI,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;OAMG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACvD;AAED,qBACa,uBAAwB,YAAW,gBAAgB,EAAE,UAAU;IAExE,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAGtC,OAAO,CAAC,MAAM,CAAS;IAGvB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,qBAAsB;IAC3C,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAQvB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAqBzC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK1F,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI;IAM/D,OAAO,IAAI,IAAI;CAGlB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjE"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAY,UAAU,EAAoD,MAAM,wBAAwB,CAAC;AAKpI,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;OAMG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACvD;AAED,qBACa,uBAAwB,YAAW,gBAAgB,EAAE,UAAU;IAExE,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,OAAO,CAAC,MAAM,CAAS;IAGvB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,qBAAsB;IAC3C,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAQvB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAuBzC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK1F,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI;IAM/D,OAAO,IAAI,IAAI;CAGlB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjE"}

package/lib/common/actions/action-dispatcher.js

@@ -32,6 +32,7 @@ const glsp_server_error_1 = require("../utils/glsp-server-error");
 const logger_1 = require("../utils/logger");
 const promise_queue_1 = require("../utils/promise-queue");
 const action_handler_registry_1 = require("./action-handler-registry");
+const client_action_handler_1 = require("./client-action-handler");
 exports.ActionDispatcher = Symbol('ActionDispatcher');
 let DefaultActionDispatcher = class DefaultActionDispatcher {
     constructor() {
@@ -40,15 +41,16 @@ let DefaultActionDispatcher = class DefaultActionDispatcher {
     }
     dispatch(action) {
         // Dont queue actions that are just delegated to the client
-        if (this.clientActionKinds.includes(action.kind)) {
+        if (this.clientActionForwarder.shouldForwardToClient(action)) {
             return this.doDispatch(action);
         }
         return this.actionQueue.enqueue(() => this.doDispatch(action));
     }
     async doDispatch(action) {
         this.logger.debug('Dispatch action:', action.kind);
+        const handledOnClient = this.clientActionForwarder.handle(action);
         const actionHandlers = this.actionHandlerRegistry.get(action.kind);
-        if (actionHandlers.length === 0) {
+        if (!handledOnClient && actionHandlers.length === 0) {
             throw new glsp_server_error_1.GLSPServerError(`No handler registered for action kind: ${action.kind}`);
         }
         const responses = [];
@@ -91,14 +93,15 @@ let DefaultActionDispatcher = class DefaultActionDispatcher {
         this.actionQueue.clear();
     }
 };
+exports.DefaultActionDispatcher = DefaultActionDispatcher;
 __decorate([
     (0, inversify_1.inject)(action_handler_registry_1.ActionHandlerRegistry),
     __metadata("design:type", action_handler_registry_1.ActionHandlerRegistry)
 ], DefaultActionDispatcher.prototype, "actionHandlerRegistry", void 0);
 __decorate([
-    (0, inversify_1.inject)(service_identifiers_1.ClientActionKinds),
-    __metadata("design:type", Array)
-], DefaultActionDispatcher.prototype, "clientActionKinds", void 0);
+    (0, inversify_1.inject)(client_action_handler_1.ClientActionForwarder),
+    __metadata("design:type", client_action_handler_1.ClientActionForwarder)
+], DefaultActionDispatcher.prototype, "clientActionForwarder", void 0);
 __decorate([
     (0, inversify_1.inject)(logger_1.Logger),
     __metadata("design:type", logger_1.Logger)
@@ -107,10 +110,9 @@ __decorate([
     (0, inversify_1.inject)(service_identifiers_1.ClientId),
     __metadata("design:type", String)
 ], DefaultActionDispatcher.prototype, "clientId", void 0);
-DefaultActionDispatcher = __decorate([
+exports.DefaultActionDispatcher = DefaultActionDispatcher = __decorate([
     (0, inversify_1.injectable)()
 ], DefaultActionDispatcher);
-exports.DefaultActionDispatcher = DefaultActionDispatcher;
 /**
  * Transfers the {@link RequestAction.requestId id} from request to response if applicable.
  *

package/lib/common/actions/action-dispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoI;AACpI,yCAA+C;AAC/C,mEAAqD;AACrD,kEAA6D;AAC7D,4CAAyC;AACzC,0DAAsD;AAEtD,uEAAkE;AAClE,mEAAgE;AAEnD,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAoCpD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAaO,gBAAW,GAAG,IAAI,4BAAY,EAAE,CAAC;QACjC,oBAAe,GAAa,EAAE,CAAC;IAiE7C,CAAC;IA/DG,QAAQ,CAAC,MAAc;QACnB,2DAA2D;QAC3D,IAAI,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;YAC1D,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,MAAc;QACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAElE,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YACjD,MAAM,IAAI,mCAAe,CAAC,0CAA0C,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACtF;QAED,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE;YAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5D,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SAC/B;QAED,IAAI,4BAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YACjE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YACxC,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;SAC7B;QAED,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,OAAsB,EAAE,OAAe;QAClE,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAES,iBAAiB,CAAC,OAAiB;QACzC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC5B;QACD,MAAM,aAAa,GAAG,IAAI,4BAAY,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9F,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,WAAW,CAAC,GAAG,OAA6B;QACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC5B;QACD,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAA,mBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,uBAAuB,CAAC,GAAG,OAA6B;QACpD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,IAAA,mBAAQ,EAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;SAC3C;IACL,CAAC;IAED,OAAO;QACH,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AA/EY,0DAAuB;AAEtB;IADT,IAAA,kBAAM,EAAC,+CAAqB,CAAC;8BACG,+CAAqB;sEAAC;AAG7C;IADT,IAAA,kBAAM,EAAC,6CAAqB,CAAC;8BACG,6CAAqB;sEAAC;AAG/C;IADP,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACC,eAAM;uDAAC;AAGb;IADT,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;yDACU;kCAXlB,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA+EnC;AAED;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,OAAe,EAAE,QAAgB;IACrD,IAAI,wBAAa,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,yBAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;QACzD,QAAgB,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;KACpD;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AALD,0BAKC"}

package/lib/common/actions/action-handler-registry.js

@@ -32,10 +32,10 @@ let ActionHandlerRegistry = class ActionHandlerRegistry extends registry_1.Multi
         return result.sort((a, b) => { var _a, _b; return (_a = a.priority) !== null && _a !== void 0 ? _a : 0 - ((_b = b.priority) !== null && _b !== void 0 ? _b : 0); });
     }
 };
-ActionHandlerRegistry = __decorate([
+exports.ActionHandlerRegistry = ActionHandlerRegistry;
+exports.ActionHandlerRegistry = ActionHandlerRegistry = __decorate([
     (0, inversify_1.injectable)()
 ], ActionHandlerRegistry);
-exports.ActionHandlerRegistry = ActionHandlerRegistry;
 let ActionHandlerRegistryInitializer = class ActionHandlerRegistryInitializer {
     constructor() {
         this.handlerConstructors = [];
@@ -45,6 +45,7 @@ let ActionHandlerRegistryInitializer = class ActionHandlerRegistryInitializer {
         handlers.forEach(handler => this.registry.registerHandler(handler));
     }
 };
+exports.ActionHandlerRegistryInitializer = ActionHandlerRegistryInitializer;
 __decorate([
     (0, inversify_1.inject)(action_handler_1.ActionHandlerFactory),
     __metadata("design:type", Function)
@@ -58,8 +59,7 @@ __decorate([
     (0, inversify_1.inject)(ActionHandlerRegistry),
     __metadata("design:type", ActionHandlerRegistry)
 ], ActionHandlerRegistryInitializer.prototype, "registry", void 0);
-ActionHandlerRegistryInitializer = __decorate([
+exports.ActionHandlerRegistryInitializer = ActionHandlerRegistryInitializer = __decorate([
     (0, inversify_1.injectable)()
 ], ActionHandlerRegistryInitializer);
-exports.ActionHandlerRegistryInitializer = ActionHandlerRegistryInitializer;
 //# sourceMappingURL=action-handler-registry.js.map

package/lib/common/actions/action-handler-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../../src/common/actions/action-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAAkD;AAClD,qDAAiG;AAEjG;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAoC;IAC3E,eAAe,CAAC,OAAsB;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACM,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,eAAC,OAAA,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC;IACtE,CAAC;CACJ,CAAA;AAhBY,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAgBjC;AAhBY,sDAAqB;AAmB3B,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QAMO,wBAAmB,GAA+B,EAAE,CAAC;IASnE,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,qCAAoB,CAAC;;iEACW;AAExC;IAAC,IAAA,kBAAM,EAAC,yCAAwB,CAAC;IAChC,IAAA,oBAAQ,GAAE;;6EACoD;AAE/D;IAAC,IAAA,kBAAM,EAAC,qBAAqB,CAAC;8BACV,qBAAqB;kEAAC;AATjC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAe5C;AAfY,4EAAgC"}
+{"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../../src/common/actions/action-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAAkD;AAClD,qDAAiG;AAEjG;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAoC;IAC3E,eAAe,CAAC,OAAsB;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACM,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,eAAC,OAAA,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC;IACtE,CAAC;CACJ,CAAA;AAhBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAgBjC;AAGM,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QAMO,wBAAmB,GAA+B,EAAE,CAAC;IASnE,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;AAfY,4EAAgC;AAE/B;IADT,IAAA,kBAAM,EAAC,qCAAoB,CAAC;;iEACW;AAI9B;IAFT,IAAA,kBAAM,EAAC,yCAAwB,CAAC;IAChC,IAAA,oBAAQ,GAAE;;6EACoD;AAGrD;IADT,IAAA,kBAAM,EAAC,qBAAqB,CAAC;8BACV,qBAAqB;kEAAC;2CATjC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAe5C"}

package/lib/common/actions/client-action-handler.d.ts

@@ -15,15 +15,24 @@
  ********************************************************************************/
 import { Action, GLSPClientProxy } from '@eclipse-glsp/protocol';
 /**
- * The client action handler is responsible of handling action kinds that are intended for the
- * GLSP client, by sending them to the client over json-rpc.
+ * Component responsible for forwarding actions that are (also) handled by the
+ * client
  */
-export declare class ClientActionHandler implements ClientActionHandler {
-    actionKinds: string[];
-    protected glspClient?: GLSPClientProxy;
+export declare class ClientActionForwarder {
+    actionKinds: Set<string>;
+    protected glspClient: GLSPClientProxy;
     protected readonly clientId: string;
-    constructor(actionKinds?: string[]);
-    execute(action: Action): [];
-    protected send(action: Action): void;
+    constructor(actionKinds: Set<string>);
+    /**
+     * Processes the given action and checks wether it is a
+     * `clientAction` i.e. an action that should be forwarded to
+     * the client to be handled there. If the check is successful
+     * the action is wrapped in an {@link ActionMessage} and sent to the client.
+     *
+     * @param action The action to check and forward
+     * @return `true` if the action was forwarded to the client, `false` otherwise
+     */
+    handle(action: Action): boolean;
+    shouldForwardToClient(action: Action): boolean;
 }
 //# sourceMappingURL=client-action-handler.d.ts.map

package/lib/common/actions/client-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAiB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIhF;;;GAGG;AAEH,qBACa,mBAAoB,YAAW,mBAAmB;IAQD,WAAW,EAAE,MAAM,EAAE;IAL/E,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEsB,WAAW,GAAE,MAAM,EAAO;IAEpF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE;IAK3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAQvC"}
+{"version":3,"file":"client-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAiB,eAAe,EAAkB,MAAM,wBAAwB,CAAC;AAKhG;;;GAGG;AACH,qBACa,qBAAqB;IAOgB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;IALtE,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;IAGtC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEU,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;IAEtE;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAS/B,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAMjD"}

package/lib/common/actions/client-action-handler.js

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientActionHandler = void 0;
+exports.ClientActionForwarder = void 0;
 /********************************************************************************
  * Copyright (c) 2022-2023 STMicroelectronics and others.
  *
@@ -31,41 +31,51 @@ exports.ClientActionHandler = void 0;
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const service_identifiers_1 = require("../di/service-identifiers");
+const client_action_1 = require("../protocol/client-action");
 /**
- * The client action handler is responsible of handling action kinds that are intended for the
- * GLSP client, by sending them to the client over json-rpc.
+ * Component responsible for forwarding actions that are (also) handled by the
+ * client
  */
-let ClientActionHandler = class ClientActionHandler {
-    constructor(actionKinds = []) {
+let ClientActionForwarder = class ClientActionForwarder {
+    constructor(actionKinds) {
         this.actionKinds = actionKinds;
     }
-    execute(action) {
-        this.send(action);
-        return [];
-    }
-    send(action) {
-        const message = { action, clientId: this.clientId };
-        if (this.glspClient) {
+    /**
+     * Processes the given action and checks wether it is a
+     * `clientAction` i.e. an action that should be forwarded to
+     * the client to be handled there. If the check is successful
+     * the action is wrapped in an {@link ActionMessage} and sent to the client.
+     *
+     * @param action The action to check and forward
+     * @return `true` if the action was forwarded to the client, `false` otherwise
+     */
+    handle(action) {
+        if (this.shouldForwardToClient(action)) {
+            const message = { action, clientId: this.clientId };
             this.glspClient.process(message);
-            return;
+            return true;
+        }
+        return false;
+    }
+    shouldForwardToClient(action) {
+        if (client_action_1.ClientAction.is(action)) {
+            return false;
         }
-        throw new Error('Could not send message to client. No GLSPClientProxy is defined');
+        return this.actionKinds.has(action.kind) || protocol_1.ResponseAction.is(action);
     }
 };
+exports.ClientActionForwarder = ClientActionForwarder;
 __decorate([
     (0, inversify_1.inject)(protocol_1.GLSPClientProxy),
-    (0, inversify_1.optional)(),
     __metadata("design:type", Object)
-], ClientActionHandler.prototype, "glspClient", void 0);
+], ClientActionForwarder.prototype, "glspClient", void 0);
 __decorate([
     (0, inversify_1.inject)(service_identifiers_1.ClientId),
     __metadata("design:type", String)
-], ClientActionHandler.prototype, "clientId", void 0);
-ClientActionHandler = __decorate([
+], ClientActionForwarder.prototype, "clientId", void 0);
+exports.ClientActionForwarder = ClientActionForwarder = __decorate([
     (0, inversify_1.injectable)(),
     __param(0, (0, inversify_1.inject)(service_identifiers_1.ClientActionKinds)),
-    __param(0, (0, inversify_1.optional)()),
-    __metadata("design:paramtypes", [Array])
-], ClientActionHandler);
-exports.ClientActionHandler = ClientActionHandler;
+    __metadata("design:paramtypes", [Set])
+], ClientActionForwarder);
 //# sourceMappingURL=client-action-handler.js.map

package/lib/common/actions/client-action-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-action-handler.js","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAgF;AAChF,yCAAyD;AACzD,mEAAwE;AAExE;;;GAGG;AAGI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAQ5B,YAA0D,cAAwB,EAAE;QAA1B,gBAAW,GAAX,WAAW,CAAe;IAAG,CAAC;IAExF,OAAO,CAAC,MAAc;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;IAES,IAAI,CAAC,MAAc;QACzB,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnE,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO;SACV;QACD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACvF,CAAC;CACJ,CAAA;AAtBG;IAAC,IAAA,kBAAM,EAAC,0BAAe,CAAC;IACvB,IAAA,oBAAQ,GAAE;;uDAC4B;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;qDACmB;AAN3B,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IASI,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;;GARzC,mBAAmB,CAuB/B;AAvBY,kDAAmB"}
+{"version":3,"file":"client-action-handler.js","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAgG;AAChG,yCAA+C;AAC/C,mEAAwE;AACxE,6DAAyD;AAEzD;;;GAGG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAO9B,YAA8C,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAc;QACjB,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACpC,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,qBAAqB,CAAC,MAAc;QAChC,IAAI,4BAAY,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yBAAc,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;CACJ,CAAA;AAjCY,sDAAqB;AAEpB;IADT,IAAA,kBAAM,EAAC,0BAAe,CAAC;;yDACc;AAGnB;IADlB,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;uDACmB;gCAL3B,qBAAqB;IADjC,IAAA,sBAAU,GAAE;IAQI,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;qCAAqB,GAAG;GAPrD,qBAAqB,CAiCjC"}

package/lib/common/actions/global-action-provider.d.ts

@@ -1,30 +1,15 @@
-/********************************************************************************
- * 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
- ********************************************************************************/
 import { Container, ContainerModule } from 'inversify';
 export declare const GlobalActionProvider: unique symbol;
+/**
+ * Provides a map of handled action kinds grouped by `diagramType`
+ */
 export interface GlobalActionProvider {
-    readonly serverActionKinds: Map<string, string[]>;
-    readonly clientActionKinds: Map<string, string[]>;
+    readonly actionKinds: Map<string, string[]>;
 }
 export declare class DefaultGlobalActionProvider implements GlobalActionProvider {
-    readonly serverActionKinds: Map<string, string[]>;
-    readonly clientActionKinds: Map<string, string[]>;
+    readonly actionKinds: Map<string, string[]>;
     constructor(serverContainer: Container, diagramModules: Map<string, ContainerModule[]>);
     createDiagramContainer(serverContainer: Container, modules: ContainerModule[]): Container;
-    loadServerActionKinds(diagramType: string, diagramContainer: Container): void;
-    loadClientActionKinds(diagramType: string, diagramContainer: Container): void;
+    loadActionKinds(diagramType: string, diagramContainer: Container): void;
 }
 //# sourceMappingURL=global-action-provider.d.ts.map

package/lib/common/actions/global-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-action-provider.d.ts","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAM3E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACrD;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IACpE,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACzD,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGzB,eAAe,EAAE,SAAS,EAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAc1E,sBAAsB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS;IAMzF,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;IAU7E,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;CAMhF"}
+{"version":3,"file":"global-action-provider.d.ts","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAM3E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC/C;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IACpE,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGnB,eAAe,EAAE,SAAS,EAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAY1E,sBAAsB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS;IAYzF,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;CAM1E"}

package/lib/common/actions/global-action-provider.js

@@ -28,54 +28,49 @@ exports.DefaultGlobalActionProvider = exports.GlobalActionProvider = void 0;
  *
  * 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 client_session_module_1 = require("../di/client-session-module");
 const service_identifiers_1 = require("../di/service-identifiers");
 const client_session_initializer_1 = require("../session/client-session-initializer");
 const action_handler_registry_1 = require("./action-handler-registry");
-const client_action_handler_1 = require("./client-action-handler");
 exports.GlobalActionProvider = Symbol('GlobalActionProvider');
 let DefaultGlobalActionProvider = class DefaultGlobalActionProvider {
     constructor(serverContainer, diagramModules) {
-        this.serverActionKinds = new Map();
-        this.clientActionKinds = new Map();
+        this.actionKinds = new Map();
         diagramModules.forEach((modules, diagramType) => {
             const container = this.createDiagramContainer(serverContainer, modules);
             const initializers = container.getAll(client_session_initializer_1.ClientSessionInitializer);
             initializers.forEach(service => service.initialize());
-            this.loadServerActionKinds(diagramType, container);
-            this.loadClientActionKinds(diagramType, container);
+            this.loadActionKinds(diagramType, container);
             container.unbindAll();
         });
     }
     createDiagramContainer(serverContainer, modules) {
         const container = serverContainer.createChild();
-        container.load(...modules);
+        const clientSessionModule = (0, client_session_module_1.createClientSessionModule)({
+            clientId: 'tempId',
+            // eslint-disable-next-line @typescript-eslint/no-empty-function
+            glspClient: { process: () => { } },
+            clientActionKinds: []
+        });
+        container.load(...modules, clientSessionModule);
         return container;
     }
-    loadServerActionKinds(diagramType, diagramContainer) {
+    loadActionKinds(diagramType, diagramContainer) {
         var _a;
         const handlerRegistry = diagramContainer.get(action_handler_registry_1.ActionHandlerRegistry);
-        const diagramServerActions = (_a = this.serverActionKinds.get(diagramType)) !== null && _a !== void 0 ? _a : [];
-        handlerRegistry
-            .getAll()
-            .filter(handler => !(handler instanceof client_action_handler_1.ClientActionHandler))
-            .forEach(handler => diagramServerActions.push(...handler.actionKinds));
-        this.serverActionKinds.set(diagramType, [...new Set(diagramServerActions)]);
-    }
-    loadClientActionKinds(diagramType, diagramContainer) {
-        var _a;
-        const clientActionKinds = diagramContainer.getAll(service_identifiers_1.ClientActionKinds);
-        const diagramClientActions = (_a = this.clientActionKinds.get(diagramType)) !== null && _a !== void 0 ? _a : [];
-        diagramClientActions.push(...clientActionKinds);
-        this.clientActionKinds.set(diagramType, diagramClientActions);
+        const diagramServerActions = (_a = this.actionKinds.get(diagramType)) !== null && _a !== void 0 ? _a : [];
+        handlerRegistry.getAll().forEach(handler => (0, protocol_1.distinctAdd)(diagramServerActions, ...handler.actionKinds));
+        this.actionKinds.set(diagramType, diagramServerActions);
     }
 };
-DefaultGlobalActionProvider = __decorate([
+exports.DefaultGlobalActionProvider = DefaultGlobalActionProvider;
+exports.DefaultGlobalActionProvider = DefaultGlobalActionProvider = __decorate([
     (0, inversify_1.injectable)(),
     __param(0, (0, inversify_1.inject)(service_identifiers_1.InjectionContainer)),
     __param(1, (0, inversify_1.inject)(service_identifiers_1.DiagramModules)),
     __metadata("design:paramtypes", [inversify_1.Container,
         Map])
 ], DefaultGlobalActionProvider);
-exports.DefaultGlobalActionProvider = DefaultGlobalActionProvider;
 //# sourceMappingURL=global-action-provider.js.map

package/lib/common/actions/global-action-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA2E;AAC3E,mEAAkG;AAClG,sFAAiF;AACjF,uEAAkE;AAClE,mEAA8D;AAEjD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAQ5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAIpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;QACnC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACnD,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACnD,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,qBAAqB,CAAC,WAAmB,EAAE,gBAA2B;;QAClE,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAwB,+CAAqB,CAAC,CAAC;QAC3F,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QAC3E,eAAe;aACV,MAAM,EAAE;aACR,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,YAAY,2CAAmB,CAAC,CAAC;aAC5D,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,qBAAqB,CAAC,WAAmB,EAAE,gBAA2B;;QAClE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,MAAM,CAAS,uCAAiB,CAAC,CAAC;QAC7E,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QAC3E,oBAAoB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;QAChD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAClE,CAAC;CACJ,CAAA;AA1CY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAMJ,WAAA,IAAA,kBAAM,EAAC,wCAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,oCAAc,CAAC,CAAA;qCADsB,qBAAS;QACd,GAAG;GANtC,2BAA2B,CA0CvC;AA1CY,kEAA2B"}
+{"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAqD;AACrD,yCAA2E;AAC3E,uEAAwE;AACxE,mEAA+E;AAC/E,sFAAiF;AACjF,uEAAkE;AAErD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAU5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC7C,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC;YAClD,QAAQ,EAAE,QAAQ;YAClB,gEAAgE;YAChE,UAAU,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE;YACjC,iBAAiB,EAAE,EAAE;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAChD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,gBAA2B;;QAC5D,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAwB,+CAAqB,CAAC,CAAC;QAC3F,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACrE,eAAe,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,sBAAW,EAAC,oBAAoB,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AAnCY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAKJ,WAAA,IAAA,kBAAM,EAAC,wCAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,oCAAc,CAAC,CAAA;qCADsB,qBAAS;QACd,GAAG;GALtC,2BAA2B,CAmCvC"}

package/lib/common/command/command-stack.js

@@ -91,12 +91,12 @@ let DefaultCommandStack = class DefaultCommandStack {
         throw error;
     }
 };
+exports.DefaultCommandStack = DefaultCommandStack;
 __decorate([
     (0, inversify_1.inject)(logger_1.Logger),
     __metadata("design:type", logger_1.Logger)
 ], DefaultCommandStack.prototype, "logger", void 0);
-DefaultCommandStack = __decorate([
+exports.DefaultCommandStack = DefaultCommandStack = __decorate([
     (0, inversify_1.injectable)()
 ], DefaultCommandStack);
-exports.DefaultCommandStack = DefaultCommandStack;
 //# sourceMappingURL=command-stack.js.map

package/lib/common/command/command-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"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"}

package/lib/common/command/command.js

@@ -24,7 +24,7 @@ var Command;
         return (_b = (_a = command.canUndo) === null || _a === void 0 ? void 0 : _a.call(command)) !== null && _b !== void 0 ? _b : true;
     }
     Command.canUndo = canUndo;
-})(Command = exports.Command || (exports.Command = {}));
+})(Command || (exports.Command = Command = {}));
 /**
  * A command that comprises a sequence of subcommands.
  */

package/lib/common/command/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/command/command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAsC5E,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,OAAO,CAAC,OAAgB;;QACpC,OAAO,MAAA,MAAA,OAAO,CAAC,OAAO,uDAAI,mCAAI,IAAI,CAAC;IACvC,CAAC;IAFe,eAAO,UAEtB,CAAA;AACL,CAAC,EAJgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAIvB;AAED;;GAEG;AACH,MAAa,eAAe;IAKxB,YAAY,GAAG,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,eAAe,GAAc,EAAE,CAAC;QAEtC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACpC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;gBACnC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC1B,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;iBACxB;qBAAM;oBACH,MAAM;iBACT;aACJ;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QACpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACJ;AAhED,0CAgEC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/command/command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAsC5E,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,OAAO,CAAC,OAAgB;;QACpC,OAAO,MAAA,MAAA,OAAO,CAAC,OAAO,uDAAI,mCAAI,IAAI,CAAC;IACvC,CAAC;IAFe,eAAO,UAEtB,CAAA;AACL,CAAC,EAJgB,OAAO,uBAAP,OAAO,QAIvB;AAED;;GAEG;AACH,MAAa,eAAe;IAKxB,YAAY,GAAG,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,eAAe,GAAc,EAAE,CAAC;QAEtC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACpC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;gBACnC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC1B,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;iBACxB;qBAAM;oBACH,MAAM;iBACT;aACJ;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QACpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACJ;AAhED,0CAgEC"}

package/lib/common/command/recording-command.d.ts

@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelRootSchema } from '@eclipse-glsp/graph';
-import { AnyObject, MaybePromise } from '@eclipse-glsp/protocol';
+import { AnyObject, GModelElementSchema, GModelRootSchema, MaybePromise } from '@eclipse-glsp/protocol';
 import * as jsonPatch from 'fast-json-patch';
 import { GModelSerializer } from '../features/model/gmodel-serializer';
 import { ModelState } from '../features/model/model-state';
@@ -37,7 +36,7 @@ export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObj
      * The actual execution i.e. series of changes applied to the JSOn object that should be captured.
      */
     protected abstract doExecute(): MaybePromise<void>;
-    protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): MaybePromise<void>;
+    protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): jsonPatch.PatchResult<JsonObject>;
     /**
      * Captures the original state of the JSON object before executing the command routine.
      * This implementation cannot clone circular structures as it relies on `JSON.stringify`.
@@ -48,16 +47,12 @@ export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObj
     undo(): Promise<void>;
     redo(): Promise<void>;
     canUndo(): boolean;
-}
-/**
- * Simple base implementation of {@link AbstractRecordingCommand} that records the changes made to the given JSON object during
- * the the given `doExecute` function.
- */
-export declare class RecordingCommand<JsonObject extends AnyObject = AnyObject> extends AbstractRecordingCommand<JsonObject> {
-    protected jsonObject: JsonObject;
-    protected doExecute: () => MaybePromise<void>;
-    constructor(jsonObject: JsonObject, doExecute: () => MaybePromise<void>);
-    protected getJsonObject(): MaybePromise<JsonObject>;
+    /**
+     * Optional hook that (if implemented) will be
+     * executed after every command-driven action that changed
+     * the underlying model i.e. command execute, undo and redo.
+     */
+    protected postChange?(newModel: JsonObject): MaybePromise<void>;
 }
 /**
  * Simple base implementation of {@link AbstractRecordingCommand} that allows recording of changes made
@@ -68,8 +63,7 @@ export declare class GModelRecordingCommand extends AbstractRecordingCommand<GMo
     protected serializer: GModelSerializer;
     protected doExecute: () => MaybePromise<void>;
     constructor(modelState: ModelState, serializer: GModelSerializer, doExecute: () => MaybePromise<void>);
-    execute(): Promise<void>;
     protected getJsonObject(): MaybePromise<GModelRootSchema>;
-    protected applyPatch(rootSchema: GModelRootSchema, patch: jsonPatch.Operation[]): MaybePromise<void>;
+    protected postChange(newModel: GModelElementSchema): MaybePromise<void>;
 }
 //# sourceMappingURL=recording-command.d.ts.map

package/lib/common/command/recording-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recording-command.d.ts","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC;;;GAGG;AACH,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,SAAS,CAAE,YAAW,OAAO;IAC3F,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAEtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;IAE5D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC;IAI1F;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;IAI7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,OAAO,IAAI,OAAO;CAGrB;AAED;;;GAGG;AACH,qBAAa,gBAAgB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,wBAAwB,CAAC,UAAU,CAAC;IACpG,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAArE,UAAU,EAAE,UAAU,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAI3F,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;CAGtD;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;IACtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,UAAU,EAAE,gBAAgB;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAA7G,UAAU,EAAE,UAAU,EAAY,UAAU,EAAE,gBAAgB,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAIpH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,gBAAgB,CAAC;cAItC,UAAU,CAAC,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC;CAKhH"}
+{"version":3,"file":"recording-command.d.ts","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC;;;GAGG;AACH,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,SAAS,CAAE,YAAW,OAAO;IAC3F,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAEtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;IAE5D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC;IAIzG;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;IAI7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAOrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,SAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;CAClE;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;IACtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,UAAU,EAAE,gBAAgB;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAA7G,UAAU,EAAE,UAAU,EAAY,UAAU,EAAE,gBAAgB,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAInI,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,gBAAgB,CAAC;cAItC,UAAU,CAAC,QAAQ,EAAE,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC;CAInF"}