@eclipse-glsp/server 1.1.0-next.44bd1e0.43 → 1.1.0-next.d47240f.50

package/lib/browser/di/app-module.d.ts

@@ -14,11 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { ContainerModule } from 'inversify';
-import { LogLevel, ModuleContext } from '../../common/index';
-export interface LaunchOptions {
-    consoleLog?: boolean;
-    logLevel?: LogLevel;
-}
-export declare function createAppModule(options?: LaunchOptions): ContainerModule;
-export declare function configureConsoleLogger<T extends LaunchOptions>(context: ModuleContext, options: T): void;
+import { LoggerConfigOptions } from '../../common/';
+export declare function createAppModule(options?: LoggerConfigOptions): ContainerModule;
 //# sourceMappingURL=app-module.d.ts.map

package/lib/browser/di/app-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-module.d.ts","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAc,MAAM,WAAW,CAAC;AACxD,OAAO,EAA6C,QAAQ,EAAE,aAAa,EAAc,MAAM,oBAAoB,CAAC;AAGpH,MAAM,WAAW,aAAa;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACvB;AACD,wBAAgB,eAAe,CAAC,OAAO,GAAE,aAAkB,GAAG,eAAe,CAO5E;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAWxG"}
+{"version":3,"file":"app-module.d.ts","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAgC,mBAAmB,EAA0B,MAAM,eAAe,CAAC;AAE1G,wBAAgB,eAAe,CAAC,OAAO,GAAE,mBAAwB,GAAG,eAAe,CAOlF"}

package/lib/browser/di/app-module.js

@@ -15,41 +15,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureConsoleLogger = exports.createAppModule = void 0;
+exports.createAppModule = void 0;
 const inversify_1 = require("inversify");
-const index_1 = require("../../common/index");
-const console_logger_1 = require("./console-logger");
+const common_1 = require("../../common/");
 function createAppModule(options = {}) {
-    const resolvedOptions = Object.assign({ consoleLog: true, logLevel: index_1.LogLevel.info }, options);
+    const resolvedOptions = Object.assign({ consoleLog: true, logLevel: common_1.LogLevel.info }, options);
     return new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
-        bind(index_1.InjectionContainer).toDynamicValue(dynamicContext => dynamicContext.container);
+        bind(common_1.InjectionContainer).toDynamicValue(dynamicContext => dynamicContext.container);
         const context = { bind, unbind, isBound, rebind };
-        configureConsoleLogger(context, resolvedOptions);
+        (0, common_1.configureConsoleLogger)(context, resolvedOptions);
     });
 }
 exports.createAppModule = createAppModule;
-function configureConsoleLogger(context, options) {
-    if (!options.consoleLog) {
-        context.bind(index_1.Logger).to(index_1.NullLogger).inSingletonScope();
-    }
-    else {
-        context.bind(index_1.Logger).toDynamicValue(ctx => new console_logger_1.ConsoleLogger(options.logLevel, getRequestParentName(ctx)));
-    }
-    context.bind(index_1.LoggerFactory).toFactory(dynamicContext => (caller) => {
-        const logger = dynamicContext.container.get(index_1.Logger);
-        logger.caller = caller;
-        return logger;
-    });
-}
-exports.configureConsoleLogger = configureConsoleLogger;
-function getRequestParentName(context) {
-    var _a;
-    if (context.currentRequest.parentRequest) {
-        const bindings = context.currentRequest.parentRequest.bindings;
-        if (bindings.length > 0) {
-            return (_a = bindings[0].implementationType) === null || _a === void 0 ? void 0 : _a.name;
-        }
-    }
-    return undefined;
-}
 //# sourceMappingURL=app-module.js.map

package/lib/browser/di/app-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-module.js","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAAwD;AACxD,8CAAoH;AACpH,qDAAiD;AAMjD,SAAgB,eAAe,CAAC,UAAyB,EAAE;IACvD,MAAM,eAAe,mBAAoB,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAQ,CAAC,IAAI,IAAK,OAAO,CAAE,CAAC;IACjG,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzD,IAAI,CAAC,0BAAkB,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAClD,sBAAsB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC;AAPD,0CAOC;AAED,SAAgB,sBAAsB,CAA0B,OAAsB,EAAE,OAAU;IAC9F,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACrB,OAAO,CAAC,IAAI,CAAC,cAAM,CAAC,CAAC,EAAE,CAAC,kBAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC;KAC1D;SAAM;QACH,OAAO,CAAC,IAAI,CAAC,cAAM,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,8BAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAC9G;IACD,OAAO,CAAC,IAAI,CAAC,qBAAa,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;QACvE,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,cAAM,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC;AAXD,wDAWC;AAED,SAAS,oBAAoB,CAAC,OAA2B;;IACrD,IAAI,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE;QACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,OAAO,MAAA,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,0CAAE,IAAI,CAAC;SAC/C;KACJ;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"app-module.js","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAA4C;AAC5C,0CAA0G;AAE1G,SAAgB,eAAe,CAAC,UAA+B,EAAE;IAC7D,MAAM,eAAe,mBAA0B,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAQ,CAAC,IAAI,IAAK,OAAO,CAAE,CAAC;IACvG,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzD,IAAI,CAAC,2BAAkB,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAClD,IAAA,+BAAsB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC;AAPD,0CAOC"}

package/lib/browser/index.d.ts

@@ -15,6 +15,5 @@
  ********************************************************************************/
 export * from '../common/index';
 export * from './di/app-module';
-export * from './di/console-logger';
 export * from './launch/worker-server-launcher';
 //# sourceMappingURL=index.d.ts.map

package/lib/browser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iCAAiC,CAAC"}

package/lib/browser/index.js

@@ -31,6 +31,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
  ********************************************************************************/
 __exportStar(require("../common/index"), exports);
 __exportStar(require("./di/app-module"), exports);
-__exportStar(require("./di/console-logger"), exports);
 __exportStar(require("./launch/worker-server-launcher"), exports);
 //# sourceMappingURL=index.js.map

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,kDAAgC;AAChC,sDAAoC;AACpC,kEAAgD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,kDAAgC;AAChC,kEAAgD"}

package/lib/browser/launch/worker-server-launcher.d.ts

@@ -13,14 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Container } from 'inversify';
 import * as jsonrpc from 'vscode-jsonrpc/browser';
-import { GLSPServer, GLSPServerLauncher, MaybePromise } from '../../common/index';
-export declare class WorkerServerLauncher extends GLSPServerLauncher {
-    private connection?;
-    protected run(): MaybePromise<void>;
-    protected disposeClientConnection(container: Container, glspServer: GLSPServer): void;
-    protected stop(): MaybePromise<void>;
-    protected createConnection(): jsonrpc.MessageConnection;
+import { MaybePromise } from '../../common/index';
+import { JsonRpcGLSPServerLauncher, JsonRpcServerInstance } from '../../common/launch/jsonrpc-server-launcher';
+export interface WorkerLaunchOptions {
+    context?: Worker;
+}
+export declare const START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed.";
+export declare class WorkerServerLauncher extends JsonRpcGLSPServerLauncher<WorkerLaunchOptions> {
+    protected connection?: jsonrpc.MessageConnection;
+    protected run(options: WorkerLaunchOptions): MaybePromise<void>;
+    protected disposeServerInstance(instance: JsonRpcServerInstance): void;
+    protected createConnection(options: WorkerLaunchOptions): jsonrpc.MessageConnection;
 }
 //# sourceMappingURL=worker-server-launcher.d.ts.map

package/lib/browser/launch/worker-server-launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,SAAS,EAAc,MAAM,WAAW,CAAC;AAClD,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAqB,YAAY,EAAyB,MAAM,oBAAoB,CAAC;AAE5H,qBACa,oBAAqB,SAAQ,kBAAkB;IACxD,OAAO,CAAC,UAAU,CAAC,CAA4B;IAE/C,SAAS,CAAC,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC;IAmBnC,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAMrF,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;IAKpC,SAAS,CAAC,gBAAgB,IAAI,OAAO,CAAC,iBAAiB;CAG1D"}
+{"version":3,"file":"worker-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAC/G,MAAM,WAAW,mBAAmB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,qBAAqB,qCAAqC,CAAC;AAExE,qBACa,oBAAqB,SAAQ,yBAAyB,CAAC,mBAAmB,CAAC;IACpF,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAEjD,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC;cAc5C,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAK/E,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB;CAMtF"}

package/lib/browser/launch/worker-server-launcher.js

@@ -21,41 +21,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerServerLauncher = void 0;
+exports.WorkerServerLauncher = exports.START_UP_COMPLETE_MSG = void 0;
 const inversify_1 = require("inversify");
 const jsonrpc = require("vscode-jsonrpc/browser");
-const index_1 = require("../../common/index");
-let WorkerServerLauncher = class WorkerServerLauncher extends index_1.GLSPServerLauncher {
-    run() {
+const jsonrpc_server_launcher_1 = require("../../common/launch/jsonrpc-server-launcher");
+exports.START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed.';
+let WorkerServerLauncher = class WorkerServerLauncher extends jsonrpc_server_launcher_1.JsonRpcGLSPServerLauncher {
+    run(options) {
         if (this.connection) {
             throw new Error('Error during launch. Server already has an active client connection');
         }
-        const container = this.createContainer();
-        this.connection = this.createConnection();
-        const glspServer = container.get(index_1.JsonRpcGLSPServer);
-        glspServer.connect(this.connection);
-        this.connection.onDispose(() => this.disposeClientConnection(container, glspServer));
+        this.connection = this.createConnection(options);
+        this.createServerInstance(this.connection);
         this.logger.info('GLSP server worker connection established');
-        this.connection.listen();
-        postMessage(index_1.START_UP_COMPLETE_MSG);
+        postMessage(exports.START_UP_COMPLETE_MSG);
         return new Promise((resolve, rejects) => {
             var _a, _b;
             (_a = this.connection) === null || _a === void 0 ? void 0 : _a.onClose(() => resolve(undefined));
             (_b = this.connection) === null || _b === void 0 ? void 0 : _b.onError(error => rejects(error));
         });
     }
-    disposeClientConnection(container, glspServer) {
-        glspServer.shutdown();
-        container.unbindAll();
+    disposeServerInstance(instance) {
+        super.disposeServerInstance(instance);
         this.connection = undefined;
     }
-    stop() {
-        var _a;
-        this.logger.info('Shutdown WorkerServerLauncher');
-        (_a = this.connection) === null || _a === void 0 ? void 0 : _a.dispose();
-    }
-    createConnection() {
-        return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader(self), new jsonrpc.BrowserMessageWriter(self));
+    createConnection(options) {
+        var _a, _b;
+        return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader((_a = options.context) !== null && _a !== void 0 ? _a : self), new jsonrpc.BrowserMessageWriter((_b = options.context) !== null && _b !== void 0 ? _b : self));
     }
 };
 WorkerServerLauncher = __decorate([

package/lib/browser/launch/worker-server-launcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAkD;AAClD,kDAAkD;AAClD,8CAA4H;AAGrH,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,0BAAkB;IAG9C,GAAG;QACT,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAoB,yBAAiB,CAAC,CAAC;QACvE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;QAErF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACzB,WAAW,CAAC,6BAAqB,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;;YACpC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,uBAAuB,CAAC,SAAoB,EAAE,UAAsB;QAC1E,UAAU,CAAC,QAAQ,EAAE,CAAC;QACtB,SAAS,CAAC,SAAS,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,IAAI;;QACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAClD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,EAAE,CAAC;IAC/B,CAAC;IAES,gBAAgB;QACtB,OAAO,OAAO,CAAC,uBAAuB,CAAC,IAAI,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3H,CAAC;CACJ,CAAA;AApCY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAoChC;AApCY,oDAAoB"}
+{"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAElD,yFAA+G;AAKlG,QAAA,qBAAqB,GAAG,kCAAkC,CAAC;AAGjE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mDAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,6BAAqB,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;;YACpC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,qBAAqB,CAAC,QAA+B;QACpE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,gBAAgB,CAAC,OAA4B;;QACnD,OAAO,OAAO,CAAC,uBAAuB,CAClC,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,EACzD,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;CACJ,CAAA;AA5BY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4BhC;AA5BY,oDAAoB"}

package/lib/common/actions/client-action-handler.d.ts

@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
-import { GLSPClientProxy } from '../protocol/glsp-client-proxy';
+import { Action, GLSPClientProxy } from '@eclipse-glsp/protocol';
 /**
  * The client action handler is responsible of handling action kinds that are intended for the
  * GLSP client, by sending them to the client over json-rpc.

package/lib/common/actions/client-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAiB,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE;;;GAGG;AAEH,qBACa,mBAAoB,YAAW,mBAAmB;IAQD,WAAW,EAAE,MAAM,EAAE;IAL/E,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEsB,WAAW,GAAE,MAAM,EAAO;IAEpF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE;IAK3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAQvC"}
+{"version":3,"file":"client-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAiB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIhF;;;GAGG;AAEH,qBACa,mBAAoB,YAAW,mBAAmB;IAQD,WAAW,EAAE,MAAM,EAAE;IAL/E,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEsB,WAAW,GAAE,MAAM,EAAO;IAEpF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE;IAK3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAQvC"}

package/lib/common/actions/client-action-handler.js

@@ -13,9 +13,24 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientActionHandler = void 0;
+/********************************************************************************
+ * Copyright (c) 2022-2023 STMicroelectronics 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 protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const service_identifiers_1 = require("../di/service-identifiers");
-const glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
 /**
  * The client action handler is responsible of handling action kinds that are intended for the
  * GLSP client, by sending them to the client over json-rpc.
@@ -38,7 +53,7 @@ let ClientActionHandler = class ClientActionHandler {
     }
 };
 __decorate([
-    (0, inversify_1.inject)(glsp_client_proxy_1.GLSPClientProxy),
+    (0, inversify_1.inject)(protocol_1.GLSPClientProxy),
     (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], ClientActionHandler.prototype, "glspClient", void 0);

package/lib/common/actions/client-action-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-action-handler.js","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAgBA,yCAAyD;AACzD,mEAAwE;AACxE,qEAAgE;AAEhE;;;GAGG;AAGI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAQ5B,YAA0D,cAAwB,EAAE;QAA1B,gBAAW,GAAX,WAAW,CAAe;IAAG,CAAC;IAExF,OAAO,CAAC,MAAc;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;IAES,IAAI,CAAC,MAAc;QACzB,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnE,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO;SACV;QACD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACvF,CAAC;CACJ,CAAA;AAtBG;IAAC,IAAA,kBAAM,EAAC,mCAAe,CAAC;IACvB,IAAA,oBAAQ,GAAE;;uDAC4B;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;qDACmB;AAN3B,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IASI,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;;GARzC,mBAAmB,CAuB/B;AAvBY,kDAAmB"}
+{"version":3,"file":"client-action-handler.js","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAgF;AAChF,yCAAyD;AACzD,mEAAwE;AAExE;;;GAGG;AAGI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAQ5B,YAA0D,cAAwB,EAAE;QAA1B,gBAAW,GAAX,WAAW,CAAe;IAAG,CAAC;IAExF,OAAO,CAAC,MAAc;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;IAES,IAAI,CAAC,MAAc;QACzB,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnE,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO;SACV;QACD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACvF,CAAC;CACJ,CAAA;AAtBG;IAAC,IAAA,kBAAM,EAAC,0BAAe,CAAC;IACvB,IAAA,oBAAQ,GAAE;;uDAC4B;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;qDACmB;AAN3B,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IASI,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;;GARzC,mBAAmB,CAuB/B;AAvBY,kDAAmB"}

package/lib/common/command/command-stack.d.ts

@@ -1,3 +1,19 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 STMicroelectronics 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 { MaybePromise } from '@eclipse-glsp/protocol';
 import { Logger } from '../utils/logger';
 import { Command } from './command';
 export declare const CommandStack: unique symbol;
@@ -13,11 +29,11 @@ export interface CommandStack {
      * Clears any redoable commands not yet redone, adds the command to the stack and then invokes {@link Command.execute}.
      * @param command the command to execute.
      */
-    execute(command: Command): void;
+    execute(command: Command): MaybePromise<void>;
     /**
      * Removes the topmost (i.e. last executed) command from the stack and invokes {@link Command.undo}.
      */
-    undo(): void;
+    undo(): MaybePromise<void>;
     /**
      * Returns `true` if the top command on the stack can be undone.
      */
@@ -25,7 +41,7 @@ export interface CommandStack {
     /**
      * Re-adds the last undo command on top of the stack and invokes {@link Command.redo}
      */
-    redo(): void;
+    redo(): MaybePromise<void>;
     /**
      * Returns `true` if there are  redoable commands in the stack.
      */
@@ -54,10 +70,10 @@ export declare class DefaultCommandStack implements CommandStack {
      * The current position within the command list when {@link DefaultCommandStack.saveIsDone} is called.
      */
     protected saveIndex: number;
-    execute(command: Command): void;
-    undo(): void;
+    execute(command: Command): Promise<void>;
+    undo(): Promise<void>;
     canUndo(): boolean;
-    redo(): void;
+    redo(): Promise<void>;
     canRedo(): boolean;
     get isDirty(): boolean;
     saveIsDone(): void;

package/lib/common/command/command-stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-stack.d.ts","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAEhC;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IAEb;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IAEb;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC;IAEnB;;OAEG;IACH,UAAU,IAAI,IAAI,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;CACjB;AAED,qBACa,mBAAoB,YAAW,YAAY;IAEpD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAM;IAEnC;;OAEG;IACH,SAAS,CAAC,GAAG,SAAM;IAEnB;;OAEG;IACH,SAAS,CAAC,SAAS,SAAM;IAEzB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAkB/B,IAAI,IAAI,IAAI;IAWZ,OAAO,IAAI,OAAO;IAMlB,IAAI,IAAI,IAAI;IAWZ,OAAO,IAAI,OAAO;IAIlB,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,UAAU,IAAI,IAAI;IAIlB,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK;CAM3C"}
+{"version":3,"file":"command-stack.d.ts","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAE9C;;OAEG;IACH,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAE3B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAE3B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC;IAEnB;;OAEG;IACH,UAAU,IAAI,IAAI,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;CACjB;AAED,qBACa,mBAAoB,YAAW,YAAY;IAEpD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAM;IAEnC;;OAEG;IACH,SAAS,CAAC,GAAG,SAAM;IAEnB;;OAEG;IACH,SAAS,CAAC,SAAS,SAAM;IAEnB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,OAAO,IAAI,OAAO;IAMZ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,OAAO,IAAI,OAAO;IAIlB,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,UAAU,IAAI,IAAI;IAIlB,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK;CAM3C"}

package/lib/common/command/command-stack.js

@@ -10,21 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultCommandStack = exports.CommandStack = void 0;
-/********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics 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 inversify_1 = require("inversify");
 const logger_1 = require("../utils/logger");
 const command_1 = require("./command");
@@ -41,9 +26,9 @@ let DefaultCommandStack = class DefaultCommandStack {
          */
         this.saveIndex = -1;
     }
-    execute(command) {
+    async execute(command) {
         try {
-            command.execute();
+            await command.execute();
         }
         catch (error) {
             this.handleError(error);
@@ -58,11 +43,11 @@ let DefaultCommandStack = class DefaultCommandStack {
             this.saveIndex = -2;
         }
     }
-    undo() {
+    async undo() {
         if (this.canUndo()) {
             const command = this.commands[this.top--];
             try {
-                command.undo();
+                await command.undo();
             }
             catch (error) {
                 this.handleError(error);
@@ -74,11 +59,11 @@ let DefaultCommandStack = class DefaultCommandStack {
             ? command_1.Command.canUndo(this.commands[this.top])
             : false;
     }
-    redo() {
+    async redo() {
         if (this.canRedo()) {
             const command = this.commands[++this.top];
             try {
-                command.redo();
+                await command.redo();
             }
             catch (error) {
                 this.handleError(error);

package/lib/common/command/command-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,4CAAyC;AACzC,uCAAoC;AAEvB,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAqD5C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAAzB;QAIO,aAAQ,GAAc,EAAE,CAAC;QAEnC;;WAEG;QACO,QAAG,GAAG,CAAC,CAAC,CAAC;QAEnB;;WAEG;QACO,cAAS,GAAG,CAAC,CAAC,CAAC;IAwE7B,CAAC;IAtEG,OAAO,CAAC,OAAgB;QACpB,IAAI;YACA,OAAO,CAAC,OAAO,EAAE,CAAC;SACrB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC3B;QACD,+DAA+D;QAC/D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,EAAE,IAAI,CAAC,GAAG,CAAC;QAEX,gFAAgF;QAChF,4EAA4E;QAC5E,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;SACvB;IACL,CAAC;IAED,IAAI;QACA,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1C,IAAI;gBACA,OAAO,CAAC,IAAI,EAAE,CAAC;aAClB;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aAC3B;SACJ;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;YACrB,CAAC,CAAC,iBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1C,CAAC,CAAC,KAAK,CAAC;IAChB,CAAC;IAED,IAAI;QACA,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI;gBACA,OAAO,CAAC,IAAI,EAAE,CAAC;aAClB;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aAC3B;SACJ;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,GAAG,CAAC;IACvC,CAAC;IAED,UAAU;QACN,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;IAC9B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC;IAES,WAAW,CAAC,KAAU;QAC5B,mIAAmI;QACnI,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2EAA2E,EAAE,KAAK,CAAC,CAAC;QACtG,MAAM,KAAK,CAAC;IAChB,CAAC;CACJ,CAAA;AArFG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;mDAAC;AAFhB,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAsF/B;AAtFY,kDAAmB"}
+{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"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"}

package/lib/common/command/command-stack.spec.js

@@ -36,142 +36,142 @@ describe('test DefaultCommandStack', () => {
         commandStack = container.resolve(command_stack_1.DefaultCommandStack);
     });
     describe('execute', () => {
-        it('should execute the given command and become dirty', () => {
+        it('should execute the given command and become dirty', async () => {
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
-            commandStack.execute(command1);
+            await commandStack.execute(command1);
             (0, chai_1.expect)(command1.execute.calledOnce).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
         });
-        it('should execute the given commands in order and become dirty', () => {
+        it('should execute the given commands in order and become dirty', async () => {
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
-            commandStack.execute(command1);
-            commandStack.execute(command2);
+            await commandStack.execute(command1);
+            await commandStack.execute(command2);
             (0, chai_1.expect)(command1.execute.calledOnce).to.be.true;
             (0, chai_1.expect)(command2.execute.calledOnce).to.be.true;
             (0, chai_1.expect)(command2.execute.calledAfter(command1.execute)).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
         });
-        it('should be able to undo after execute', () => {
+        it('should be able to undo after execute', async () => {
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
-            commandStack.execute(command1);
+            await commandStack.execute(command1);
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
         });
-        it('should clear the redo stack after execution', () => {
+        it('should clear the redo stack after execution', async () => {
             commandStack['commands'].push(command2);
             commandStack['top'] = -1;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
-            commandStack.execute(command1);
+            await commandStack.execute(command1);
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
         });
-        it('should flush the stack in case of an execution error', () => {
+        it('should flush the stack in case of an execution error', async () => {
             command2.execute.throwsException();
             const flushSpy = sandbox.spy(commandStack, 'flush');
-            (0, chai_1.expect)(() => commandStack.execute(command2)).to.throw();
+            await (0, mock_util_1.expectToThrowAsync)(() => commandStack.execute(command2));
             (0, chai_1.expect)(command2.execute.calledOnce).to.be.true;
             (0, chai_1.expect)(flushSpy.calledOnce).to.be.true;
         });
     });
     describe('undo', () => {
-        it('should do nothing if the command stack is empty', () => {
+        it('should do nothing if the command stack is empty', async () => {
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
-            commandStack.undo();
+            await commandStack.undo();
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
         });
-        it('should undo the command and become non-dirty again', () => {
+        it('should undo the command and become non-dirty again', async () => {
             commandStack['commands'].push(command1);
             commandStack['top'] = 0;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
-            commandStack.undo();
+            await commandStack.undo();
             (0, chai_1.expect)(command1.undo.calledOnce).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
         });
-        it('should undo multiple command and become non-dirty again', () => {
+        it('should undo multiple command and become non-dirty again', async () => {
             commandStack['commands'].push(command1, command2);
             commandStack['top'] = 1;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
-            commandStack.undo();
+            await commandStack.undo();
             (0, chai_1.expect)(command2.undo.calledOnce).to.be.true;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
-            commandStack.undo();
+            await commandStack.undo();
             (0, chai_1.expect)(command1.undo.calledOnce).to.be.true;
             (0, chai_1.expect)(command1.undo.calledAfter(command2.undo)).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
         });
-        it('should flush the stack in case of an execution error', () => {
+        it('should flush the stack in case of an execution error', async () => {
             command2.undo.throwsException();
             const flushSpy = sandbox.spy(commandStack, 'flush');
             commandStack['commands'].push(command2);
             commandStack['top'] = 0;
-            (0, chai_1.expect)(() => commandStack.undo()).to.throw();
+            await (0, mock_util_1.expectToThrowAsync)(() => commandStack.undo());
             (0, chai_1.expect)(command2.undo.calledOnce).to.be.true;
             (0, chai_1.expect)(flushSpy.calledOnce).to.be.true;
         });
     });
     describe('redo', () => {
-        it('should do nothing if the command stack is empty', () => {
+        it('should do nothing if the command stack is empty', async () => {
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
-            commandStack.redo();
+            await commandStack.redo();
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
         });
-        it('should redo the command and become dirty again', () => {
+        it('should redo the command and become dirty again', async () => {
             commandStack['commands'].push(command1);
             commandStack['top'] = -1;
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
-            commandStack.redo();
+            await commandStack.redo();
             (0, chai_1.expect)(command1.redo.calledOnce).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
         });
-        it('should undo multiple command and become non-dirty again', () => {
+        it('should undo multiple command and become non-dirty again', async () => {
             commandStack['commands'].push(command2, command1);
             commandStack['top'] = -1;
             commandStack['saveIndex'] = -1;
             (0, chai_1.expect)(commandStack.isDirty).to.be.false;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
-            commandStack.redo();
+            await commandStack.redo();
             (0, chai_1.expect)(command2.redo.calledOnce).to.be.true;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.true;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
-            commandStack.redo();
+            await commandStack.redo();
             (0, chai_1.expect)(command1.redo.calledOnce).to.be.true;
             (0, chai_1.expect)(command1.redo.calledAfter(command2.redo)).to.be.true;
             (0, chai_1.expect)(commandStack.isDirty).to.be.true;
             (0, chai_1.expect)(commandStack.canRedo()).to.be.false;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
         });
-        it('should flush the stack in case of an execution error', () => {
+        it('should flush the stack in case of an execution error', async () => {
             command2.redo.throwsException();
             const flushSpy = sandbox.spy(commandStack, 'flush');
             commandStack['commands'].push(command2);
             commandStack['top'] = -1;
-            (0, chai_1.expect)(() => commandStack.redo()).to.throw();
+            await (0, mock_util_1.expectToThrowAsync)(() => commandStack.redo());
             (0, chai_1.expect)(command2.redo.calledOnce).to.be.true;
             (0, chai_1.expect)(flushSpy.calledOnce).to.be.true;
         });
-        it('should be able to undo after redo', () => {
+        it('should be able to undo after redo', async () => {
             commandStack['commands'].push(command1);
             commandStack['top'] = -1;
             (0, chai_1.expect)(commandStack.canUndo()).to.be.false;
-            commandStack.redo();
+            await commandStack.redo();
             (0, chai_1.expect)(commandStack.canUndo()).to.be.true;
         });
     });