monaco-languageclient-examples 2025.8.3 → 2025.8.4

package/dist/python/client/config.js

@@ -20,11 +20,10 @@ import getTestingServiceOverride from '@codingame/monaco-vscode-testing-service-
 import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override';
 import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override';
 import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override';
-import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
-import { MonacoLanguageClient } from 'monaco-languageclient';
-import { createUrl } from 'monaco-languageclient/tools';
-import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
+import { createUrl } from 'monaco-languageclient/common';
+import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscodeApiLocales';
+import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-languageclient/vscodeApiWrapper';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import * as vscode from 'vscode';
 import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
 import badPyCode from '../../../resources/python/bad.py?raw';
@@ -62,12 +61,12 @@ export const createDefaultConfigParams = (homeDir, htmlContainer) => {
     fileSystemProvider.registerFile(new RegisteredMemoryFile(files.get('hello.py').uri, helloPyCode));
     fileSystemProvider.registerFile(new RegisteredMemoryFile(files.get('hello2.py').uri, hello2PyCode));
     fileSystemProvider.registerFile(new RegisteredMemoryFile(files.get('bad.py').uri, badPyCode));
-    fileSystemProvider.registerFile(new RegisteredMemoryFile(configParams.workspaceFile, createDefaultWorkspaceContent(configParams.workspaceRoot)));
+    fileSystemProvider.registerFile(new RegisteredMemoryFile(configParams.workspaceFile, createDefaultWorkspaceContent(workspaceRoot)));
     fileSystemProvider.registerFile(createDebugLaunchConfigFile(workspaceRoot, configParams.languageId));
     registerFileSystemOverlay(1, fileSystemProvider);
     return configParams;
 };
-export const createWrapperConfig = () => {
+export const createPythonAppConfig = () => {
     const configParams = createDefaultConfigParams('/home/mlc', document.body);
     const url = createUrl({
         secured: false,
@@ -82,101 +81,65 @@ export const createWrapperConfig = () => {
     const iWebSocket = toSocket(webSocket);
     const reader = new WebSocketMessageReader(iWebSocket);
     const writer = new WebSocketMessageWriter(iWebSocket);
-    const wrapperConfig = {
+    const vscodeApiConfig = {
         $type: 'extended',
         htmlContainer: configParams.htmlContainer,
         logLevel: LogLevel.Debug,
-        languageClientConfigs: {
-            configs: {
-                python: {
-                    name: 'Python Language Server Example',
-                    connection: {
-                        options: {
-                            $type: 'WebSocketDirect',
-                            webSocket: webSocket,
-                            startOptions: {
-                                onCall: (languageClient) => {
-                                    setTimeout(() => {
-                                        ['pyright.restartserver', 'pyright.organizeimports'].forEach((cmdName) => {
-                                            vscode.commands.registerCommand(cmdName, (...args) => {
-                                                languageClient?.sendRequest('workspace/executeCommand', { command: cmdName, arguments: args });
-                                            });
-                                        });
-                                    }, 250);
-                                },
-                                reportStatus: true,
-                            }
-                        },
-                        messageTransports: { reader, writer }
-                    },
-                    clientOptions: {
-                        documentSelector: [configParams.languageId],
-                        workspaceFolder: {
-                            index: 0,
-                            name: configParams.workspaceRoot,
-                            uri: vscode.Uri.parse(configParams.workspaceRoot)
-                        },
-                    }
-                }
-            }
+        serviceOverrides: {
+            ...getKeybindingsServiceOverride(),
+            ...getLifecycleServiceOverride(),
+            ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
+            ...getBannerServiceOverride(),
+            ...getStatusBarServiceOverride(),
+            ...getTitleBarServiceOverride(),
+            ...getExplorerServiceOverride(),
+            ...getRemoteAgentServiceOverride(),
+            ...getEnvironmentServiceOverride(),
+            ...getSecretStorageServiceOverride(),
+            ...getStorageServiceOverride(),
+            ...getSearchServiceOverride(),
+            ...getDebugServiceOverride(),
+            ...getTestingServiceOverride(),
+            ...getPreferencesServiceOverride()
         },
-        vscodeApiConfig: {
-            serviceOverrides: {
-                ...getKeybindingsServiceOverride(),
-                ...getLifecycleServiceOverride(),
-                ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
-                ...getBannerServiceOverride(),
-                ...getStatusBarServiceOverride(),
-                ...getTitleBarServiceOverride(),
-                ...getExplorerServiceOverride(),
-                ...getRemoteAgentServiceOverride(),
-                ...getEnvironmentServiceOverride(),
-                ...getSecretStorageServiceOverride(),
-                ...getStorageServiceOverride(),
-                ...getSearchServiceOverride(),
-                ...getDebugServiceOverride(),
-                ...getTestingServiceOverride(),
-                ...getPreferencesServiceOverride()
-            },
-            viewsConfig: {
-                viewServiceType: 'ViewsService',
-                htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
-                viewsInitFunc: defaultViewsInit
-            },
-            userConfiguration: {
-                json: JSON.stringify({
-                    'workbench.colorTheme': 'Default Dark Modern',
-                    'editor.guides.bracketPairsHorizontal': 'active',
-                    'editor.wordBasedSuggestions': 'off',
-                    'editor.experimental.asyncTokenization': true,
-                    'debug.toolBarLocation': 'docked'
-                })
+        viewsConfig: {
+            viewServiceType: 'ViewsService',
+            htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
+            viewsInitFunc: defaultViewsInit
+        },
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'editor.guides.bracketPairsHorizontal': 'active',
+                'editor.wordBasedSuggestions': 'off',
+                'editor.experimental.asyncTokenization': true,
+                'debug.toolBarLocation': 'docked'
+            })
+        },
+        workspaceConfig: {
+            enableWorkspaceTrust: true,
+            windowIndicator: {
+                label: 'mlc-python-example',
+                tooltip: '',
+                command: ''
             },
-            workspaceConfig: {
-                enableWorkspaceTrust: true,
-                windowIndicator: {
-                    label: 'mlc-python-example',
-                    tooltip: '',
-                    command: ''
-                },
-                workspaceProvider: {
-                    trusted: true,
-                    async open() {
-                        window.open(window.location.href);
-                        return true;
-                    },
-                    workspace: {
-                        workspaceUri: configParams.workspaceFile
-                    }
+            workspaceProvider: {
+                trusted: true,
+                async open() {
+                    window.open(window.location.href);
+                    return true;
                 },
-                configurationDefaults: {
-                    'window.title': 'mlc-python-example${separator}${dirty}${activeEditorShort}'
-                },
-                productConfiguration: {
-                    nameShort: 'mlc-python-example',
-                    nameLong: 'mlc-python-example'
+                workspace: {
+                    workspaceUri: configParams.workspaceFile
                 }
             },
+            configurationDefaults: {
+                'window.title': 'mlc-python-example${separator}${dirty}${activeEditorShort}'
+            },
+            productConfiguration: {
+                nameShort: 'mlc-python-example',
+                nameLong: 'mlc-python-example'
+            }
         },
         extensions: [
             {
@@ -191,12 +154,45 @@ export const createWrapperConfig = () => {
             },
             provideDebuggerExtensionConfig(configParams)
         ],
-        editorAppConfig: {
-            monacoWorkerFactory: configureDefaultWorkerFactory
+        monacoWorkerFactory: configureDefaultWorkerFactory
+    };
+    const languageClientConfig = {
+        name: 'Python Language Server Example',
+        connection: {
+            options: {
+                $type: 'WebSocketDirect',
+                webSocket: webSocket,
+                startOptions: {
+                    onCall: (languageClient) => {
+                        setTimeout(() => {
+                            ['pyright.restartserver', 'pyright.organizeimports'].forEach((cmdName) => {
+                                vscode.commands.registerCommand(cmdName, (...args) => {
+                                    languageClient?.sendRequest('workspace/executeCommand', { command: cmdName, arguments: args });
+                                });
+                            });
+                        }, 250);
+                    },
+                    reportStatus: true,
+                }
+            },
+            messageTransports: { reader, writer }
+        },
+        clientOptions: {
+            documentSelector: [configParams.languageId],
+            workspaceFolder: {
+                index: 0,
+                name: configParams.workspaceRoot,
+                uri: vscode.Uri.parse(configParams.workspaceRoot)
+            },
         }
     };
+    const editorAppConfig = {
+        $type: vscodeApiConfig.$type
+    };
     return {
-        wrapperConfig,
+        vscodeApiConfig,
+        languageClientConfig,
+        editorAppConfig,
         configParams: configParams
     };
 };

package/dist/python/client/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/python/client/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/python/client/config.ts"],"names":[],"mappings":"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"}

package/dist/python/client/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,gBAAgB,qBAsB5B,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,gBAAgB,qBA6B5B,CAAC"}

package/dist/python/client/main.js

@@ -2,28 +2,34 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import * as vscode from 'vscode';
 import {} from '@codingame/monaco-vscode-api/extensions';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
-import { createWrapperConfig } from './config.js';
+import { EditorApp } from 'monaco-languageclient/editorApp';
+import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import * as vscode from 'vscode';
 import { configureDebugging } from '../../debugger/client/debugger.js';
+import { createPythonAppConfig } from './config.js';
 export const runPythonWrapper = async () => {
-    const appConfig = createWrapperConfig();
-    const wrapper = new MonacoEditorLanguageClientWrapper();
-    if (wrapper.isStarted()) {
+    const appConfig = createPythonAppConfig();
+    // perform global init
+    const apiWrapper = new MonacoVscodeApiWrapper(appConfig.vscodeApiConfig);
+    await apiWrapper.init();
+    const lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);
+    const editorApp = new EditorApp(appConfig.editorAppConfig);
+    if (editorApp.isStarted()) {
         console.warn('Editor was already started!');
     }
     else {
-        await wrapper.init(appConfig.wrapperConfig);
-        const result = wrapper.getExtensionRegisterResult('mlc-python-example');
+        const result = apiWrapper.getExtensionRegisterResult('mlc-python-example');
         result.setAsDefaultApi();
-        const initResult = wrapper.getExtensionRegisterResult('debugger-py-client');
+        const initResult = apiWrapper.getExtensionRegisterResult('debugger-py-client');
         if (initResult !== undefined) {
             configureDebugging(await initResult.getApi(), appConfig.configParams);
         }
+        await lcWrapper.start();
         await vscode.commands.executeCommand('workbench.view.explorer');
         await vscode.window.showTextDocument(appConfig.configParams.files.get('hello2.py').uri);
-        await wrapper.start();
+        await editorApp.start(appConfig.vscodeApiConfig.htmlContainer);
     }
 };
 //# sourceMappingURL=main.js.map

package/dist/python/client/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAA4C,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACvC,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;IAExD,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACJ,MAAM,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAE5C,MAAM,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;QAC/G,MAAM,CAAC,eAAe,EAAE,CAAC;QAEzB,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,oBAAoB,CAAoD,CAAC;QAC/H,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,kBAAkB,CAAC,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,GAAG,CAAC,CAAC;QAEzF,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAA4C,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACvC,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;IAE1C,sBAAsB;IACtB,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IACzE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAExB,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAE3D,IAAI,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACJ,MAAM,MAAM,GAAG,UAAU,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;QAClH,MAAM,CAAC,eAAe,EAAE,CAAC;QAEzB,MAAM,UAAU,GAAG,UAAU,CAAC,0BAA0B,CAAC,oBAAoB,CAAoD,CAAC;QAClI,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,kBAAkB,CAAC,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QAExB,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,GAAG,CAAC,CAAC;QAEzF,MAAM,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,aAAc,CAAC,CAAC;IACpE,CAAC;AACL,CAAC,CAAC"}

package/dist/python/client/reactPython.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reactPython.d.ts","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAcA,eAAO,MAAM,cAAc,qBAgC1B,CAAC"}
+{"version":3,"file":"reactPython.d.ts","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAcA,eAAO,MAAM,cAAc,qBAiC1B,CAAC"}

package/dist/python/client/reactPython.js

@@ -2,20 +2,19 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
 * ------------------------------------------------------------------------------------------ */
-import * as vscode from 'vscode';
 import {} from '@codingame/monaco-vscode-api/extensions';
+import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
-import { createWrapperConfig } from './config.js';
+import * as vscode from 'vscode';
 import { configureDebugging } from '../../debugger/client/debugger.js';
+import { createPythonAppConfig } from './config.js';
 export const runPythonReact = async () => {
-    const appConfig = createWrapperConfig();
-    const onLoad = async (wrapper) => {
-        const result = wrapper.getExtensionRegisterResult('mlc-python-example');
+    const appConfig = createPythonAppConfig();
+    const onVscodeApiInitDone = async (apiWrapper) => {
+        const result = apiWrapper.getExtensionRegisterResult('mlc-python-example');
         result.setAsDefaultApi();
-        const initResult = wrapper.getExtensionRegisterResult('debugger-py-client');
+        const initResult = apiWrapper.getExtensionRegisterResult('debugger-py-client');
         if (initResult !== undefined) {
             configureDebugging(await initResult.getApi(), appConfig.configParams);
         }
@@ -25,7 +24,7 @@ export const runPythonReact = async () => {
     const root = ReactDOM.createRoot(document.getElementById('react-root'));
     const App = () => {
         return (React.createElement("div", { style: { 'backgroundColor': '#1f1f1f' } },
-            React.createElement(MonacoEditorReactComp, { wrapperConfig: appConfig.wrapperConfig, style: { 'height': '100%' }, onLoad: onLoad, onError: (e) => {
+            React.createElement(MonacoEditorReactComp, { vscodeApiConfig: appConfig.vscodeApiConfig, editorAppConfig: appConfig.editorAppConfig, style: { 'height': '100%' }, onVscodeApiInitDone: onVscodeApiInitDone, onError: (e) => {
                     console.error(e);
                 } })));
     };

package/dist/python/client/reactPython.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactPython.js","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAA4C,MAAM,yCAAyC,CAAC;AACnG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAG,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;IACrC,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IAExC,MAAM,MAAM,GAAG,KAAK,EAAE,OAA0C,EAAE,EAAE;QAChE,MAAM,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;QAC/G,MAAM,CAAC,eAAe,EAAE,CAAC;QAEzB,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,oBAAoB,CAAoD,CAAC;QAC/H,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,kBAAkB,CAAC,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,GAAG,CAAC,CAAC;IAC7F,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IAEzE,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;YACxC,oBAAC,qBAAqB,IAClB,aAAa,EAAE,SAAS,CAAC,aAAa,EACtC,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAC3B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,GAAI,CACP,CACT,CAAC;IACN,CAAC,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,oBAAC,GAAG,OAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
+{"version":3,"file":"reactPython.js","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAA4C,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;IACrC,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;IAE1C,MAAM,mBAAmB,GAAG,KAAK,EAAE,UAAkC,EAAE,EAAE;QACrE,MAAM,MAAM,GAAG,UAAU,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;QAClH,MAAM,CAAC,eAAe,EAAE,CAAC;QAEzB,MAAM,UAAU,GAAG,UAAU,CAAC,0BAA0B,CAAC,oBAAoB,CAAoD,CAAC;QAClI,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,kBAAkB,CAAC,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,GAAG,CAAC,CAAC;IAC7F,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IAEzE,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;YACxC,oBAAC,qBAAqB,IAClB,eAAe,EAAE,SAAS,CAAC,eAAe,EAC1C,eAAe,EAAE,SAAS,CAAC,eAAe,EAC1C,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAC3B,mBAAmB,EAAE,mBAAmB,EACxC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,GAAI,CACP,CACT,CAAC;IACN,CAAC,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,oBAAC,GAAG,OAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}

package/dist/ts/wrapperTs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperTs.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"AAOA,OAAO,uDAAuD,CAAC;AAC/D,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAMjF,eAAO,MAAM,YAAY,qBAwGxB,CAAC"}
+{"version":3,"file":"wrapperTs.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"AAMA,OAAO,uDAAuD,CAAC;AAE/D,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAOjF,eAAO,MAAM,YAAY,qBA8GxB,CAAC"}

package/dist/ts/wrapperTs.js

@@ -2,14 +2,15 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import * as vscode from 'vscode';
-import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import '@codingame/monaco-vscode-javascript-default-extension';
+import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
-import { LogLevel } from '@codingame/monaco-vscode-api';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
+import { EditorApp } from 'monaco-languageclient/editorApp';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
+import * as vscode from 'vscode';
 import { disableElement } from '../common/client/utils.js';
 export const runTsWrapper = async () => {
     const codeUri = '/workspace/hello.ts';
@@ -20,59 +21,63 @@ export const runTsWrapper = async () => {
     const codeOriginal = `function sayGoodbye(): string {
     return "Goodbye";
 };`;
-    const wrapperConfig = {
+    const htmlContainer = document.getElementById('monaco-editor-root');
+    const vscodeApiConfig = {
         $type: 'extended',
-        htmlContainer: document.getElementById('monaco-editor-root'),
+        htmlContainer,
         logLevel: LogLevel.Debug,
-        vscodeApiConfig: {
-            serviceOverrides: {
-                ...getKeybindingsServiceOverride()
-            },
+        serviceOverrides: {
+            ...getKeybindingsServiceOverride()
+        },
+        advanced: {
             enableExtHostWorker: true,
-            userConfiguration: {
-                json: JSON.stringify({
-                    'workbench.colorTheme': 'Default Dark Modern',
-                    'typescript.tsserver.web.projectWideIntellisense.enabled': true,
-                    'typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors': false,
-                    'diffEditor.renderSideBySide': false,
-                    'editor.lightbulb.enabled': 'on',
-                    'editor.glyphMargin': true,
-                    'editor.guides.bracketPairsHorizontal': true,
-                    'editor.experimental.asyncTokenization': true
-                })
-            }
         },
-        editorAppConfig: {
-            codeResources: {
-                modified: {
-                    text: code,
-                    uri: codeUri
-                },
-                original: {
-                    text: codeOriginal,
-                    uri: codeOriginalUri,
-                }
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'typescript.tsserver.web.projectWideIntellisense.enabled': true,
+                'typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors': false,
+                'diffEditor.renderSideBySide': false,
+                'editor.lightbulb.enabled': 'on',
+                'editor.glyphMargin': true,
+                'editor.guides.bracketPairsHorizontal': true,
+                'editor.experimental.asyncTokenization': true
+            })
+        },
+        monacoWorkerFactory: configureDefaultWorkerFactory
+    };
+    const editorAppConfig = {
+        $type: vscodeApiConfig.$type,
+        codeResources: {
+            modified: {
+                text: code,
+                uri: codeUri
             },
-            monacoWorkerFactory: configureDefaultWorkerFactory
+            original: {
+                text: codeOriginal,
+                uri: codeOriginalUri,
+            }
         }
     };
-    const wrapper = new MonacoEditorLanguageClientWrapper();
+    const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
+    await apiWrapper.init();
+    const editorApp = new EditorApp(editorAppConfig);
     disableElement('button-swap-code', true);
     try {
         document.querySelector('#button-start')?.addEventListener('click', async () => {
-            await wrapper.initAndStart(wrapperConfig);
+            await editorApp.start(htmlContainer);
             vscode.commands.getCommands().then((x) => {
                 console.log(`Found ${x.length} commands`);
                 const finding = x.find((elem) => elem === 'actions.find');
                 console.log(`Found command: ${finding}`);
             });
-            wrapper.getEditor()?.focus();
+            editorApp.getEditor()?.focus();
             await vscode.commands.executeCommand('actions.find');
         });
         document.querySelector('#button-swap-code')?.addEventListener('click', () => {
-            const codeResources = wrapper.getEditorApp()?.getConfig().codeResources;
+            const codeResources = editorApp.getConfig().codeResources;
             if (codeResources?.modified?.uri === codeUri) {
-                wrapper.updateCodeResources({
+                editorApp.updateCodeResources({
                     modified: {
                         text: codeOriginal,
                         uri: codeOriginalUri
@@ -84,7 +89,7 @@ export const runTsWrapper = async () => {
                 });
             }
             else {
-                wrapper.updateCodeResources({
+                editorApp.updateCodeResources({
                     modified: {
                         text: code,
                         uri: codeUri
@@ -98,13 +103,13 @@ export const runTsWrapper = async () => {
         });
         document.querySelector('#button-diff')?.addEventListener('click', async () => {
             // ensure it is boolean value and not undefined
-            const useDiffEditor = wrapperConfig.editorAppConfig.useDiffEditor ?? false;
-            wrapperConfig.editorAppConfig.useDiffEditor = !useDiffEditor;
-            disableElement('button-swap-code', !wrapperConfig.editorAppConfig.useDiffEditor);
-            await wrapper.initAndStart(wrapperConfig);
+            const useDiffEditor = editorAppConfig.useDiffEditor ?? false;
+            editorAppConfig.useDiffEditor = !useDiffEditor;
+            disableElement('button-swap-code', !editorAppConfig.useDiffEditor);
+            await editorApp.start(htmlContainer);
         });
         document.querySelector('#button-dispose')?.addEventListener('click', async () => {
-            await wrapper.dispose();
+            await editorApp.dispose();
         });
     }
     catch (e) {

package/dist/ts/wrapperTs.js.map

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

package/json.html

@@ -17,7 +17,7 @@
     </div>
     <div id="monaco-editor-root" style="height: 80vh;"></div>
     <script type="module">
-        import { runJsonWrapper } from './src/json/client/wrapperWs.ts';
+        import { runJsonWrapper } from './src/json/client/client.ts';
 
         runJsonWrapper();
     </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "2025.8.3",
+  "version": "2025.8.4",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -113,13 +113,12 @@
     "@codingame/monaco-vscode-typescript-language-features-default-extension": "~20.2.1",
     "@codingame/monaco-vscode-views-service-override": "~20.2.1",
     "@codingame/monaco-vscode-outline-service-override": "~20.2.1",
-    "@typefox/monaco-editor-react": "~6.12.0",
-    "cors": "^2.8.5",
+    "@typefox/monaco-editor-react": "~7.0.0-next.1",
+    "cors": "~2.8.5",
     "express": "~5.1.0",
     "jszip": "~3.10.1",
     "langium": "~4.0.0",
-    "monaco-editor-wrapper": "~6.12.0",
-    "monaco-languageclient": "~9.11.0",
+    "monaco-languageclient": "~10.0.0-next.1",
     "pyright": "~1.1.404",
     "react": "~19.1.1",
     "react-dom": "~19.1.1",
@@ -134,7 +133,7 @@
     "wtd-core": "~4.0.1"
   },
   "devDependencies": {
-    "@types/cors": "^2.8.19",
+    "@types/cors": "~2.8.19",
     "@types/emscripten": "~1.40.1",
     "@types/express": "~5.0.3",
     "@types/ws": "~8.18.1",

package/src/appPlayground/common.ts

@@ -5,11 +5,11 @@
 
 import * as vscode from 'vscode';
 import type { RegisterLocalProcessExtensionResult } from '@codingame/monaco-vscode-api/extensions';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
 import type { ConfigResult } from './config.js';
+import type { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 
-export const configurePostStart = async (wrapper: MonacoEditorLanguageClientWrapper, configResult: ConfigResult) => {
-    const result = wrapper.getExtensionRegisterResult('mlc-app-playground') as RegisterLocalProcessExtensionResult;
+export const configurePostStart = async (apiWrapper: MonacoVscodeApiWrapper, configResult: ConfigResult) => {
+    const result = apiWrapper.getExtensionRegisterResult('mlc-app-playground') as RegisterLocalProcessExtensionResult;
     result.setAsDefaultApi();
 
     // WA: Force show explorer and not search