@eclipse-glsp/client 1.1.0-next.383e4e9.264 → 1.1.0-next.3d1b3e6.280

package/css/decoration.css

@@ -14,13 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-:root {
-    --glsp-error-foreground: red;
-    --glsp-warning-foreground: yellow;
-    --glsp-info-foreground: lightblue;
-    --glsp-issue-background: rgb(255 255 255 / 85%);
-}
-
 .sprotty-issue-background {
     fill: var(--glsp-issue-background);
     background-color: var(--glsp-issue-background);

package/css/glsp-sprotty.css

@@ -14,6 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+:root {
+    --glsp-error-foreground: red;
+    --glsp-warning-foreground: yellow;
+    --glsp-info-foreground: lightblue;
+    --glsp-issue-background: rgb(255 255 255 / 85%);
+}
+
 .sprotty {
     padding: 0px;
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;

package/css/key-shortcut.css

@@ -92,7 +92,7 @@
     cursor: pointer;
 }
 
-.columnTitle {
+.column-title {
     text-align: left;
 }
 
@@ -105,3 +105,7 @@
     justify-content: space-between;
     flex-wrap: wrap;
 }
+
+.shortcut-table thead th {
+    border-bottom: 2px solid #000;
+}

package/{lib/base/source-uri-aware.js → css/navigation.css}

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSourceUriAware = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2023 EclipseSource and others.
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) 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
@@ -16,9 +13,14 @@ exports.isSourceUriAware = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const _glsp_sprotty_1 = require("../glsp-sprotty/index");
-function isSourceUriAware(obj) {
-    return _glsp_sprotty_1.AnyObject.is(obj) && (0, _glsp_sprotty_1.hasStringProp)(obj, 'sourceURI');
+
+:root {
+    --glsp-navigation-highlight: rgba(136, 68, 68, 0.2);
+}
+.navigable-element {
+    stroke: var(--glsp-navigation-highlight) !important;
+}
+.navigable-element .sprotty-edge.arrow {
+    fill: var(--glsp-navigation-highlight) !important;
+    stroke: var(--glsp-navigation-highlight) !important;
 }
-exports.isSourceUriAware = isSourceUriAware;
-//# sourceMappingURL=source-uri-aware.js.map

package/css/status-overlay.css

@@ -0,0 +1,75 @@
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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
+ ********************************************************************************/
+
+.sprotty-status {
+    position: absolute;
+    top: 5px;
+    left: 10px;
+    display: flex;
+    align-items: center;
+}
+
+.sprotty-status .fatal {
+    color: var(--glsp-error-foreground);
+}
+
+.sprotty-status .error {
+    color: var(--glsp-error-foreground);
+}
+
+.sprotty-status .warning {
+    color: var(--glsp-warning-foreground);
+}
+
+.sprotty-status .info {
+    color: var(--glsp-info-foreground);
+}
+
+.sprotty-error {
+    fill: var(--glsp-issue-background);
+    color: var(--glsp-error-foreground);
+}
+
+.sprotty-warning {
+    fill: var(--glsp-issue-background);
+    color: var(--glsp-warning-foreground);
+}
+
+.sprotty-info {
+    fill: var(--glsp-issue-background);
+    color: var();
+}
+
+.sprotty-infoRow .codicon {
+    margin-right: 8px;
+}
+.sprotty-status .ok {
+    visibility: hidden;
+}
+
+.sprotty-status-message {
+    visibility: hidden;
+    padding-left: 10px;
+}
+
+.sprotty-status-message.fatal {
+    visibility: visible;
+    padding-left: 10px;
+}
+
+.sprotty-status:hover .sprotty-status-message {
+    visibility: visible;
+}

package/css/toast.css

@@ -0,0 +1,45 @@
+/********************************************************************************
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) 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
+ ********************************************************************************/
+.toast {
+    position: absolute;
+    bottom: 1rem;
+    width: 100%;
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    grid-column-gap: 1rem;
+    margin: 0 1rem;
+}
+
+.toast-column-left {
+    grid-column: 1 / span 1;
+}
+
+.toast-column-center {
+    grid-column: 2 / span 1;
+}
+
+.toast-column-right {
+    grid-column: 3 / span 1;
+}
+
+.toast-container {
+    display: inline-block;
+    min-width: 256px;
+    max-width: 516px;
+    background-color: #ccc;
+    color: #000;
+    padding: 0.5rem;
+}

package/lib/base/action-dispatcher.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Action, ActionDispatcher, RequestAction, ResponseAction } from '../glsp-sprotty/index';
-import { ModelInitializationConstraint } from './model-initialization-constraint';
+import { ModelInitializationConstraint } from './model/model-initialization-constraint';
 export declare class GLSPActionDispatcher extends ActionDispatcher {
     protected readonly timeouts: Map<string, NodeJS.Timeout>;
     protected initializedConstraint: boolean;
@@ -9,6 +9,12 @@ export declare class GLSPActionDispatcher extends ActionDispatcher {
     startModelInitialization(): void;
     onceModelInitialized(): Promise<void>;
     hasHandler(action: Action): boolean;
+    /**
+     * Processes all given actions, by dispatching them to the corresponding handlers, after the model initialization is completed.
+     *
+     * @param actions The actions that should be dispatched after the model initialization
+     */
+    dispatchOnceModelInitialized(...actions: Action[]): void;
     dispatch(action: Action): Promise<void>;
     protected handleAction(action: Action): Promise<void>;
     request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res>;
@@ -22,6 +28,6 @@ export declare class GLSPActionDispatcher extends ActionDispatcher {
      * If `rejectOnTimeout` is set to false (default) the returned promise will be resolved with
      * no value, otherwise it will be rejected.
      */
-    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs?: number, rejectOnTimeout?: boolean): Promise<Res>;
+    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs?: number, rejectOnTimeout?: boolean): Promise<Res | undefined>;
 }
 //# sourceMappingURL=action-dispatcher.d.ts.map

package/lib/base/action-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,qBACa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAED,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAEhG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,wBAAwB,IAAI,IAAI;IAQhC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAI1B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAM7B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrD,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,SAAO,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2BhI"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF,qBACa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAGxC,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAEzD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,wBAAwB,IAAI,IAAI;IAQhC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC;;;;OAIG;IACH,4BAA4B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrD,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,SAAO,EAChB,eAAe,UAAQ,GACxB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CA2B9B"}

package/lib/base/action-dispatcher.js

@@ -27,7 +27,7 @@ exports.GLSPActionDispatcher = void 0;
  ********************************************************************************/
 const inversify_1 = require("inversify");
 const _glsp_sprotty_1 = require("../glsp-sprotty/index");
-const model_initialization_constraint_1 = require("./model-initialization-constraint");
+const model_initialization_constraint_1 = require("./model/model-initialization-constraint");
 let GLSPActionDispatcher = exports.GLSPActionDispatcher = class GLSPActionDispatcher extends _glsp_sprotty_1.ActionDispatcher {
     constructor() {
         super(...arguments);
@@ -40,7 +40,7 @@ let GLSPActionDispatcher = exports.GLSPActionDispatcher = class GLSPActionDispat
     startModelInitialization() {
         if (!this.initializedConstraint) {
             this.logger.log(this, 'Starting model initialization mode');
-            this.initializationConstraint.onInitialized().then(() => this.logger.log(this, 'Model initialization completed'));
+            this.initializationConstraint.onInitialized(() => this.logger.log(this, 'Model initialization completed'));
             this.initializedConstraint = true;
         }
     }
@@ -50,8 +50,16 @@ let GLSPActionDispatcher = exports.GLSPActionDispatcher = class GLSPActionDispat
     hasHandler(action) {
         return this.actionHandlerRegistry.get(action.kind).length > 0;
     }
-    dispatch(action) {
-        const result = super.dispatch(action);
+    /**
+     * Processes all given actions, by dispatching them to the corresponding handlers, after the model initialization is completed.
+     *
+     * @param actions The actions that should be dispatched after the model initialization
+     */
+    dispatchOnceModelInitialized(...actions) {
+        this.initializationConstraint.onInitialized(() => this.dispatchAll(actions));
+    }
+    async dispatch(action) {
+        const result = await super.dispatch(action);
         this.initializationConstraint.notifyDispatched(action);
         return result;
     }
@@ -63,11 +71,11 @@ let GLSPActionDispatcher = exports.GLSPActionDispatcher = class GLSPActionDispat
                 clearTimeout(timeout);
                 this.timeouts.delete(action.responseId);
             }
-            // we might have reached a timeout, so we simply drop the response
+            // Check if we have a pending request for the response.
+            // If not the  we clear the responseId => action will be dispatched normally
             const deferred = this.requests.get(action.responseId);
             if (deferred === undefined) {
-                this.logger.log(this, 'No matching request for response', action);
-                return Promise.resolve();
+                action.responseId = '';
             }
         }
         return super.handleAction(action);

package/lib/base/action-dispatcher.js.map

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

package/lib/base/action-dispatcher.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=action-dispatcher.spec.d.ts.map

package/lib/base/action-dispatcher.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"action-dispatcher.spec.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.spec.ts"],"names":[],"mappings":""}

package/lib/base/action-dispatcher.spec.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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 chai_1 = require("chai");
+const inversify_1 = require("inversify");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+const action_dispatcher_1 = require("./action-dispatcher");
+const default_module_1 = require("./default.module");
+const container = new inversify_1.Container();
+container.load(default_module_1.defaultModule);
+container.bind(_glsp_sprotty_1.TYPES.IDiagramOptions).toConstantValue({
+    clientId: 'client1',
+    diagramType: 'diagramType',
+    glspClientProvider: async () => ({})
+});
+const registry = container.get(_glsp_sprotty_1.ActionHandlerRegistry);
+const actionDispatcher = container.get(action_dispatcher_1.GLSPActionDispatcher);
+let testHandlerDelay = 0;
+const testHandler = {
+    handle: action => {
+        const request = action;
+        new Promise(resolve => setTimeout(resolve, testHandlerDelay)).then(() => actionDispatcher.dispatch({
+            kind: 'response',
+            responseId: request.requestId
+        }));
+    }
+};
+registry.register('request', testHandler);
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+registry.register('response', { handle: () => { } });
+actionDispatcher.initialize().then(() => {
+    actionDispatcher['blockUntil'] = undefined;
+});
+describe('GLSPActionDispatcher', () => {
+    describe('requestUntil', () => {
+        it('should resolve successfully if response dispatched within timeout', async () => {
+            testHandlerDelay = 15;
+            const requestAction = { kind: 'request', requestId: '' };
+            const response = await actionDispatcher.requestUntil(requestAction, 150);
+            (0, chai_1.expect)(response === null || response === void 0 ? void 0 : response.responseId).to.be.equal(requestAction.requestId);
+        });
+        it('should resolve to `undefined` if no response dispatched within timeout & `rejectOnTimeout` flag is false', async () => {
+            testHandlerDelay = 30;
+            const requestAction = { kind: 'request', requestId: '' };
+            const response = await actionDispatcher.requestUntil(requestAction, 5);
+            (0, chai_1.expect)(response).to.be.undefined;
+        });
+        it('should be rejected if no response dispatched within timeout & `rejectOnTimeout` flag is true', async () => {
+            testHandlerDelay = 30;
+            const requestAction = { kind: 'request', requestId: '' };
+            const gotRejected = await actionDispatcher.requestUntil(requestAction, 5, true).then(() => false, () => true);
+            (0, chai_1.expect)(gotRejected, 'Response promise should be rejected').to.be.true;
+        });
+    });
+    describe('request & re-dispatch', () => {
+        it('should be possible to re-dispatch the response of a `request` call', async () => {
+            const requestAction = { kind: 'request', requestId: '' };
+            const response = await actionDispatcher.request(requestAction);
+            const dispatchSuccessful = await actionDispatcher.dispatch(response).then(() => true, err => false);
+            (0, chai_1.expect)(dispatchSuccessful, 'Promise of re-dispatch should resolve successfully').to.be.true;
+        });
+    });
+});
+//# sourceMappingURL=action-dispatcher.spec.js.map

package/lib/base/action-dispatcher.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"action-dispatcher.spec.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.spec.ts"],"names":[],"mappings":"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"}

package/lib/base/action-handler-registry.d.ts

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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 { ActionHandlerRegistry } from '../glsp-sprotty/index';
+export declare class GLSPActionHandlerRegistry extends ActionHandlerRegistry {
+    /**
+     * Retrieve a set of all action kinds for which (at least) one
+     * handler is registered
+     * @returns the set of handled action kinds
+     */
+    getHandledActionKinds(): string[];
+}
+//# sourceMappingURL=action-handler-registry.d.ts.map

package/lib/base/action-handler-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"action-handler-registry.d.ts","sourceRoot":"","sources":["../../src/base/action-handler-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,qBACa,yBAA0B,SAAQ,qBAAqB;IAChE;;;;OAIG;IACH,qBAAqB,IAAI,MAAM,EAAE;CAGpC"}

package/lib/{features/tools/base-glsp-creation-tool.js → base/action-handler-registry.js}

@@ -1,12 +1,4 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseGLSPCreationTool = void 0;
 /********************************************************************************
  * Copyright (c) 2023 EclipseSource and others.
  *
@@ -22,24 +14,27 @@ exports.BaseGLSPCreationTool = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLSPActionHandlerRegistry = void 0;
 const inversify_1 = require("inversify");
-const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
-const base_glsp_tool_1 = require("./base-glsp-tool");
-let BaseGLSPCreationTool = exports.BaseGLSPCreationTool = class BaseGLSPCreationTool extends base_glsp_tool_1.BaseGLSPTool {
-    handle(action) {
-        if (this.isTriggerAction(action)) {
-            this.triggerAction = action;
-            return _glsp_sprotty_1.EnableToolsAction.create([this.id]);
-        }
-    }
-    enable() {
-        if (this.triggerAction === undefined) {
-            throw new TypeError(`Could not enable tool ${this.id}. The triggerAction cannot be undefined.`);
-        }
-        this.doEnable();
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+let GLSPActionHandlerRegistry = exports.GLSPActionHandlerRegistry = class GLSPActionHandlerRegistry extends _glsp_sprotty_1.ActionHandlerRegistry {
+    /**
+     * Retrieve a set of all action kinds for which (at least) one
+     * handler is registered
+     * @returns the set of handled action kinds
+     */
+    getHandledActionKinds() {
+        return Array.from(this.elements.keys());
     }
 };
-exports.BaseGLSPCreationTool = BaseGLSPCreationTool = __decorate([
+exports.GLSPActionHandlerRegistry = GLSPActionHandlerRegistry = __decorate([
     (0, inversify_1.injectable)()
-], BaseGLSPCreationTool);
-//# sourceMappingURL=base-glsp-creation-tool.js.map
+], GLSPActionHandlerRegistry);
+//# sourceMappingURL=action-handler-registry.js.map

package/lib/base/action-handler-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../src/base/action-handler-registry.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,iDAAsD;AAG/C,IAAM,yBAAyB,uCAA/B,MAAM,yBAA0B,SAAQ,qCAAqB;IAChE;;;;OAIG;IACH,qBAAqB;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAA;oCATY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CASrC"}

package/lib/base/default.module.d.ts

@@ -14,20 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import '@vscode/codicons/dist/codicon.css';
-import { Container } from 'inversify';
-import { FeatureModule, InitializeResult } from '../glsp-sprotty/index';
+import { FeatureModule } from '../glsp-sprotty/index';
 import '../../css/glsp-sprotty.css';
 /**
  * The default module provides all of GLSP's base functionality and services.
  * It builds on top of sprotty's default module {@link `sprottyDefaultModule`}.
  */
 export declare const defaultModule: FeatureModule;
-/**
- * Utility function to configure the {@link ModelSource}, i.e. the `DiagramServer`, as action handler for all server actions for the given
- * diagramType.
- * @param result A promise that resolves after all server actions have been registered.
- * @param diagramType The diagram type.
- * @param container The di container.
- */
-export declare function configureServerActions(result: InitializeResult, diagramType: string, container: Container): Promise<void>;
 //# sourceMappingURL=default.module.d.ts.map

package/lib/base/default.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default.module.d.ts","sourceRoot":"","sources":["../../src/base/default.module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAEH,aAAa,EACb,gBAAgB,EAanB,MAAM,eAAe,CAAC;AACvB,OAAO,4BAA4B,CAAC;AAkBpC;;;GAGG;AACH,eAAO,MAAM,aAAa,eAwDxB,CAAC;AAEH;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/H"}
+{"version":3,"file":"default.module.d.ts","sourceRoot":"","sources":["../../src/base/default.module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAEH,aAAa,EAahB,MAAM,eAAe,CAAC;AACvB,OAAO,4BAA4B,CAAC;AAsBpC;;;GAGG;AACH,eAAO,MAAM,aAAa,eA0DxB,CAAC"}

package/lib/base/default.module.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureServerActions = exports.defaultModule = void 0;
+exports.defaultModule = void 0;
 /********************************************************************************
  * Copyright (c) 2019-2023 EclipseSource and others.
  *
@@ -20,6 +20,7 @@ require("@vscode/codicons/dist/codicon.css");
 const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 require("../../css/glsp-sprotty.css");
 const action_dispatcher_1 = require("./action-dispatcher");
+const action_handler_registry_1 = require("./action-handler-registry");
 const command_stack_1 = require("./command-stack");
 const editor_context_service_1 = require("./editor-context-service");
 const css_feedback_1 = require("./feedback/css-feedback");
@@ -27,11 +28,14 @@ const feedback_action_dispatcher_1 = require("./feedback/feedback-action-dispatc
 const update_model_command_1 = require("./feedback/update-model-command");
 const focus_state_change_action_1 = require("./focus/focus-state-change-action");
 const focus_tracker_1 = require("./focus/focus-tracker");
-const model_initialization_constraint_1 = require("./model-initialization-constraint");
+const diagram_loader_1 = require("./model/diagram-loader");
+const glsp_model_source_1 = require("./model/glsp-model-source");
+const model_initialization_constraint_1 = require("./model/model-initialization-constraint");
 const model_registry_1 = require("./model/model-registry");
 const selection_clearing_mouse_listener_1 = require("./selection-clearing-mouse-listener");
 const selection_service_1 = require("./selection-service");
-const glsp_tool_manager_1 = require("./tool-manager/glsp-tool-manager");
+const tool_1 = require("./tool-manager/tool");
+const tool_manager_1 = require("./tool-manager/tool-manager");
 const key_tool_1 = require("./view/key-tool");
 const mouse_tool_1 = require("./view/mouse-tool");
 const view_registry_1 = require("./view/view-registry");
@@ -44,15 +48,9 @@ exports.defaultModule = new _glsp_sprotty_1.FeatureModule((bind, unbind, isBound
     _glsp_sprotty_1.sprottyDefaultModule.registry(bind, unbind, isBound, rebind, ...rest);
     const context = { bind, unbind, isBound, rebind };
     bind(editor_context_service_1.EditorContextService).toSelf().inSingletonScope();
-    bind(_glsp_sprotty_1.TYPES.IEditorContextServiceProvider).toProvider(ctx => () => new Promise((resolve, reject) => {
-        if (ctx.container.isBound(editor_context_service_1.EditorContextService)) {
-            resolve(ctx.container.get(editor_context_service_1.EditorContextService));
-        }
-        else {
-            reject();
-        }
-    }));
+    bind(_glsp_sprotty_1.TYPES.IEditorContextServiceProvider).toProvider(ctx => async () => ctx.container.get(editor_context_service_1.EditorContextService));
     (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetEditModeAction.KIND, editor_context_service_1.EditorContextService);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetDirtyStateAction.KIND, editor_context_service_1.EditorContextService);
     bind(focus_tracker_1.FocusTracker).toSelf().inSingletonScope();
     (0, _glsp_sprotty_1.configureActionHandler)(context, focus_state_change_action_1.FocusStateChangedAction.KIND, focus_tracker_1.FocusTracker);
     // Model update initialization ------------------------------------
@@ -64,10 +62,12 @@ exports.defaultModule = new _glsp_sprotty_1.FeatureModule((bind, unbind, isBound
     (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.KeyTool).toService(key_tool_1.GLSPKeyTool);
     (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.MouseListener, selection_clearing_mouse_listener_1.SelectionClearingMouseListener);
     (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.ICommandStack).to(command_stack_1.GLSPCommandStack).inSingletonScope();
-    bind(glsp_tool_manager_1.GLSPToolManager).toSelf().inSingletonScope();
-    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
     bind(action_dispatcher_1.GLSPActionDispatcher).toSelf().inSingletonScope();
     (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.IActionDispatcher).toService(action_dispatcher_1.GLSPActionDispatcher);
+    bind(action_handler_registry_1.GLSPActionHandlerRegistry).toSelf().inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.ActionHandlerRegistry).toService(action_handler_registry_1.GLSPActionHandlerRegistry);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.ModelSource, glsp_model_source_1.GLSPModelSource);
+    bind(diagram_loader_1.DiagramLoader).toSelf().inSingletonScope();
     bind(model_initialization_constraint_1.ModelInitializationConstraint).to(model_initialization_constraint_1.DefaultModelInitializationConstraint).inSingletonScope();
     // support re-registration of model elements and views
     (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.SModelRegistry).to(model_registry_1.GLSPModelRegistry).inSingletonScope();
@@ -81,22 +81,12 @@ exports.defaultModule = new _glsp_sprotty_1.FeatureModule((bind, unbind, isBound
     (0, _glsp_sprotty_1.configureCommand)(context, _glsp_sprotty_1.MoveCommand);
     (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.IVNodePostprocessor, _glsp_sprotty_1.LocationPostprocessor);
     bind(_glsp_sprotty_1.TYPES.HiddenVNodePostprocessor).toService(_glsp_sprotty_1.LocationPostprocessor);
+    // Tool manager initialization ------------------------------------
+    bind(_glsp_sprotty_1.TYPES.IToolManager).to(tool_manager_1.ToolManager).inSingletonScope();
+    bind(tool_manager_1.DefaultToolsEnablingKeyListener).toSelf().inSingletonScope();
+    bind(_glsp_sprotty_1.TYPES.KeyListener).toService(tool_manager_1.DefaultToolsEnablingKeyListener);
+    bind(tool_manager_1.ToolManagerActionHandler).toSelf().inSingletonScope();
+    (0, _glsp_sprotty_1.configureActionHandler)(context, tool_1.EnableDefaultToolsAction.KIND, tool_manager_1.ToolManagerActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, tool_1.EnableToolsAction.KIND, tool_manager_1.ToolManagerActionHandler);
 });
-/**
- * Utility function to configure the {@link ModelSource}, i.e. the `DiagramServer`, as action handler for all server actions for the given
- * diagramType.
- * @param result A promise that resolves after all server actions have been registered.
- * @param diagramType The diagram type.
- * @param container The di container.
- */
-async function configureServerActions(result, diagramType, container) {
-    const modelSource = container.get(_glsp_sprotty_1.TYPES.ModelSource);
-    const actionHandlerRegistry = container.get(_glsp_sprotty_1.ActionHandlerRegistry);
-    const serverActions = result.serverActions[diagramType];
-    if (serverActions.length === 0) {
-        throw new Error(`No server-handled actions could be derived from the initialize result for diagramType: ${diagramType}!`);
-    }
-    serverActions.forEach(actionKind => actionHandlerRegistry.register(actionKind, modelSource));
-}
-exports.configureServerActions = configureServerActions;
 //# sourceMappingURL=default.module.js.map