monaco-languageclient 7.3.0 → 8.0.0-next.2

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this npm module are documented in this file.
 
-## [7.3.0] - 2024-01-03
+## [8.0.0] - 2024-03-0x
+
+- WIP: Repository now includes `monaco-editor-wrapper` and `@typefox/monaco-editor-react`
+- Updated to `@codingame/monaco-vscode-api@2.0.1`. This ensures amoung other things proper sematic versioning
+  - Details
+
+## [7.3.0] - 2024-01-04
 
 - Updated to `@codingame/monaco-vscode-api@1.85.0` and `@codingame/monaco-editor-treemende@1.85.0` / `monaco-editor@0.45.0`
 

package/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io)
+Copyright (c) 2018-2024 TypeFox GmbH (http://www.typefox.io)
 
 All rights reserved.
 

package/lib/index.d.ts

@@ -1,5 +1,24 @@
-export type { IConnectionProvider, MonacoLanguageClientOptions } from './monaco-language-client.js';
-export * from './monaco-language-client.js';
-export type { InitializeServiceConfig, MonacoEnvironmentEnhanced } from './monaco-vscode-api-services.js';
-export * from './monaco-vscode-api-services.js';
+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>;
+}
+/**
+ * monaco-languageclient requires the following services in addition to the default services monaco-vscode-api provides:
+ *   - languages
+ *   - model
+ */
+export declare const supplyRequiredServices: () => {
+    [x: string]: any;
+};
 //# 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,YAAY,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACpG,cAAc,6BAA6B,CAAC;AAC5C,YAAY,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAC1G,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,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;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;CAKlC,CAAC"}

package/lib/index.js

@@ -1,7 +1,29 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
+ * Copyright (c) 2024 TypeFox GmbH (http://www.typefox.io). All rights reserved.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
-export * from './monaco-language-client.js';
-export * from './monaco-vscode-api-services.js';
+import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
+import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
+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);
+    }
+}
+/**
+ * monaco-languageclient requires the following services in addition to the default services monaco-vscode-api provides:
+ *   - languages
+ *   - model
+ */
+export const supplyRequiredServices = () => {
+    return {
+        ...getLanguagesServiceOverride(),
+        ...getModelServiceOverride()
+    };
+};
 //# 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;AAGhG,cAAc,6BAA6B,CAAC;AAE5C,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AACtF,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;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACvC,OAAO;QACH,GAAG,2BAA2B,EAAE;QAChC,GAAG,uBAAuB,EAAE;KAC/B,CAAC;AACN,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "7.3.0",
+  "version": "8.0.0-next.2",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -37,8 +37,8 @@
     "npm": ">=9.0.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.1",
+    "npm": "10.2.4"
   },
   "files": [
     "lib",
@@ -48,33 +48,26 @@
     "License.txt"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-editor-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-languages-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-model-service-override": "~1.85.0",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0",
+    "@codingame/monaco-vscode-languages-service-override": "~3.0.0",
+    "@codingame/monaco-vscode-model-service-override": "~3.0.0",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
-    "monaco-editor": "0.45.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "@codingame/monaco-vscode-api": "~3.0.0",
+    "@codingame/monaco-vscode-editor-api": "~3.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~3.0.0"
   },
   "peerDependenciesMeta": {
-    "monaco-editor": {
+    "@codingame/monaco-vscode-api": {
+      "optional": false
+    },
+    "@codingame/monaco-vscode-editor-api": {
       "optional": false
     },
     "vscode": {
       "optional": false
     }
   },
-  "overrides": {
-    "monaco-editor": "$monaco-editor",
-    "vscode": "$vscode"
-  },
-  "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
-  },
   "scripts": {
     "clean": "shx rm -fr lib *.tsbuildinfo",
     "compile": "tsc --build tsconfig.src.json",

package/src/index.ts

@@ -1,9 +1,44 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
+ * Copyright (c) 2024 TypeFox GmbH (http://www.typefox.io). All rights reserved.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-export type { IConnectionProvider, MonacoLanguageClientOptions } from './monaco-language-client.js';
-export * from './monaco-language-client.js';
-export type { InitializeServiceConfig, MonacoEnvironmentEnhanced } from './monaco-vscode-api-services.js';
-export * from './monaco-vscode-api-services.js';
+import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
+import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
+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);
+    }
+}
+
+/**
+ * monaco-languageclient requires the following services in addition to the default services monaco-vscode-api provides:
+ *   - languages
+ *   - model
+ */
+export const supplyRequiredServices = () => {
+    return {
+        ...getLanguagesServiceOverride(),
+        ...getModelServiceOverride()
+    };
+};

package/lib/monaco-language-client.d.ts

@@ -1,16 +0,0 @@
-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>;
-}
-//# sourceMappingURL=monaco-language-client.d.ts.map

package/lib/monaco-language-client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monaco-language-client.d.ts","sourceRoot":"","sources":["../src/monaco-language-client.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"}

package/lib/monaco-language-client.js

@@ -1,16 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
- * Licensed under the MIT License. See License.txt in the project 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);
-    }
-}
-//# sourceMappingURL=monaco-language-client.js.map

package/lib/monaco-language-client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"monaco-language-client.js","sourceRoot":"","sources":["../src/monaco-language-client.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"}

package/lib/monaco-vscode-api-services.d.ts

@@ -1,31 +0,0 @@
-import { editor, Environment } from 'monaco-editor';
-import { IWorkbenchConstructionOptions } from 'vscode/services';
-import 'vscode/localExtensionHost';
-import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
-export interface MonacoEnvironmentEnhanced extends Environment {
-    vscodeApiInitialised: boolean;
-}
-export type InitializeServiceConfig = {
-    userServices?: editor.IEditorOverrideServices;
-    debugLogging?: boolean;
-    workspaceConfig?: IWorkbenchConstructionOptions;
-};
-export declare const wasVscodeApiInitialized: () => boolean;
-export declare const initServices: (config?: InitializeServiceConfig) => Promise<void>;
-export declare const useOpenEditorStub: OpenEditor;
-export declare const reportServiceLoading: (services: editor.IEditorOverrideServices, debugLogging: boolean) => void;
-export declare const mergeServices: (services: editor.IEditorOverrideServices, overrideServices: editor.IEditorOverrideServices) => void;
-/**
- * monaco-vscode-api automatically loads the following services:
- *  - layout
- *  - environment
- *  - extension
- *  - files
- *  - quickAccess
- *
- * monaco-languageclient always adds the following services:
- *   - languages
- *   - model
- */
-export declare const importAllServices: (config?: InitializeServiceConfig) => Promise<void>;
-//# sourceMappingURL=monaco-vscode-api-services.d.ts.map

package/lib/monaco-vscode-api-services.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"monaco-vscode-api-services.d.ts","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAA2B,6BAA6B,EAAsB,MAAM,iBAAiB,CAAC;AAC7G,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAI9E,MAAM,WAAW,yBAA0B,SAAQ,WAAW;IAC1D,oBAAoB,EAAE,OAAO,CAAC;CACjC;AAED,MAAM,MAAM,uBAAuB,GAAG;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC,uBAAuB,CAAC;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACnD,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAEnC,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,uBAAuB,kBAelE,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAG/B,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,OAAO,uBAAuB,gBAAgB,OAAO,SAMnG,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,OAAO,uBAAuB,oBAAoB,OAAO,uBAAuB,SAIvH,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,YAAmB,uBAAuB,kBA+BvE,CAAC"}

package/lib/monaco-vscode-api-services.js

@@ -1,84 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- * ------------------------------------------------------------------------------------------ */
-import { ILogService, initialize, StandaloneServices } from 'vscode/services';
-import 'vscode/localExtensionHost';
-import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
-import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
-export const wasVscodeApiInitialized = () => {
-    return window.MonacoEnvironment?.vscodeApiInitialised === true;
-};
-export const initServices = async (config) => {
-    if (!wasVscodeApiInitialized()) {
-        await importAllServices(config);
-        if (config?.debugLogging === true) {
-            console.log('Initialization of vscode services completed successfully.');
-        }
-        if (!window.MonacoEnvironment) {
-            window.MonacoEnvironment = {};
-        }
-        window.MonacoEnvironment.vscodeApiInitialised = true;
-    }
-    else {
-        if (config?.debugLogging === true) {
-            console.log('Initialization of vscode services can only performed once!');
-        }
-    }
-};
-export const useOpenEditorStub = async (modelRef, options, sideBySide) => {
-    console.log('Received open editor call with parameters: ', modelRef, options, sideBySide);
-    return undefined;
-};
-export const reportServiceLoading = (services, debugLogging) => {
-    for (const serviceName of Object.keys(services)) {
-        if (debugLogging) {
-            console.log(`Loading service: ${serviceName}`);
-        }
-    }
-};
-export const mergeServices = (services, overrideServices) => {
-    for (const [name, service] of Object.entries(services)) {
-        overrideServices[name] = service;
-    }
-};
-/**
- * monaco-vscode-api automatically loads the following services:
- *  - layout
- *  - environment
- *  - extension
- *  - files
- *  - quickAccess
- *
- * monaco-languageclient always adds the following services:
- *   - languages
- *   - model
- */
-export const importAllServices = async (config) => {
-    const lc = config ?? {};
-    const userServices = lc.userServices ?? {};
-    const mlcDefautServices = {
-        ...getLanguagesServiceOverride(),
-        ...getModelServiceOverride()
-    };
-    mergeServices(mlcDefautServices, userServices);
-    reportServiceLoading(userServices, lc.debugLogging === true);
-    const haveThemeService = Object.keys(userServices).includes('themeService');
-    const haveTextmateService = Object.keys(userServices).includes('textMateTokenizationFeature');
-    const haveMarkersService = Object.keys(userServices).includes('markersService');
-    const haveViewsService = Object.keys(userServices).includes('viewsService');
-    // theme requires textmate
-    if (haveThemeService && !haveTextmateService) {
-        throw new Error('"theme" service requires "textmate" service. Please add it to the "userServices".');
-    }
-    // markers service requires views service
-    if (haveMarkersService && !haveViewsService) {
-        throw new Error('"markers" service requires "views" service. Please add it to the "userServices".');
-    }
-    await initialize(userServices);
-    const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
-    if (logLevel) {
-        StandaloneServices.get(ILogService).setLevel(logLevel);
-    }
-};
-//# sourceMappingURL=monaco-vscode-api-services.js.map

package/lib/monaco-vscode-api-services.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"monaco-vscode-api-services.js","sourceRoot":"","sources":["../src/monaco-vscode-api-services.ts"],"names":[],"mappings":"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"}

package/src/monaco-language-client.ts

@@ -1,30 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
- * Licensed under the MIT License. See License.txt in the project 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);
-    }
-}

package/src/monaco-vscode-api-services.ts

@@ -1,106 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- * ------------------------------------------------------------------------------------------ */
-
-import { editor, Environment } from 'monaco-editor';
-import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services';
-import 'vscode/localExtensionHost';
-import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
-import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
-import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
-
-export interface MonacoEnvironmentEnhanced extends Environment {
-    vscodeApiInitialised: boolean;
-}
-
-export type InitializeServiceConfig = {
-    userServices?: editor.IEditorOverrideServices;
-    debugLogging?: boolean;
-    workspaceConfig?: IWorkbenchConstructionOptions;
-};
-
-export const wasVscodeApiInitialized = () => {
-    return (window.MonacoEnvironment as MonacoEnvironmentEnhanced)?.vscodeApiInitialised === true;
-};
-
-export const initServices = async (config?: InitializeServiceConfig) => {
-    if (!wasVscodeApiInitialized()) {
-        await importAllServices(config);
-        if (config?.debugLogging === true) {
-            console.log('Initialization of vscode services completed successfully.');
-        }
-        if (!window.MonacoEnvironment) {
-            window.MonacoEnvironment = {};
-        }
-        (window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true;
-    } else {
-        if (config?.debugLogging === true) {
-            console.log('Initialization of vscode services can only performed once!');
-        }
-    }
-};
-
-export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySide) => {
-    console.log('Received open editor call with parameters: ', modelRef, options, sideBySide);
-    return undefined;
-};
-
-export const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean) => {
-    for (const serviceName of Object.keys(services)) {
-        if (debugLogging) {
-            console.log(`Loading service: ${serviceName}`);
-        }
-    }
-};
-
-export const mergeServices = (services: editor.IEditorOverrideServices, overrideServices: editor.IEditorOverrideServices) => {
-    for (const [name, service] of Object.entries(services)) {
-        overrideServices[name] = service;
-    }
-};
-
-/**
- * monaco-vscode-api automatically loads the following services:
- *  - layout
- *  - environment
- *  - extension
- *  - files
- *  - quickAccess
- *
- * monaco-languageclient always adds the following services:
- *   - languages
- *   - model
- */
-export const importAllServices = async (config?: InitializeServiceConfig) => {
-    const lc: InitializeServiceConfig = config ?? {};
-    const userServices: editor.IEditorOverrideServices = lc.userServices ?? {};
-
-    const mlcDefautServices = {
-        ...getLanguagesServiceOverride(),
-        ...getModelServiceOverride()
-    };
-    mergeServices(mlcDefautServices, userServices);
-    reportServiceLoading(userServices, lc.debugLogging === true);
-
-    const haveThemeService = Object.keys(userServices).includes('themeService');
-    const haveTextmateService = Object.keys(userServices).includes('textMateTokenizationFeature');
-    const haveMarkersService = Object.keys(userServices).includes('markersService');
-    const haveViewsService = Object.keys(userServices).includes('viewsService');
-
-    // theme requires textmate
-    if (haveThemeService && !haveTextmateService) {
-        throw new Error('"theme" service requires "textmate" service. Please add it to the "userServices".');
-    }
-
-    // markers service requires views service
-    if (haveMarkersService && !haveViewsService) {
-        throw new Error('"markers" service requires "views" service. Please add it to the "userServices".');
-    }
-
-    await initialize(userServices);
-    const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
-    if (logLevel) {
-        StandaloneServices.get(ILogService).setLevel(logLevel);
-    }
-};