@eclipse-glsp/server 1.1.0-RC07 → 1.1.0-RC09

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,17 +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';
+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 GLSPServerLauncher<WorkerLaunchOptions> {
+export declare class WorkerServerLauncher extends JsonRpcGLSPServerLauncher<WorkerLaunchOptions> {
     protected connection?: jsonrpc.MessageConnection;
     protected run(options: WorkerLaunchOptions): MaybePromise<void>;
-    protected disposeClientConnection(container: Container, glspServer: GLSPServer): 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,EAAE,MAAM,oBAAoB,CAAC;AACrG,MAAM,WAAW,mBAAmB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,qBAAqB,qCAAqC,CAAC;AAExE,qBACa,oBAAqB,SAAQ,kBAAkB,CAAC,mBAAmB,CAAC;IAC7E,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAEjD,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC;IAoB/D,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAMrF,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB;CAMtF"}
+{"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

@@ -24,21 +24,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
+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 index_1.GLSPServerLauncher {
+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(options);
-        const glspServer = container.get(index_1.JsonRpcGLSPServer);
-        glspServer.connect(this.connection);
-        this.connection.onDispose(() => this.disposeClientConnection(container, glspServer));
+        this.createServerInstance(this.connection);
         this.logger.info('GLSP server worker connection established');
-        this.connection.listen();
-        this.toDispose.push(this.connection);
         postMessage(exports.START_UP_COMPLETE_MSG);
         return new Promise((resolve, rejects) => {
             var _a, _b;
@@ -46,9 +41,8 @@ let WorkerServerLauncher = class WorkerServerLauncher extends index_1.GLSPServer
             (_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;
     }
     createConnection(options) {

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,8CAAqG;AAKxF,QAAA,qBAAqB,GAAG,kCAAkC,CAAC;AAGjE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,0BAAuC;IAGnE,GAAG,CAAC,OAA4B;QACtC,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,CAAC,OAAO,CAAC,CAAC;QACjD,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,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrC,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,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;AAnCY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAmChC;AAnCY,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,4 +1,19 @@
-import { MaybePromise } from '..';
+/********************************************************************************
+ * 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;

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,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,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"}
+{"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");

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":"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"}
+{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"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"}

package/lib/common/di/client-session-module.d.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { GLSPClientProxy } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { GLSPClientProxy } from '../protocol/glsp-client-proxy';
 export declare function createClientSessionModule(clientId: string, glspClient: GLSPClientProxy): ContainerModule;
 //# sourceMappingURL=client-session-module.d.ts.map

package/lib/common/di/client-session-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-session-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,GAAG,eAAe,CASxG"}
+{"version":3,"file":"client-session-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,GAAG,eAAe,CASxG"}

package/lib/common/di/client-session-module.js

@@ -16,8 +16,8 @@ exports.createClientSessionModule = void 0;
  *
  * 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 glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
 const service_identifiers_1 = require("./service-identifiers");
 function createClientSessionModule(clientId, glspClient) {
     return new inversify_1.ContainerModule((bind, _unbind, isBound, rebind) => {
@@ -27,7 +27,7 @@ function createClientSessionModule(clientId, glspClient) {
         else {
             bind(service_identifiers_1.ClientId).toConstantValue(clientId);
         }
-        bind(glsp_client_proxy_1.GLSPClientProxy).toConstantValue(glspClient);
+        bind(protocol_1.GLSPClientProxy).toConstantValue(glspClient);
     });
 }
 exports.createClientSessionModule = createClientSessionModule;

package/lib/common/di/client-session-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-session-module.js","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qEAAgE;AAChE,+DAAiD;AAEjD,SAAgB,yBAAyB,CAAC,QAAgB,EAAE,UAA2B;IACnF,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1D,IAAI,OAAO,CAAC,8BAAQ,CAAC,EAAE;YACnB,MAAM,CAAC,8BAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC9C;aAAM;YACH,IAAI,CAAC,8BAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;QACD,IAAI,CAAC,mCAAe,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC;AATD,8DASC"}
+{"version":3,"file":"client-session-module.js","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAyD;AACzD,yCAA4C;AAC5C,+DAAiD;AAEjD,SAAgB,yBAAyB,CAAC,QAAgB,EAAE,UAA2B;IACnF,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1D,IAAI,OAAO,CAAC,8BAAQ,CAAC,EAAE;YACnB,MAAM,CAAC,8BAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC9C;aAAM;YACH,IAAI,CAAC,8BAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;QACD,IAAI,CAAC,0BAAe,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC;AATD,8DASC"}

package/lib/common/di/glsp-module.d.ts

@@ -13,11 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { BindingContext } from '@eclipse-glsp/protocol';
 import { ContainerModule, interfaces } from 'inversify';
 import { AbstractMultiBinding } from './multi-binding';
 /**
  * A wrapper interface to get access to the binding related functions
  * for a inversify container.
+ * @deprecated Use `BindingContext` from `@eclipse-glsp/protocol` instead
  */
 export interface ModuleContext {
     bind: interfaces.Bind;
@@ -30,7 +32,7 @@ export interface ModuleContext {
  */
 export declare abstract class GLSPModule extends ContainerModule {
     static CLIENT_ACTIONS: string;
-    protected context: ModuleContext;
+    protected context: BindingContext;
     constructor();
     protected abstract configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void;
     /**

package/lib/common/di/glsp-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/glsp-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;IACtB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;IAC1B,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;IAC5B,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,8BACsB,UAAW,SAAQ,eAAe;IACpD,OAAc,cAAc,SAAmB;IAE/C,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;;IASjC,SAAS,CAAC,QAAQ,CAAC,SAAS,CACxB,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,MAAM,EAAE,UAAU,CAAC,MAAM,EACzB,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,GAC1B,IAAI;IAEP;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI;CAIvI"}
+{"version":3,"file":"glsp-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/glsp-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;IACtB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;IAC1B,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;IAC5B,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,8BACsB,UAAW,SAAQ,eAAe;IACpD,OAAc,cAAc,SAAmB;IAE/C,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC;;IASlC,SAAS,CAAC,QAAQ,CAAC,SAAS,CACxB,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,MAAM,EAAE,UAAU,CAAC,MAAM,EACzB,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,GAC1B,IAAI;IAEP;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI;CAIvI"}

package/lib/common/di/glsp-module.js

@@ -10,21 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPModule = 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");
 /**
  * Common super class for GLSP {@link ContainerModule}s.

package/lib/common/di/glsp-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-module.js","sourceRoot":"","sources":["../../../src/common/di/glsp-module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAoE;AAcpE;;GAEG;AAEI,IAAe,UAAU,GAAzB,MAAe,UAAW,SAAQ,2BAAe;IAKpD;QACI,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,IAAI,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;YACjD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IASD;;;;;;;;OAQG;IACO,qBAAqB,CAAI,OAAgC,EAAE,YAAwD;QACzH,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;;AA9Ba,yBAAc,GAAG,eAAe,CAAC;AAD7B,UAAU;IAD/B,IAAA,sBAAU,GAAE;;GACS,UAAU,CAgC/B;AAhCqB,gCAAU"}
+{"version":3,"file":"glsp-module.js","sourceRoot":"","sources":["../../../src/common/di/glsp-module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAoE;AAepE;;GAEG;AAEI,IAAe,UAAU,GAAzB,MAAe,UAAW,SAAQ,2BAAe;IAKpD;QACI,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,IAAI,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;YACjD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IASD;;;;;;;;OAQG;IACO,qBAAqB,CAAI,OAAgC,EAAE,YAAwD;QACzH,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;;AA9Ba,yBAAc,GAAG,eAAe,CAAC;AAD7B,UAAU;IAD/B,IAAA,sBAAU,GAAE;;GACS,UAAU,CAgC/B;AAhCqB,gCAAU"}

package/lib/common/di/multi-binding.d.ts

@@ -1,5 +1,20 @@
+/********************************************************************************
+ * 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 { BindingContext } from '@eclipse-glsp/protocol';
 import { BindingTarget } from './binding-target';
-import { ModuleContext } from './glsp-module';
 /**
  * A helper class used in `GLSPModules` to ease the configuration of multi-injected service identifiers.
  * Instead of directly binding to the service identifier a new multi binding object can be created. This object
@@ -11,7 +26,7 @@ export declare abstract class AbstractMultiBinding<T> {
     readonly identifier: string | symbol;
     protected bindings: T[];
     constructor(identifier: string | symbol);
-    abstract applyBindings(context: ModuleContext): void;
+    abstract applyBindings(context: BindingContext): void;
     add(newBinding: T): void;
     addAll(newBindings: T[]): void;
     addAll(...newBindings: T[]): void;
@@ -27,7 +42,7 @@ export declare abstract class AbstractMultiBinding<T> {
  * @typeparam T the base type of {@link BindingTarget}.
  */
 export declare class MultiBinding<T> extends AbstractMultiBinding<BindingTarget<T>> {
-    applyBindings(context: ModuleContext): void;
+    applyBindings(context: BindingContext): void;
 }
 /**
  * Implementation of {@link AbstractMultiBinding} for multi-injected values that should be bound to concrete instance using the
@@ -36,6 +51,6 @@ export declare class MultiBinding<T> extends AbstractMultiBinding<BindingTarget<
  * * @typeparam T the type of the instances
  */
 export declare class InstanceMultiBinding<T> extends AbstractMultiBinding<T> {
-    applyBindings(context: ModuleContext): void;
+    applyBindings(context: BindingContext): void;
 }
 //# sourceMappingURL=multi-binding.d.ts.map

package/lib/common/di/multi-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multi-binding.d.ts","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;GAMG;AACH,8BAAsB,oBAAoB,CAAC,CAAC;IAG5B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAFhD,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAM;gBAER,UAAU,EAAE,MAAM,GAAG,MAAM;IAEhD,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAEpD,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAIxB,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAOjC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;IAIzB,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI;IAI9B,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI;IAK1C,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO;IAI7B,MAAM,IAAI,CAAC,EAAE;CAGhB;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACvE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAG9C;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAG9C"}
+{"version":3,"file":"multi-binding.d.ts","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,cAAc,EAA6C,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE;;;;;;GAMG;AACH,8BAAsB,oBAAoB,CAAC,CAAC;IAG5B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAFhD,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAM;gBAER,UAAU,EAAE,MAAM,GAAG,MAAM;IAEhD,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAErD,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAIxB,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAOjC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;IAIzB,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI;IAI9B,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI;IAK1C,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO;IAI7B,MAAM,IAAI,CAAC,EAAE;CAGhB;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACvE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAG/C;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAG/C"}

package/lib/common/di/multi-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"multi-binding.js","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmF;AACnF,qDAAqE;AAGrE;;;;;;GAMG;AACH,MAAsB,oBAAoB;IAGtC,YAAqB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAFtC,aAAQ,GAAQ,EAAE,CAAC;IAEsB,CAAC;IAIpD,GAAG,CAAC,UAAa;QACb,IAAA,sBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAID,MAAM,CAAC,GAAG,WAA4B;QAClC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,QAAW;QACd,IAAA,iBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,QAAa;QACnB,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,UAAa,EAAE,UAAa;QAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAvCD,oDAuCC;AAED;;;;GAIG;AACH,MAAa,YAAgB,SAAQ,oBAAsC;IACvE,aAAa,CAAC,OAAsB;QAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;CACJ;AAJD,oCAIC;AAED;;;;;GAKG;AACH,MAAa,oBAAwB,SAAQ,oBAAuB;IAChE,aAAa,CAAC,OAAsB;QAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACJ;AAJD,oDAIC"}
+{"version":3,"file":"multi-binding.js","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmG;AACnG,qDAAqE;AAErE;;;;;;GAMG;AACH,MAAsB,oBAAoB;IAGtC,YAAqB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAFtC,aAAQ,GAAQ,EAAE,CAAC;IAEsB,CAAC;IAIpD,GAAG,CAAC,UAAa;QACb,IAAA,sBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAID,MAAM,CAAC,GAAG,WAA4B;QAClC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,QAAW;QACd,IAAA,iBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,QAAa;QACnB,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,UAAa,EAAE,UAAa;QAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAvCD,oDAuCC;AAED;;;;GAIG;AACH,MAAa,YAAgB,SAAQ,oBAAsC;IACvE,aAAa,CAAC,OAAuB;QACjC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;CACJ;AAJD,oCAIC;AAED;;;;;GAKG;AACH,MAAa,oBAAwB,SAAQ,oBAAuB;IAChE,aAAa,CAAC,OAAuB;QACjC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACJ;AAJD,oDAIC"}

package/lib/common/di/server-module.d.ts

@@ -13,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { GLSPServer, GLSPServerListener } from '@eclipse-glsp/protocol';
 import { ContainerModule, interfaces } from 'inversify';
 import { GlobalActionProvider } from '../actions/global-action-provider';
-import { GLSPClientProxy, JsonRpcGLSPClientProxy } from '../protocol/glsp-client-proxy';
-import { GLSPServer, JsonRpcGLSPServer } from '../protocol/glsp-server';
-import { GLSPServerListener } from '../protocol/glsp-server-listener';
 import { ClientSessionFactory } from '../session/client-session-factory';
 import { ClientSessionManager } from '../session/client-session-manager';
 import { BindingTarget } from './binding-target';
@@ -61,13 +59,10 @@ export declare class ServerModule extends GLSPModule {
     configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void;
     protected bindDiagramModules(): BindingTarget<Map<string, ContainerModule[]>>;
     protected bindGLSPServer(): BindingTarget<GLSPServer>;
-    protected bindJsonRpcGLSPServer(): BindingTarget<JsonRpcGLSPServer>;
     protected bindClientSessionFactory(): BindingTarget<ClientSessionFactory>;
     protected bindClientSessionManager(): BindingTarget<ClientSessionManager>;
     protected bindGlobalActionProvider(): BindingTarget<GlobalActionProvider>;
     protected bindInjectionContainer(): BindingTarget<interfaces.Container>;
-    protected bindGLSPClientProxy(): BindingTarget<GLSPClientProxy>;
-    protected bindJsonRpcGLSPClientProxy(): BindingTarget<JsonRpcGLSPClientProxy>;
     protected configureGLSPServerListeners(binding: MultiBinding<GLSPServerListener>): void;
 }
 //# sourceMappingURL=server-module.d.ts.map

package/lib/common/di/server-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAA0B,eAAe,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAChH,OAAO,EAAqB,UAAU,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAoBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,qBAAqB,IAAI,aAAa,CAAC,iBAAiB,CAAC;IAInE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,mBAAmB,IAAI,aAAa,CAAC,eAAe,CAAC;IAI/D,SAAS,CAAC,0BAA0B,IAAI,aAAa,CAAC,sBAAsB,CAAC;IAI7E,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;CAG1F"}
+{"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAkBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;CAG1F"}

package/lib/common/di/server-module.js

@@ -1,10 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerModule = 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 global_action_provider_1 = require("../actions/global-action-provider");
-const glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
 const glsp_server_1 = require("../protocol/glsp-server");
-const glsp_server_listener_1 = require("../protocol/glsp-server-listener");
 const client_session_factory_1 = require("../session/client-session-factory");
 const client_session_manager_1 = require("../session/client-session-manager");
 const binding_target_1 = require("./binding-target");
@@ -57,15 +71,14 @@ class ServerModule extends glsp_module_1.GLSPModule {
     configure(bind, unbind, isBound, rebind) {
         const context = this.context;
         (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.DiagramModules, this.bindDiagramModules());
-        (0, binding_target_1.applyBindingTarget)(context, glsp_server_1.GLSPServer, this.bindGLSPServer()).inSingletonScope();
-        (0, binding_target_1.applyBindingTarget)(context, glsp_server_1.JsonRpcGLSPServer, this.bindJsonRpcGLSPServer());
+        (0, binding_target_1.applyBindingTarget)(context, protocol_1.GLSPServer, this.bindGLSPServer()).inSingletonScope();
         (0, binding_target_1.applyBindingTarget)(context, client_session_factory_1.ClientSessionFactory, this.bindClientSessionFactory()).inSingletonScope();
         (0, binding_target_1.applyBindingTarget)(context, client_session_manager_1.ClientSessionManager, this.bindClientSessionManager()).inSingletonScope();
-        this.configureMultiBinding(new multi_binding_1.MultiBinding(glsp_server_listener_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
+        this.configureMultiBinding(new multi_binding_1.MultiBinding(protocol_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
         (0, binding_target_1.applyBindingTarget)(context, global_action_provider_1.GlobalActionProvider, this.bindGlobalActionProvider()).inSingletonScope();
-        (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
-        (0, binding_target_1.applyBindingTarget)(context, glsp_client_proxy_1.GLSPClientProxy, this.bindGLSPClientProxy()).inSingletonScope();
-        (0, binding_target_1.applyBindingTarget)(context, glsp_client_proxy_1.JsonRpcGLSPClientProxy, this.bindJsonRpcGLSPClientProxy());
+        if (!isBound(service_identifiers_1.InjectionContainer)) {
+            (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
+        }
     }
     bindDiagramModules() {
         return { constantValue: this.diagramModules };
@@ -73,9 +86,6 @@ class ServerModule extends glsp_module_1.GLSPModule {
     bindGLSPServer() {
         return glsp_server_1.DefaultGLSPServer;
     }
-    bindJsonRpcGLSPServer() {
-        return { service: glsp_server_1.GLSPServer };
-    }
     bindClientSessionFactory() {
         return client_session_factory_1.DefaultClientSessionFactory;
     }
@@ -88,12 +98,6 @@ class ServerModule extends glsp_module_1.GLSPModule {
     bindInjectionContainer() {
         return { dynamicValue: context => context.container };
     }
-    bindGLSPClientProxy() {
-        return glsp_client_proxy_1.DefaultGLSPClientProxy;
-    }
-    bindJsonRpcGLSPClientProxy() {
-        return { service: glsp_client_proxy_1.GLSPClientProxy };
-    }
     configureGLSPServerListeners(binding) {
         binding.add({ service: client_session_manager_1.ClientSessionManager });
     }