monaco-languageclient 10.0.0-next.0 → 10.0.0-next.2

package/src/vscode/utils.ts

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
@@ -12,11 +12,10 @@ import { FakeWorker as Worker } from 'monaco-languageclient/workerFactory';
 import type { MonacoEnvironmentEnhanced } from './config.js';
 
 export const getEnhancedMonacoEnvironment = (): MonacoEnvironmentEnhanced => {
-    const monWin = (self as Window);
-    if (monWin.MonacoEnvironment === undefined) {
-        monWin.MonacoEnvironment = {};
+    if (typeof MonacoEnvironment === 'undefined') {
+        globalThis.MonacoEnvironment = {};
     }
-    const envEnhanced = monWin.MonacoEnvironment as MonacoEnvironmentEnhanced;
+    const envEnhanced = MonacoEnvironment as MonacoEnvironmentEnhanced;
     if (envEnhanced.vscodeApiInitialising === undefined) {
         envEnhanced.vscodeApiInitialising = false;
     }

package/src/worker/index.ts

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 

package/src/wrapper/lcconfig.ts

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
@@ -12,11 +12,13 @@ export interface ConnectionConfig {
 }
 
 export interface LanguageClientConfig {
-    name?: string;
+    languageId: string;
     connection: ConnectionConfig;
     clientOptions: LanguageClientOptions;
     restartOptions?: LanguageClientRestartOptions;
     disposeWorker?: boolean;
+    overwriteExisting?: boolean;
+    enforceDispose?: boolean;
 }
 
 export interface LanguageClientRestartOptions {
@@ -26,7 +28,5 @@ export interface LanguageClientRestartOptions {
 }
 
 export interface LanguageClientConfigs {
-    configs: Record<string, LanguageClientConfig>
-    overwriteExisting?: boolean;
-    enforceDispose?: boolean;
+    configs: Record<string, LanguageClientConfig>;
 }

package/src/wrapper/lcmanager.ts

@@ -1,10 +1,10 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
 import type { Logger } from 'monaco-languageclient/common';
-import type { LanguageClientConfigs } from './lcconfig.js';
+import type { LanguageClientConfig, LanguageClientConfigs } from './lcconfig.js';
 import { LanguageClientWrapper } from './lcwrapper.js';
 
 export class LanguageClientsManager {
@@ -33,25 +33,30 @@ export class LanguageClientsManager {
         return this.languageClientWrappers.get(languageId)?.getWorker();
     }
 
+    async setConfig(languageClientConfig: LanguageClientConfig): Promise<void> {
+        const languageId = languageClientConfig.languageId;
+        const current = this.languageClientWrappers.get(languageId);
+        const lcw = new LanguageClientWrapper(languageClientConfig, this.logger);
+
+        if (current !== undefined) {
+            if (languageClientConfig.overwriteExisting === true) {
+                if (languageClientConfig.enforceDispose === true) {
+                    await current.dispose();
+                }
+            } else {
+                throw new Error(`A languageclient config with id "${languageId}" already exists and you confiured to not override.`);
+            }
+        }
+        this.languageClientWrappers.set(languageId, lcw);
+    }
+
     async setConfigs(languageClientConfigs: LanguageClientConfigs): Promise<void> {
         this.languageClientConfigs = languageClientConfigs;
 
-        const lccEntries = Object.entries(this.languageClientConfigs.configs);
-        if (lccEntries.length > 0) {
-            for (const [languageId, lcc] of lccEntries) {
-                const current = this.languageClientWrappers.get(languageId);
-                const lcw = new LanguageClientWrapper(lcc, this.logger);
-
-                if (current !== undefined) {
-                    if (languageClientConfigs.overwriteExisting === true) {
-                        if (languageClientConfigs.enforceDispose === true) {
-                            await current.dispose();
-                        }
-                    } else {
-                        throw new Error(`A languageclient config with id "${languageId}" already exists and you confiured to not override.`);
-                    }
-                }
-                this.languageClientWrappers.set(languageId, lcw);
+        const lccs = Object.values(this.languageClientConfigs.configs);
+        if (lccs.length > 0) {
+            for (const lcc of lccs) {
+                await this.setConfig(lcc);
             }
         }
     }

package/src/wrapper/lcwrapper.ts

@@ -21,12 +21,12 @@ export class LanguageClientWrapper {
     private languageClientConfig: LanguageClientConfig;
     private worker?: Worker;
     private port?: MessagePort;
-    private name?: string;
+    private languageId: string;
     private logger: Logger | undefined;
 
     constructor(config: LanguageClientConfig, logger?: Logger) {
         this.languageClientConfig = config;
-        this.name = this.languageClientConfig.name ?? 'unnamed';
+        this.languageId = this.languageClientConfig.languageId;
         this.logger = logger;
     }
 
@@ -102,7 +102,7 @@ export class LanguageClientWrapper {
         };
         webSocket.onerror = (ev: Event) => {
             const languageClientError: LanguageClientError = {
-                message: `languageClientWrapper (${this.name}): Websocket connection failed.`,
+                message: `languageClientWrapper (${this.languageId}): Websocket connection failed.`,
                 error: (ev as ErrorEvent).error ?? 'No error was provided.'
             };
             reject(languageClientError);
@@ -120,7 +120,7 @@ export class LanguageClientWrapper {
 
                 this.worker.onerror = (ev) => {
                     const languageClientError: LanguageClientError = {
-                        message: `languageClientWrapper (${this.name}): Illegal worker configuration detected.`,
+                        message: `languageClientWrapper (${this.languageId}): Illegal worker configuration detected.`,
                         error: ev.error ?? 'No error was provided.'
                     };
                     reject(languageClientError);
@@ -155,7 +155,8 @@ export class LanguageClientWrapper {
         }
 
         const mlcConfig = {
-            name: this.languageClientConfig.name ?? 'Monaco Wrapper Language Client',
+            id: this.languageClientConfig.languageId,
+            name: 'Monaco Wrapper Language Client',
             clientOptions: {
                 // disable the default error handler...
                 errorHandler: {
@@ -205,12 +206,12 @@ export class LanguageClientWrapper {
             }
         } catch (e: unknown) {
             const languageClientError: LanguageClientError = {
-                message: `languageClientWrapper (${this.name}): Start was unsuccessful.`,
+                message: `languageClientWrapper (${this.languageId}): Start was unsuccessful.`,
                 error: Object.hasOwn(e ?? {}, 'cause') ? (e as Error) : 'No error was provided.'
             };
             reject(languageClientError);
         }
-        this.logger?.info(`languageClientWrapper (${this.name}): Started successfully.`);
+        this.logger?.info(`languageClientWrapper (${this.languageId}): Started successfully.`);
         resolve();
         starting = false;
     }
@@ -232,7 +233,7 @@ export class LanguageClientWrapper {
                     } finally {
                         retry++;
                         if (retry > (restartOptions.retries) && !this.isStarted()) {
-                            this.logger?.info('Disabling Language Client. Failed to start clangd after 5 retries');
+                            this.logger?.info(`Disabling Language Client. Failed to start clangd after ${restartOptions.retries} retries`);
                         } else {
                             setTimeout(async () => {
                                 await this.restart(this.worker, restartOptions.keepWorker);
@@ -258,7 +259,7 @@ export class LanguageClientWrapper {
             }
         } catch (e) {
             const languageClientError: LanguageClientError = {
-                message: `languageClientWrapper (${this.name}): Disposing the monaco-languageclient resulted in error.`,
+                message: `languageClientWrapper (${this.languageId}): Disposing the monaco-languageclient resulted in error.`,
                 error: Object.hasOwn(e ?? {}, 'cause') ? (e as Error) : 'No error was provided.'
             };
             return Promise.reject(languageClientError);