monaco-languageclient 8.8.3 → 9.0.0-next.10

package/lib/vscode/services.d.ts

@@ -1,31 +1,46 @@
 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 = {
-    userServices?: monaco.editor.IEditorOverrideServices;
+export interface UserConfiguration {
+    json?: string;
+}
+export interface ViewsConfig {
+    viewServiceType: 'EditorService' | 'ViewsService' | 'WorkspaceService';
+    openEditorFunc?: OpenEditor;
+    viewsInitFunc?: () => void;
+}
+export interface VscodeApiConfig {
+    vscodeApiInitPerformExternally?: boolean;
+    loadThemes?: boolean;
+    serviceOverrides?: monaco.editor.IEditorOverrideServices;
     enableExtHostWorker?: boolean;
-    debugLogging?: boolean;
     workspaceConfig?: IWorkbenchConstructionOptions;
-};
+    userConfiguration?: UserConfiguration;
+    viewsConfig?: ViewsConfig;
+    envOptions?: EnvironmentOverride;
+}
+export interface InitServicesInstructions {
+    htmlContainer?: HTMLElement;
+    caller?: string;
+    performServiceConsistencyChecks?: () => 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 mergeServices: (overrideServices: monaco.editor.IEditorOverrideServices, services?: monaco.editor.IEditorOverrideServices) => void;
+export declare const initServices: (vscodeApiConfig: VscodeApiConfig, instructions: InitServicesInstructions) => Promise<void>;
 /**
  * monaco-vscode-api automatically loads the following services:
  *  - layout
@@ -37,7 +52,7 @@ export declare const initServices: (instruction: InitServicesInstruction) => Pro
  *   - languages
  *   - model
  */
-export declare const importAllServices: (instruction: InitServicesInstruction) => Promise<void>;
+export declare const importAllServices: (vscodeApiConfig: VscodeApiConfig, instructions: InitServicesInstructions) => 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;AAKrD,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;AACD,MAAM,WAAW,WAAW;IACxB,eAAe,EAAE,eAAe,GAAG,cAAc,GAAG,kBAAkB,CAAC;IACvE,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC5B,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,6BAA6B,CAAC;IAChD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,wBAAwB;IACrC,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+BAA+B,CAAC,EAAE,MAAM,OAAO,CAAC;IAChD,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,qBAAsB,MAAM,CAAC,MAAM,CAAC,uBAAuB,aAAa,MAAM,CAAC,MAAM,CAAC,uBAAuB,SAMtI,CAAC;AAEF,eAAO,MAAM,YAAY,oBAA2B,eAAe,gBAAgB,wBAAwB,kBAmB1G,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,oBAA2B,eAAe,gBAAgB,wBAAwB,kBAoB/G,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,wBAA+B,OAAO,gBAAgB,MAAM,CAAC,MAAM,CAAC,uBAAuB,kBAY7H,CAAC;AAEF,eAAO,MAAM,gCAAgC,QAAO,mBA8DnD,CAAC"}

package/lib/vscode/services.js

@@ -3,12 +3,14 @@
  * 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';
+import { setUnexpectedErrorHandler } from 'vscode/monaco';
+import { updateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
 export const initEnhancedMonacoEnvironment = () => {
     const monWin = self;
     if (!monWin.MonacoEnvironment) {
@@ -23,9 +25,14 @@ export const initEnhancedMonacoEnvironment = () => {
     }
     return envEnhanced;
 };
+export const getMonacoEnvironmentEnhanced = () => {
+    const monWin = self;
+    return monWin.MonacoEnvironment;
+};
 export const supplyRequiredServices = async () => {
     return {
         ...getLanguagesServiceOverride(),
+        ...getLogServiceOverride(),
         ...getModelServiceOverride()
     };
 };
@@ -34,31 +41,28 @@ export const reportServiceLoading = (services, logger) => {
         logger?.debug(`Loading service: ${serviceName}`);
     }
 };
-export const mergeServices = (services, overrideServices) => {
-    for (const [name, service] of Object.entries(services)) {
-        overrideServices[name] = service;
+export const mergeServices = (overrideServices, services) => {
+    if (services !== undefined) {
+        for (const [name, service] of Object.entries(services)) {
+            overrideServices[name] = service;
+        }
     }
 };
-export const initServices = async (instruction) => {
+export const initServices = async (vscodeApiConfig, 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(vscodeApiConfig, instructions);
+            vscodeApiConfig.viewsConfig?.viewsInitFunc?.();
+            instructions.logger?.debug('Initialization of vscode services completed successfully.');
             envEnhanced.vscodeApiInitialised = true;
         }
+        await updateUserConfiguration(vscodeApiConfig.userConfiguration?.json ?? JSON.stringify({}));
     }
 };
 /**
@@ -72,18 +76,23 @@ export const initServices = async (instruction) => {
  *   - languages
  *   - model
  */
-export const importAllServices = async (instruction) => {
-    const lc = instruction.serviceConfig ?? {};
-    const userServices = lc.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);
+export const importAllServices = async (vscodeApiConfig, instructions) => {
+    const services = await supplyRequiredServices();
+    mergeServices(services, vscodeApiConfig.serviceOverrides);
+    await configureExtHostWorker(vscodeApiConfig.enableExtHostWorker === true, services);
+    reportServiceLoading(services, instructions.logger);
+    if (instructions.performServiceConsistencyChecks === undefined ||
+        (typeof instructions.performServiceConsistencyChecks === 'function' && instructions.performServiceConsistencyChecks())) {
+        if (vscodeApiConfig.viewsConfig?.viewServiceType === 'ViewsService' || vscodeApiConfig.viewsConfig?.viewServiceType === 'WorkspaceService') {
+            await initialize(services, instructions.htmlContainer, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
+        }
+        else {
+            await initialize(services, undefined, vscodeApiConfig.workspaceConfig, vscodeApiConfig.envOptions);
+        }
     }
+    setUnexpectedErrorHandler((e) => {
+        instructions.logger?.createErrorAndLog('Unexpected error', e);
+    });
 };
 /**
  * Enable ext host to run in a worker
@@ -95,10 +104,9 @@ export const configureExtHostWorker = async (enableExtHostWorker, userServices)
             url: fakeWorker.url.toString(),
             options: fakeWorker.options
         };
-        const extHostServices = {
+        mergeServices(userServices, {
             ...getExtensionServiceOverride(workerConfig),
-        };
-        mergeServices(extHostServices, userServices);
+        });
     }
 };
 export const createDefaultLocaleConfiguration = () => {

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.8.3",
+  "version": "9.0.0-next.10",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -29,8 +29,12 @@
       "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"
+    },
+    "./fs": {
+      "types": "./lib/fs/index.d.ts",
+      "default": "./lib/fs/index.js"
     }
   },
   "typesVersions": {
@@ -42,7 +46,10 @@
         "lib/tools/index"
       ],
       "vscode/services": [
-        "lib/vscode/services"
+        "lib/vscode/index"
+      ],
+      "fs": [
+        "lib/fs/index"
       ]
     }
   },
@@ -51,8 +58,8 @@
     "npm": ">=9.0.0"
   },
   "volta": {
-    "node": "20.16.0",
-    "npm": "10.8.1"
+    "node": "22.12.0",
+    "npm": "10.9.0"
   },
   "files": [
     "lib",
@@ -62,17 +69,19 @@
     "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-configuration-service-override": "~11.1.2",
+    "@codingame/monaco-vscode-extensions-service-override": "~11.1.2",
+    "@codingame/monaco-vscode-languages-service-override": "~11.1.2",
+    "@codingame/monaco-vscode-localization-service-override": "~11.1.2",
+    "@codingame/monaco-vscode-log-service-override": "~11.1.2",
+    "@codingame/monaco-vscode-model-service-override": "~11.1.2",
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~11.1.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@~11.1.2",
     "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@~11.1.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@~11.1.2"
   },
   "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 ConnectionConfigOptions = 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/fs/definitions.ts

@@ -0,0 +1,127 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { Logger } from 'monaco-languageclient/tools';
+
+export interface FileReadRequest {
+    resourceUri: string
+}
+
+export type FileReadResultStatus = 'success' | 'denied';
+
+export interface FileReadRequestResult {
+    status: FileReadResultStatus
+    content: string | ArrayBuffer
+}
+
+export interface FileUpdate {
+    resourceUri: string
+    content: string | ArrayBuffer
+}
+
+export type FileUpdateResultStatus = 'equal' | 'updated' | 'created' | 'denied';
+
+export interface FileUpdateResult {
+    status: FileUpdateResultStatus
+    message?: string
+}
+
+export interface DirectoryListingRequest {
+    directoryUri: string
+}
+
+export interface DirectoryListingRequestResult {
+    files: string[]
+}
+
+export type StatsRequestType = 'directory' | 'file';
+
+export interface StatsRequest {
+    type: StatsRequestType,
+    resourceUri: string
+}
+
+export interface StatsRequestResult {
+    type: StatsRequestType
+    size: number
+    name: string
+    mtime: number
+}
+
+export enum EndpointType {
+    DRIVER,
+    FOLLOWER,
+    LOCAL,
+    EMPTY
+}
+
+export interface FileSystemCapabilities {
+
+    /**
+     * Get a text file content
+     * @param params the resourceUri of the file
+     * @returns The ReadFileResult containing the content of the file
+     */
+    readFile(params: FileReadRequest): Promise<FileReadRequestResult>
+
+    /**
+     * Save a file on the filesystem
+     * @param params the resourceUri and the content of the file
+     * @returns The FileUpdateResult containing the result of the operation and an optional message
+     */
+    writeFile(params: FileUpdate): Promise<FileUpdateResult>;
+
+    /**
+     * The implementation has to decide if the file at given uri at need to be updated
+     * @param params the resourceUri and the content of the file
+     * @returns The FileUpdateResult containing the result of the operation and an optional message
+     */
+    syncFile(params: FileUpdate): Promise<FileUpdateResult>;
+
+    /**
+     * Get file stats on a given file
+     * @param params the resourceUri and if a file or a directory is requested
+     */
+    getFileStats(params: StatsRequest): Promise<StatsRequestResult>
+
+    /**
+     * List the files of a directory
+     * @param resourceUri the Uri of the directory
+     */
+    listFiles(params: DirectoryListingRequest): Promise<DirectoryListingRequestResult>
+
+}
+
+/**
+ * Defines the APT for a file system endpoint
+ */
+export interface FileSystemEndpoint extends FileSystemCapabilities {
+
+    /**
+     * Whatever can't be handled in the constructor should be done here
+     */
+    init?(): void;
+
+    /**
+     * Set an optional logger
+     * @param logger the logger implemenation
+     */
+    setLogger?(logger: Logger): void;
+
+    /**
+     * Get the type of the client
+     */
+    getEndpointType(): EndpointType;
+
+    /**
+     * Provide info about the file system
+     */
+    getFileSystemInfo(): string;
+
+    /**
+     * Signal readiness
+     */
+    ready?(): void;
+}

package/src/fs/endpoints/defaultEndpoint.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 { Logger } from 'monaco-languageclient/tools';
+import { DirectoryListingRequest, DirectoryListingRequestResult, EndpointType, FileReadRequest, FileReadRequestResult, FileSystemEndpoint, FileUpdate, FileUpdateResult, StatsRequest, StatsRequestResult } from '../definitions.js';
+
+export class EmptyFileSystemEndpoint implements FileSystemEndpoint {
+
+    private endpointType: EndpointType;
+    private logger?: Logger;
+
+    constructor(endpointType: EndpointType) {
+        this.endpointType = endpointType;
+    }
+
+    init(): void { }
+
+    getFileSystemInfo(): string {
+        return 'This file system performs no operations.';
+    }
+
+    setLogger(logger: Logger): void {
+        this.logger = logger;
+    }
+
+    getEndpointType(): EndpointType {
+        return this.endpointType;
+    }
+
+    readFile(params: FileReadRequest): Promise<FileReadRequestResult> {
+        this.logger?.info(`Reading file: ${params.resourceUri}`);
+        return Promise.resolve({
+            status: 'denied',
+            content: ''
+        });
+    }
+
+    writeFile(params: FileUpdate): Promise<FileUpdateResult> {
+        this.logger?.info(`Writing file: ${params.resourceUri}`);
+        return Promise.resolve({ status: 'denied' });
+    }
+
+    syncFile(params: FileUpdate): Promise<FileUpdateResult> {
+        this.logger?.info(`Syncing file: ${params.resourceUri}`);
+        return Promise.resolve({ status: 'denied' });
+    }
+
+    getFileStats(params: StatsRequest): Promise<StatsRequestResult> {
+        this.logger?.info(`Getting file stats for: "${params.resourceUri}" (${params.type})`);
+        return Promise.reject('No stats available.');
+    }
+
+    listFiles(params: DirectoryListingRequest): Promise<DirectoryListingRequestResult> {
+        this.logger?.info(`Listing files for directory: "${params.directoryUri}"`);
+        return Promise.reject('No file listing possible.');
+    }
+
+}

package/src/fs/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 './definitions.js';
+export * from './endpoints/defaultEndpoint.js';

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';