@eclipse-glsp/server 1.1.0-next.dc6b980.47 → 1.1.0-next.de91dcd.60

package/lib/common/operations/operation-handler.js

@@ -21,7 +21,7 @@ const model_state_1 = require("../features/model/model-state");
  * The `OperationActionHandler` is responsible for retrieving all available (valid) operation handlers for an
  * operation that is dispatched via `ActionDispatcher`.
  */
-let OperationHandler = class OperationHandler {
+let OperationHandler = exports.OperationHandler = class OperationHandler {
     /**
      * Executes the operation handler for the given {@link Operation} and returns the corresponding {@link Command}.
      * If the given operation cannot be handled by this handler or the handler execution did not result in any changes
@@ -47,10 +47,9 @@ __decorate([
     (0, inversify_1.inject)(model_state_1.ModelState),
     __metadata("design:type", Object)
 ], OperationHandler.prototype, "modelState", void 0);
-OperationHandler = __decorate([
+exports.OperationHandler = OperationHandler = __decorate([
     (0, inversify_1.injectable)()
 ], OperationHandler);
-exports.OperationHandler = OperationHandler;
 exports.OperationHandlerConstructor = Symbol('OperationHandlerConstructor');
 exports.OperationHandlerFactory = Symbol('OperationHandlerFactory');
 //# sourceMappingURL=operation-handler.js.map

package/lib/common/operations/operation-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA2D;AAE3D,+DAA2D;AAE3D;;;;;;;;GAQG;AAEI,IAAe,gBAAgB,GAA/B,MAAe,gBAAgB;IAsBlC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAoB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,SAAoB;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC;IACzE,CAAC;CACJ,CAAA;AA1CG;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;oDACc;AAFf,gBAAgB;IADrC,IAAA,sBAAU,GAAE;GACS,gBAAgB,CA2CrC;AA3CqB,4CAAgB;AA6CzB,QAAA,2BAA2B,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAIpE,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA2D;AAE3D,+DAA2D;AAE3D;;;;;;;;GAQG;AAEI,IAAe,gBAAgB,8BAA/B,MAAe,gBAAgB;IAsBlC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAoB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,SAAoB;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,aAAa,CAAC;IACzE,CAAC;CACJ,CAAA;AAzCa;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;oDACc;2BAFf,gBAAgB;IADrC,IAAA,sBAAU,GAAE;GACS,gBAAgB,CA2CrC;AAEY,QAAA,2BAA2B,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAIpE,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}

package/lib/common/protocol/glsp-server.d.ts

@@ -13,122 +13,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ActionMessage, Args, DisposeClientSessionParameters, InitializeClientSessionParameters, InitializeParameters, InitializeResult, MaybePromise } from '@eclipse-glsp/protocol';
-import * as jsonrpc from 'vscode-jsonrpc';
-import { MessageConnection } from 'vscode-jsonrpc';
+import { ActionMessage, Args, DisposeClientSessionParameters, GLSPClientProxy, GLSPServer, GLSPServerListener, InitializeClientSessionParameters, InitializeParameters, InitializeResult, MaybePromise } from '@eclipse-glsp/protocol';
 import { GlobalActionProvider } from '../actions/global-action-provider';
 import { ClientSession } from '../session/client-session';
 import { ClientSessionManager } from '../session/client-session-manager';
 import { Logger } from '../utils/logger';
-import { JsonRpcGLSPClientProxy } from './glsp-client-proxy';
-import { GLSPServerListener } from './glsp-server-listener';
-export declare const GLSPServer: unique symbol;
-/**
- * Interface for implementations of a server component using json-rpc for client-server communication.
- * Based on the specification of the Graphical Language Server Protocol:
- * https://github.com/eclipse-glsp/glsp/blob/master/PROTOCOL.md
- */
-export interface GLSPServer {
-    /**
-     *
-     * The `initialize` request has to be the first request from the client to the server. Until the server has responded
-     * with an {@link InitializeResult} no other request or notification can be handled and is expected to throw an
-     * error. A client is uniquely identified by an `applicationId` and has to specify on which `protocolVersion` it is
-     * based on. In addition, custom arguments can be provided in the `args` map to allow for custom initialization
-     * behavior on the server.
-     *
-     * After successfully initialization all {@link GLSPServerListener}s are notified via the
-     * {@link GLSPServerListener.serverInitialized} method.
-     *
-     * @param params the {@link InitializeParameters}.
-     * @returns A promise of the {@link InitializeResult} .
-     *
-     * @throws {@link Error} Subsequent initialize requests return the {@link InitializeResult} of the initial request
-     * if the given application id and protocol version are matching, otherwise the promise rejects with an error.
-     *
-     */
-    initialize(params: InitializeParameters): Promise<InitializeResult>;
-    /**
-     * The `initializeClientSession` request is sent to the server whenever a new graphical representation (diagram) is
-     * created. Each individual diagram on the client side counts as one session and has to provide a unique
-     * `clientSessionId` and its `diagramType`. In addition, custom arguments can be provided in the `args` map to allow
-     * for custom initialization behavior on the server. Subsequent `initializeClientSession` requests for the same
-     * client id and diagram type are expected to resolve successfully but don't have an actual effect because the
-     * corresponding client session is  already initialized.
-     *
-     * @param params the {@link InitializeClientSessionParameters}.
-     * @returns A promise that completes when the initialization was successful.
-     */
-    initializeClientSession(params: InitializeClientSessionParameters): Promise<void>;
-    /**
-     * The 'DisposeClientSession' request is sent to the server when a graphical representation (diagram) is no longer
-     * needed, e.g. the tab containing the diagram widget has been closed. The session is identified by its unique
-     * `clientSessionId`. In addition, custom arguments can be provided in the `args` map to allow for custom dispose
-     * behavior on the server.
-     *
-     * @param params the {@link DisposeClientSessionParameters}.
-     * @returns A `void` promise that completes if the disposal was successful.
-     *
-     */
-    disposeClientSession(params: DisposeClientSessionParameters): Promise<void>;
-    /**
-     * A `process` notification is sent from the client to server when the server should handle i.e. process a specific
-     * {@link ActionMessage}. Any communication that is performed between initialization and shutdown is handled by
-     * sending action messages, either from the client to the server or from the server to the client. This is the core
-     * part of the Graphical Language Server Protocol.
-     *
-     * @param message The {@link ActionMessage} that should be processed.
-     */
-    process(message: ActionMessage): void;
-    /**
-     * The `shutdown` notification is sent from the client to the server if the client disconnects from the server (e.g.
-     * the client application has been closed).
-     * This gives the server a chance to clean up and dispose any resources dedicated to the client and its sessions.
-     * All {@link GLSPServerListener}s are notified via the {@link GLSPServerListener.serverShutDown} method.
-     * Afterwards the server instance is considered to be disposed and can no longer be used for handling requests.
-     *
-     */
-    shutdown(): void;
-    /**
-     * Register a new {@link GLSPServerListener}.
-     *
-     * @param listener The listener that should be registered.
-     * @returns `true` if the listener was registered successfully, `false` otherwise (e.g. listener is already
-     *         registered).
-     */
-    addListener(listener: GLSPServerListener): boolean;
-    /**
-     * Unregister a {@link GLSPServerListener}.
-     *
-     * @param listener The listener that should be removed
-     * @returns 'true' if the listener was unregistered successfully, `false` otherwise (e.g. listener is was not
-     *         registered in the first place).
-     */
-    removeListener(listener: GLSPServerListener): boolean;
-    /**
-     * get a {@link ClientSession}.
-     *
-     * @param sessionId The id of the session to get
-     * @returns The either the ClientSession or undefined, if no ClientSession was found for the given id.
-     */
-    getClientSession(sessionId: string): ClientSession | undefined;
-}
-export declare const JsonRpcGLSPServer: unique symbol;
-export interface JsonRpcGLSPServer extends GLSPServer {
-    connect(connection: jsonrpc.MessageConnection): void;
-}
-export declare class DefaultGLSPServer implements JsonRpcGLSPServer {
+export declare class DefaultGLSPServer implements GLSPServer {
     static readonly PROTOCOL_VERSION = "1.0.0";
     protected logger: Logger;
     protected sessionManager: ClientSessionManager;
     protected actionProvider: GlobalActionProvider;
-    protected glspClient: JsonRpcGLSPClientProxy;
+    protected glspClientProxy?: GLSPClientProxy;
     protected initializeResult?: InitializeResult;
     protected applicationId: string;
     protected clientSessions: Map<string, ClientSession>;
     protected serverListeners: GLSPServerListener[];
     constructor(serverListeners?: GLSPServerListener[]);
-    protected setupJsonRpc(connection: MessageConnection): void;
     protected validateProtocolVersion(params: InitializeParameters): void;
     protected validateServerInitialized(): void;
     initialize(params: InitializeParameters): Promise<InitializeResult>;
@@ -139,9 +39,9 @@ export declare class DefaultGLSPServer implements JsonRpcGLSPServer {
     protected handleDisposeClientSessionArgs(args: Args | undefined): Promise<void>;
     process(message: ActionMessage): void;
     protected handleProcessError(message: ActionMessage, reason: any): void | PromiseLike<void>;
+    protected sendToClient(message: ActionMessage): void;
     getClientSession(sessionId: string): ClientSession | undefined;
     shutdown(): void;
-    connect(connection: jsonrpc.MessageConnection): void;
     protected isInitialized(): boolean;
     addListener(listener: GLSPServerListener): boolean;
     removeListener(listener: GLSPServerListener): boolean;

package/lib/common/protocol/glsp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-server.d.ts","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-server.d.ts","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,IAAI,EACJ,8BAA8B,EAE9B,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,iCAAiC,EACjC,oBAAoB,EACpB,gBAAgB,EAChB,YAAY,EAIf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBACa,iBAAkB,YAAW,UAAU;IAChD,gBAAuB,gBAAgB,WAAW;IAGlD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAG/C,SAAS,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAI/C,SAAS,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAE5C,SAAS,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAE9C,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAEhC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACrD,SAAS,CAAC,eAAe,EAAE,kBAAkB,EAAE,CAAM;gBAEI,eAAe,GAAE,kBAAkB,EAAO;IAKnG,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IASrE,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAM9B,UAAU,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2BhF,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,YAAY,CAAC,gBAAgB,CAAC;IAInG,uBAAuB,CAAC,MAAM,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9F,SAAS,CAAC,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC;IAI1E,oBAAoB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;cAUxE,8BAA8B,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAYrC,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAa3F,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAQpD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAIvD,QAAQ,IAAI,IAAI;IAOvB,SAAS,CAAC,aAAa,IAAI,OAAO;IAIlC,WAAW,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAKlD,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAKrD,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,kBAAkB,GAAG,kBAAkB,EAAE;CAGzF"}

package/lib/common/protocol/glsp-server.js

@@ -13,7 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 var DefaultGLSPServer_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultGLSPServer = exports.JsonRpcGLSPServer = exports.GLSPServer = void 0;
+exports.DefaultGLSPServer = void 0;
 /********************************************************************************
  * Copyright (c) 2022-2023 STMicroelectronics and others.
  *
@@ -35,23 +35,12 @@ const global_action_provider_1 = require("../actions/global-action-provider");
 const client_session_manager_1 = require("../session/client-session-manager");
 const glsp_server_error_1 = require("../utils/glsp-server-error");
 const logger_1 = require("../utils/logger");
-const glsp_client_proxy_1 = require("./glsp-client-proxy");
-const glsp_server_listener_1 = require("./glsp-server-listener");
-exports.GLSPServer = Symbol('GLSPServer');
-exports.JsonRpcGLSPServer = Symbol('JsonRpcGLSPServer');
-let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
+let DefaultGLSPServer = exports.DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
     constructor(serverListeners = []) {
         this.serverListeners = [];
         this.clientSessions = new Map();
         serverListeners.forEach(listener => this.addListener(listener));
     }
-    setupJsonRpc(connection) {
-        connection.onRequest(protocol_1.JsonrpcGLSPClient.InitializeRequest.method, (params) => this.initialize(params));
-        connection.onRequest(protocol_1.JsonrpcGLSPClient.InitializeClientSessionRequest, (params) => this.initializeClientSession(params));
-        connection.onRequest(protocol_1.JsonrpcGLSPClient.DisposeClientSessionRequest, (params) => this.disposeClientSession(params));
-        connection.onNotification(protocol_1.JsonrpcGLSPClient.ActionMessageNotification, message => this.process(message));
-        connection.onNotification(protocol_1.JsonrpcGLSPClient.ShutdownNotification, () => this.shutdown());
-    }
     validateProtocolVersion(params) {
         if (params.protocolVersion !== DefaultGLSPServer_1.PROTOCOL_VERSION) {
             throw new Error(
@@ -131,7 +120,14 @@ let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
             errorMsg = reason.message;
         }
         const errorAction = protocol_1.ServerMessageAction.create(errorMsg, { severity: 'ERROR', details });
-        this.glspClient.process({ clientId: message.clientId, action: errorAction });
+        this.sendToClient({ clientId: message.clientId, action: errorAction });
+    }
+    sendToClient(message) {
+        if (this.glspClientProxy) {
+            this.glspClientProxy.process(message);
+            return;
+        }
+        throw new Error("Could not send message to client. No 'GLSPClientProxy' is connected");
     }
     getClientSession(sessionId) {
         return this.clientSessions.get(sessionId);
@@ -142,10 +138,6 @@ let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
         this.clientSessions.clear();
         this.initializeResult = undefined;
     }
-    connect(connection) {
-        this.setupJsonRpc(connection);
-        this.glspClient.connect(connection);
-    }
     isInitialized() {
         return this.initializeResult !== undefined;
     }
@@ -175,14 +167,14 @@ __decorate([
     __metadata("design:type", Object)
 ], DefaultGLSPServer.prototype, "actionProvider", void 0);
 __decorate([
-    (0, inversify_1.inject)(glsp_client_proxy_1.JsonRpcGLSPClientProxy),
+    (0, inversify_1.inject)(protocol_1.GLSPClientProxy),
+    (0, inversify_1.optional)(),
     __metadata("design:type", Object)
-], DefaultGLSPServer.prototype, "glspClient", void 0);
-DefaultGLSPServer = DefaultGLSPServer_1 = __decorate([
+], DefaultGLSPServer.prototype, "glspClientProxy", void 0);
+exports.DefaultGLSPServer = DefaultGLSPServer = DefaultGLSPServer_1 = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.multiInject)(glsp_server_listener_1.GLSPServerListener)),
+    __param(0, (0, inversify_1.multiInject)(protocol_1.GLSPServerListener)),
     __param(0, (0, inversify_1.optional)()),
     __metadata("design:paramtypes", [Array])
 ], DefaultGLSPServer);
-exports.DefaultGLSPServer = DefaultGLSPServer;
 //# sourceMappingURL=glsp-server.js.map

package/lib/common/protocol/glsp-server.js.map

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

package/lib/common/session/client-session-factory.d.ts

@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
+import { GLSPClientProxy, InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
 import { Container, ContainerModule } from 'inversify';
-import { GLSPClientProxy } from '../protocol/glsp-client-proxy';
 import { ClientSession } from './client-session';
 export declare const ClientSessionFactory: unique symbol;
 /**

package/lib/common/session/client-session-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-session-factory.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAI3E,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAGvE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;CACpE;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IAEpE,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC;IAGrC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;IAEtC,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;CAenE"}
+{"version":3,"file":"client-session-factory.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAK3E,OAAO,EAAE,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAGvE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;CACpE;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IAEpE,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC;IAGrC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;IAEtC,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;CAenE"}

package/lib/common/session/client-session-factory.js

@@ -10,16 +10,31 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultClientSessionFactory = exports.ClientSessionFactory = 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 action_dispatcher_1 = require("../actions/action-dispatcher");
 const client_session_module_1 = require("../di/client-session-module");
 const service_identifiers_1 = require("../di/service-identifiers");
-const glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
 const glsp_server_error_1 = require("../utils/glsp-server-error");
 const client_session_1 = require("./client-session");
 const client_session_initializer_1 = require("./client-session-initializer");
 exports.ClientSessionFactory = Symbol('ClientSessionFactory');
-let DefaultClientSessionFactory = class DefaultClientSessionFactory {
+let DefaultClientSessionFactory = exports.DefaultClientSessionFactory = class DefaultClientSessionFactory {
     create(params) {
         const { clientSessionId: id, diagramType, args } = params;
         const diagramModules = this.diagramModules.get(diagramType);
@@ -44,11 +59,10 @@ __decorate([
     __metadata("design:type", Map)
 ], DefaultClientSessionFactory.prototype, "diagramModules", void 0);
 __decorate([
-    (0, inversify_1.inject)(glsp_client_proxy_1.GLSPClientProxy),
+    (0, inversify_1.inject)(protocol_1.GLSPClientProxy),
     __metadata("design:type", Object)
 ], DefaultClientSessionFactory.prototype, "glspClient", void 0);
-DefaultClientSessionFactory = __decorate([
+exports.DefaultClientSessionFactory = DefaultClientSessionFactory = __decorate([
     (0, inversify_1.injectable)()
 ], DefaultClientSessionFactory);
-exports.DefaultClientSessionFactory = DefaultClientSessionFactory;
 //# sourceMappingURL=client-session-factory.js.map

package/lib/common/session/client-session-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-session-factory.js","sourceRoot":"","sources":["../../../src/common/session/client-session-factory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA2E;AAC3E,oEAAgE;AAChE,uEAAwE;AACxE,mEAA+E;AAC/E,qEAAgE;AAChE,kEAA6D;AAC7D,qDAAuE;AACvE,6EAAwE;AAE3D,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAmB5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAUpC,MAAM,CAAC,MAAyC;QAC5C,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,MAAM,IAAI,mCAAe,CAAC,sEAAsE,WAAW,IAAI,CAAC,CAAC;SACpH;QAED,MAAM,aAAa,GAAG,IAAA,iDAAyB,EAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QAC5D,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,EAAE,aAAa,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;QACjG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAmB,oCAAgB,CAAC,CAAC;QAClF,OAAO,IAAI,qCAAoB,CAAC,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;IACzF,CAAC;CACJ,CAAA;AAxBG;IAAC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;8BACA,qBAAS;oEAAC;AAErC;IAAC,IAAA,kBAAM,EAAC,oCAAc,CAAC;8BACG,GAAG;mEAA4B;AAEzD;IAAC,IAAA,kBAAM,EAAC,mCAAe,CAAC;;+DACc;AAR7B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAyBvC;AAzBY,kEAA2B"}
+{"version":3,"file":"client-session-factory.js","sourceRoot":"","sources":["../../../src/common/session/client-session-factory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4F;AAC5F,yCAA2E;AAC3E,oEAAgE;AAChE,uEAAwE;AACxE,mEAA+E;AAC/E,kEAA6D;AAC7D,qDAAuE;AACvE,6EAAwE;AAE3D,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAmB5D,IAAM,2BAA2B,yCAAjC,MAAM,2BAA2B;IAUpC,MAAM,CAAC,MAAyC;QAC5C,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,MAAM,IAAI,mCAAe,CAAC,sEAAsE,WAAW,IAAI,CAAC,CAAC;SACpH;QAED,MAAM,aAAa,GAAG,IAAA,iDAAyB,EAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QAC5D,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,EAAE,aAAa,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;QACjG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAmB,oCAAgB,CAAC,CAAC;QAClF,OAAO,IAAI,qCAAoB,CAAC,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;IACzF,CAAC;CACJ,CAAA;AAvBa;IADT,IAAA,kBAAM,EAAC,wCAAkB,CAAC;8BACA,qBAAS;oEAAC;AAG3B;IADT,IAAA,kBAAM,EAAC,oCAAc,CAAC;8BACG,GAAG;mEAA4B;AAG/C;IADT,IAAA,kBAAM,EAAC,0BAAe,CAAC;;+DACc;sCAR7B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAyBvC"}

package/lib/common/session/client-session-manager.d.ts

@@ -13,9 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
-import { GLSPServer } from '../protocol/glsp-server';
-import { GLSPServerListener } from '../protocol/glsp-server-listener';
+import { GLSPServer, GLSPServerListener, InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
 import { ClientSession } from './client-session';
 import { ClientSessionFactory } from './client-session-factory';
 import { ClientSessionListener } from './client-session-listener';

package/lib/common/session/client-session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-session-manager.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,iCAAiC,EAAU,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;IAEnF;;;;;OAKG;IACH,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAE/D;;;;;OAKG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;IAE7D;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC;IAEvD;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAErF;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAAC;IAEzD;;;;;OAKG;IACH,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACxD;AAID,qBACa,2BAA4B,YAAW,oBAAoB,EAAE,kBAAkB;IAC1D,cAAc,EAAE,oBAAoB,CAAC;IAEnE,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAoC;IACxF,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAA8C;IAEvG,SAAS,CAAC,oBAAoB,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,GAAG,qBAAqB,EAAE;IAM1H,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;IAiBlF,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAIvD,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAYtD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO;IAOpF,SAAS,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAO9F,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAMxD,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI;IAQpD,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAI3C"}
+{"version":3,"file":"client-session-manager.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,iCAAiC,EAAU,MAAM,wBAAwB,CAAC;AAGnH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;IAEnF;;;;;OAKG;IACH,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAE/D;;;;;OAKG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;IAE7D;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC;IAEvD;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAErF;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAAC;IAEzD;;;;;OAKG;IACH,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACxD;AAID,qBACa,2BAA4B,YAAW,oBAAoB,EAAE,kBAAkB;IAC1D,cAAc,EAAE,oBAAoB,CAAC;IAEnE,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAoC;IACxF,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAA8C;IAEvG,SAAS,CAAC,oBAAoB,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,GAAG,qBAAqB,EAAE;IAM1H,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;IAiBlF,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAIvD,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAYtD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO;IAOpF,SAAS,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAO9F,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAMxD,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI;IAQpD,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAI3C"}

package/lib/common/session/client-session-manager.js

@@ -31,7 +31,7 @@ const glsp_server_error_1 = require("../utils/glsp-server-error");
 const client_session_factory_1 = require("./client-session-factory");
 exports.ClientSessionManager = Symbol('ClientSessionManager');
 const ALL_CLIENT_IDS_KEY = '*';
-let DefaultClientSessionManager = class DefaultClientSessionManager {
+let DefaultClientSessionManager = exports.DefaultClientSessionManager = class DefaultClientSessionManager {
     constructor() {
         this.clientSessions = new Map();
         this.listeners = new Map();
@@ -109,8 +109,7 @@ __decorate([
     (0, inversify_1.inject)(client_session_factory_1.ClientSessionFactory),
     __metadata("design:type", Object)
 ], DefaultClientSessionManager.prototype, "sessionFactory", void 0);
-DefaultClientSessionManager = __decorate([
+exports.DefaultClientSessionManager = DefaultClientSessionManager = __decorate([
     (0, inversify_1.injectable)()
 ], DefaultClientSessionManager);
-exports.DefaultClientSessionManager = DefaultClientSessionManager;
 //# sourceMappingURL=client-session-manager.js.map

package/lib/common/session/client-session-manager.js.map

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

package/lib/common/utils/args-util.js

@@ -29,7 +29,7 @@ var ArgsUtil;
             }
         }
         return {
-            [ArgsUtil.KEY_RADIUS_TOP_RIGHT]: topLeft,
+            [ArgsUtil.KEY_RADIUS_TOP_LEFT]: topLeft,
             [ArgsUtil.KEY_RADIUS_BOTTOM_LEFT]: bottomLeft,
             [ArgsUtil.KEY_RADIUS_BOTTOM_RIGHT]: bottomRight,
             [ArgsUtil.KEY_RADIUS_TOP_RIGHT]: topRight
@@ -77,5 +77,5 @@ var ArgsUtil;
         return value && typeof value === 'boolean' ? value : false;
     }
     ArgsUtil.getBoolean = getBoolean;
-})(ArgsUtil = exports.ArgsUtil || (exports.ArgsUtil = {}));
+})(ArgsUtil || (exports.ArgsUtil = ArgsUtil = {}));
 //# sourceMappingURL=args-util.js.map

package/lib/common/utils/args-util.js.map

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

package/lib/{browser/di → common/utils}/console-logger.d.ts

@@ -13,7 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Logger, LogLevel } from '../../common/index';
+import { BindingContext } from '@eclipse-glsp/protocol';
+import { LogLevel, Logger, LoggerConfigOptions } from './logger';
+/**
+ *  Simple logger implementation that forwards logging calls to the `console` and
+ *  can be used in both the browser and node context.
+ */
 export declare class ConsoleLogger extends Logger {
     logLevel: LogLevel;
     caller?: string | undefined;
@@ -26,4 +31,5 @@ export declare class ConsoleLogger extends Logger {
     logAdditionals(...params: any[]): string;
     stringify(param: unknown): string;
 }
+export declare function configureConsoleLogger<T extends LoggerConfigOptions>(context: BindingContext, options: T): void;
 //# sourceMappingURL=console-logger.d.ts.map

package/lib/common/utils/console-logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"console-logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAmD,MAAM,UAAU,CAAC;AAElH;;;GAGG;AACH,qBACa,aAAc,SAAQ,MAAM;IAClB,QAAQ,EAAE,QAAQ;IAAyB,MAAM,CAAC;gBAAlD,QAAQ,GAAE,QAAwB,EAAS,MAAM,CAAC,oBAAQ;IAI7E,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAOrD,cAAc,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAOxC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAOpC;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAW/G"}

package/lib/{browser/di → common/utils}/console-logger.js

@@ -24,32 +24,36 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleLogger = void 0;
+exports.configureConsoleLogger = exports.ConsoleLogger = void 0;
 const inversify_1 = require("inversify");
-const index_1 = require("../../common/index");
-let ConsoleLogger = class ConsoleLogger extends index_1.Logger {
-    constructor(logLevel = index_1.LogLevel.none, caller) {
+const logger_1 = require("./logger");
+/**
+ *  Simple logger implementation that forwards logging calls to the `console` and
+ *  can be used in both the browser and node context.
+ */
+let ConsoleLogger = exports.ConsoleLogger = class ConsoleLogger extends logger_1.Logger {
+    constructor(logLevel = logger_1.LogLevel.none, caller) {
         super();
         this.logLevel = logLevel;
         this.caller = caller;
     }
     info(message, ...params) {
-        if (index_1.LogLevel.info <= this.logLevel) {
+        if (logger_1.LogLevel.info <= this.logLevel) {
             console.info(this.logMessage(message, params));
         }
     }
     warn(message, ...params) {
-        if (index_1.LogLevel.warn <= this.logLevel) {
+        if (logger_1.LogLevel.warn <= this.logLevel) {
             console.warn(this.logMessage(message, params));
         }
     }
     error(message, ...params) {
-        if (index_1.LogLevel.error <= this.logLevel) {
+        if (logger_1.LogLevel.error <= this.logLevel) {
             console.error(this.logMessage(message, params));
         }
     }
     debug(message, ...params) {
-        if (index_1.LogLevel.debug <= this.logLevel) {
+        if (logger_1.LogLevel.debug <= this.logLevel) {
             console.debug(this.logMessage(message, params));
         }
     }
@@ -73,9 +77,22 @@ let ConsoleLogger = class ConsoleLogger extends index_1.Logger {
         return JSON.stringify(param, undefined, 4);
     }
 };
-ConsoleLogger = __decorate([
+exports.ConsoleLogger = ConsoleLogger = __decorate([
     (0, inversify_1.injectable)(),
     __metadata("design:paramtypes", [Number, String])
 ], ConsoleLogger);
-exports.ConsoleLogger = ConsoleLogger;
+function configureConsoleLogger(context, options) {
+    if (!options.consoleLog) {
+        context.bind(logger_1.Logger).to(logger_1.NullLogger).inSingletonScope();
+    }
+    else {
+        context.bind(logger_1.Logger).toDynamicValue(ctx => new ConsoleLogger(options.logLevel, (0, logger_1.getRequestParentName)(ctx)));
+    }
+    context.bind(logger_1.LoggerFactory).toFactory(dynamicContext => (caller) => {
+        const logger = dynamicContext.container.get(logger_1.Logger);
+        logger.caller = caller;
+        return logger;
+    });
+}
+exports.configureConsoleLogger = configureConsoleLogger;
 //# sourceMappingURL=console-logger.js.map

package/lib/common/utils/console-logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"console-logger.js","sourceRoot":"","sources":["../../../src/common/utils/console-logger.ts"],"names":[],"mappings":"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"}

package/lib/common/utils/logger.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 { interfaces } from 'inversify';
 export declare abstract class Logger {
     abstract logLevel: LogLevel;
     abstract caller?: string;
@@ -24,4 +40,9 @@ export declare enum LogLevel {
     debug = 4
 }
 export declare function asLogLevel(level: string | number): LogLevel | undefined;
+export interface LoggerConfigOptions {
+    consoleLog?: boolean;
+    logLevel?: LogLevel;
+}
+export declare function getRequestParentName(context: interfaces.Context): string | undefined;
 //# sourceMappingURL=logger.d.ts.map

package/lib/common/utils/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/logger.ts"],"names":[],"mappings":"AAiBA,8BACsB,MAAM;IACxB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAEtD,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAEtD,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAEvD,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAC1D;AAED,qBAAa,UAAW,SAAQ,MAAM;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAG7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAG7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAG9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAGjD;AAED,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;AAEvD,oBAAY,QAAQ;IAChB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,IAAI,IAAI;IACR,IAAI,IAAI;IACR,KAAK,IAAI;CACZ;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,CAUvE"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/common/utils/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AAEnD,8BACsB,MAAM;IACxB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAEtD,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAEtD,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAEvD,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAC1D;AAED,qBAAa,UAAW,SAAQ,MAAM;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAG7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAG7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAG9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAGjD;AAED,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;AAEvD,oBAAY,QAAQ;IAChB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,IAAI,IAAI;IACR,IAAI,IAAI;IACR,KAAK,IAAI;CACZ;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,CAUvE;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,MAAM,GAAG,SAAS,CASpF"}