@eclipse-glsp/server 2.4.0-next.118 → 2.4.0-next.120

package/lib/common/gmodel/change-bounds-operation-handler.d.ts

@@ -1,4 +1,4 @@
-import { ChangeBoundsOperation, Dimension, MaybePromise, Point } from '@eclipse-glsp/protocol';
+import { ChangeBoundsOperation, Dimension, ElementAndBounds, MaybePromise, Point } from '@eclipse-glsp/protocol';
 import { Command } from '../command/command';
 import { GModelOperationHandler } from './gmodel-operation-handler';
 /**
@@ -7,6 +7,7 @@ import { GModelOperationHandler } from './gmodel-operation-handler';
 export declare class GModelChangeBoundsOperationHandler extends GModelOperationHandler {
     operationType: string;
     createCommand(operation: ChangeBoundsOperation): MaybePromise<Command | undefined>;
+    protected hasChanged(element: ElementAndBounds): boolean;
     protected executeChangeBounds(operation: ChangeBoundsOperation): void;
     protected changeElementBounds(elementId: string, newSize: Dimension, newPosition: Point | undefined): void;
 }

package/lib/common/gmodel/change-bounds-operation-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-bounds-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/change-bounds-operation-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE;;GAEG;AACH,qBACa,kCAAmC,SAAQ,sBAAsB;IAC1E,aAAa,SAA8B;IAE3C,aAAa,CAAC,SAAS,EAAE,qBAAqB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAIlF,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,qBAAqB,GAAG,IAAI;IAMrE,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;CAuB7G"}
+{"version":3,"file":"change-bounds-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/change-bounds-operation-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEjH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE;;GAEG;AACH,qBACa,kCAAmC,SAAQ,sBAAsB;IAC1E,aAAa,SAA8B;IAE3C,aAAa,CAAC,SAAS,EAAE,qBAAqB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAQlF,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAYxD,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,qBAAqB,GAAG,IAAI;IAMrE,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;CAuB7G"}

package/lib/common/gmodel/change-bounds-operation-handler.js

@@ -35,7 +35,22 @@ let GModelChangeBoundsOperationHandler = class GModelChangeBoundsOperationHandle
         this.operationType = protocol_1.ChangeBoundsOperation.KIND;
     }
     createCommand(operation) {
-        return this.commandOf(() => this.executeChangeBounds(operation));
+        const newBounds = operation.newBounds.filter(element => this.hasChanged(element));
+        if (newBounds.length === 0) {
+            return undefined;
+        }
+        return this.commandOf(() => this.executeChangeBounds({ ...operation, newBounds }));
+    }
+    hasChanged(element) {
+        const knownElement = this.modelState.index.find(element.elementId);
+        if (!knownElement || !(0, graph_1.isGBoundsAware)(knownElement)) {
+            return true;
+        }
+        const sizeChanged = knownElement.size ? !protocol_1.Dimension.equals(knownElement.size, element.newSize) : true;
+        if (sizeChanged) {
+            return true;
+        }
+        return knownElement.position && element.newPosition ? !protocol_1.Point.equals(knownElement.position, element.newPosition) : true;
     }
     executeChangeBounds(operation) {
         for (const element of operation.newBounds) {

package/lib/common/gmodel/change-bounds-operation-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-bounds-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/change-bounds-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAAwD;AACxD,qDAA+F;AAC/F,yCAAuC;AAEvC,yEAAoE;AAEpE;;GAEG;AAEI,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,iDAAsB;IAAvE;;QACH,kBAAa,GAAG,gCAAqB,CAAC,IAAI,CAAC;IAmC/C,CAAC;IAjCG,aAAa,CAAC,SAAgC;QAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IACrE,CAAC;IAES,mBAAmB,CAAC,SAAgC;QAC1D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACtF,CAAC;IACL,CAAC;IAES,mBAAmB,CAAC,SAAiB,EAAE,OAAkB,EAAE,WAA8B;QAC/F,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,EAAE,aAAK,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QACnC,IAAI,aAAa,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACnC,IAAI,WAAW,EAAE,CAAC;YACd,aAAa,GAAG,MAAM,YAAY,kBAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAClI,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;gBAC9B,YAAY,CAAC,aAAa,GAAG,EAAE,CAAC;YACpC,CAAC;YACD,YAAY,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;YACxD,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9D,CAAC;QAED,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC;QAC5B,YAAY,CAAC,QAAQ,GAAG,aAAa,CAAC;IAC1C,CAAC;CACJ,CAAA;AApCY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,sBAAU,GAAE;GACA,kCAAkC,CAoC9C"}
+{"version":3,"file":"change-bounds-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/change-bounds-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAAwE;AACxE,qDAAiH;AACjH,yCAAuC;AAEvC,yEAAoE;AAEpE;;GAEG;AAEI,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,iDAAsB;IAAvE;;QACH,kBAAa,GAAG,gCAAqB,CAAC,IAAI,CAAC;IAmD/C,CAAC;IAjDG,aAAa,CAAC,SAAgC;QAC1C,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAClF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;IAES,UAAU,CAAC,OAAyB;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,CAAC,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAS,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrG,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,YAAY,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAK,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3H,CAAC;IAES,mBAAmB,CAAC,SAAgC;QAC1D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACtF,CAAC;IACL,CAAC;IAES,mBAAmB,CAAC,SAAiB,EAAE,OAAkB,EAAE,WAA8B;QAC/F,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,EAAE,aAAK,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QACnC,IAAI,aAAa,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACnC,IAAI,WAAW,EAAE,CAAC;YACd,aAAa,GAAG,MAAM,YAAY,kBAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAClI,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;gBAC9B,YAAY,CAAC,aAAa,GAAG,EAAE,CAAC;YACpC,CAAC;YACD,YAAY,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;YACxD,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9D,CAAC;QAED,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC;QAC5B,YAAY,CAAC,QAAQ,GAAG,aAAa,CAAC;IAC1C,CAAC;CACJ,CAAA;AApDY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,sBAAU,GAAE;GACA,kCAAkC,CAoD9C"}

package/lib/common/gmodel/change-routing-points-operation-handler.d.ts

@@ -13,12 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ChangeRoutingPointsOperation, MaybePromise } from '@eclipse-glsp/protocol';
+import { ChangeRoutingPointsOperation, ElementAndRoutingPoints, MaybePromise } from '@eclipse-glsp/protocol';
 import { Command } from '../command/command';
 import { GModelOperationHandler } from './gmodel-operation-handler';
 export declare class GModelChangeRoutingPointsOperationHandler extends GModelOperationHandler {
     operationType: string;
     createCommand(operation: ChangeRoutingPointsOperation): MaybePromise<Command | undefined>;
+    protected hasChanged(element: ElementAndRoutingPoints): boolean;
     executeChangeRoutingPoints(operation: ChangeRoutingPointsOperation): MaybePromise<void>;
 }
 //# sourceMappingURL=change-routing-points-operation-handler.d.ts.map

package/lib/common/gmodel/change-routing-points-operation-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-routing-points-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/change-routing-points-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,4BAA4B,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,qBACa,yCAA0C,SAAQ,sBAAsB;IACjF,aAAa,SAAqC;IAElD,aAAa,CAAC,SAAS,EAAE,4BAA4B,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAIzF,0BAA0B,CAAC,SAAS,EAAE,4BAA4B,GAAG,YAAY,CAAC,IAAI,CAAC;CAQ1F"}
+{"version":3,"file":"change-routing-points-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/change-routing-points-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,YAAY,EAAS,MAAM,wBAAwB,CAAC;AAEpH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,qBACa,yCAA0C,SAAQ,sBAAsB;IACjF,aAAa,SAAqC;IAElD,aAAa,CAAC,SAAS,EAAE,4BAA4B,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAQzF,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO;IAa/D,0BAA0B,CAAC,SAAS,EAAE,4BAA4B,GAAG,YAAY,CAAC,IAAI,CAAC;CAI1F"}

package/lib/common/gmodel/change-routing-points-operation-handler.js

@@ -22,9 +22,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GModelChangeRoutingPointsOperationHandler = void 0;
+const graph_1 = require("@eclipse-glsp/graph");
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const glsp_server_error_1 = require("../utils/glsp-server-error");
 const layout_util_1 = require("../utils/layout-util");
 const gmodel_operation_handler_1 = require("./gmodel-operation-handler");
 let GModelChangeRoutingPointsOperationHandler = class GModelChangeRoutingPointsOperationHandler extends gmodel_operation_handler_1.GModelOperationHandler {
@@ -33,12 +33,26 @@ let GModelChangeRoutingPointsOperationHandler = class GModelChangeRoutingPointsO
         this.operationType = protocol_1.ChangeRoutingPointsOperation.KIND;
     }
     createCommand(operation) {
-        return this.commandOf(() => this.executeChangeRoutingPoints(operation));
+        const newRoutingPoints = operation.newRoutingPoints.filter(newRoutingPoints => this.hasChanged(newRoutingPoints));
+        if (newRoutingPoints.length === 0) {
+            return undefined;
+        }
+        return this.commandOf(() => this.executeChangeRoutingPoints({ ...operation, newRoutingPoints }));
     }
-    executeChangeRoutingPoints(operation) {
-        if (!operation.newRoutingPoints) {
-            throw new glsp_server_error_1.GLSPServerError('Incomplete change routingPoints  action');
+    hasChanged(element) {
+        var _a;
+        const knownElement = this.modelState.index.findByClass(element.elementId, graph_1.GEdge);
+        if (!knownElement || knownElement.routingPoints.length !== ((_a = element.newRoutingPoints) === null || _a === void 0 ? void 0 : _a.length)) {
+            return true;
+        }
+        for (let i = 0; i < knownElement.routingPoints.length; i++) {
+            if (!protocol_1.Point.equals(knownElement.routingPoints[i], element.newRoutingPoints[i])) {
+                return true;
+            }
         }
+        return false;
+    }
+    executeChangeRoutingPoints(operation) {
         const index = this.modelState.index;
         operation.newRoutingPoints.forEach(routingPoints => (0, layout_util_1.applyRoutingPoints)(routingPoints, index));
     }

package/lib/common/gmodel/change-routing-points-operation-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-routing-points-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/change-routing-points-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,qDAAoF;AACpF,yCAAuC;AAEvC,kEAA6D;AAC7D,sDAA0D;AAC1D,yEAAoE;AAG7D,IAAM,yCAAyC,GAA/C,MAAM,yCAA0C,SAAQ,iDAAsB;IAA9E;;QACH,kBAAa,GAAG,uCAA4B,CAAC,IAAI,CAAC;IActD,CAAC;IAZG,aAAa,CAAC,SAAuC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,0BAA0B,CAAC,SAAuC;QAC9D,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC;YAC9B,MAAM,IAAI,mCAAe,CAAC,yCAAyC,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,IAAA,gCAAkB,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IAClG,CAAC;CACJ,CAAA;AAfY,8FAAyC;oDAAzC,yCAAyC;IADrD,IAAA,sBAAU,GAAE;GACA,yCAAyC,CAerD"}
+{"version":3,"file":"change-routing-points-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/change-routing-points-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,+CAA4C;AAC5C,qDAAoH;AACpH,yCAAuC;AAEvC,sDAA0D;AAC1D,yEAAoE;AAG7D,IAAM,yCAAyC,GAA/C,MAAM,yCAA0C,SAAQ,iDAAsB;IAA9E;;QACH,kBAAa,GAAG,uCAA4B,CAAC,IAAI,CAAC;IA2BtD,CAAC;IAzBG,aAAa,CAAC,SAAuC;QACjD,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClH,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,GAAG,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACrG,CAAC;IAES,UAAU,CAAC,OAAgC;;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,aAAK,CAAC,CAAC;QACjF,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,aAAa,CAAC,MAAM,MAAK,MAAA,OAAO,CAAC,gBAAgB,0CAAE,MAAM,CAAA,EAAE,CAAC;YAC1F,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,gBAAK,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5E,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,0BAA0B,CAAC,SAAuC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,IAAA,gCAAkB,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IAClG,CAAC;CACJ,CAAA;AA5BY,8FAAyC;oDAAzC,yCAAyC;IADrD,IAAA,sBAAU,GAAE;GACA,yCAAyC,CA4BrD"}

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

@@ -48,7 +48,7 @@ let CompoundOperationHandler = class CompoundOperationHandler extends operation_
                 commands.push(command);
             }
         }
-        return new command_1.CompoundCommand(commands);
+        return commands.length > 0 ? new command_1.CompoundCommand(commands) : undefined;
     }
 };
 exports.CompoundOperationHandler = CompoundOperationHandler;

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

@@ -1 +1 @@
-{"version":3,"file":"compound-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/compound-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA2D;AAC3D,yCAA+C;AAC/C,gDAA8D;AAC9D,2DAAuD;AACvD,6EAAwE;AAExE;;;;GAIG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAgB;IAAvD;;QAIH,kBAAa,GAAG,4BAAiB,CAAC,IAAI,CAAC;IAa3C,CAAC;IAXG,KAAK,CAAC,aAAa,CAAC,SAA4B;QAC5C,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,EAAE,CAAC,0CAAE,OAAO,CAAC,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;QAC5H,MAAM,QAAQ,GAAc,EAAE,CAAC;QAE/B,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACV,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;QACD,OAAO,IAAI,yBAAe,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;CACJ,CAAA;AAjBY,4DAAwB;AAEvB;IADT,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;0EAAC;mCAFpD,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAiBpC"}
+{"version":3,"file":"compound-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/compound-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA2D;AAC3D,yCAA+C;AAC/C,gDAA8D;AAC9D,2DAAuD;AACvD,6EAAwE;AAExE;;;;GAIG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAgB;IAAvD;;QAIH,kBAAa,GAAG,4BAAiB,CAAC,IAAI,CAAC;IAa3C,CAAC;IAXG,KAAK,CAAC,aAAa,CAAC,SAA4B;QAC5C,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,EAAE,CAAC,0CAAE,OAAO,CAAC,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;QAC5H,MAAM,QAAQ,GAAc,EAAE,CAAC;QAE/B,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACV,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,yBAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,CAAC;CACJ,CAAA;AAjBY,4DAAwB;AAEvB;IADT,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;0EAAC;mCAFpD,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAiBpC"}

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

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

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

@@ -65,8 +65,9 @@ let OperationActionHandler = OperationActionHandler_1 = class OperationActionHan
         const command = await handler.execute(operation);
         if (command) {
             await this.executeCommand(command);
+            return this.submitModel();
         }
-        return this.modelSubmissionHandler.submitModel('operation');
+        return [];
     }
     async executeCommand(command) {
         return this.commandStack.execute(command);

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

@@ -1 +1 @@
-{"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YAC7B,OAAO;gBACH,wBAAa,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAC5F,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,OAAgB;QAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAES,WAAW;QACjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AAhEY,wDAAsB;AAErB;IADT,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;wEAAC;AAGnD;IADT,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;sEAAC;AAG/C;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAGvB;IADT,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;iCAX5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAcI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GAbtB,sBAAsB,CAgElC"}
+{"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YAC7B,OAAO;gBACH,wBAAa,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAC5F,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QAC9B,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,OAAgB;QAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAES,WAAW;QACjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AAjEY,wDAAsB;AAErB;IADT,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;wEAAC;AAGnD;IADT,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;sEAAC;AAG/C;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAGvB;IADT,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;iCAX5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAcI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GAbtB,sBAAsB,CAiElC"}

package/lib/common/utils/console-logger.d.ts

@@ -27,9 +27,13 @@ export declare class ConsoleLogger extends Logger {
     warn(message: string, ...params: any[]): void;
     error(message: string, ...params: any[]): void;
     debug(message: string, ...params: any[]): void;
-    logMessage(message: string, ...params: any[]): string;
+    logMessage(level: LogLevel, message: string, ...params: any[]): string;
+    protected logCaller(): string;
+    protected logTimestamp(): string;
     logAdditionals(...params: any[]): string;
+    protected logAdditionalsSeparator(): string;
     stringify(param: unknown): string;
+    protected stringifyError(error: Error): string;
 }
 export declare function configureConsoleLogger<T extends LoggerConfigOptions>(context: BindingContext, options: T): void;
 //# sourceMappingURL=console-logger.d.ts.map

package/lib/common/utils/console-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console-logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAmD,MAAM,UAAU,CAAC;AAElH;;;GAGG;AACH,qBACa,aAAc,SAAQ,MAAM;IAE1B,QAAQ,EAAE,QAAQ;IAClB,MAAM,CAAC;gBADP,QAAQ,GAAE,QAAwB,EAClC,MAAM,CAAC,oBAAQ;IAK1B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAOrD,cAAc,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAOxC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAOpC;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAW/G"}
+{"version":3,"file":"console-logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAA+D,MAAM,UAAU,CAAC;AAE9H;;;GAGG;AACH,qBACa,aAAc,SAAQ,MAAM;IAE1B,QAAQ,EAAE,QAAQ;IAClB,MAAM,CAAC;gBADP,QAAQ,GAAE,QAAwB,EAClC,MAAM,CAAC,oBAAQ;IAK1B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAItE,SAAS,CAAC,SAAS,IAAI,MAAM;IAI7B,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,cAAc,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAIxC,SAAS,CAAC,uBAAuB,IAAI,MAAM;IAI3C,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;IAIjC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM;CAIjD;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAW/G"}

package/lib/common/utils/console-logger.js

@@ -39,42 +39,45 @@ let ConsoleLogger = class ConsoleLogger extends logger_1.Logger {
     }
     info(message, ...params) {
         if (logger_1.LogLevel.info <= this.logLevel) {
-            console.info(this.logMessage(message, params));
+            console.info(this.logMessage(logger_1.LogLevel.info, message, ...params));
         }
     }
     warn(message, ...params) {
         if (logger_1.LogLevel.warn <= this.logLevel) {
-            console.warn(this.logMessage(message, params));
+            console.warn(this.logMessage(logger_1.LogLevel.warn, message, ...params));
         }
     }
     error(message, ...params) {
         if (logger_1.LogLevel.error <= this.logLevel) {
-            console.error(this.logMessage(message, params));
+            console.error(this.logMessage(logger_1.LogLevel.error, message, ...params));
         }
     }
     debug(message, ...params) {
         if (logger_1.LogLevel.debug <= this.logLevel) {
-            console.debug(this.logMessage(message, params));
+            console.debug(this.logMessage(logger_1.LogLevel.debug, message, ...params));
         }
     }
-    logMessage(message, ...params) {
-        const timestamp = new Date().toLocaleTimeString();
-        const caller = this.caller ? `[${this.caller}]` : '';
-        const additional = this.logAdditionals(...params);
-        return `${timestamp} ${this.logLevel} - ${caller} ${message} ${additional}`;
+    logMessage(level, message, ...params) {
+        return `${this.logTimestamp()} ${(0, logger_1.asLogLevel)(level)} - ${this.logCaller()} ${message} ${this.logAdditionals(...params)}`;
+    }
+    logCaller() {
+        return this.caller ? `[${this.caller}]` : '';
+    }
+    logTimestamp() {
+        return new Date().toLocaleTimeString();
     }
     logAdditionals(...params) {
-        if (!params || params.length === 0) {
-            return '';
-        }
-        return params.map(param => this.stringify(param)).join(',\n');
+        return !params || params.length === 0 ? '' : params.map(param => this.stringify(param)).join(this.logAdditionalsSeparator());
+    }
+    logAdditionalsSeparator() {
+        return ',\n';
     }
     stringify(param) {
-        if (param instanceof Error) {
-            return `${param.message}
-            ${param.stack || ''}`;
-        }
-        return JSON.stringify(param, undefined, 4);
+        return param instanceof Error ? this.stringifyError(param) : JSON.stringify(param, undefined, 4);
+    }
+    stringifyError(error) {
+        return `${error.message}
+        ${error.stack || ''}`;
     }
 };
 exports.ConsoleLogger = ConsoleLogger;

package/lib/common/utils/console-logger.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/server",
-  "version": "2.4.0-next.118+079fa99",
+  "version": "2.4.0-next.120+867d5a7",
   "description": "A js server framework for Eclipse GLSP",
   "keywords": [
     "eclipse",
@@ -58,7 +58,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/graph": "2.4.0-next.118+079fa99",
+    "@eclipse-glsp/graph": "2.4.0-next.120+867d5a7",
     "@eclipse-glsp/protocol": "next",
     "@types/uuid": "8.3.1",
     "commander": "^8.3.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "079fa991b7f977b842a10fee0e4337a8346c5b7d"
+  "gitHead": "867d5a7e4136544e79983e45438f0a4ae051d221"
 }

package/src/common/gmodel/change-bounds-operation-handler.ts

@@ -13,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelRoot, GNode } from '@eclipse-glsp/graph';
-import { ChangeBoundsOperation, Dimension, MaybePromise, Point } from '@eclipse-glsp/protocol';
+import { GModelRoot, GNode, isGBoundsAware } from '@eclipse-glsp/graph';
+import { ChangeBoundsOperation, Dimension, ElementAndBounds, MaybePromise, Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import { Command } from '../command/command';
 import { GModelOperationHandler } from './gmodel-operation-handler';
@@ -27,7 +27,23 @@ export class GModelChangeBoundsOperationHandler extends GModelOperationHandler {
     operationType = ChangeBoundsOperation.KIND;
 
     createCommand(operation: ChangeBoundsOperation): MaybePromise<Command | undefined> {
-        return this.commandOf(() => this.executeChangeBounds(operation));
+        const newBounds = operation.newBounds.filter(element => this.hasChanged(element));
+        if (newBounds.length === 0) {
+            return undefined;
+        }
+        return this.commandOf(() => this.executeChangeBounds({ ...operation, newBounds }));
+    }
+
+    protected hasChanged(element: ElementAndBounds): boolean {
+        const knownElement = this.modelState.index.find(element.elementId);
+        if (!knownElement || !isGBoundsAware(knownElement)) {
+            return true;
+        }
+        const sizeChanged = knownElement.size ? !Dimension.equals(knownElement.size, element.newSize) : true;
+        if (sizeChanged) {
+            return true;
+        }
+        return knownElement.position && element.newPosition ? !Point.equals(knownElement.position, element.newPosition) : true;
     }
 
     protected executeChangeBounds(operation: ChangeBoundsOperation): void {

package/src/common/gmodel/change-routing-points-operation-handler.ts

@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ChangeRoutingPointsOperation, MaybePromise } from '@eclipse-glsp/protocol';
+import { GEdge } from '@eclipse-glsp/graph';
+import { ChangeRoutingPointsOperation, ElementAndRoutingPoints, MaybePromise, Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import { Command } from '../command/command';
-import { GLSPServerError } from '../utils/glsp-server-error';
 import { applyRoutingPoints } from '../utils/layout-util';
 import { GModelOperationHandler } from './gmodel-operation-handler';
 
@@ -26,14 +26,27 @@ export class GModelChangeRoutingPointsOperationHandler extends GModelOperationHa
     operationType = ChangeRoutingPointsOperation.KIND;
 
     createCommand(operation: ChangeRoutingPointsOperation): MaybePromise<Command | undefined> {
-        return this.commandOf(() => this.executeChangeRoutingPoints(operation));
+        const newRoutingPoints = operation.newRoutingPoints.filter(newRoutingPoints => this.hasChanged(newRoutingPoints));
+        if (newRoutingPoints.length === 0) {
+            return undefined;
+        }
+        return this.commandOf(() => this.executeChangeRoutingPoints({ ...operation, newRoutingPoints }));
     }
 
-    executeChangeRoutingPoints(operation: ChangeRoutingPointsOperation): MaybePromise<void> {
-        if (!operation.newRoutingPoints) {
-            throw new GLSPServerError('Incomplete change routingPoints  action');
+    protected hasChanged(element: ElementAndRoutingPoints): boolean {
+        const knownElement = this.modelState.index.findByClass(element.elementId, GEdge);
+        if (!knownElement || knownElement.routingPoints.length !== element.newRoutingPoints?.length) {
+            return true;
+        }
+        for (let i = 0; i < knownElement.routingPoints.length; i++) {
+            if (!Point.equals(knownElement.routingPoints[i], element.newRoutingPoints[i])) {
+                return true;
+            }
         }
+        return false;
+    }
 
+    executeChangeRoutingPoints(operation: ChangeRoutingPointsOperation): MaybePromise<void> {
         const index = this.modelState.index;
         operation.newRoutingPoints.forEach(routingPoints => applyRoutingPoints(routingPoints, index));
     }

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

@@ -40,6 +40,6 @@ export class CompoundOperationHandler extends OperationHandler {
                 commands.push(command);
             }
         }
-        return new CompoundCommand(commands);
+        return commands.length > 0 ? new CompoundCommand(commands) : undefined;
     }
 }

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

@@ -67,8 +67,9 @@ export class OperationActionHandler implements ActionHandler {
         const command = await handler.execute(operation);
         if (command) {
             await this.executeCommand(command);
+            return this.submitModel();
         }
-        return this.modelSubmissionHandler.submitModel('operation');
+        return [];
     }
 
     protected async executeCommand(command: Command): Promise<void> {

package/src/common/utils/console-logger.ts

@@ -16,7 +16,7 @@
 
 import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
 import { injectable } from 'inversify';
-import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, getRequestParentName } from './logger';
+import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, asLogLevel, getRequestParentName } from './logger';
 
 /**
  *  Simple logger implementation that forwards logging calls to the `console` and
@@ -33,48 +33,55 @@ export class ConsoleLogger extends Logger {
 
     info(message: string, ...params: any[]): void {
         if (LogLevel.info <= this.logLevel) {
-            console.info(this.logMessage(message, params));
+            console.info(this.logMessage(LogLevel.info, message, ...params));
         }
     }
 
     warn(message: string, ...params: any[]): void {
         if (LogLevel.warn <= this.logLevel) {
-            console.warn(this.logMessage(message, params));
+            console.warn(this.logMessage(LogLevel.warn, message, ...params));
         }
     }
 
     error(message: string, ...params: any[]): void {
         if (LogLevel.error <= this.logLevel) {
-            console.error(this.logMessage(message, params));
+            console.error(this.logMessage(LogLevel.error, message, ...params));
         }
     }
 
     debug(message: string, ...params: any[]): void {
         if (LogLevel.debug <= this.logLevel) {
-            console.debug(this.logMessage(message, params));
+            console.debug(this.logMessage(LogLevel.debug, message, ...params));
         }
     }
 
-    logMessage(message: string, ...params: any[]): string {
-        const timestamp = new Date().toLocaleTimeString();
-        const caller = this.caller ? `[${this.caller}]` : '';
-        const additional = this.logAdditionals(...params);
-        return `${timestamp} ${this.logLevel} - ${caller} ${message} ${additional}`;
+    logMessage(level: LogLevel, message: string, ...params: any[]): string {
+        return `${this.logTimestamp()} ${asLogLevel(level)} - ${this.logCaller()} ${message} ${this.logAdditionals(...params)}`;
+    }
+
+    protected logCaller(): string {
+        return this.caller ? `[${this.caller}]` : '';
+    }
+
+    protected logTimestamp(): string {
+        return new Date().toLocaleTimeString();
     }
 
     logAdditionals(...params: any[]): string {
-        if (!params || params.length === 0) {
-            return '';
-        }
-        return params.map(param => this.stringify(param)).join(',\n');
+        return !params || params.length === 0 ? '' : params.map(param => this.stringify(param)).join(this.logAdditionalsSeparator());
+    }
+
+    protected logAdditionalsSeparator(): string {
+        return ',\n';
     }
 
     stringify(param: unknown): string {
-        if (param instanceof Error) {
-            return `${param.message}
-            ${param.stack || ''}`;
-        }
-        return JSON.stringify(param, undefined, 4);
+        return param instanceof Error ? this.stringifyError(param) : JSON.stringify(param, undefined, 4);
+    }
+
+    protected stringifyError(error: Error): string {
+        return `${error.message}
+        ${error.stack || ''}`;
     }
 }