monaco-languageclient 8.8.3 → 9.0.0-next.2

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [9.0.0-next.2] - 2024-10-10
+
+- Support all arguments for monaco-vscode-api `initialize` [#756](https://github.com/TypeFox/monaco-languageclient/pull/756)
+- Update to monaco-vscode-api 9.0.x [#749](https://github.com/TypeFox/monaco-languageclient/pull/749)
+  - Updated all `@codingame/monaco-vscode` packages to `10.0.1`.
+  - Enhancements to logging
+- monaco-languageclient config improvement, wrapper+languageclientwrapper improvements [#741](https://github.com/TypeFox/monaco-languageclient/pull/741)
+  - Pass MessageTransports directly
+  - Allows to configure more than one language client
+
 ## [8.8.3] - 2024-08-26
 
 - Update to monaco-vscode-api 8.0.4 (monaco-editor 0.51.0)

package/lib/client.d.ts

@@ -0,0 +1,13 @@
+import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from 'vscode-languageclient/browser.js';
+export type MonacoLanguageClientOptions = {
+    name: string;
+    id?: string;
+    clientOptions: LanguageClientOptions;
+    messageTransports: MessageTransports;
+};
+export declare class MonacoLanguageClient extends BaseLanguageClient {
+    protected readonly messageTransports: MessageTransports;
+    constructor({ id, name, clientOptions, messageTransports }: MonacoLanguageClientOptions);
+    protected createMessageTransports(_encoding: string): Promise<MessageTransports>;
+}
+//# sourceMappingURL=client.d.ts.map

package/lib/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEhH,MAAM,MAAM,2BAA2B,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,qBAAqB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;CACxC,CAAA;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;IACxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAE5C,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,EAAE,EAAE,2BAA2B;cAKpE,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAG5F"}

package/lib/client.js

@@ -0,0 +1,16 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { BaseLanguageClient } from 'vscode-languageclient/browser.js';
+export class MonacoLanguageClient extends BaseLanguageClient {
+    messageTransports;
+    constructor({ id, name, clientOptions, messageTransports }) {
+        super(id ?? name.toLowerCase(), name, clientOptions);
+        this.messageTransports = messageTransports;
+    }
+    createMessageTransports(_encoding) {
+        return Promise.resolve(this.messageTransports);
+    }
+}
+//# sourceMappingURL=client.js.map

package/lib/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,kBAAkB,EAA4C,MAAM,kCAAkC,CAAC;AAShH,MAAM,OAAO,oBAAqB,SAAQ,kBAAkB;IACrC,iBAAiB,CAAoB;IAExD,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,EAA+B;QACnF,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QACrD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAEkB,uBAAuB,CAAC,SAAiB;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACnD,CAAC;CACJ"}

package/lib/commonTypes.d.ts

@@ -0,0 +1,47 @@
+import { MonacoLanguageClient } from './client.js';
+export type ConnetionConfigOptions = WebSocketConfigOptionsDirect | WebSocketConfigOptionsParams | WebSocketConfigOptionsUrl | WorkerConfigOptionsParams | WorkerConfigOptionsDirect;
+export interface WebSocketCallOptions {
+    /** Adds handle on languageClient */
+    onCall: (languageClient?: MonacoLanguageClient) => void;
+    /** Reports Status Of Language Client */
+    reportStatus?: boolean;
+}
+export interface WebSocketConfigOptionsDirect {
+    $type: 'WebSocketDirect';
+    webSocket: WebSocket;
+    startOptions?: WebSocketCallOptions;
+    stopOptions?: WebSocketCallOptions;
+}
+export interface WebSocketUrlParams {
+    secured: boolean;
+    host: string;
+    port?: number;
+    path?: string;
+    extraParams?: Record<string, string | number | Array<string | number>>;
+}
+export interface WebSocketConfigOptionsParams extends WebSocketUrlParams {
+    $type: 'WebSocketParams';
+    startOptions?: WebSocketCallOptions;
+    stopOptions?: WebSocketCallOptions;
+}
+export interface WebSocketUrlString {
+    url: string;
+}
+export interface WebSocketConfigOptionsUrl extends WebSocketUrlString {
+    $type: 'WebSocketUrl';
+    startOptions?: WebSocketCallOptions;
+    stopOptions?: WebSocketCallOptions;
+}
+export interface WorkerConfigOptionsParams {
+    $type: 'WorkerConfig';
+    url: URL;
+    type: 'classic' | 'module';
+    messagePort?: MessagePort;
+    workerName?: string;
+}
+export interface WorkerConfigOptionsDirect {
+    $type: 'WorkerDirect';
+    worker: Worker;
+    messagePort?: MessagePort;
+}
+//# sourceMappingURL=commonTypes.d.ts.map

package/lib/commonTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,GAAG,4BAA4B,GAAG,yBAAyB,GAAG,yBAAyB,GAAG,yBAAyB,CAAC;AAErL,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACxD,wCAAwC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,4BAA4B;IACzC,KAAK,EAAE,iBAAiB,CAAA;IACxB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACpE,KAAK,EAAE,iBAAiB,CAAA;IACxB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,kBAAkB;IAC/B,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,yBAA0B,SAAQ,kBAAkB;IACjE,KAAK,EAAE,cAAc,CAAA;IACrB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,EAAE,cAAc,CAAA;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B"}

package/lib/commonTypes.js

@@ -0,0 +1,6 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+export {};
+//# sourceMappingURL=commonTypes.js.map

package/lib/commonTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAAA;;;gGAGgG"}

package/lib/index.d.ts

@@ -1,16 +1,3 @@
-import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from 'vscode-languageclient/lib/common/client.js';
-export interface IConnectionProvider {
-    get(encoding: string): Promise<MessageTransports>;
-}
-export type MonacoLanguageClientOptions = {
-    name: string;
-    id?: string;
-    clientOptions: LanguageClientOptions;
-    connectionProvider: IConnectionProvider;
-};
-export declare class MonacoLanguageClient extends BaseLanguageClient {
-    protected readonly connectionProvider: IConnectionProvider;
-    constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClientOptions);
-    protected createMessageTransports(encoding: string): Promise<MessageTransports>;
-}
+export * from './client.js';
+export * from './commonTypes.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAE1H,MAAM,WAAW,mBAAmB;IAChC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrD;AAED,MAAM,MAAM,2BAA2B,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,qBAAqB,CAAC;IACrC,kBAAkB,EAAE,mBAAmB,CAAC;CAC3C,CAAA;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;IACxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;gBAE/C,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,2BAA2B;cAKrE,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAG3F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC"}

package/lib/index.js

@@ -2,15 +2,6 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { BaseLanguageClient } from 'vscode-languageclient/lib/common/client.js';
-export class MonacoLanguageClient extends BaseLanguageClient {
-    connectionProvider;
-    constructor({ id, name, clientOptions, connectionProvider }) {
-        super(id ?? name.toLowerCase(), name, clientOptions);
-        this.connectionProvider = connectionProvider;
-    }
-    createMessageTransports(encoding) {
-        return this.connectionProvider.get(encoding);
-    }
-}
+export * from './client.js';
+export * from './commonTypes.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,kBAAkB,EAA4C,MAAM,4CAA4C,CAAC;AAa1H,MAAM,OAAO,oBAAqB,SAAQ,kBAAkB;IACrC,kBAAkB,CAAsB;IAE3D,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAA+B;QACpF,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IACjD,CAAC;IAEkB,uBAAuB,CAAC,QAAgB;QACvD,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;CACJ"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC"}

package/lib/tools/index.d.ts

@@ -1,15 +1,2 @@
-export type LoggerConfig = {
-    enabled: boolean;
-    debugEnabled?: boolean;
-};
-export declare class Logger {
-    private enabled;
-    private debugEnabled;
-    constructor(config?: LoggerConfig);
-    updateConfig(config?: LoggerConfig): void;
-    isEnabled(): boolean;
-    isDebugEnabled(): boolean;
-    info(message: string): void;
-    debug(message: string, force?: boolean): void;
-}
+export * from './logging.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,YAAY,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAA;CACzB,CAAC;AAEF,qBAAa,MAAM;IAEf,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,YAAY,CAAU;gBAElB,MAAM,CAAC,EAAE,YAAY;IAIjC,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY;IAKlC,SAAS;IAIT,cAAc;IAId,IAAI,CAAC,OAAO,EAAE,MAAM;IAMpB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;CAKzC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAKA,cAAc,cAAc,CAAC"}

package/lib/tools/index.js

@@ -2,31 +2,5 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-export class Logger {
-    enabled;
-    debugEnabled;
-    constructor(config) {
-        this.updateConfig(config);
-    }
-    updateConfig(config) {
-        this.enabled = !config ? true : config.enabled === true;
-        this.debugEnabled = this.enabled && config?.debugEnabled === true;
-    }
-    isEnabled() {
-        return this.enabled;
-    }
-    isDebugEnabled() {
-        return this.debugEnabled;
-    }
-    info(message) {
-        if (this.enabled) {
-            console.log(message);
-        }
-    }
-    debug(message, force) {
-        if (this.enabled && (this.debugEnabled || force === true)) {
-            console.debug(message);
-        }
-    }
-}
+export * from './logging.js';
 //# sourceMappingURL=index.js.map

package/lib/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAOhG,MAAM,OAAO,MAAM;IAEP,OAAO,CAAU;IACjB,YAAY,CAAU;IAE9B,YAAY,MAAqB;QAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,YAAY,CAAC,MAAqB;QAC9B,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAO,CAAC,OAAO,KAAK,IAAI,CAAC;QACzD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;IACtE,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,CAAC,OAAe;QAChB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,KAAe;QAClC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,KAAK,KAAK,IAAI,CAAC,EAAE,CAAC;YACxD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,cAAc,CAAC"}

package/lib/tools/logging.d.ts

@@ -0,0 +1,10 @@
+import { ConsoleLogger as VSCodeConsoleLogger, ILogger } from '@codingame/monaco-vscode-log-service-override';
+import { LogLevel } from 'vscode/services';
+export interface Logger extends ILogger {
+    createErrorAndLog(message: string, ...params: unknown[]): Error;
+}
+export declare class ConsoleLogger extends VSCodeConsoleLogger {
+    constructor(logLevel?: LogLevel, useColors?: boolean);
+    createErrorAndLog(message: string, ...params: unknown[]): Error;
+}
+//# sourceMappingURL=logging.d.ts.map

package/lib/tools/logging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/tools/logging.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAE,OAAO,EAAE,MAAM,+CAA+C,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,WAAW,MAAO,SAAQ,OAAO;IACnC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;CACnE;AAED,qBAAa,aAAc,SAAQ,mBAAmB;gBAEtC,QAAQ,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,OAAO;IAIpD,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE;CAO1D"}

package/lib/tools/logging.js

@@ -0,0 +1,18 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { ConsoleLogger as VSCodeConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
+import { LogLevel } from 'vscode/services';
+export class ConsoleLogger extends VSCodeConsoleLogger {
+    constructor(logLevel, useColors) {
+        super(logLevel ?? LogLevel.Off, useColors);
+    }
+    createErrorAndLog(message, ...params) {
+        if (this.getLevel() >= LogLevel.Error) {
+            this.error(message, ...params);
+        }
+        return new Error(message);
+    }
+}
+//# sourceMappingURL=logging.js.map

package/lib/tools/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/tools/logging.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAW,MAAM,+CAA+C,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAM3C,MAAM,OAAO,aAAc,SAAQ,mBAAmB;IAElD,YAAY,QAAmB,EAAE,SAAmB;QAChD,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,iBAAiB,CAAC,OAAe,EAAE,GAAG,MAAiB;QACnD,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;CAEJ"}

package/lib/vscode/index.d.ts

@@ -0,0 +1,3 @@
+export * from './fakeWorker.js';
+export * from './services.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vscode/index.ts"],"names":[],"mappings":"AAKA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}

package/lib/vscode/index.js

@@ -0,0 +1,7 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+export * from './fakeWorker.js';
+export * from './services.js';
+//# sourceMappingURL=index.js.map

package/lib/vscode/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vscode/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}

package/lib/vscode/services.d.ts

@@ -1,31 +1,43 @@
 import * as monaco from 'monaco-editor';
 import 'vscode/localExtensionHost';
 import { IWorkbenchConstructionOptions } from 'vscode/services';
+import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
 import type { LocalizationOptions } from '@codingame/monaco-vscode-localization-service-override';
-import { Logger } from '../tools/index.js';
+import { EnvironmentOverride } from 'vscode/workbench';
+import { Logger } from 'monaco-languageclient/tools';
 export interface MonacoEnvironmentEnhanced extends monaco.Environment {
     vscodeInitialising?: boolean;
     vscodeApiInitialised?: boolean;
 }
-export type InitializeServiceConfig = {
+export interface UserConfiguration {
+    json?: string;
+}
+export interface VscodeApiConfig {
     userServices?: monaco.editor.IEditorOverrideServices;
     enableExtHostWorker?: boolean;
-    debugLogging?: boolean;
     workspaceConfig?: IWorkbenchConstructionOptions;
-};
+    userConfiguration?: UserConfiguration;
+    viewsConfig?: {
+        viewServiceType: 'EditorService' | 'ViewsService' | 'WorkspaceService';
+        openEditorFunc?: OpenEditor;
+        viewsInitFunc?: () => void;
+    };
+    envOptions?: EnvironmentOverride;
+}
+export interface InitVscodeApiInstructions extends VscodeApiConfig {
+    htmlContainer: HTMLElement;
+    caller?: string;
+    performChecks?: () => boolean;
+    logger?: Logger;
+}
 export declare const initEnhancedMonacoEnvironment: () => MonacoEnvironmentEnhanced;
+export declare const getMonacoEnvironmentEnhanced: () => MonacoEnvironmentEnhanced;
 export declare const supplyRequiredServices: () => Promise<{
     [x: string]: any;
 }>;
 export declare const reportServiceLoading: (services: monaco.editor.IEditorOverrideServices, logger?: Logger) => void;
 export declare const mergeServices: (services: monaco.editor.IEditorOverrideServices, overrideServices: monaco.editor.IEditorOverrideServices) => void;
-export type InitServicesInstruction = {
-    serviceConfig?: InitializeServiceConfig;
-    caller?: string;
-    performChecks?: () => boolean;
-    logger?: Logger;
-};
-export declare const initServices: (instruction: InitServicesInstruction) => Promise<void>;
+export declare const initServices: (instructions: InitVscodeApiInstructions) => Promise<void>;
 /**
  * monaco-vscode-api automatically loads the following services:
  *  - layout
@@ -37,7 +49,7 @@ export declare const initServices: (instruction: InitServicesInstruction) => Pro
  *   - languages
  *   - model
  */
-export declare const importAllServices: (instruction: InitServicesInstruction) => Promise<void>;
+export declare const importAllServices: (instructions: InitVscodeApiInstructions) => Promise<void>;
 /**
  * Enable ext host to run in a worker
  */

package/lib/vscode/services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAA2B,6BAA6B,EAAgC,MAAM,iBAAiB,CAAC;AAKvH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAElG,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,WAAW;IACjE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,MAAM,uBAAuB,GAAG;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACrD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,iCAczC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;EAKlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,WAAW,MAAM,SAIpG,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,oBAAoB,MAAM,CAAC,MAAM,CAAC,uBAAuB,SAIrI,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IAClC,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,YAAY,gBAAuB,uBAAuB,kBAwBtE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,gBAAuB,uBAAuB,kBAgB3E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,MAAM,CAAC,MAAM,CAAC,uBAAuB,kBAa7H,CAAC;AAEF,eAAO,MAAM,gCAAgC,QAAO,mBA8DnD,CAAC"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAc,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAM9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAGrD,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,WAAW;IACjE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACrD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,6BAA6B,CAAC;IAChD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,WAAW,CAAC,EAAE;QACV,eAAe,EAAE,eAAe,GAAG,cAAc,GAAG,kBAAkB,CAAC;QACvE,cAAc,CAAC,EAAE,UAAU,CAAC;QAC5B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;KAC9B,CAAC;IACF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,yBAA0B,SAAQ,eAAe;IAC9D,aAAa,EAAE,WAAW,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,6BAA6B,iCAczC,CAAC;AAEF,eAAO,MAAM,4BAA4B,QAEF,yBACtC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;EAMlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,WAAW,MAAM,SAIpG,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,MAAM,CAAC,MAAM,CAAC,uBAAuB,oBAAoB,MAAM,CAAC,MAAM,CAAC,uBAAuB,SAIrI,CAAC;AAEF,eAAO,MAAM,YAAY,iBAAwB,yBAAyB,kBAiBzE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,iBAAwB,yBAAyB,kBAiB9E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,MAAM,CAAC,MAAM,CAAC,uBAAuB,kBAa7H,CAAC;AAEF,eAAO,MAAM,gCAAgC,QAAO,mBA8DnD,CAAC"}

package/lib/vscode/services.js

@@ -3,12 +3,12 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 import 'vscode/localExtensionHost';
-import { ILogService, initialize, LogLevel, StandaloneServices } from 'vscode/services';
+import { initialize } from 'vscode/services';
 import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-service-override';
 import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
+import getLogServiceOverride from '@codingame/monaco-vscode-log-service-override';
 import { FakeWorker as Worker } from './fakeWorker.js';
-import { Logger } from '../tools/index.js';
 export const initEnhancedMonacoEnvironment = () => {
     const monWin = self;
     if (!monWin.MonacoEnvironment) {
@@ -23,9 +23,14 @@ export const initEnhancedMonacoEnvironment = () => {
     }
     return envEnhanced;
 };
+export const getMonacoEnvironmentEnhanced = () => {
+    const monWin = self;
+    return monWin.MonacoEnvironment;
+};
 export const supplyRequiredServices = async () => {
     return {
         ...getLanguagesServiceOverride(),
+        ...getLogServiceOverride(),
         ...getModelServiceOverride()
     };
 };
@@ -39,24 +44,18 @@ export const mergeServices = (services, overrideServices) => {
         overrideServices[name] = service;
     }
 };
-export const initServices = async (instruction) => {
+export const initServices = async (instructions) => {
     const envEnhanced = initEnhancedMonacoEnvironment();
-    // in case debugLogging is set and for whatever reason no logger is passed a proper one is created
-    if (instruction.serviceConfig?.debugLogging === true && !instruction.logger) {
-        instruction.logger = new Logger({
-            enabled: true,
-            debugEnabled: true
-        });
-    }
     if (!(envEnhanced.vscodeInitialising ?? false)) {
         if (envEnhanced.vscodeApiInitialised ?? false) {
-            instruction.logger?.debug('Initialization of vscode services can only performed once!');
+            instructions.logger?.debug('Initialization of vscode services can only performed once!');
         }
         else {
             envEnhanced.vscodeInitialising = true;
-            instruction.logger?.debug(`Initializing vscode services. Caller: ${instruction.caller ?? 'unknown'}`);
-            await importAllServices(instruction);
-            instruction.logger?.debug('Initialization of vscode services completed successfully.');
+            instructions.logger?.debug(`Initializing vscode services. Caller: ${instructions.caller ?? 'unknown'}`);
+            await importAllServices(instructions);
+            instructions.viewsConfig?.viewsInitFunc?.();
+            instructions.logger?.debug('Initialization of vscode services completed successfully.');
             envEnhanced.vscodeApiInitialised = true;
         }
     }
@@ -72,17 +71,19 @@ export const initServices = async (instruction) => {
  *   - languages
  *   - model
  */
-export const importAllServices = async (instruction) => {
-    const lc = instruction.serviceConfig ?? {};
-    const userServices = lc.userServices ?? {};
+export const importAllServices = async (instructions) => {
+    const userServices = instructions.userServices ?? {};
     const lcRequiredServices = await supplyRequiredServices();
     mergeServices(lcRequiredServices, userServices);
-    await configureExtHostWorker(instruction.serviceConfig?.enableExtHostWorker === true, userServices);
-    reportServiceLoading(userServices, instruction.logger);
-    if (instruction.performChecks === undefined || instruction.performChecks()) {
-        await initialize(userServices, undefined, lc.workspaceConfig);
-        const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel ?? LogLevel.Info;
-        StandaloneServices.get(ILogService).setLevel(logLevel);
+    await configureExtHostWorker(instructions.enableExtHostWorker === true, userServices);
+    reportServiceLoading(userServices, instructions.logger);
+    if (instructions.performChecks === undefined || (typeof instructions.performChecks === 'function' && instructions.performChecks())) {
+        if (instructions.viewsConfig?.viewServiceType === 'ViewsService' || instructions.viewsConfig?.viewServiceType === 'WorkspaceService') {
+            await initialize(userServices, instructions.htmlContainer, instructions.workspaceConfig, instructions.envOptions);
+        }
+        else {
+            await initialize(userServices, undefined, instructions.workspaceConfig, instructions.envOptions);
+        }
     }
 };
 /**

package/lib/vscode/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAiC,QAAQ,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEvH,OAAO,2BAA2B,MAAM,sDAAsD,CAAC;AAC/F,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AAEtF,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAc3C,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAG,EAAE;IAC9C,MAAM,MAAM,GAAI,IAAe,CAAC;IAChC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC5B,MAAM,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAClC,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,iBAA8C,CAAC;IAC1E,IAAI,WAAW,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACjD,WAAW,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAC7C,CAAC;IACD,IAAI,WAAW,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC/C,WAAW,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAC3C,CAAC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC7C,OAAO;QACH,GAAG,2BAA2B,EAAE;QAChC,GAAG,uBAAuB,EAAE;KAC/B,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAA+C,EAAE,MAAe,EAAE,EAAE;IACrG,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,MAAM,EAAE,KAAK,CAAC,oBAAoB,WAAW,EAAE,CAAC,CAAC;IACrD,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAA+C,EAAE,gBAAuD,EAAE,EAAE;IACtI,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IACrC,CAAC;AACL,CAAC,CAAC;AASF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,WAAoC,EAAE,EAAE;IACvE,MAAM,WAAW,GAAG,6BAA6B,EAAE,CAAC;IAEpD,kGAAkG;IAClG,IAAI,WAAW,CAAC,aAAa,EAAE,YAAY,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAC1E,WAAW,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YAC5B,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,CAAC,WAAW,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE,CAAC;QAC7C,IAAI,WAAW,CAAC,oBAAoB,IAAI,KAAK,EAAE,CAAC;YAC5C,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAC5F,CAAC;aAAM,CAAC;YACJ,WAAW,CAAC,kBAAkB,GAAG,IAAI,CAAC;YACtC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,yCAAyC,WAAW,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC;YAEtG,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACrC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,2DAA2D,CAAC,CAAC;YAEvF,WAAW,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAC5C,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,WAAoC,EAAE,EAAE;IAC5E,MAAM,EAAE,GAA4B,WAAW,CAAC,aAAa,IAAI,EAAE,CAAC;IACpE,MAAM,YAAY,GAA0C,EAAE,CAAC,YAAY,IAAI,EAAE,CAAC;IAElF,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAE1D,aAAa,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;IAChD,MAAM,sBAAsB,CAAC,WAAW,CAAC,aAAa,EAAE,mBAAmB,KAAK,IAAI,EAAE,YAAY,CAAC,CAAC;IAEpG,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAEvD,IAAI,WAAW,CAAC,aAAa,KAAK,SAAS,IAAI,WAAW,CAAC,aAAa,EAAE,EAAE,CAAC;QACzE,MAAM,UAAU,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,EAAE,CAAC,eAAe,EAAE,kBAAkB,EAAE,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC;QACnF,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,mBAA4B,EAAE,YAAmD,EAAE,EAAE;IAC9H,IAAI,mBAAmB,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,qCAAqC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACnH,MAAM,YAAY,GAAiB;YAC/B,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC9B,OAAO,EAAE,UAAU,CAAC,OAAO;SAC9B,CAAC;QAEF,MAAM,eAAe,GAAG;YACpB,GAAG,2BAA2B,CAAC,YAAY,CAAC;SAC/C,CAAC;QACF,aAAa,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACjD,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAwB,EAAE;IACtE,OAAO;QACH,KAAK,CAAC,WAAW;YACb,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,EAAU;YACtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,kBAAkB,EAAE,CAAC;gBACjB,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,OAAO;aACxB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,UAAU;aAC3B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,QAAQ;aACzB,EAAE;gBACC,MAAM,EAAE,OAAO;gBACf,YAAY,EAAE,qBAAqB;aACtC,EAAE;gBACC,MAAM,EAAE,UAAU;gBAClB,YAAY,EAAE,iBAAiB;aAClC,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,EAAE;gBACC,MAAM,EAAE,SAAS;gBACjB,YAAY,EAAE,sBAAsB;aACvC,EAAE;gBACC,MAAM,EAAE,SAAS;gBACjB,YAAY,EAAE,uBAAuB;aACxC,EAAE;gBACC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,SAAS;aAC1B,CAAC;KACL,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "8.8.3",
+  "version": "9.0.0-next.2",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -29,8 +29,8 @@
       "default": "./lib/tools/index.js"
     },
     "./vscode/services": {
-      "types": "./lib/vscode/services.d.ts",
-      "default": "./lib/vscode/services.js"
+      "types": "./lib/vscode/index.d.ts",
+      "default": "./lib/vscode/index.js"
     }
   },
   "typesVersions": {
@@ -42,7 +42,7 @@
         "lib/tools/index"
       ],
       "vscode/services": [
-        "lib/vscode/services"
+        "lib/vscode/index"
       ]
     }
   },
@@ -51,8 +51,8 @@
     "npm": ">=9.0.0"
   },
   "volta": {
-    "node": "20.16.0",
-    "npm": "10.8.1"
+    "node": "20.18.0",
+    "npm": "10.8.3"
   },
   "files": [
     "lib",
@@ -62,17 +62,18 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-extensions-service-override": "~8.0.4",
-    "@codingame/monaco-vscode-languages-service-override": "~8.0.4",
-    "@codingame/monaco-vscode-localization-service-override": "~8.0.4",
-    "@codingame/monaco-vscode-model-service-override": "~8.0.4",
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~8.0.4",
-    "vscode": "npm:@codingame/monaco-vscode-api@~8.0.4",
+    "@codingame/monaco-vscode-extensions-service-override": "~10.0.1",
+    "@codingame/monaco-vscode-languages-service-override": "~10.0.1",
+    "@codingame/monaco-vscode-localization-service-override": "~10.0.1",
+    "@codingame/monaco-vscode-log-service-override": "~10.0.1",
+    "@codingame/monaco-vscode-model-service-override": "~10.0.1",
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~8.0.4",
-    "vscode": "npm:@codingame/monaco-vscode-api@~8.0.4"
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~10.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@~10.0.1"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

package/src/client.ts

@@ -0,0 +1,26 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from 'vscode-languageclient/browser.js';
+
+export type MonacoLanguageClientOptions = {
+    name: string;
+    id?: string;
+    clientOptions: LanguageClientOptions;
+    messageTransports: MessageTransports;
+}
+
+export class MonacoLanguageClient extends BaseLanguageClient {
+    protected readonly messageTransports: MessageTransports;
+
+    constructor({ id, name, clientOptions, messageTransports }: MonacoLanguageClientOptions) {
+        super(id ?? name.toLowerCase(), name, clientOptions);
+        this.messageTransports = messageTransports;
+    }
+
+    protected override createMessageTransports(_encoding: string): Promise<MessageTransports> {
+        return Promise.resolve(this.messageTransports);
+    }
+}

package/src/commonTypes.ts

@@ -0,0 +1,60 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { MonacoLanguageClient } from './client.js';
+
+export type ConnetionConfigOptions = WebSocketConfigOptionsDirect | WebSocketConfigOptionsParams | WebSocketConfigOptionsUrl | WorkerConfigOptionsParams | WorkerConfigOptionsDirect;
+
+export interface WebSocketCallOptions {
+    /** Adds handle on languageClient */
+    onCall: (languageClient?: MonacoLanguageClient) => void;
+    /** Reports Status Of Language Client */
+    reportStatus?: boolean;
+}
+
+export interface WebSocketConfigOptionsDirect {
+    $type: 'WebSocketDirect'
+    webSocket: WebSocket
+    startOptions?: WebSocketCallOptions;
+    stopOptions?: WebSocketCallOptions;
+}
+
+export interface WebSocketUrlParams {
+    secured: boolean;
+    host: string;
+    port?: number;
+    path?: string;
+    extraParams?: Record<string, string | number | Array<string | number>>;
+}
+
+export interface WebSocketConfigOptionsParams extends WebSocketUrlParams {
+    $type: 'WebSocketParams'
+    startOptions?: WebSocketCallOptions;
+    stopOptions?: WebSocketCallOptions;
+}
+
+export interface WebSocketUrlString {
+    url: string;
+}
+
+export interface WebSocketConfigOptionsUrl extends WebSocketUrlString {
+    $type: 'WebSocketUrl'
+    startOptions?: WebSocketCallOptions;
+    stopOptions?: WebSocketCallOptions;
+}
+
+export interface WorkerConfigOptionsParams {
+    $type: 'WorkerConfig'
+    url: URL;
+    type: 'classic' | 'module';
+    messagePort?: MessagePort;
+    workerName?: string;
+}
+
+export interface WorkerConfigOptionsDirect {
+    $type: 'WorkerDirect';
+    worker: Worker;
+    messagePort?: MessagePort;
+}

package/src/index.ts

@@ -3,28 +3,5 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from 'vscode-languageclient/lib/common/client.js';
-
-export interface IConnectionProvider {
-    get(encoding: string): Promise<MessageTransports>;
-}
-
-export type MonacoLanguageClientOptions = {
-    name: string;
-    id?: string;
-    clientOptions: LanguageClientOptions;
-    connectionProvider: IConnectionProvider;
-}
-
-export class MonacoLanguageClient extends BaseLanguageClient {
-    protected readonly connectionProvider: IConnectionProvider;
-
-    constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClientOptions) {
-        super(id ?? name.toLowerCase(), name, clientOptions);
-        this.connectionProvider = connectionProvider;
-    }
-
-    protected override createMessageTransports(encoding: string): Promise<MessageTransports> {
-        return this.connectionProvider.get(encoding);
-    }
-}
+export * from './client.js';
+export * from './commonTypes.js';

package/src/tools/index.ts

@@ -3,42 +3,4 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-export type LoggerConfig = {
-    enabled: boolean,
-    debugEnabled?: boolean
-};
-
-export class Logger {
-
-    private enabled: boolean;
-    private debugEnabled: boolean;
-
-    constructor(config?: LoggerConfig) {
-        this.updateConfig(config);
-    }
-
-    updateConfig(config?: LoggerConfig) {
-        this.enabled = !config ? true : config!.enabled === true;
-        this.debugEnabled = this.enabled && config?.debugEnabled === true;
-    }
-
-    isEnabled() {
-        return this.enabled;
-    }
-
-    isDebugEnabled() {
-        return this.debugEnabled;
-    }
-
-    info(message: string) {
-        if (this.enabled) {
-            console.log(message);
-        }
-    }
-
-    debug(message: string, force?: boolean) {
-        if (this.enabled && (this.debugEnabled || force === true)) {
-            console.debug(message);
-        }
-    }
-}
+export * from './logging.js';

package/src/tools/logging.ts

@@ -0,0 +1,26 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { ConsoleLogger as VSCodeConsoleLogger, ILogger } from '@codingame/monaco-vscode-log-service-override';
+import { LogLevel } from 'vscode/services';
+
+export interface Logger extends ILogger {
+    createErrorAndLog(message: string, ...params: unknown[]): Error;
+}
+
+export class ConsoleLogger extends VSCodeConsoleLogger {
+
+    constructor(logLevel?: LogLevel, useColors?: boolean) {
+        super(logLevel ?? LogLevel.Off, useColors);
+    }
+
+    createErrorAndLog(message: string, ...params: unknown[]) {
+        if (this.getLevel() >= LogLevel.Error) {
+            this.error(message, ...params);
+        }
+        return new Error(message);
+    }
+
+}

package/src/vscode/index.ts

@@ -0,0 +1,7 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+export * from './fakeWorker.js';
+export * from './services.js';

package/src/vscode/services.ts

@@ -5,26 +5,46 @@
 
 import * as monaco from 'monaco-editor';
 import 'vscode/localExtensionHost';
-import { ILogService, initialize, IWorkbenchConstructionOptions, LogLevel, StandaloneServices } from 'vscode/services';
+import { initialize, IWorkbenchConstructionOptions } from 'vscode/services';
+import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
 import type { WorkerConfig } from '@codingame/monaco-vscode-extensions-service-override';
 import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-service-override';
 import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
+import getLogServiceOverride from '@codingame/monaco-vscode-log-service-override';
 import type { LocalizationOptions } from '@codingame/monaco-vscode-localization-service-override';
+import { EnvironmentOverride } from 'vscode/workbench';
+import { Logger } from 'monaco-languageclient/tools';
 import { FakeWorker as Worker } from './fakeWorker.js';
-import { Logger } from '../tools/index.js';
 
 export interface MonacoEnvironmentEnhanced extends monaco.Environment {
     vscodeInitialising?: boolean;
     vscodeApiInitialised?: boolean;
 }
 
-export type InitializeServiceConfig = {
+export interface UserConfiguration {
+    json?: string;
+}
+
+export interface VscodeApiConfig {
     userServices?: monaco.editor.IEditorOverrideServices;
     enableExtHostWorker?: boolean;
-    debugLogging?: boolean;
     workspaceConfig?: IWorkbenchConstructionOptions;
-};
+    userConfiguration?: UserConfiguration;
+    viewsConfig?: {
+        viewServiceType: 'EditorService' | 'ViewsService' | 'WorkspaceService';
+        openEditorFunc?: OpenEditor;
+        viewsInitFunc?: () => void;
+    },
+    envOptions?: EnvironmentOverride;
+}
+
+export interface InitVscodeApiInstructions extends VscodeApiConfig {
+    htmlContainer: HTMLElement;
+    caller?: string;
+    performChecks?: () => boolean;
+    logger?: Logger;
+}
 
 export const initEnhancedMonacoEnvironment = () => {
     const monWin = (self as Window);
@@ -42,9 +62,15 @@ export const initEnhancedMonacoEnvironment = () => {
     return envEnhanced;
 };
 
+export const getMonacoEnvironmentEnhanced = () => {
+    const monWin = (self as Window);
+    return monWin.MonacoEnvironment as MonacoEnvironmentEnhanced;
+};
+
 export const supplyRequiredServices = async () => {
     return {
         ...getLanguagesServiceOverride(),
+        ...getLogServiceOverride(),
         ...getModelServiceOverride()
     };
 };
@@ -61,33 +87,19 @@ export const mergeServices = (services: monaco.editor.IEditorOverrideServices, o
     }
 };
 
-export type InitServicesInstruction = {
-    serviceConfig?: InitializeServiceConfig;
-    caller?: string;
-    performChecks?: () => boolean;
-    logger?: Logger;
-};
-
-export const initServices = async (instruction: InitServicesInstruction) => {
+export const initServices = async (instructions: InitVscodeApiInstructions) => {
     const envEnhanced = initEnhancedMonacoEnvironment();
 
-    // in case debugLogging is set and for whatever reason no logger is passed a proper one is created
-    if (instruction.serviceConfig?.debugLogging === true && !instruction.logger) {
-        instruction.logger = new Logger({
-            enabled: true,
-            debugEnabled: true
-        });
-    }
-
     if (!(envEnhanced.vscodeInitialising ?? false)) {
         if (envEnhanced.vscodeApiInitialised ?? false) {
-            instruction.logger?.debug('Initialization of vscode services can only performed once!');
+            instructions.logger?.debug('Initialization of vscode services can only performed once!');
         } else {
             envEnhanced.vscodeInitialising = true;
-            instruction.logger?.debug(`Initializing vscode services. Caller: ${instruction.caller ?? 'unknown'}`);
+            instructions.logger?.debug(`Initializing vscode services. Caller: ${instructions.caller ?? 'unknown'}`);
 
-            await importAllServices(instruction);
-            instruction.logger?.debug('Initialization of vscode services completed successfully.');
+            await importAllServices(instructions);
+            instructions.viewsConfig?.viewsInitFunc?.();
+            instructions.logger?.debug('Initialization of vscode services completed successfully.');
 
             envEnhanced.vscodeApiInitialised = true;
         }
@@ -105,21 +117,22 @@ export const initServices = async (instruction: InitServicesInstruction) => {
  *   - languages
  *   - model
  */
-export const importAllServices = async (instruction: InitServicesInstruction) => {
-    const lc: InitializeServiceConfig = instruction.serviceConfig ?? {};
-    const userServices: monaco.editor.IEditorOverrideServices = lc.userServices ?? {};
+export const importAllServices = async (instructions: InitVscodeApiInstructions) => {
+    const userServices: monaco.editor.IEditorOverrideServices = instructions.userServices ?? {};
 
     const lcRequiredServices = await supplyRequiredServices();
 
     mergeServices(lcRequiredServices, userServices);
-    await configureExtHostWorker(instruction.serviceConfig?.enableExtHostWorker === true, userServices);
+    await configureExtHostWorker(instructions.enableExtHostWorker === true, userServices);
 
-    reportServiceLoading(userServices, instruction.logger);
+    reportServiceLoading(userServices, instructions.logger);
 
-    if (instruction.performChecks === undefined || instruction.performChecks()) {
-        await initialize(userServices, undefined, lc.workspaceConfig);
-        const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel ?? LogLevel.Info;
-        StandaloneServices.get(ILogService).setLevel(logLevel);
+    if (instructions.performChecks === undefined || (typeof instructions.performChecks === 'function' && instructions.performChecks())) {
+        if (instructions.viewsConfig?.viewServiceType === 'ViewsService' || instructions.viewsConfig?.viewServiceType === 'WorkspaceService') {
+            await initialize(userServices, instructions.htmlContainer, instructions.workspaceConfig, instructions.envOptions);
+        } else {
+            await initialize(userServices, undefined, instructions.workspaceConfig, instructions.envOptions);
+        }
     }
 };