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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server-bundled",
-  "version": "2.4.0-next.118+079fa99",
+  "version": "2.4.0-next.120+867d5a7",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "079fa991b7f977b842a10fee0e4337a8346c5b7d"
+  "gitHead": "867d5a7e4136544e79983e45438f0a4ae051d221"
 }

package/wf-glsp-server-node.js

@@ -64553,7 +64553,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) {
@@ -64621,9 +64636,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.GModelChangeRoutingPointsOperationHandler = void 0;
+const graph_1 = __webpack_require__(/*! @eclipse-glsp/graph */ "../../packages/graph/lib/index.js");
 const protocol_1 = __webpack_require__(/*! @eclipse-glsp/protocol */ "../../node_modules/@eclipse-glsp/protocol/lib/index.js");
 const inversify_1 = __webpack_require__(/*! inversify */ "../../node_modules/inversify/lib/cjs/index.js");
-const glsp_server_error_1 = __webpack_require__(/*! ../utils/glsp-server-error */ "../../packages/server/lib/common/utils/glsp-server-error.js");
 const layout_util_1 = __webpack_require__(/*! ../utils/layout-util */ "../../packages/server/lib/common/utils/layout-util.js");
 const gmodel_operation_handler_1 = __webpack_require__(/*! ./gmodel-operation-handler */ "../../packages/server/lib/common/gmodel/gmodel-operation-handler.js");
 let GModelChangeRoutingPointsOperationHandler = class GModelChangeRoutingPointsOperationHandler extends gmodel_operation_handler_1.GModelOperationHandler {
@@ -64632,12 +64647,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));
     }
@@ -65775,7 +65804,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;
@@ -66048,8 +66077,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);
@@ -66967,42 +66997,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;