monaco-languageclient 8.2.0 → 8.3.1

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [8.3.1] - 2024-04-17
+
+- Updated to version `4.3.2` of `@codingame/monaco-vscode` packages
+
+## [8.3.0] - 2024-04-10
+
+- Updated to version `4.2.1` of `@codingame/monaco-vscode` packages
+- Introduce new export `tools` exposing the `Logger` migrated here from `monaco-editor-wrapper`
+
 ## [8.2.0] - 2024-04-10
 
 - Updated to version `4.1.2` of `@codingame/monaco-vscode` packages

package/lib/tools/index.d.ts

@@ -0,0 +1,15 @@
+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;
+}
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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"}

package/lib/tools/index.js

@@ -0,0 +1,32 @@
+/* --------------------------------------------------------------------------------------------
+ * 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);
+        }
+    }
+}
+//# sourceMappingURL=index.js.map

package/lib/tools/index.js.map

@@ -0,0 +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"}

package/lib/vscode/services.d.ts

@@ -2,6 +2,7 @@ import * as monaco from 'monaco-editor';
 import 'vscode/localExtensionHost';
 import { IWorkbenchConstructionOptions } from 'vscode/services';
 import type { LocalizationOptions } from '@codingame/monaco-vscode-localization-service-override';
+import { Logger } from '../tools/index.js';
 export interface MonacoEnvironmentEnhanced extends monaco.Environment {
     vscodeInitialising?: boolean;
     vscodeApiInitialised?: boolean;
@@ -16,9 +17,15 @@ export declare const initEnhancedMonacoEnvironment: () => MonacoEnvironmentEnhan
 export declare const supplyRequiredServices: () => Promise<{
     [x: string]: any;
 }>;
-export declare const reportServiceLoading: (services: monaco.editor.IEditorOverrideServices, debugLogging: boolean) => void;
+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 declare const initServices: (config?: InitializeServiceConfig, caller?: string, performChecks?: () => boolean) => Promise<void>;
+export type InitServicesInstruction = {
+    serviceConfig?: InitializeServiceConfig;
+    caller?: string;
+    performChecks?: () => boolean;
+    logger?: Logger;
+};
+export declare const initServices: (instruction: InitServicesInstruction) => Promise<void>;
 /**
  * monaco-vscode-api automatically loads the following services:
  *  - layout
@@ -30,7 +37,7 @@ export declare const initServices: (config?: InitializeServiceConfig, caller?: s
  *   - languages
  *   - model
  */
-export declare const importAllServices: (config?: InitializeServiceConfig, performChecks?: () => boolean) => Promise<void>;
+export declare const importAllServices: (instruction: InitServicesInstruction) => 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,EAAsB,MAAM,iBAAiB,CAAC;AAK7G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAGlG,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,OAAO,MAAM,CAAC,uBAAuB,gBAAgB,OAAO,SAM1G,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,OAAO,MAAM,CAAC,uBAAuB,oBAAoB,OAAO,MAAM,CAAC,uBAAuB,SAIrI,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,uBAAuB,WAAW,MAAM,kBAAkB,MAAM,OAAO,kBAoBlH,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,YAAmB,uBAAuB,kBAAkB,MAAM,OAAO,kBAiBtG,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,OAAO,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,EAA2B,6BAA6B,EAAsB,MAAM,iBAAiB,CAAC;AAK7G,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,OAAO,MAAM,CAAC,uBAAuB,WAAW,MAAM,SAIpG,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,OAAO,MAAM,CAAC,uBAAuB,oBAAoB,OAAO,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,kBAkB3E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,OAAO,MAAM,CAAC,uBAAuB,kBAa7H,CAAC;AAEF,eAAO,MAAM,gCAAgC,QAAO,mBA8DnD,CAAC"}

package/lib/vscode/services.js

@@ -8,6 +8,7 @@ import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-ser
 import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
 import { FakeWorker as Worker } from './fakeWorker.js';
+import { Logger } from '../tools/index.js';
 export const initEnhancedMonacoEnvironment = () => {
     const monWin = self;
     if (!monWin.MonacoEnvironment) {
@@ -28,11 +29,9 @@ export const supplyRequiredServices = async () => {
         ...getModelServiceOverride()
     };
 };
-export const reportServiceLoading = (services, debugLogging) => {
+export const reportServiceLoading = (services, logger) => {
     for (const serviceName of Object.keys(services)) {
-        if (debugLogging) {
-            console.log(`Loading service: ${serviceName}`);
-        }
+        logger?.debug(`Loading service: ${serviceName}`);
     }
 };
 export const mergeServices = (services, overrideServices) => {
@@ -40,23 +39,24 @@ export const mergeServices = (services, overrideServices) => {
         overrideServices[name] = service;
     }
 };
-export const initServices = async (config, caller, performChecks) => {
+export const initServices = async (instruction) => {
     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) {
         if (envEnhanced.vscodeApiInitialised) {
-            if (config?.debugLogging === true) {
-                console.log('Initialization of vscode services can only performed once!');
-            }
+            instruction.logger?.debug('Initialization of vscode services can only performed once!');
         }
         else {
             envEnhanced.vscodeInitialising = true;
-            if (config?.debugLogging === true) {
-                console.log(`Initializing vscode services. Caller: ${caller ?? 'unknown'}`);
-            }
-            await importAllServices(config, performChecks);
-            if (config?.debugLogging === true) {
-                console.log('Initialization of vscode services completed successfully.');
-            }
+            instruction.logger?.debug(`Initializing vscode services. Caller: ${instruction.caller ?? 'unknown'}`);
+            await importAllServices(instruction);
+            instruction.logger?.debug('Initialization of vscode services completed successfully.');
             envEnhanced.vscodeApiInitialised = true;
         }
     }
@@ -72,14 +72,14 @@ export const initServices = async (config, caller, performChecks) => {
  *   - languages
  *   - model
  */
-export const importAllServices = async (config, performChecks) => {
-    const lc = config ?? {};
+export const importAllServices = async (instruction) => {
+    const lc = instruction.serviceConfig ?? {};
     const userServices = lc.userServices ?? {};
     const lcRequiredServices = await supplyRequiredServices();
     mergeServices(lcRequiredServices, userServices);
-    await configureExtHostWorker(config?.enableExtHostWorker === true, userServices);
-    reportServiceLoading(userServices, lc.debugLogging === true);
-    if (performChecks === undefined || performChecks()) {
+    await configureExtHostWorker(instruction.serviceConfig?.enableExtHostWorker === true, userServices);
+    reportServiceLoading(userServices, instruction.logger);
+    if (instruction.performChecks === undefined || instruction.performChecks()) {
         await initialize(userServices);
         const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
         if (logLevel) {

package/lib/vscode/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/vscode/services.ts"],"names":[],"mappings":"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"}
+{"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.2.0",
+  "version": "8.3.1",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -24,6 +24,10 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
+    "./tools": {
+      "types": "./lib/tools/index.d.ts",
+      "default": "./lib/tools/index.js"
+    },
     "./vscode/services": {
       "types": "./lib/vscode/services.d.ts",
       "default": "./lib/vscode/services.js"
@@ -34,6 +38,9 @@
       ".": [
         "lib/index.d.ts"
       ],
+      "tools": [
+        "lib/tools/index"
+      ],
       "vscode/services": [
         "lib/vscode/services"
       ]
@@ -44,7 +51,7 @@
     "npm": ">=9.0.0"
   },
   "volta": {
-    "node": "20.12.0",
+    "node": "20.12.2",
     "npm": "10.5.0"
   },
   "files": [
@@ -55,17 +62,17 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-extensions-service-override": "~4.1.2",
-    "@codingame/monaco-vscode-languages-service-override": "~4.1.2",
-    "@codingame/monaco-vscode-localization-service-override": "~4.1.2",
-    "@codingame/monaco-vscode-model-service-override": "~4.1.2",
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~4.1.2",
-    "vscode": "npm:@codingame/monaco-vscode-api@~4.1.2",
+    "@codingame/monaco-vscode-extensions-service-override": "~4.3.2",
+    "@codingame/monaco-vscode-languages-service-override": "~4.3.2",
+    "@codingame/monaco-vscode-localization-service-override": "~4.3.2",
+    "@codingame/monaco-vscode-model-service-override": "~4.3.2",
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~4.3.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@~4.3.2",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~4.1.2",
-    "vscode": "npm:@codingame/monaco-vscode-api@~4.1.2"
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~4.3.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@~4.3.2"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

package/src/tools/index.ts

@@ -0,0 +1,44 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * 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);
+        }
+    }
+}

package/src/vscode/services.ts

@@ -12,6 +12,7 @@ import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-serv
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
 import type { LocalizationOptions } from '@codingame/monaco-vscode-localization-service-override';
 import { FakeWorker as Worker } from './fakeWorker.js';
+import { Logger } from '../tools/index.js';
 
 export interface MonacoEnvironmentEnhanced extends monaco.Environment {
     vscodeInitialising?: boolean;
@@ -48,11 +49,9 @@ export const supplyRequiredServices = async () => {
     };
 };
 
-export const reportServiceLoading = (services: monaco.editor.IEditorOverrideServices, debugLogging: boolean) => {
+export const reportServiceLoading = (services: monaco.editor.IEditorOverrideServices, logger?: Logger) => {
     for (const serviceName of Object.keys(services)) {
-        if (debugLogging) {
-            console.log(`Loading service: ${serviceName}`);
-        }
+        logger?.debug(`Loading service: ${serviceName}`);
     }
 };
 
@@ -62,23 +61,34 @@ export const mergeServices = (services: monaco.editor.IEditorOverrideServices, o
     }
 };
 
-export const initServices = async (config?: InitializeServiceConfig, caller?: string, performChecks?: () => boolean) => {
+export type InitServicesInstruction = {
+    serviceConfig?: InitializeServiceConfig;
+    caller?: string;
+    performChecks?: () => boolean;
+    logger?: Logger;
+};
+
+export const initServices = async (instruction: InitServicesInstruction) => {
     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) {
         if (envEnhanced.vscodeApiInitialised) {
-            if (config?.debugLogging === true) {
-                console.log('Initialization of vscode services can only performed once!');
-            }
+            instruction.logger?.debug('Initialization of vscode services can only performed once!');
         } else {
             envEnhanced.vscodeInitialising = true;
-            if (config?.debugLogging === true) {
-                console.log(`Initializing vscode services. Caller: ${caller ?? 'unknown'}`);
-            }
-            await importAllServices(config, performChecks);
-            if (config?.debugLogging === true) {
-                console.log('Initialization of vscode services completed successfully.');
-            }
+            instruction.logger?.debug(`Initializing vscode services. Caller: ${instruction.caller ?? 'unknown'}`);
+
+            await importAllServices(instruction);
+            instruction.logger?.debug('Initialization of vscode services completed successfully.');
+
             envEnhanced.vscodeApiInitialised = true;
         }
     }
@@ -95,17 +105,18 @@ export const initServices = async (config?: InitializeServiceConfig, caller?: st
  *   - languages
  *   - model
  */
-export const importAllServices = async (config?: InitializeServiceConfig, performChecks?: () => boolean) => {
-    const lc: InitializeServiceConfig = config ?? {};
+export const importAllServices = async (instruction: InitServicesInstruction) => {
+    const lc: InitializeServiceConfig = instruction.serviceConfig ?? {};
     const userServices: monaco.editor.IEditorOverrideServices = lc.userServices ?? {};
 
     const lcRequiredServices = await supplyRequiredServices();
 
     mergeServices(lcRequiredServices, userServices);
-    await configureExtHostWorker(config?.enableExtHostWorker === true, userServices);
-    reportServiceLoading(userServices, lc.debugLogging === true);
+    await configureExtHostWorker(instruction.serviceConfig?.enableExtHostWorker === true, userServices);
+
+    reportServiceLoading(userServices, instruction.logger);
 
-    if (performChecks === undefined || performChecks()) {
+    if (instruction.performChecks === undefined || instruction.performChecks()) {
         await initialize(userServices);
         const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
         if (logLevel) {