@eclipse-glsp-examples/workflow-server-bundled 2.4.0-next.117 → 2.4.0-next.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server-bundled",
-  "version": "2.4.0-next.117+6064bdb",
+  "version": "2.4.0-next.119+86e89a1",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6064bdbe4f9590c6ce92e98914154ddfd18abdcd"
+  "gitHead": "86e89a196104c33a8121ecbb17390c0e3520a9bd"
 }

package/wf-glsp-server-node.js

@@ -63425,11 +63425,16 @@ let RequestModelActionHandler = class RequestModelActionHandler {
         this.modelState.setAll((_a = action.options) !== null && _a !== void 0 ? _a : {});
         const isReconnecting = client_options_util_1.ClientOptionsUtil.isReconnecting(action.options);
         const progress = this.reportModelLoading('Model loading in progress');
-        if (isReconnecting) {
-            await this.handleReconnect(action);
+        try {
+            if (isReconnecting) {
+                await this.handleReconnect(action);
+            }
+            else {
+                await this.sourceModelStorage.loadSourceModel(action);
+            }
         }
-        else {
-            await this.sourceModelStorage.loadSourceModel(action);
+        catch (err) {
+            this.handleModelLoadingError(err, progress);
         }
         this.reportModelLoadingFinished(progress);
         return this.submissionHandler.submitInitialModel(action);
@@ -63452,7 +63457,13 @@ let RequestModelActionHandler = class RequestModelActionHandler {
     }
     reportModelLoadingFinished(monitor) {
         this.actionDispatcher.dispatch(protocol_1.StatusAction.create('', { severity: 'NONE' }));
-        monitor.end();
+        monitor === null || monitor === void 0 ? void 0 : monitor.end();
+    }
+    handleModelLoadingError(error, monitor) {
+        // In case of an error we end progress reporting and rethrow the error so
+        // that it can be handled by the default error handler
+        monitor === null || monitor === void 0 ? void 0 : monitor.end();
+        throw error;
     }
 };
 exports.RequestModelActionHandler = RequestModelActionHandler;
@@ -64542,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) {
@@ -64610,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 {
@@ -64621,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));
     }
@@ -65764,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;
@@ -66037,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);