@eclipse-glsp/server 1.1.0-next.3d7585d.42 → 1.1.0-next.42963d6.55

package/lib/common/di/multi-binding.d.ts

@@ -1,5 +1,20 @@
+/********************************************************************************
+ * 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 { BindingContext } from '@eclipse-glsp/protocol';
 import { BindingTarget } from './binding-target';
-import { ModuleContext } from './glsp-module';
 /**
  * A helper class used in `GLSPModules` to ease the configuration of multi-injected service identifiers.
  * Instead of directly binding to the service identifier a new multi binding object can be created. This object
@@ -11,7 +26,7 @@ export declare abstract class AbstractMultiBinding<T> {
     readonly identifier: string | symbol;
     protected bindings: T[];
     constructor(identifier: string | symbol);
-    abstract applyBindings(context: ModuleContext): void;
+    abstract applyBindings(context: BindingContext): void;
     add(newBinding: T): void;
     addAll(newBindings: T[]): void;
     addAll(...newBindings: T[]): void;
@@ -27,7 +42,7 @@ export declare abstract class AbstractMultiBinding<T> {
  * @typeparam T the base type of {@link BindingTarget}.
  */
 export declare class MultiBinding<T> extends AbstractMultiBinding<BindingTarget<T>> {
-    applyBindings(context: ModuleContext): void;
+    applyBindings(context: BindingContext): void;
 }
 /**
  * Implementation of {@link AbstractMultiBinding} for multi-injected values that should be bound to concrete instance using the
@@ -36,6 +51,6 @@ export declare class MultiBinding<T> extends AbstractMultiBinding<BindingTarget<
  * * @typeparam T the type of the instances
  */
 export declare class InstanceMultiBinding<T> extends AbstractMultiBinding<T> {
-    applyBindings(context: ModuleContext): void;
+    applyBindings(context: BindingContext): void;
 }
 //# sourceMappingURL=multi-binding.d.ts.map

package/lib/common/di/multi-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multi-binding.d.ts","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;GAMG;AACH,8BAAsB,oBAAoB,CAAC,CAAC;IAG5B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAFhD,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAM;gBAER,UAAU,EAAE,MAAM,GAAG,MAAM;IAEhD,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAEpD,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAIxB,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAOjC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;IAIzB,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI;IAI9B,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI;IAK1C,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO;IAI7B,MAAM,IAAI,CAAC,EAAE;CAGhB;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACvE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAG9C;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAG9C"}
+{"version":3,"file":"multi-binding.d.ts","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,cAAc,EAA6C,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE;;;;;;GAMG;AACH,8BAAsB,oBAAoB,CAAC,CAAC;IAG5B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAFhD,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAM;gBAER,UAAU,EAAE,MAAM,GAAG,MAAM;IAEhD,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAErD,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAIxB,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAOjC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;IAIzB,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI;IAI9B,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI;IAK1C,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO;IAI7B,MAAM,IAAI,CAAC,EAAE;CAGhB;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACvE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAG/C;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAG/C"}

package/lib/common/di/multi-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"multi-binding.js","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmF;AACnF,qDAAqE;AAGrE;;;;;;GAMG;AACH,MAAsB,oBAAoB;IAGtC,YAAqB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAFtC,aAAQ,GAAQ,EAAE,CAAC;IAEsB,CAAC;IAIpD,GAAG,CAAC,UAAa;QACb,IAAA,sBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAID,MAAM,CAAC,GAAG,WAA4B;QAClC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,QAAW;QACd,IAAA,iBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,QAAa;QACnB,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,UAAa,EAAE,UAAa;QAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAvCD,oDAuCC;AAED;;;;GAIG;AACH,MAAa,YAAgB,SAAQ,oBAAsC;IACvE,aAAa,CAAC,OAAsB;QAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;CACJ;AAJD,oCAIC;AAED;;;;;GAKG;AACH,MAAa,oBAAwB,SAAQ,oBAAuB;IAChE,aAAa,CAAC,OAAsB;QAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACJ;AAJD,oDAIC"}
+{"version":3,"file":"multi-binding.js","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmG;AACnG,qDAAqE;AAErE;;;;;;GAMG;AACH,MAAsB,oBAAoB;IAGtC,YAAqB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAFtC,aAAQ,GAAQ,EAAE,CAAC;IAEsB,CAAC;IAIpD,GAAG,CAAC,UAAa;QACb,IAAA,sBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAID,MAAM,CAAC,GAAG,WAA4B;QAClC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,QAAW;QACd,IAAA,iBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,QAAa;QACnB,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,UAAa,EAAE,UAAa;QAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAvCD,oDAuCC;AAED;;;;GAIG;AACH,MAAa,YAAgB,SAAQ,oBAAsC;IACvE,aAAa,CAAC,OAAuB;QACjC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;CACJ;AAJD,oCAIC;AAED;;;;;GAKG;AACH,MAAa,oBAAwB,SAAQ,oBAAuB;IAChE,aAAa,CAAC,OAAuB;QACjC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACJ;AAJD,oDAIC"}

package/lib/common/di/server-module.d.ts

@@ -13,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { GLSPServer, GLSPServerListener } from '@eclipse-glsp/protocol';
 import { ContainerModule, interfaces } from 'inversify';
 import { GlobalActionProvider } from '../actions/global-action-provider';
-import { GLSPClientProxy, JsonRpcGLSPClientProxy } from '../protocol/glsp-client-proxy';
-import { GLSPServer, JsonRpcGLSPServer } from '../protocol/glsp-server';
-import { GLSPServerListener } from '../protocol/glsp-server-listener';
 import { ClientSessionFactory } from '../session/client-session-factory';
 import { ClientSessionManager } from '../session/client-session-manager';
 import { BindingTarget } from './binding-target';
@@ -61,13 +59,10 @@ export declare class ServerModule extends GLSPModule {
     configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void;
     protected bindDiagramModules(): BindingTarget<Map<string, ContainerModule[]>>;
     protected bindGLSPServer(): BindingTarget<GLSPServer>;
-    protected bindJsonRpcGLSPServer(): BindingTarget<JsonRpcGLSPServer>;
     protected bindClientSessionFactory(): BindingTarget<ClientSessionFactory>;
     protected bindClientSessionManager(): BindingTarget<ClientSessionManager>;
     protected bindGlobalActionProvider(): BindingTarget<GlobalActionProvider>;
     protected bindInjectionContainer(): BindingTarget<interfaces.Container>;
-    protected bindGLSPClientProxy(): BindingTarget<GLSPClientProxy>;
-    protected bindJsonRpcGLSPClientProxy(): BindingTarget<JsonRpcGLSPClientProxy>;
     protected configureGLSPServerListeners(binding: MultiBinding<GLSPServerListener>): void;
 }
 //# sourceMappingURL=server-module.d.ts.map

package/lib/common/di/server-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAA0B,eAAe,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAChH,OAAO,EAAqB,UAAU,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAoBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,qBAAqB,IAAI,aAAa,CAAC,iBAAiB,CAAC;IAInE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,mBAAmB,IAAI,aAAa,CAAC,eAAe,CAAC;IAI/D,SAAS,CAAC,0BAA0B,IAAI,aAAa,CAAC,sBAAsB,CAAC;IAI7E,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;CAG1F"}
+{"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAkBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;CAG1F"}

package/lib/common/di/server-module.js

@@ -1,10 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerModule = 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 global_action_provider_1 = require("../actions/global-action-provider");
-const glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
 const glsp_server_1 = require("../protocol/glsp-server");
-const glsp_server_listener_1 = require("../protocol/glsp-server-listener");
 const client_session_factory_1 = require("../session/client-session-factory");
 const client_session_manager_1 = require("../session/client-session-manager");
 const binding_target_1 = require("./binding-target");
@@ -57,15 +71,14 @@ class ServerModule extends glsp_module_1.GLSPModule {
     configure(bind, unbind, isBound, rebind) {
         const context = this.context;
         (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.DiagramModules, this.bindDiagramModules());
-        (0, binding_target_1.applyBindingTarget)(context, glsp_server_1.GLSPServer, this.bindGLSPServer()).inSingletonScope();
-        (0, binding_target_1.applyBindingTarget)(context, glsp_server_1.JsonRpcGLSPServer, this.bindJsonRpcGLSPServer());
+        (0, binding_target_1.applyBindingTarget)(context, protocol_1.GLSPServer, this.bindGLSPServer()).inSingletonScope();
         (0, binding_target_1.applyBindingTarget)(context, client_session_factory_1.ClientSessionFactory, this.bindClientSessionFactory()).inSingletonScope();
         (0, binding_target_1.applyBindingTarget)(context, client_session_manager_1.ClientSessionManager, this.bindClientSessionManager()).inSingletonScope();
-        this.configureMultiBinding(new multi_binding_1.MultiBinding(glsp_server_listener_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
+        this.configureMultiBinding(new multi_binding_1.MultiBinding(protocol_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
         (0, binding_target_1.applyBindingTarget)(context, global_action_provider_1.GlobalActionProvider, this.bindGlobalActionProvider()).inSingletonScope();
-        (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
-        (0, binding_target_1.applyBindingTarget)(context, glsp_client_proxy_1.GLSPClientProxy, this.bindGLSPClientProxy()).inSingletonScope();
-        (0, binding_target_1.applyBindingTarget)(context, glsp_client_proxy_1.JsonRpcGLSPClientProxy, this.bindJsonRpcGLSPClientProxy());
+        if (!isBound(service_identifiers_1.InjectionContainer)) {
+            (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
+        }
     }
     bindDiagramModules() {
         return { constantValue: this.diagramModules };
@@ -73,9 +86,6 @@ class ServerModule extends glsp_module_1.GLSPModule {
     bindGLSPServer() {
         return glsp_server_1.DefaultGLSPServer;
     }
-    bindJsonRpcGLSPServer() {
-        return { service: glsp_server_1.GLSPServer };
-    }
     bindClientSessionFactory() {
         return client_session_factory_1.DefaultClientSessionFactory;
     }
@@ -88,12 +98,6 @@ class ServerModule extends glsp_module_1.GLSPModule {
     bindInjectionContainer() {
         return { dynamicValue: context => context.container };
     }
-    bindGLSPClientProxy() {
-        return glsp_client_proxy_1.DefaultGLSPClientProxy;
-    }
-    bindJsonRpcGLSPClientProxy() {
-        return { service: glsp_client_proxy_1.GLSPClientProxy };
-    }
     configureGLSPServerListeners(binding) {
         binding.add({ service: client_session_manager_1.ClientSessionManager });
     }

package/lib/common/di/server-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":";;;AAgBA,8EAAsG;AACtG,qEAAgH;AAChH,yDAA2F;AAC3F,2EAAsE;AACtE,8EAAsG;AACtG,8EAAsG;AACtG,qDAAqE;AAErE,+CAA2C;AAC3C,mDAA+C;AAC/C,+DAA2E;AAE3E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,YAAa,SAAQ,wBAAU;IAA5C;;QAEuB,mBAAc,GAAmC,IAAI,GAAG,EAAE,CAAC;IAiFlF,CAAC;IA/EG;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAA4B,EAAE,GAAG,iBAAoC;QACxF,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAC9C,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,gEAAgE,WAAW,GAAG,CAAC,CAAC;SACnG;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB;QAC9G,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAA,mCAAkB,EAAC,OAAO,EAAE,oCAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAEvE,IAAA,mCAAkB,EAAC,OAAO,EAAE,wBAAU,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClF,IAAA,mCAAkB,EAAC,OAAO,EAAE,+BAAiB,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAC7E,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAI,CAAC,qBAAqB,CAAC,IAAI,4BAAY,CAAqB,yCAAkB,CAAC,EAAE,OAAO,CAAC,EAAE,CAC3F,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAC7C,CAAC;QAEF,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEtG,IAAA,mCAAkB,EAAC,OAAO,EAAE,wCAAkB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;QAE/E,IAAA,mCAAkB,EAAC,OAAO,EAAE,mCAAe,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC5F,IAAA,mCAAkB,EAAC,OAAO,EAAE,0CAAsB,EAAE,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAC3F,CAAC;IAES,kBAAkB;QACxB,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;IAClD,CAAC;IAES,cAAc;QACpB,OAAO,+BAAiB,CAAC;IAC7B,CAAC;IAES,qBAAqB;QAC3B,OAAO,EAAE,OAAO,EAAE,wBAAU,EAAE,CAAC;IACnC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,sBAAsB;QAC5B,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1D,CAAC;IAES,mBAAmB;QACzB,OAAO,0CAAsB,CAAC;IAClC,CAAC;IAES,0BAA0B;QAChC,OAAO,EAAE,OAAO,EAAE,mCAAe,EAAE,CAAC;IACxC,CAAC;IAES,4BAA4B,CAAC,OAAyC;QAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,6CAAoB,EAAE,CAAC,CAAC;IACnD,CAAC;;AAlFL,oCAmFC;AAlFiB,4BAAe,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwE;AAExE,8EAAsG;AACtG,yDAA4D;AAC5D,8EAAsG;AACtG,8EAAsG;AACtG,qDAAqE;AAErE,+CAA2C;AAC3C,mDAA+C;AAC/C,+DAA2E;AAE3E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,YAAa,SAAQ,wBAAU;IAA5C;;QAEuB,mBAAc,GAAmC,IAAI,GAAG,EAAE,CAAC;IAmElF,CAAC;IAjEG;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAA4B,EAAE,GAAG,iBAAoC;QACxF,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAC9C,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,gEAAgE,WAAW,GAAG,CAAC,CAAC;SACnG;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB;QAC9G,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAA,mCAAkB,EAAC,OAAO,EAAE,oCAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAEvE,IAAA,mCAAkB,EAAC,OAAO,EAAE,qBAAU,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClF,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAI,CAAC,qBAAqB,CAAC,IAAI,4BAAY,CAAqB,6BAAkB,CAAC,EAAE,OAAO,CAAC,EAAE,CAC3F,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAC7C,CAAC;QAEF,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEtG,IAAI,CAAC,OAAO,CAAC,wCAAkB,CAAC,EAAE;YAC9B,IAAA,mCAAkB,EAAC,OAAO,EAAE,wCAAkB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;SAClF;IACL,CAAC;IAES,kBAAkB;QACxB,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;IAClD,CAAC;IAES,cAAc;QACpB,OAAO,+BAAiB,CAAC;IAC7B,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,sBAAsB;QAC5B,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1D,CAAC;IAES,4BAA4B,CAAC,OAAyC;QAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,6CAAoB,EAAE,CAAC,CAAC;IACnD,CAAC;;AApEL,oCAqEC;AApEiB,4BAAe,GAAG,iBAAiB,CAAC"}

package/lib/common/features/contextactions/tool-palette-item-provider.d.ts

@@ -43,7 +43,7 @@ export declare abstract class ToolPaletteItemProvider implements ContextActionsP
 export declare class DefaultToolPaletteItemProvider extends ToolPaletteItemProvider {
     operationHandlerRegistry: OperationHandlerRegistry;
     protected counter: number;
-    getItems(args?: Args): PaletteItem[];
+    getItems(_args?: Args): PaletteItem[];
     createPaletteItem(handlers: CreateOperationHandler[], kind: string): PaletteItem[];
     create(action: PaletteItem.TriggerElementCreationAction, label: string): PaletteItem;
 }

package/lib/common/features/contextactions/tool-palette-item-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-palette-item-provider.d.ts","sourceRoot":"","sources":["../../../../src/common/features/contextactions/tool-palette-item-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,IAAI,EAGJ,aAAa,EACb,aAAa,EACb,YAAY,EACZ,WAAW,EACd,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE;;GAEG;AACH,8BACsB,uBAAwB,YAAW,sBAAsB;IAC3E;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;OAKG;IACG,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAIxE;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;CAC9D;AAED,qBACa,8BAA+B,SAAQ,uBAAuB;IACrC,wBAAwB,EAAE,wBAAwB,CAAC;IACrF,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,WAAW,EAAE;IAapC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE;IAQlF,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,4BAA4B,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW;CAGvF"}
+{"version":3,"file":"tool-palette-item-provider.d.ts","sourceRoot":"","sources":["../../../../src/common/features/contextactions/tool-palette-item-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,IAAI,EAGJ,aAAa,EACb,aAAa,EACb,YAAY,EACZ,WAAW,EACd,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE;;GAEG;AACH,8BACsB,uBAAwB,YAAW,sBAAsB;IAC3E;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;OAKG;IACG,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAIxE;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;CAC9D;AAED,qBACa,8BAA+B,SAAQ,uBAAuB;IACrC,wBAAwB,EAAE,wBAAwB,CAAC;IACrF,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,WAAW,EAAE;IAWrC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE;IAQlF,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,4BAA4B,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW;CAGvF"}

package/lib/common/features/contextactions/tool-palette-item-provider.js

@@ -54,10 +54,8 @@ ToolPaletteItemProvider = __decorate([
 ], ToolPaletteItemProvider);
 exports.ToolPaletteItemProvider = ToolPaletteItemProvider;
 let DefaultToolPaletteItemProvider = class DefaultToolPaletteItemProvider extends ToolPaletteItemProvider {
-    getItems(args) {
-        const handlers = this.operationHandlerRegistry
-            .getAll()
-            .filter(handler => handler instanceof create_operation_handler_1.CreateOperationHandler);
+    getItems(_args) {
+        const handlers = this.operationHandlerRegistry.getAll().filter(create_operation_handler_1.CreateOperationHandler.is);
         this.counter = 0;
         const nodes = this.createPaletteItem(handlers, protocol_1.CreateNodeOperation.KIND);
         const edges = this.createPaletteItem(handlers, protocol_1.CreateEdgeOperation.KIND);

package/lib/common/features/contextactions/tool-palette-item-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-palette-item-provider.js","sourceRoot":"","sources":["../../../../src/common/features/contextactions/tool-palette-item-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAQgC;AAChC,yCAA+C;AAC/C,wFAAmF;AACnF,4FAAuF;AAGvF;;GAEG;AAEI,IAAe,uBAAuB,GAAtC,MAAe,uBAAuB;IACzC;;OAEG;IACH,IAAI,SAAS;QACT,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,aAA4B;QACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CASJ,CAAA;AAzBqB,uBAAuB;IAD5C,IAAA,sBAAU,GAAE;GACS,uBAAuB,CAyB5C;AAzBqB,0DAAuB;AA4BtC,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,uBAAuB;IAIvE,QAAQ,CAAC,IAAW;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB;aACzC,MAAM,EAAE;aACR,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,YAAY,iDAAsB,CAA6B,CAAC;QAC9F,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,8BAAmB,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,8BAAmB,CAAC,IAAI,CAAC,CAAC;QACzE,OAAO;YACH,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,EAAE;YAC5G,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,EAAE;SAC/G,CAAC;IACN,CAAC;IAED,iBAAiB,CAAC,QAAkC,EAAE,IAAY;QAC9D,OAAO,QAAQ;aACV,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC;aACjD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aAC7F,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;aAC7D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,MAAgD,EAAE,KAAa;QAClE,OAAO,EAAE,EAAE,EAAE,eAAe,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;IACxG,CAAC;CACJ,CAAA;AA3BG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BAA2B,qDAAwB;gFAAC;AAD5E,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CA4B1C;AA5BY,wEAA8B"}
+{"version":3,"file":"tool-palette-item-provider.js","sourceRoot":"","sources":["../../../../src/common/features/contextactions/tool-palette-item-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAQgC;AAChC,yCAA+C;AAC/C,wFAAmF;AACnF,4FAAuF;AAGvF;;GAEG;AAEI,IAAe,uBAAuB,GAAtC,MAAe,uBAAuB;IACzC;;OAEG;IACH,IAAI,SAAS;QACT,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,aAA4B;QACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CASJ,CAAA;AAzBqB,uBAAuB;IAD5C,IAAA,sBAAU,GAAE;GACS,uBAAuB,CAyB5C;AAzBqB,0DAAuB;AA4BtC,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,uBAAuB;IAIvE,QAAQ,CAAC,KAAY;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,iDAAsB,CAAC,EAAE,CAA6B,CAAC;QACtH,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,8BAAmB,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,8BAAmB,CAAC,IAAI,CAAC,CAAC;QACzE,OAAO;YACH,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,EAAE;YAC5G,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,EAAE;SAC/G,CAAC;IACN,CAAC;IAED,iBAAiB,CAAC,QAAkC,EAAE,IAAY;QAC9D,OAAO,QAAQ;aACV,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC;aACjD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aAC7F,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;aAC7D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,MAAgD,EAAE,KAAa;QAClE,OAAO,EAAE,EAAE,EAAE,eAAe,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;IACxG,CAAC;CACJ,CAAA;AAzBG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BAA2B,qDAAwB;gFAAC;AAD5E,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CA0B1C;AA1BY,wEAA8B"}

package/lib/common/{gmodel → features/layout}/computed-bounds-action-handler.d.ts

@@ -15,9 +15,14 @@
  ********************************************************************************/
 import { GModelRoot } from '@eclipse-glsp/graph';
 import { Action, ComputedBoundsAction, MaybePromise } from '@eclipse-glsp/protocol';
-import { ActionHandler } from '../actions/action-handler';
-import { ModelState } from '../features/model/model-state';
-import { ModelSubmissionHandler } from '../features/model/model-submission-handler';
+import { ActionHandler } from '../../actions/action-handler';
+import { ModelState } from '../model/model-state';
+import { ModelSubmissionHandler } from '../model/model-submission-handler';
+/**
+ * Syncs the bounds computed by the client (i.e. the actual bounds after applying CSS styles) back to the `GModel`.
+ * In this default implementation the updated bounds are stored transient. This means they are applied to the graphical model but
+ * are not persisted to the source model.
+ */
 export declare class ComputedBoundsActionHandler implements ActionHandler {
     protected submissionHandler: ModelSubmissionHandler;
     protected modelState: ModelState;

package/lib/common/features/layout/computed-bounds-action-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"computed-bounds-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E;;;;GAIG;AACH,qBACa,2BAA4B,YAAW,aAAa;IAE7D,SAAS,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAGpD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAEjC,WAAW,WAA+B;IAC1C,OAAO,CAAC,MAAM,EAAE,oBAAoB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAU7D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAO3E,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC"}

package/lib/common/{gmodel → features/layout}/computed-bounds-action-handler.js

@@ -12,9 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComputedBoundsActionHandler = void 0;
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const model_state_1 = require("../features/model/model-state");
-const model_submission_handler_1 = require("../features/model/model-submission-handler");
-const layout_util_1 = require("../utils/layout-util");
+const layout_util_1 = require("../../utils/layout-util");
+const model_state_1 = require("../model/model-state");
+const model_submission_handler_1 = require("../model/model-submission-handler");
+/**
+ * Syncs the bounds computed by the client (i.e. the actual bounds after applying CSS styles) back to the `GModel`.
+ * In this default implementation the updated bounds are stored transient. This means they are applied to the graphical model but
+ * are not persisted to the source model.
+ */
 let ComputedBoundsActionHandler = class ComputedBoundsActionHandler {
     constructor() {
         this.actionKinds = [protocol_1.ComputedBoundsAction.KIND];
@@ -30,7 +35,7 @@ let ComputedBoundsActionHandler = class ComputedBoundsActionHandler {
     applyBounds(root, action) {
         var _a, _b;
         const index = this.modelState.index;
-        action.bounds.forEach(bounds => (0, layout_util_1.applyBounds)(bounds, index));
+        action.bounds.forEach(bounds => (0, layout_util_1.applyElementAndBounds)(bounds, index));
         ((_a = action.alignments) !== null && _a !== void 0 ? _a : []).forEach(alignment => (0, layout_util_1.applyAlignment)(alignment, index));
         ((_b = action.routes) !== null && _b !== void 0 ? _b : []).forEach(route => (0, layout_util_1.applyRoute)(route, index));
     }

package/lib/common/features/layout/computed-bounds-action-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computed-bounds-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAoF;AACpF,yCAA+C;AAE/C,yDAA4F;AAC5F,sDAAkD;AAClD,gFAA2E;AAE3E;;;;GAIG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QAOH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IAmB9C,CAAC;IAlBG,OAAO,CAAC,MAA4B;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE;YACpC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;SACvD;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAES,WAAW,CAAC,IAAgB,EAAE,MAA4B;;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,mCAAqB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QACtE,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,4BAAc,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACjF,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,wBAAU,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;CAGJ,CAAA;AAzBG;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;sEAAC;AAEpD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;+DACc;AALxB,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA0BvC;AA1BY,kEAA2B"}

package/lib/common/features/layout/layout-operation-handler.d.ts

@@ -13,16 +13,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Operation } from '@eclipse-glsp/protocol';
+import { LayoutOperation, MaybePromise, Operation } from '@eclipse-glsp/protocol';
+import { Command } from '../../command/command';
 import { DiagramConfiguration } from '../../diagram/diagram-configuration';
 import { OperationHandler } from '../../operations/operation-handler';
 import { Logger } from '../../utils/logger';
+import { GModelSerializer } from '../model/gmodel-serializer';
 import { LayoutEngine } from './layout-engine';
-export declare class LayoutOperationHandler implements OperationHandler {
+/**
+ * The default handler for `{@link LayoutOperation}s. Does invoke the (optional) layout engine
+ * if the server is configured for manual layouting. Changes are stored transient in the graphical model and are not
+ * persisted in the source model.
+ */
+export declare class LayoutOperationHandler extends OperationHandler {
     protected logger: Logger;
     protected layoutEngine?: LayoutEngine;
     protected diagramConfiguration: DiagramConfiguration;
+    protected serializer: GModelSerializer;
     readonly operationType = "layout";
-    execute(operation: Operation): Promise<void>;
+    createCommand(operation: LayoutOperation): MaybePromise<Command | undefined>;
+    protected executeOperation(_operation: Operation): Promise<void>;
 }
 //# sourceMappingURL=layout-operation-handler.d.ts.map

package/lib/common/features/layout/layout-operation-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-operation-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/layout/layout-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAmB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBACa,sBAAuB,YAAW,gBAAgB;IAE3D,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAIzB,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAGtC,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAErD,QAAQ,CAAC,aAAa,YAAwB;IACxC,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAWrD"}
+{"version":3,"file":"layout-operation-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/layout/layout-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;GAIG;AACH,qBACa,sBAAuB,SAAQ,gBAAgB;IAExD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAIzB,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAGtC,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAEvC,QAAQ,CAAC,aAAa,YAAwB;IAE9C,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;cAW5D,gBAAgB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzE"}

package/lib/common/features/layout/layout-operation-handler.js

@@ -27,23 +27,35 @@ exports.LayoutOperationHandler = void 0;
  ********************************************************************************/
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
+const recording_command_1 = require("../../command/recording-command");
 const diagram_configuration_1 = require("../../diagram/diagram-configuration");
+const operation_handler_1 = require("../../operations/operation-handler");
 const logger_1 = require("../../utils/logger");
+const gmodel_serializer_1 = require("../model/gmodel-serializer");
 const layout_engine_1 = require("./layout-engine");
-let LayoutOperationHandler = class LayoutOperationHandler {
+/**
+ * The default handler for `{@link LayoutOperation}s. Does invoke the (optional) layout engine
+ * if the server is configured for manual layouting. Changes are stored transient in the graphical model and are not
+ * persisted in the source model.
+ */
+let LayoutOperationHandler = class LayoutOperationHandler extends operation_handler_1.OperationHandler {
     constructor() {
+        super(...arguments);
         this.operationType = protocol_1.LayoutOperation.KIND;
     }
-    async execute(operation) {
-        if (operation.kind === protocol_1.LayoutOperation.KIND) {
-            if (this.diagramConfiguration.layoutKind === diagram_configuration_1.ServerLayoutKind.MANUAL) {
-                if (this.layoutEngine) {
-                    await this.layoutEngine.layout();
-                    return;
-                }
-                this.logger.warn('Could not execute layout operation. No `LayoutEngine` is bound!');
-            }
+    createCommand(operation) {
+        if (this.diagramConfiguration.layoutKind !== diagram_configuration_1.ServerLayoutKind.MANUAL) {
+            return undefined;
         }
+        if (!this.layoutEngine) {
+            this.logger.warn('Could not execute layout operation. No `LayoutEngine` is bound!');
+            return undefined;
+        }
+        return new recording_command_1.GModelRecordingCommand(this.modelState, this.serializer, () => this.executeOperation(operation));
+    }
+    async executeOperation(_operation) {
+        var _a;
+        await ((_a = this.layoutEngine) === null || _a === void 0 ? void 0 : _a.layout());
     }
 };
 __decorate([
@@ -59,6 +71,10 @@ __decorate([
     (0, inversify_1.inject)(diagram_configuration_1.DiagramConfiguration),
     __metadata("design:type", Object)
 ], LayoutOperationHandler.prototype, "diagramConfiguration", void 0);
+__decorate([
+    (0, inversify_1.inject)(gmodel_serializer_1.GModelSerializer),
+    __metadata("design:type", Object)
+], LayoutOperationHandler.prototype, "serializer", void 0);
 LayoutOperationHandler = __decorate([
     (0, inversify_1.injectable)()
 ], LayoutOperationHandler);

package/lib/common/features/layout/layout-operation-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout-operation-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/layout-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoE;AACpE,yCAAyD;AACzD,+EAA6F;AAE7F,+CAA4C;AAC5C,mDAA+C;AAGxC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAWM,kBAAa,GAAG,0BAAe,CAAC,IAAI,CAAC;IAYlD,CAAC;IAXG,KAAK,CAAC,OAAO,CAAC,SAAoB;QAC9B,IAAI,SAAS,CAAC,IAAI,KAAK,0BAAe,CAAC,IAAI,EAAE;YACzC,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,KAAK,wCAAgB,CAAC,MAAM,EAAE;gBAClE,IAAI,IAAI,CAAC,YAAY,EAAE;oBACnB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;oBACjC,OAAO;iBACV;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;aACvF;SACJ;IACL,CAAC;CACJ,CAAA;AAtBG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;sDAAC;AAEzB;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;IACpB,IAAA,oBAAQ,GAAE;;4DAC2B;AAEtC;IAAC,IAAA,kBAAM,EAAC,4CAAoB,CAAC;;oEACwB;AAT5C,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAuBlC;AAvBY,wDAAsB"}
+{"version":3,"file":"layout-operation-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/layout-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAkF;AAClF,yCAAyD;AAEzD,uEAAyE;AACzE,+EAA6F;AAC7F,0EAAsE;AACtE,+CAA4C;AAC5C,kEAA8D;AAC9D,mDAA+C;AAE/C;;;;GAIG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oCAAgB;IAArD;;QAcM,kBAAa,GAAG,0BAAe,CAAC,IAAI,CAAC;IAgBlD,CAAC;IAdG,aAAa,CAAC,SAA0B;QACpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,KAAK,wCAAgB,CAAC,MAAM,EAAE;YAClE,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YACpF,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,IAAI,0CAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAChH,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,UAAqB;;QAClD,MAAM,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,EAAE,CAAA,CAAC;IACtC,CAAC;CACJ,CAAA;AA7BG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;sDAAC;AAEzB;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;IACpB,IAAA,oBAAQ,GAAE;;4DAC2B;AAEtC;IAAC,IAAA,kBAAM,EAAC,4CAAoB,CAAC;;oEACwB;AAErD;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;0DACc;AAZ9B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA8BlC;AA9BY,wDAAsB"}

package/lib/common/features/model/model-state.d.ts

@@ -25,7 +25,6 @@ export interface ModelState {
     readonly root: GModelRoot;
     updateRoot(newRoot: GModelRoot): void;
     editMode: string;
-    isDirty: boolean;
     sourceUri?: string;
     clientId: string;
     readonly isReadonly: boolean;
@@ -39,7 +38,6 @@ export declare class DefaultModelState implements ModelState {
     protected properties: Map<string, any>;
     protected _root: GModelRoot;
     editMode: string;
-    isDirty: boolean;
     set<P>(key: string, property: P): void;
     setAll(properties: Record<string, unknown>): void;
     get<P>(key: string, guard?: (object: unknown) => object is P): P | undefined;

package/lib/common/features/model/model-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-state.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,eAAO,MAAM,UAAU,eAAuB,CAAC;AAE/C,MAAM,WAAW,UAAU;IACvB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;IACvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAClD,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IAC7E,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC/B;AAED,eAAO,MAAM,cAAc,cAAc,CAAC;AAE1C,qBACa,iBAAkB,YAAW,UAAU;IAEhD,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAG5B,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,UAAU,mBAA0B;IAE9C,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC;IAE5B,QAAQ,SAAqB;IAE7B,OAAO,UAAS;IAEhB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI;IAItC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIjD,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS;IAQ5E,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAW,IAAI,IAAI,UAAU,CAE5B;IAED,SAAS,KAAK,IAAI,CAAC,IAAI,EAAE,UAAU,EAElC;IAED,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;CAIxC"}
+{"version":3,"file":"model-state.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,eAAO,MAAM,UAAU,eAAuB,CAAC;AAE/C,MAAM,WAAW,UAAU;IACvB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;IACvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAClD,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IAC7E,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC/B;AAED,eAAO,MAAM,cAAc,cAAc,CAAC;AAE1C,qBACa,iBAAkB,YAAW,UAAU;IAEhD,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAG5B,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,UAAU,mBAA0B;IAE9C,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC;IAE5B,QAAQ,SAAqB;IAE7B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI;IAItC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIjD,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS;IAQ5E,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAW,IAAI,IAAI,UAAU,CAE5B;IAED,SAAS,KAAK,IAAI,CAAC,IAAI,EAAE,UAAU,EAElC;IAED,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;CAIxC"}

package/lib/common/features/model/model-state.js

@@ -21,7 +21,6 @@ let DefaultModelState = class DefaultModelState {
     constructor() {
         this.properties = new Map();
         this.editMode = protocol_1.EditMode.EDITABLE;
-        this.isDirty = false;
     }
     set(key, property) {
         this.properties.set(key, property);

package/lib/common/features/model/model-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-state.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-state.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAkD;AAClD,yCAA+C;AAC/C,sEAAwD;AACxD,iDAA6C;AAC7C,2DAAuD;AAE1C,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAiBlC,QAAA,cAAc,GAAG,WAAW,CAAC;AAGnC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QAUO,eAAU,GAAG,IAAI,GAAG,EAAe,CAAC;QAI9C,aAAQ,GAAG,mBAAQ,CAAC,QAAQ,CAAC;QAE7B,YAAO,GAAG,KAAK,CAAC;IA0CpB,CAAC;IAxCG,GAAG,CAAI,GAAW,EAAE,QAAW;QAC3B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,UAAmC;QACtC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,GAAG,CAAI,GAAW,EAAE,KAAwC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,MAAW,CAAC;SACtB;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAc,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,QAAQ,KAAK,mBAAQ,CAAC,QAAQ,CAAC;IAC/C,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAc,IAAI,CAAC,IAAgB;QAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAAmB;QAC1B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;CACJ,CAAA;AAzDG;IAAC,IAAA,kBAAM,EAAC,0BAAW,CAAC;8BACJ,0BAAW;gDAAC;AAE5B;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;qDACc;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;mDACS;AARjB,iBAAiB;IAD7B,IAAA,sBAAU,GAAE;GACA,iBAAiB,CA0D7B;AA1DY,8CAAiB"}
+{"version":3,"file":"model-state.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-state.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAkD;AAClD,yCAA+C;AAC/C,sEAAwD;AACxD,iDAA6C;AAC7C,2DAAuD;AAE1C,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAgBlC,QAAA,cAAc,GAAG,WAAW,CAAC;AAGnC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QAUO,eAAU,GAAG,IAAI,GAAG,EAAe,CAAC;QAI9C,aAAQ,GAAG,mBAAQ,CAAC,QAAQ,CAAC;IA0CjC,CAAC;IAxCG,GAAG,CAAI,GAAW,EAAE,QAAW;QAC3B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,UAAmC;QACtC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,GAAG,CAAI,GAAW,EAAE,KAAwC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,MAAW,CAAC;SACtB;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAc,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,QAAQ,KAAK,mBAAQ,CAAC,QAAQ,CAAC;IAC/C,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAc,IAAI,CAAC,IAAgB;QAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAAmB;QAC1B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;CACJ,CAAA;AAvDG;IAAC,IAAA,kBAAM,EAAC,0BAAW,CAAC;8BACJ,0BAAW;gDAAC;AAE5B;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;qDACc;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;mDACS;AARjB,iBAAiB;IAD7B,IAAA,sBAAU,GAAE;GACA,iBAAiB,CAwD7B;AAxDY,8CAAiB"}

package/lib/common/features/model/model-submission-handler.d.ts

@@ -15,6 +15,7 @@
  ********************************************************************************/
 import { GModelRootSchema } from '@eclipse-glsp/graph';
 import { Action, DirtyStateChangeReason, MaybePromise } from '@eclipse-glsp/protocol';
+import { CommandStack } from '../../command/command-stack';
 import { DiagramConfiguration } from '../../diagram/diagram-configuration';
 import { LayoutEngine } from '../layout/layout-engine';
 import { GModelFactory } from './gmodel-factory';
@@ -26,6 +27,7 @@ export declare class ModelSubmissionHandler {
     protected modelFactory: GModelFactory;
     protected modelState: ModelState;
     protected layoutEngine: LayoutEngine;
+    protected commandStack: CommandStack;
     /**
      * Returns a list of actions to update the client-side model, based on the specified <code>modelState</code>.
      *

package/lib/common/features/model/model-submission-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACH,MAAM,EACN,sBAAsB,EACtB,YAAY,EAKf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBACa,sBAAsB;IAE/B,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IAGtC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAIjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC;;;;;;;;OAQG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAWpE;;;;;;;;;;;;;OAaG;IACG,mBAAmB,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkB7E,SAAS,CAAC,eAAe,IAAI,gBAAgB;CAGhD"}
+{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACH,MAAM,EACN,sBAAsB,EACtB,YAAY,EAKf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBACa,sBAAsB;IAE/B,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IAGtC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAIjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC;;;;;;;;OAQG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAWpE;;;;;;;;;;;;;OAaG;IACG,mBAAmB,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkB7E,SAAS,CAAC,eAAe,IAAI,gBAAgB;CAGhD"}

package/lib/common/features/model/model-submission-handler.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelSubmissionHandler = void 0;
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
+const command_stack_1 = require("../../command/command-stack");
 const diagram_configuration_1 = require("../../diagram/diagram-configuration");
 const layout_engine_1 = require("../layout/layout-engine");
 const gmodel_factory_1 = require("./gmodel-factory");
@@ -33,7 +34,7 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
         this.modelState.root.revision = ((_a = this.modelState.root.revision) !== null && _a !== void 0 ? _a : 0) + 1;
         const root = this.serializeGModel();
         if (this.diagramConfiguration.needsClientLayout) {
-            return [protocol_1.RequestBoundsAction.create(root), protocol_1.SetDirtyStateAction.create(this.modelState.isDirty, { reason })];
+            return [protocol_1.RequestBoundsAction.create(root), protocol_1.SetDirtyStateAction.create(this.commandStack.isDirty, { reason })];
         }
         return [protocol_1.SetModelAction.create(root)];
     }
@@ -61,7 +62,7 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
             ? protocol_1.SetModelAction.create(root)
             : protocol_1.UpdateModelAction.create(root, { animate: this.diagramConfiguration.animatedUpdate }));
         if (!this.diagramConfiguration.needsClientLayout) {
-            result.push(protocol_1.SetDirtyStateAction.create(this.modelState.isDirty, { reason }));
+            result.push(protocol_1.SetDirtyStateAction.create(this.commandStack.isDirty, { reason }));
         }
         return result;
     }
@@ -90,6 +91,10 @@ __decorate([
     (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], ModelSubmissionHandler.prototype, "layoutEngine", void 0);
+__decorate([
+    (0, inversify_1.inject)(command_stack_1.CommandStack),
+    __metadata("design:type", Object)
+], ModelSubmissionHandler.prototype, "commandStack", void 0);
 ModelSubmissionHandler = __decorate([
     (0, inversify_1.injectable)()
 ], ModelSubmissionHandler);

package/lib/common/features/model/model-submission-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAQgC;AAChC,yCAAyD;AACzD,+EAA6F;AAC7F,2DAAuD;AACvD,qDAAiD;AACjD,2DAAuD;AACvD,+CAA2C;AAGpC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAiB/B;;;;;;;;OAQG;IACH,WAAW,CAAC,MAA+B;;QACvC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;YAC7C,OAAO,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;SAC9G;QACD,OAAO,CAAC,yBAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,mBAAmB,CAAC,MAA+B;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,KAAK,wCAAgB,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE;YAC1F,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;SACpC;QACD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CACP,IAAI,CAAC,QAAQ,KAAK,CAAC;YACf,CAAC,CAAC,yBAAc,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7B,CAAC,CAAC,4BAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,CAAC,CAC9F,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;YAC9C,MAAM,CAAC,IAAI,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;SAChF;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,eAAe;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;CACJ,CAAA;AAvEG;IAAC,IAAA,kBAAM,EAAC,4CAAoB,CAAC;;oEACwB;AAErD;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;0DACc;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAa,CAAC;;4DACgB;AAEtC;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;IACpB,IAAA,oBAAQ,GAAE;;4DAC0B;AAf5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAwElC;AAxEY,wDAAsB"}
+{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAQgC;AAChC,yCAAyD;AACzD,+DAA2D;AAC3D,+EAA6F;AAC7F,2DAAuD;AACvD,qDAAiD;AACjD,2DAAuD;AACvD,+CAA2C;AAGpC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAoB/B;;;;;;;;OAQG;IACH,WAAW,CAAC,MAA+B;;QACvC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;YAC7C,OAAO,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;SAChH;QACD,OAAO,CAAC,yBAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,mBAAmB,CAAC,MAA+B;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,KAAK,wCAAgB,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE;YAC1F,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;SACpC;QACD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CACP,IAAI,CAAC,QAAQ,KAAK,CAAC;YACf,CAAC,CAAC,yBAAc,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7B,CAAC,CAAC,4BAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,CAAC,CAC9F,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;YAC9C,MAAM,CAAC,IAAI,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;SAClF;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,eAAe;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;CACJ,CAAA;AA1EG;IAAC,IAAA,kBAAM,EAAC,4CAAoB,CAAC;;oEACwB;AAErD;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;0DACc;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAa,CAAC;;4DACgB;AAEtC;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;IACpB,IAAA,oBAAQ,GAAE;;4DAC0B;AAErC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;AAlB5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA2ElC;AA3EY,wDAAsB"}

package/lib/common/features/model/save-model-action-handler.d.ts

@@ -15,11 +15,11 @@
  ********************************************************************************/
 import { Action, SaveModelAction } from '@eclipse-glsp/protocol';
 import { ActionHandler } from '../../actions/action-handler';
-import { ModelState } from './model-state';
+import { CommandStack } from '../../command/command-stack';
 import { SourceModelStorage } from './source-model-storage';
 export declare class SaveModelActionHandler implements ActionHandler {
     actionKinds: string[];
-    protected modelState: ModelState;
+    protected commandStack: CommandStack;
     protected sourceModelStorage: SourceModelStorage;
     execute(action: SaveModelAction): Promise<Action[]>;
 }

package/lib/common/features/model/save-model-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save-model-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/save-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,eAAe,EAAuB,MAAM,wBAAwB,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,sBAAuB,YAAW,aAAa;IACxD,WAAW,WAA0B;IAGrC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE3C,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAM5D"}
+{"version":3,"file":"save-model-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/save-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,eAAe,EAAuB,MAAM,wBAAwB,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,sBAAuB,YAAW,aAAa;IACxD,WAAW,WAA0B;IAGrC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE3C,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAK5D"}

package/lib/common/features/model/save-model-action-handler.js

@@ -27,7 +27,7 @@ exports.SaveModelActionHandler = void 0;
  ********************************************************************************/
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const model_state_1 = require("./model-state");
+const command_stack_1 = require("../../command/command-stack");
 const source_model_storage_1 = require("./source-model-storage");
 let SaveModelActionHandler = class SaveModelActionHandler {
     constructor() {
@@ -35,14 +35,14 @@ let SaveModelActionHandler = class SaveModelActionHandler {
     }
     async execute(action) {
         await this.sourceModelStorage.saveSourceModel(action);
-        this.modelState.isDirty = false; // TODO: call save is done when available
-        return [protocol_1.SetDirtyStateAction.create(this.modelState.isDirty, { reason: 'save' })];
+        this.commandStack.saveIsDone();
+        return [protocol_1.SetDirtyStateAction.create(this.commandStack.isDirty, { reason: 'save' })];
     }
 };
 __decorate([
-    (0, inversify_1.inject)(model_state_1.ModelState),
+    (0, inversify_1.inject)(command_stack_1.CommandStack),
     __metadata("design:type", Object)
-], SaveModelActionHandler.prototype, "modelState", void 0);
+], SaveModelActionHandler.prototype, "commandStack", void 0);
 __decorate([
     (0, inversify_1.inject)(source_model_storage_1.SourceModelStorage),
     __metadata("design:type", Object)

package/lib/common/features/model/save-model-action-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"save-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/save-model-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsF;AACtF,yCAA+C;AAE/C,+CAA2C;AAC3C,iEAA4D;AAGrD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QACH,gBAAW,GAAG,CAAC,0BAAe,CAAC,IAAI,CAAC,CAAC;IAczC,CAAC;IANG,KAAK,CAAC,OAAO,CAAC,MAAuB;QACjC,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,yCAAyC;QAE1E,OAAO,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;CACJ,CAAA;AAZG;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;kEACsB;AAPxC,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAelC;AAfY,wDAAsB"}
+{"version":3,"file":"save-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/save-model-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsF;AACtF,yCAA+C;AAE/C,+DAA2D;AAC3D,iEAA4D;AAGrD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QACH,gBAAW,GAAG,CAAC,0BAAe,CAAC,IAAI,CAAC,CAAC;IAazC,CAAC;IALG,KAAK,CAAC,OAAO,CAAC,MAAuB;QACjC,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QAC/B,OAAO,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;CACJ,CAAA;AAXG;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;AAErC;IAAC,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;kEACsB;AAPxC,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAclC;AAdY,wDAAsB"}

package/lib/common/gmodel/apply-label-edit-operation-handler.d.ts

@@ -1,9 +1,8 @@
 import { ApplyLabelEditOperation, MaybePromise } from '@eclipse-glsp/protocol';
-import { ModelState } from '../features/model/model-state';
-import { OperationHandler } from '../operations/operation-handler';
-export declare class ApplyLabelEditOperationHandler implements OperationHandler {
+import { Command } from '../command/command';
+import { GModelOperationHandler } from './gmodel-operation-handler';
+export declare class GModelApplyLabelEditOperationHandler extends GModelOperationHandler {
     readonly operationType = "applyLabelEdit";
-    protected readonly modelState: ModelState;
-    execute(operation: ApplyLabelEditOperation): MaybePromise<void>;
+    createCommand(operation: ApplyLabelEditOperation): MaybePromise<Command | undefined>;
 }
 //# sourceMappingURL=apply-label-edit-operation-handler.d.ts.map