@eclipse-glsp/client 0.10.0-next.ca17587.154 → 1.1.0-RC01

package/lib/features/validation/validate.js

@@ -12,9 +12,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeleteMarkersCommand = exports.ApplyMarkersCommand = exports.ApplyMarkersAction = exports.SetMarkersCommand = exports.ExternalMarkerManager = exports.ValidationFeedbackEmitter = void 0;
+exports.DeleteMarkersCommand = exports.ApplyMarkersCommand = exports.ApplyMarkersAction = exports.SetMarkersActionHandler = exports.ExternalMarkerManager = exports.ValidationFeedbackEmitter = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource 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
@@ -34,7 +34,6 @@ const sprotty_1 = require("sprotty");
 const editor_context_service_1 = require("../../base/editor-context-service");
 const types_1 = require("../../base/types");
 const smodel_util_1 = require("../../utils/smodel-util");
-const hover_1 = require("../hover/hover");
 const model_1 = require("../tool-feedback/model");
 const issue_marker_1 = require("./issue-marker");
 /**
@@ -53,7 +52,7 @@ let ValidationFeedbackEmitter = class ValidationFeedbackEmitter {
         this.feedbackActionDispatcher.deregisterFeedback(this, []);
         // Clear existing markers
         if (this.registeredAction !== undefined) {
-            const deleteMarkersAction = new protocol_1.DeleteMarkersAction(this.registeredAction.markers);
+            const deleteMarkersAction = protocol_1.DeleteMarkersAction.create(this.registeredAction.markers);
             this.actionDispatcher().then(dispatcher => dispatcher.dispatch(deleteMarkersAction));
         }
         // Register new action responsible for applying markers and re-applying them when the model is updated
@@ -62,15 +61,15 @@ let ValidationFeedbackEmitter = class ValidationFeedbackEmitter {
     }
 };
 __decorate([
-    inversify_1.inject(types_1.GLSP_TYPES.IFeedbackActionDispatcher),
+    (0, inversify_1.inject)(types_1.TYPES.IFeedbackActionDispatcher),
     __metadata("design:type", Object)
 ], ValidationFeedbackEmitter.prototype, "feedbackActionDispatcher", void 0);
 __decorate([
-    inversify_1.inject(sprotty_1.TYPES.IActionDispatcherProvider),
+    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcherProvider),
     __metadata("design:type", Function)
 ], ValidationFeedbackEmitter.prototype, "actionDispatcher", void 0);
 ValidationFeedbackEmitter = __decorate([
-    inversify_1.injectable(),
+    (0, inversify_1.injectable)(),
     __metadata("design:paramtypes", [])
 ], ValidationFeedbackEmitter);
 exports.ValidationFeedbackEmitter = ValidationFeedbackEmitter;
@@ -86,111 +85,93 @@ let ExternalMarkerManager = class ExternalMarkerManager {
     }
     removeMarkers(markers) {
         if (this.actionDispatcher) {
-            this.actionDispatcher.dispatch(new protocol_1.DeleteMarkersAction(markers));
+            this.actionDispatcher.dispatch(protocol_1.DeleteMarkersAction.create(markers));
         }
     }
 };
 ExternalMarkerManager = __decorate([
-    inversify_1.injectable()
+    (0, inversify_1.injectable)()
 ], ExternalMarkerManager);
 exports.ExternalMarkerManager = ExternalMarkerManager;
-/**
- * Command for handling `SetMarkersAction`
- */
-let SetMarkersCommand = class SetMarkersCommand extends sprotty_1.Command {
-    constructor(action) {
-        super();
-        this.action = action;
+let SetMarkersActionHandler = class SetMarkersActionHandler {
+    handle(action) {
+        const markers = action.markers;
+        this.setMarkers(markers);
     }
-    async execute(context) {
-        const markers = this.action.markers;
+    async setMarkers(markers) {
+        var _a;
         const uri = await this.editorContextService.getSourceUri();
-        if (this.externalMarkerManager) {
-            this.externalMarkerManager.setMarkers(markers, uri);
-        }
-        const applyMarkersAction = new ApplyMarkersAction(markers);
+        (_a = this.externalMarkerManager) === null || _a === void 0 ? void 0 : _a.setMarkers(markers, uri);
+        const applyMarkersAction = ApplyMarkersAction.create(markers);
         this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction);
-        return context.root;
-    }
-    undo(context) {
-        return context.root;
-    }
-    redo(context) {
-        return this.execute(context);
     }
 };
-SetMarkersCommand.KIND = protocol_1.SetMarkersAction.KIND;
 __decorate([
-    inversify_1.inject(ValidationFeedbackEmitter),
+    (0, inversify_1.inject)(ValidationFeedbackEmitter),
     __metadata("design:type", ValidationFeedbackEmitter)
-], SetMarkersCommand.prototype, "validationFeedbackEmitter", void 0);
+], SetMarkersActionHandler.prototype, "validationFeedbackEmitter", void 0);
 __decorate([
-    inversify_1.inject(ExternalMarkerManager),
-    inversify_1.optional(),
+    (0, inversify_1.inject)(ExternalMarkerManager),
+    (0, inversify_1.optional)(),
     __metadata("design:type", ExternalMarkerManager)
-], SetMarkersCommand.prototype, "externalMarkerManager", void 0);
+], SetMarkersActionHandler.prototype, "externalMarkerManager", void 0);
 __decorate([
-    inversify_1.inject(editor_context_service_1.EditorContextService),
+    (0, inversify_1.inject)(editor_context_service_1.EditorContextService),
     __metadata("design:type", editor_context_service_1.EditorContextService)
-], SetMarkersCommand.prototype, "editorContextService", void 0);
-SetMarkersCommand = __decorate([
-    inversify_1.injectable(),
-    __param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
-    __metadata("design:paramtypes", [protocol_1.SetMarkersAction])
-], SetMarkersCommand);
-exports.SetMarkersCommand = SetMarkersCommand;
+], SetMarkersActionHandler.prototype, "editorContextService", void 0);
+SetMarkersActionHandler = __decorate([
+    (0, inversify_1.injectable)()
+], SetMarkersActionHandler);
+exports.SetMarkersActionHandler = SetMarkersActionHandler;
+var ApplyMarkersAction;
+(function (ApplyMarkersAction) {
+    ApplyMarkersAction.KIND = 'applyMarkers';
+    function is(object) {
+        return protocol_1.Action.hasKind(object, ApplyMarkersAction.KIND) && (0, protocol_1.hasArrayProp)(object, 'markers');
+    }
+    ApplyMarkersAction.is = is;
+    function create(markers) {
+        return {
+            kind: ApplyMarkersAction.KIND,
+            markers
+        };
+    }
+    ApplyMarkersAction.create = create;
+})(ApplyMarkersAction = exports.ApplyMarkersAction || (exports.ApplyMarkersAction = {}));
 /**
- * Action for applying makers to a model
- */
-let ApplyMarkersAction = class ApplyMarkersAction {
-    constructor(markers, kind = ApplyMarkersCommand.KIND) {
-        this.markers = markers;
-        this.kind = kind;
-    }
-};
-ApplyMarkersAction = __decorate([
-    inversify_1.injectable(),
-    __metadata("design:paramtypes", [Array, Object])
-], ApplyMarkersAction);
-exports.ApplyMarkersAction = ApplyMarkersAction;
-/**
- * Command for handling `ApplyMarkersAction`
+ * Handles {@link ApplyMarkersAction}s by creating the corresponding {@link SIssueMarker}s and
+ * adding them to the graphical model.
  */
 let ApplyMarkersCommand = class ApplyMarkersCommand extends model_1.FeedbackCommand {
     constructor(action) {
         super();
         this.action = action;
-        this.priority = 0;
     }
     execute(context) {
-        const markers = this.action.markers;
-        for (const marker of markers) {
+        this.action.markers.forEach(marker => {
             const modelElement = context.root.index.getById(marker.elementId);
             if (modelElement instanceof sprotty_1.SParentElement) {
-                const issueMarker = issue_marker_1.getOrCreateSIssueMarker(modelElement);
-                const issue = issue_marker_1.createSIssue(marker);
+                const issueMarker = (0, issue_marker_1.getOrCreateSIssueMarker)(modelElement);
+                const issue = (0, issue_marker_1.createSIssue)(marker);
                 issueMarker.issues.push(issue);
+                if (issueMarker instanceof issue_marker_1.GIssueMarker) {
+                    issueMarker.computeProjectionCssClasses();
+                }
                 addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker);
             }
-        }
-        return context.root;
-    }
-    undo(context) {
+        });
         return context.root;
     }
-    redo(context) {
-        return this.execute(context);
-    }
 };
-ApplyMarkersCommand.KIND = 'applyMarkers';
+ApplyMarkersCommand.KIND = ApplyMarkersAction.KIND;
 ApplyMarkersCommand = __decorate([
-    inversify_1.injectable(),
-    __param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
-    __metadata("design:paramtypes", [ApplyMarkersAction])
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
+    __metadata("design:paramtypes", [Object])
 ], ApplyMarkersCommand);
 exports.ApplyMarkersCommand = ApplyMarkersCommand;
 function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
-    const maxSeverityCSSClass = hover_1.getSeverity(issueMarker);
+    const maxSeverityCSSClass = (0, issue_marker_1.getSeverity)(issueMarker);
     if (!modelElement.cssClasses) {
         modelElement.cssClasses = [maxSeverityCSSClass];
     }
@@ -200,23 +181,23 @@ function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
     }
 }
 function removeCSSClassFromIssueParent(modelElement, issueMarker) {
-    smodel_util_1.removeCssClasses(modelElement, [hover_1.getSeverity(issueMarker)]);
+    const severity = (0, issue_marker_1.getSeverity)(issueMarker);
+    (0, smodel_util_1.removeCssClasses)(modelElement, [severity]);
 }
 /**
  * Command for handling `DeleteMarkersAction`
  */
-let DeleteMarkersCommand = class DeleteMarkersCommand extends sprotty_1.Command {
+let DeleteMarkersCommand = class DeleteMarkersCommand extends model_1.FeedbackCommand {
     constructor(action) {
         super();
         this.action = action;
     }
     execute(context) {
-        const markers = this.action.markers;
-        for (const marker of markers) {
+        this.action.markers.forEach(marker => {
             const modelElement = context.root.index.getById(marker.elementId);
             if (modelElement instanceof sprotty_1.SParentElement) {
-                const issueMarker = issue_marker_1.getSIssueMarker(modelElement);
-                if (issueMarker !== undefined) {
+                const issueMarker = (0, issue_marker_1.getSIssueMarker)(modelElement);
+                if (issueMarker) {
                     removeCSSClassFromIssueParent(modelElement, issueMarker);
                     for (let index = 0; index < issueMarker.issues.length; ++index) {
                         const issue = issueMarker.issues[index];
@@ -232,21 +213,15 @@ let DeleteMarkersCommand = class DeleteMarkersCommand extends sprotty_1.Command
                     }
                 }
             }
-        }
+        });
         return context.root;
     }
-    undo(context) {
-        return context.root;
-    }
-    redo(context) {
-        return this.execute(context);
-    }
 };
 DeleteMarkersCommand.KIND = protocol_1.DeleteMarkersAction.KIND;
 DeleteMarkersCommand = __decorate([
-    inversify_1.injectable(),
-    __param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
-    __metadata("design:paramtypes", [protocol_1.DeleteMarkersAction])
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
+    __metadata("design:paramtypes", [Object])
 ], DeleteMarkersCommand);
 exports.DeleteMarkersCommand = DeleteMarkersCommand;
 //# sourceMappingURL=validate.js.map

package/lib/features/validation/validate.js.map

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

package/lib/features/viewport/di.config.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource 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

package/lib/features/viewport/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/viewport/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAiB5C,QAAA,MAAM,kBAAkB,iBAYtB,CAAC;AAEH,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/viewport/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAgB5C,QAAA,MAAM,kBAAkB,iBAYtB,CAAC;AAEH,eAAe,kBAAkB,CAAC"}

package/lib/features/viewport/di.config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource 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
@@ -19,16 +19,16 @@ const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
 const glsp_scroll_mouse_listener_1 = require("./glsp-scroll-mouse-listener");
 const glspViewportModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
-    sprotty_1.configureCommand({ bind, isBound }, sprotty_1.CenterCommand);
-    sprotty_1.configureCommand({ bind, isBound }, sprotty_1.FitToScreenCommand);
-    sprotty_1.configureCommand({ bind, isBound }, sprotty_1.GetViewportCommand);
-    sprotty_1.configureCommand({ bind, isBound }, sprotty_1.SetViewportCommand);
+    (0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.CenterCommand);
+    (0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.FitToScreenCommand);
+    (0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.GetViewportCommand);
+    (0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.SetViewportCommand);
     bind(sprotty_1.TYPES.KeyListener).to(sprotty_1.CenterKeyboardListener);
     bind(sprotty_1.TYPES.MouseListener).to(sprotty_1.ZoomMouseListener);
     bind(glsp_scroll_mouse_listener_1.GLSPScrollMouseListener).toSelf().inSingletonScope();
     bind(sprotty_1.TYPES.MouseListener).toService(glsp_scroll_mouse_listener_1.GLSPScrollMouseListener);
-    sprotty_1.configureActionHandler({ bind, isBound }, sprotty_1.EnableToolsAction.KIND, glsp_scroll_mouse_listener_1.GLSPScrollMouseListener);
-    sprotty_1.configureActionHandler({ bind, isBound }, sprotty_1.EnableDefaultToolsAction.KIND, glsp_scroll_mouse_listener_1.GLSPScrollMouseListener);
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, sprotty_1.EnableToolsAction.KIND, glsp_scroll_mouse_listener_1.GLSPScrollMouseListener);
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, sprotty_1.EnableDefaultToolsAction.KIND, glsp_scroll_mouse_listener_1.GLSPScrollMouseListener);
 });
 exports.default = glspViewportModule;
 //# sourceMappingURL=di.config.js.map

package/lib/features/viewport/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/viewport/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAYiB;AAEjB,6EAAuE;AAEvE,MAAM,kBAAkB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACtE,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,uBAAa,CAAC,CAAC;IACnD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAkB,CAAC,CAAC;IACxD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAkB,CAAC,CAAC;IACxD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAkB,CAAC,CAAC;IACxD,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,gCAAsB,CAAC,CAAC;IACnD,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,2BAAiB,CAAC,CAAC;IAChD,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,oDAAuB,CAAC,CAAC;IAE7D,gCAAsB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,2BAAiB,CAAC,IAAI,EAAE,oDAAuB,CAAC,CAAC;IAC3F,gCAAsB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAwB,CAAC,IAAI,EAAE,oDAAuB,CAAC,CAAC;AACtG,CAAC,CAAC,CAAC;AAEH,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/viewport/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAYiB;AACjB,6EAAuE;AAEvE,MAAM,kBAAkB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACtE,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,uBAAa,CAAC,CAAC;IACnD,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAkB,CAAC,CAAC;IACxD,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAkB,CAAC,CAAC;IACxD,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAkB,CAAC,CAAC;IACxD,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,gCAAsB,CAAC,CAAC;IACnD,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,2BAAiB,CAAC,CAAC;IAChD,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,oDAAuB,CAAC,CAAC;IAE7D,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,2BAAiB,CAAC,IAAI,EAAE,oDAAuB,CAAC,CAAC;IAC3F,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAwB,CAAC,IAAI,EAAE,oDAAuB,CAAC,CAAC;AACtG,CAAC,CAAC,CAAC;AAEH,kBAAe,kBAAkB,CAAC"}

package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource 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

package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-scroll-mouse-listener.d.ts","sourceRoot":"","sources":["../../../src/features/viewport/glsp-scroll-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAA+C,cAAc,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGpI,qBACa,uBAAwB,SAAQ,mBAAoB,YAAW,cAAc;IACtF,gBAAgB,UAAS;IAEzB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAUhD,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;CAMpF"}
+{"version":3,"file":"glsp-scroll-mouse-listener.d.ts","sourceRoot":"","sources":["../../../src/features/viewport/glsp-scroll-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAA+C,cAAc,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGpI,qBACa,uBAAwB,SAAQ,mBAAoB,YAAW,cAAc;IACtF,gBAAgB,UAAS;IAEzB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAUvC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;CAM7F"}

package/lib/features/viewport/glsp-scroll-mouse-listener.js

@@ -16,12 +16,12 @@ let GLSPScrollMouseListener = class GLSPScrollMouseListener extends sprotty_1.Sc
         this.preventScrolling = false;
     }
     handle(action) {
-        if (action instanceof sprotty_1.EnableToolsAction) {
+        if (action.kind === sprotty_1.EnableToolsAction.KIND) {
             if (action.toolIds.includes(marquee_mouse_tool_1.MarqueeMouseTool.ID)) {
                 this.preventScrolling = true;
             }
         }
-        else if (action instanceof sprotty_1.EnableDefaultToolsAction) {
+        else if (action.kind === sprotty_1.EnableDefaultToolsAction.KIND) {
             this.preventScrolling = false;
         }
     }
@@ -33,7 +33,7 @@ let GLSPScrollMouseListener = class GLSPScrollMouseListener extends sprotty_1.Sc
     }
 };
 GLSPScrollMouseListener = __decorate([
-    inversify_1.injectable()
+    (0, inversify_1.injectable)()
 ], GLSPScrollMouseListener);
 exports.GLSPScrollMouseListener = GLSPScrollMouseListener;
 //# sourceMappingURL=glsp-scroll-mouse-listener.js.map

package/lib/features/viewport/glsp-scroll-mouse-listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-scroll-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/viewport/glsp-scroll-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AACvC,qCAAoI;AACpI,oEAA+D;AAG/D,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,6BAAmB;IAAhE;;QACI,qBAAgB,GAAG,KAAK,CAAC;IAkB7B,CAAC;IAhBG,MAAM,CAAC,MAAc;QACjB,IAAI,MAAM,YAAY,2BAAiB,EAAE;YACrC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,qCAAgB,CAAC,EAAE,CAAC,EAAE;gBAC9C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAChC;SACJ;aAAM,IAAI,MAAM,YAAY,kCAAwB,EAAE;YACnD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;SACjC;IACL,CAAC;IAED,SAAS,CAAC,MAAqB,EAAE,KAAiB;QAC9C,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,OAAO,EAAE,CAAC;SACb;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAA;AAnBY,uBAAuB;IADnC,sBAAU,EAAE;GACA,uBAAuB,CAmBnC;AAnBY,0DAAuB"}
+{"version":3,"file":"glsp-scroll-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/viewport/glsp-scroll-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AACvC,qCAAoI;AACpI,oEAA+D;AAG/D,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,6BAAmB;IAAhE;;QACI,qBAAgB,GAAG,KAAK,CAAC;IAkB7B,CAAC;IAhBG,MAAM,CAAC,MAAc;QACjB,IAAI,MAAM,CAAC,IAAI,KAAK,2BAAiB,CAAC,IAAI,EAAE;YACxC,IAAK,MAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,qCAAgB,CAAC,EAAE,CAAC,EAAE;gBACrE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAChC;SACJ;aAAM,IAAI,MAAM,CAAC,IAAI,KAAK,kCAAwB,CAAC,IAAI,EAAE;YACtD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;SACjC;IACL,CAAC;IAEQ,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,OAAO,EAAE,CAAC;SACb;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAA;AAnBY,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAmBnC;AAnBY,0DAAuB"}

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource 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
@@ -21,18 +21,17 @@ import glspDecorationModule from './features/decoration/di.config';
 import glspEditLabelModule from './features/edit-label/di.config';
 import modelHintsModule from './features/hints/di.config';
 import glspHoverModule from './features/hover/di.config';
-import layoutCommandsModule from './features/layout/di.config';
-import modelSourceWatcherModule from './features/model-source-watcher/di.config';
+import layoutModule from './features/layout/di.config';
 import glspMouseToolModule from './features/mouse-tool/di.config';
 import { navigationModule } from './features/navigation/di.config';
 import saveModule from './features/save/di.config';
 import glspSelectModule from './features/select/di.config';
+import sourceModelWatcherModule from './features/source-model-watcher/di.config';
 import toolFeedbackModule from './features/tool-feedback/di.config';
 import paletteModule from './features/tool-palette/di.config';
-import toolsModule from './features/tools/di.config';
+import { enableDefaultToolsOnFocusLossModule, toolsModule } from './features/tools/di.config';
 import { markerNavigatorModule, validationModule } from './features/validation/di.config';
 import glspViewportModule from './features/viewport/di.config';
-export * from 'sprotty';
 export * from './base/action-dispatcher';
 export * from './base/actions/focus-change-action';
 export * from './base/argumentable';
@@ -50,6 +49,7 @@ export * from './base/model/model-registry';
 export * from './base/model/update-model-command';
 export * from './base/selection-clearing-mouse-listener';
 export * from './base/source-uri-aware';
+export * from './base/tool-manager/tool-actions';
 export * from './base/types';
 export * from './base/view/view-registry';
 export * from './features/change-bounds/model';
@@ -64,8 +64,7 @@ export * from './features/edit-label/edit-label-validator';
 export * from './features/hints/model';
 export * from './features/hints/type-hints';
 export * from './features/hover/hover';
-export * from './features/layout/layout-commands';
-export * from './features/model-source-watcher/model-source-changed-action-handler';
+export * from './features/layout/layout-elements-action';
 export * from './features/mouse-tool/mouse-tool';
 export * from './features/navigation/navigation-action-handler';
 export * from './features/navigation/navigation-target-resolver';
@@ -73,32 +72,32 @@ export * from './features/rank/model';
 export * from './features/reconnect/model';
 export * from './features/save/model';
 export * from './features/save/save-keylistener';
+export * from './features/source-model-watcher/source-model-changed-action-handler';
 export * from './features/tool-feedback/change-bounds-tool-feedback';
 export * from './features/tool-feedback/creation-tool-feedback';
 export * from './features/tool-feedback/css-feedback';
 export * from './features/tool-feedback/edge-edit-tool-feedback';
 export * from './features/tool-feedback/feedback-action-dispatcher';
 export * from './features/tool-feedback/model';
-export * from './features/tool-palette/palette-item';
 export * from './features/tool-palette/tool-palette';
 export * from './features/tools/base-glsp-tool';
 export * from './features/tools/change-bounds-tool';
 export * from './features/tools/delete-tool';
 export * from './features/tools/edge-creation-tool';
 export * from './features/tools/edge-edit-tool';
-export * from './features/tools/node-creation-tool';
 export * from './features/tools/marquee-behavior';
+export * from './features/tools/node-creation-tool';
 export * from './features/validation/issue-marker';
 export * from './features/validation/marker-navigator';
 export * from './features/validation/validate';
 export * from './features/viewport/glsp-scroll-mouse-listener';
 export * from './lib/model';
 export * from './model-source/glsp-diagram-server';
-export * from './protocol-reexport';
+export * from './sprotty-reexport';
 export * from './utils/argument-utils';
 export * from './utils/marker';
 export * from './utils/smodel-util';
 export * from './utils/viewpoint-util';
 export * from './views';
-export { validationModule, saveModule, paletteModule, toolFeedbackModule, defaultGLSPModule, modelHintsModule, glspCommandPaletteModule, glspContextMenuModule, glspServerCopyPasteModule, copyPasteContextMenuModule, glspSelectModule, glspMouseToolModule, layoutCommandsModule, glspEditLabelModule, glspHoverModule, toolsModule, navigationModule, markerNavigatorModule, glspDecorationModule, modelSourceWatcherModule, glspViewportModule };
+export { validationModule, saveModule, paletteModule, toolFeedbackModule, defaultGLSPModule, modelHintsModule, glspCommandPaletteModule, glspContextMenuModule, glspServerCopyPasteModule, copyPasteContextMenuModule, glspSelectModule, glspMouseToolModule, layoutModule, glspEditLabelModule, glspHoverModule, toolsModule, enableDefaultToolsOnFocusLossModule, navigationModule, markerNavigatorModule, glspDecorationModule, sourceModelWatcherModule as modelSourceWatcherModule, glspViewportModule };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

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