monaco-languageclient-examples 2025.8.5 → 2025.9.1-next.0

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [2025.9.1] - unreleased
+
+- Add outline to appPlayground example [#936](https://github.com/TypeFox/monaco-languageclient/pull/936).
+- Updated to `monaco-languageclient@10.0.0` and `@typefox/monaco-editor-react@7.0.0`.
+  - Align all examples with the API changes.
+  - Unify single editor extended examples (json, eclipse.jdt.ls, groovy)
+  - Transform bare example to become json classic example
+  - Remove Langium classic example.
+  - Update Langium example to Langium 4.0 supportign multiple files.
+- Updated all `@codingame/monaco-vscode` packages to `21.0.1`.
+
+## [2025.8.6] - 2025-08-22
+
+- Makes json-client independent of external resource files.
+
 ## [2025.8.5] - 2025-08-22
 
 - Fixed broken json-client sub-package export.

package/README.md

@@ -1,6 +1,5 @@
 # Monaco Language Client Examples
 
-[![Gitpod - Code Now](https://img.shields.io/badge/Gitpod-code%20now-blue.svg?longCache=true)](https://gitpod.io#https://github.com/TypeFox/monaco-languageclient)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?longCache=true)](https://github.com/TypeFox/monaco-languageclient/labels/help%20wanted)
 [![monaco-languageclient](https://github.com/TypeFox/monaco-languageclient/actions/workflows/actions.yml/badge.svg)](https://github.com/TypeFox/monaco-languageclient/actions/workflows/actions.yml)
 [![NPM Version](https://img.shields.io/npm/v/monaco-languageclient-examples.svg)](https://www.npmjs.com/package/monaco-languageclient-examples)

package/dist/appPlayground/config.d.ts

@@ -3,8 +3,8 @@ import '@codingame/monaco-vscode-search-result-default-extension';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
 import '../../resources/vsix/open-collaboration-tools.vsix';
-import { type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
 import type { EditorAppConfig } from 'monaco-languageclient/editorApp';
+import { type HtmlContainerConfig, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
 export type ConfigResult = {
     vscodeApiConfig: MonacoVscodeApiConfig;
     editorAppConfig: EditorAppConfig;
@@ -12,5 +12,5 @@ export type ConfigResult = {
     helloTsUri: vscode.Uri;
     testerTsUri: vscode.Uri;
 };
-export declare const configure: (htmlContainer?: HTMLElement) => Promise<ConfigResult>;
+export declare const configure: (htmlContainer: HtmlContainerConfig) => Promise<ConfigResult>;
 //# sourceMappingURL=config.d.ts.map

package/dist/appPlayground/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,0DAA0D,CAAC;AAClE,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAEjF,OAAO,oDAAoD,CAAC;AAE5D,OAAO,EAAyD,KAAK,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC3I,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAOvE,MAAM,MAAM,YAAY,GAAG;IACvB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAA;IAChC,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,gBAAgB,WAAW,KAAG,OAAO,CAAC,YAAY,CA6GjF,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,0DAA0D,CAAC;AAClE,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAEjF,OAAO,oDAAoD,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,EAAyD,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAMrK,MAAM,MAAM,YAAY,GAAG;IACvB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAA;IAChC,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,eAAe,mBAAmB,KAAG,OAAO,CAAC,YAAY,CA4GxF,CAAC"}

package/dist/appPlayground/config.js

@@ -23,8 +23,8 @@ import '@codingame/monaco-vscode-search-result-default-extension';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
 import '../../resources/vsix/open-collaboration-tools.vsix';
-import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-languageclient/vscodeApiWrapper';
 import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscodeApiLocales';
+import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-languageclient/vscodeApiWrapper';
 import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import helloTsCode from '../../resources/appPlayground/hello.ts?raw';
 import testerTsCode from '../../resources/appPlayground/tester.ts?raw';
@@ -34,7 +34,6 @@ export const configure = async (htmlContainer) => {
     const vscodeApiConfig = {
         $type: 'extended',
         logLevel: LogLevel.Debug,
-        htmlContainer,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
             ...getLifecycleServiceOverride(),
@@ -51,7 +50,8 @@ export const configure = async (htmlContainer) => {
             ...getOutlineServiceOverride()
         },
         viewsConfig: {
-            viewServiceType: 'ViewsService',
+            $type: 'ViewsService',
+            htmlContainer,
             htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
             viewsInitFunc: defaultViewsInit
         },
@@ -107,8 +107,7 @@ export const configure = async (htmlContainer) => {
         monacoWorkerFactory: configureDefaultWorkerFactory
     };
     const editorAppConfig = {
-        $type: vscodeApiConfig.$type,
-        id: 'AAP',
+        id: 'AAP'
     };
     const workspaceUri = vscode.Uri.file('/workspace');
     const helloTsUri = vscode.Uri.file('/workspace/hello.ts');

package/dist/appPlayground/config.js.map

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

package/dist/appPlayground/main.js

@@ -11,7 +11,7 @@ export const runApplicationPlayground = async () => {
     const configResult = await configure(document.body);
     // perform global init
     const apiWrapper = new MonacoVscodeApiWrapper(configResult.vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
     await configurePostStart(apiWrapper, configResult);
 };
 //# sourceMappingURL=main.js.map

package/dist/appPlayground/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IAC/C,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEpD,sBAAsB;IACtB,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAExB,MAAM,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AACvD,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IAC/C,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEpD,sBAAsB;IACtB,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;IAEzB,MAAM,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AACvD,CAAC,CAAC"}

package/dist/appPlayground/reactMain.js

@@ -8,7 +8,7 @@ import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
 import { configure } from './config.js';
 import { configurePostStart } from './common.js';
 export const runApplicationPlaygroundReact = async () => {
-    const configResult = await configure();
+    const configResult = await configure('ReactPlaceholder');
     const root = ReactDOM.createRoot(document.getElementById('react-root'));
     const App = () => {
         return (React.createElement("div", { style: { 'backgroundColor': '#1f1f1f' } },

package/dist/appPlayground/reactMain.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactMain.js","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,IAAI,EAAE;IAEpD,MAAM,YAAY,GAAG,MAAM,SAAS,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IACzE,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;YACxC,oBAAC,qBAAqB,IAClB,eAAe,EAAE,YAAY,CAAC,eAAe,EAC7C,eAAe,EAAE,YAAY,CAAC,eAAe,EAC7C,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;oBACtC,MAAM,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;gBACvD,CAAC,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":"reactMain.js","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,IAAI,EAAE;IAEpD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IACzE,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;YACxC,oBAAC,qBAAqB,IAClB,eAAe,EAAE,YAAY,CAAC,eAAe,EAC7C,eAAe,EAAE,YAAY,CAAC,eAAe,EAC7C,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;oBACtC,MAAM,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;gBACvD,CAAC,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"}

package/dist/browser/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAOA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAKzD,OAAO,+CAA+C,CAAC;AAKvD,eAAO,MAAM,gBAAgB,qBAmJ5B,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAOA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAKzD,OAAO,+CAA+C,CAAC;AAKvD,eAAO,MAAM,gBAAgB,qBAoJ5B,CAAC"}

package/dist/browser/main.js

@@ -18,7 +18,6 @@ export const runBrowserEditor = async () => {
     const codeConverter = createCodeConverter();
     const protocolConverter = createProtocolConverter(undefined, true, true);
     let mainVscodeDocument;
-    const htmlContainer = document.getElementById('monaco-editor-root');
     const languageId = 'json';
     const code = `{
     "$schema": "http://json.schemastore.org/coffeelint",
@@ -27,7 +26,10 @@ export const runBrowserEditor = async () => {
     const codeUri = '/workspace/model.json';
     const vscodeApiConfig = {
         $type: 'extended',
-        htmlContainer,
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer: document.getElementById('monaco-editor-root')
+        },
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
@@ -43,7 +45,6 @@ export const runBrowserEditor = async () => {
         monacoWorkerFactory: configureDefaultWorkerFactory
     };
     const editorAppConfig = {
-        $type: vscodeApiConfig.$type,
         codeResources: {
             modified: {
                 text: code,
@@ -52,7 +53,7 @@ export const runBrowserEditor = async () => {
         }
     };
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
     const editorApp = new EditorApp(editorAppConfig);
     vscode.workspace.onDidOpenTextDocument((_event) => {
         mainVscodeDocument = _event;
@@ -138,7 +139,7 @@ export const runBrowserEditor = async () => {
     const cleanDiagnostics = () => {
         diagnosticCollection.clear();
     };
-    await editorApp.start(htmlContainer);
+    await editorApp.start(apiWrapper.getHtmlContainer());
     editorApp.getTextModels().modified?.onDidChangeContent(() => {
         validate();
     });

package/dist/browser/main.js.map

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

package/dist/clangd/client/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/clangd/client/config.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAyD,KAAK,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE3I,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,MAAM,eAAe,GAAG;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;CACpC,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAU,QAAQ;IAChD,aAAa,EAAE,WAAW,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,WAAW,CAAA;CAClC,KAAG,OAAO,CAAC,eAAe,CAsG1B,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/clangd/client/config.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAyD,KAAK,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE3I,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,MAAM,eAAe,GAAG;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;CACpC,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAU,QAAQ;IAChD,aAAa,EAAE,WAAW,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,WAAW,CAAA;CAClC,KAAG,OAAO,CAAC,eAAe,CAoG1B,CAAC"}

package/dist/clangd/client/config.js

@@ -19,7 +19,6 @@ import { ClangdWorkerHandler } from './workerHandler.js';
 export const createClangdAppConfig = async (config) => {
     const vscodeApiConfig = {
         $type: 'extended',
-        htmlContainer: config.htmlContainer,
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
@@ -33,7 +32,8 @@ export const createClangdAppConfig = async (config) => {
             ...getSecretStorageServiceOverride()
         },
         viewsConfig: {
-            viewServiceType: 'ViewsService',
+            $type: 'ViewsService',
+            htmlContainer: config.htmlContainer,
             htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
             viewsInitFunc: defaultViewsInit
         },
@@ -85,7 +85,7 @@ export const createClangdAppConfig = async (config) => {
         monacoWorkerFactory: configureDefaultWorkerFactory
     };
     const languageClientConfig = {
-        name: 'Clangd WASM Language Server',
+        languageId: 'cpp',
         connection: {
             options: {
                 $type: 'WorkerDirect',
@@ -107,9 +107,7 @@ export const createClangdAppConfig = async (config) => {
             }
         }
     };
-    const editorAppConfig = {
-        $type: vscodeApiConfig.$type
-    };
+    const editorAppConfig = {};
     return {
         vscodeApiConfig,
         languageClientConfig,

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

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

package/dist/clangd/client/main.js

@@ -35,7 +35,7 @@ export const runClangdWrapper = async () => {
     });
     // perform global init
     const apiWrapper = new MonacoVscodeApiWrapper(appConfig.vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
     const lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);
     const initConfig = {
         lsMessagePort: channelLs.port2,

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

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

package/dist/common/client/extendedClient.d.ts

@@ -4,6 +4,6 @@ export type ExampleLsConfig = {
     port: number;
     path: string;
     basePath: string;
-    documentSelector: string;
+    languageId: string;
 };
 //# sourceMappingURL=extendedClient.d.ts.map

package/dist/common/client/extendedClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extendedClient.d.ts","sourceRoot":"","sources":["../../../src/common/client/extendedClient.ts"],"names":[],"mappings":"AAUA,OAAO,iDAAiD,CAAC;AAMzD,eAAO,MAAM,iBAAiB,GAAU,UAAU,eAAe,EAAE,WAAW,MAAM,kBAuFnF,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"extendedClient.d.ts","sourceRoot":"","sources":["../../../src/common/client/extendedClient.ts"],"names":[],"mappings":"AAUA,OAAO,iDAAiD,CAAC;AAOzD,eAAO,MAAM,iBAAiB,GAAU,UAAU,eAAe,EAAE,WAAW,MAAM,kBA8FnF,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACtB,CAAC"}

package/dist/common/client/extendedClient.js

@@ -12,15 +12,19 @@ import { EditorApp } from 'monaco-languageclient/editorApp';
 import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
 import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { LangiumMonarchContent } from '../../langium/langium-dsl/config/langium.monarch.js';
 export const runExtendedClient = async (lsConfig, helloCode) => {
-    const helloUri = vscode.Uri.file(`${lsConfig.basePath}/workspace/hello.${lsConfig.documentSelector}`);
+    const helloUri = vscode.Uri.file(`${lsConfig.basePath}/workspace/hello.${lsConfig.languageId}`);
     const fileSystemProvider = new RegisteredFileSystemProvider(false);
     fileSystemProvider.registerFile(new RegisteredMemoryFile(helloUri, helloCode));
     registerFileSystemOverlay(1, fileSystemProvider);
     const htmlContainer = document.getElementById('monaco-editor-root');
     const vscodeApiConfig = {
         $type: 'extended',
-        htmlContainer,
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer
+        },
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
@@ -37,6 +41,7 @@ export const runExtendedClient = async (lsConfig, helloCode) => {
         monacoWorkerFactory: configureDefaultWorkerFactory
     };
     const languageClientConfig = {
+        languageId: lsConfig.languageId,
         connection: {
             options: {
                 $type: 'WebSocketUrl',
@@ -56,7 +61,7 @@ export const runExtendedClient = async (lsConfig, helloCode) => {
             },
         },
         clientOptions: {
-            documentSelector: [lsConfig.documentSelector],
+            documentSelector: [lsConfig.languageId],
             workspaceFolder: {
                 index: 0,
                 name: 'workspace',
@@ -65,22 +70,25 @@ export const runExtendedClient = async (lsConfig, helloCode) => {
         }
     };
     const editorAppConfig = {
-        $type: vscodeApiConfig.$type,
         codeResources: {
             modified: {
                 text: helloCode,
                 uri: helloUri.path
             }
+        },
+        languageDef: {
+            monarchLanguage: LangiumMonarchContent,
+            languageExtensionConfig: { id: 'langium' }
         }
     };
     // perform global init
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
     const lcWrapper = new LanguageClientWrapper(languageClientConfig, apiWrapper.getLogger());
     const editorApp = new EditorApp(editorAppConfig);
     try {
         document.querySelector('#button-start')?.addEventListener('click', async () => {
-            await editorApp.start(htmlContainer);
+            await editorApp.start(apiWrapper.getHtmlContainer());
             await lcWrapper.start();
             // open files, so the LS can pick it up
             await vscode.workspace.openTextDocument(helloUri);

package/dist/common/client/extendedClient.js.map

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

package/dist/debugger/common/definitions.d.ts

@@ -1,4 +1,5 @@
 import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
+import type { HtmlContainerConfig } from 'monaco-languageclient/vscodeApiWrapper';
 import { Uri } from 'vscode';
 export type FileDefinition = {
     path: string;
@@ -18,7 +19,7 @@ export type ConfigParams = {
     homeDir: string;
     workspaceRoot: string;
     workspaceFile: Uri;
-    htmlContainer?: HTMLElement;
+    htmlContainer: HtmlContainerConfig;
     protocol: 'ws' | 'wss';
     hostname: string;
     port: number;

package/dist/debugger/common/definitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../../src/debugger/common/definitions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,QAAQ,EAAE,IAAI,GAAG,KAAK,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,eAAe,MAAM,EAAE,MAAM,MAAM,yBAkB9E,CAAC"}
+{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../../src/debugger/common/definitions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,mBAAmB,CAAC;IACnC,QAAQ,EAAE,IAAI,GAAG,KAAK,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,eAAe,MAAM,EAAE,MAAM,MAAM,yBAkB9E,CAAC"}

package/dist/debugger/common/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../../src/debugger/common/definitions.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAgC7B,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,aAAqB,EAAE,IAAY,EAAE,EAAE;IAC/E,OAAO,IAAI,oBAAoB,CAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,sBAAsB,CAAC,EAChD,IAAI,CAAC,SAAS,CACV;QACI,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE;YACZ;gBACI,IAAI,EAAE,iBAAiB;gBACvB,IAAI;gBACJ,OAAO,EAAE,QAAQ;aACpB;SACJ;KACJ,EACD,IAAI,EACJ,CAAC,CACJ,CACJ,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../../src/debugger/common/definitions.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAEvF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAgC7B,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,aAAqB,EAAE,IAAY,EAAE,EAAE;IAC/E,OAAO,IAAI,oBAAoB,CAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,sBAAsB,CAAC,EAChD,IAAI,CAAC,SAAS,CACV;QACI,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE;YACZ;gBACI,IAAI,EAAE,iBAAiB;gBACvB,IAAI;gBACJ,OAAO,EAAE,QAAQ;aACpB;SACJ;KACJ,EACD,IAAI,EACJ,CAAC,CACJ,CACJ,CAAC;AACN,CAAC,CAAC"}

package/dist/eclipse.jdt.ls/config.js

@@ -6,6 +6,6 @@ export const eclipseJdtLsConfig = {
     port: 30003,
     path: '/jdtls',
     basePath: '/home/mlc/packages/examples/resources/eclipse.jdt.ls',
-    documentSelector: 'java'
+    languageId: 'java'
 };
 //# sourceMappingURL=config.js.map

package/dist/eclipse.jdt.ls/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/eclipse.jdt.ls/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,kBAAkB,GAAoB;IAC/C,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,sDAAsD;IAChE,gBAAgB,EAAE,MAAM;CAC3B,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/eclipse.jdt.ls/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,kBAAkB,GAAoB;IAC/C,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,sDAAsD;IAChE,UAAU,EAAE,MAAM;CACrB,CAAC"}

package/dist/groovy/config.js

@@ -6,6 +6,6 @@ export const groovyConfig = {
     port: 30002,
     path: '/groovy',
     basePath: '/home/gradle/mlc/packages/examples/resources/groovy',
-    documentSelector: 'groovy'
+    languageId: 'groovy'
 };
 //# sourceMappingURL=config.js.map

package/dist/groovy/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/groovy/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,YAAY,GAAoB;IACzC,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,qDAAqD;IAC/D,gBAAgB,EAAE,QAAQ;CAC7B,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/groovy/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,YAAY,GAAoB;IACzC,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,qDAAqD;IAC/D,UAAU,EAAE,QAAQ;CACvB,CAAC"}

package/dist/json/client/classic.d.ts

@@ -0,0 +1,4 @@
+import type { Logger } from 'monaco-languageclient/common';
+export declare const runClient: () => Promise<void>;
+export declare const configureClassicWorkerFactory: (logger?: Logger) => void;
+//# sourceMappingURL=classic.d.ts.map

package/dist/json/client/classic.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic.d.ts","sourceRoot":"","sources":["../../../src/json/client/classic.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAM3D,eAAO,MAAM,SAAS,qBA8DrB,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,SAAS,MAAM,SAQ5D,CAAC"}

package/dist/{bare/client.js → json/client/classic.js}

@@ -3,53 +3,56 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import * as monaco from '@codingame/monaco-vscode-editor-api';
-import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
-import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override';
-import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
-// monaco-editor does not supply json highlighting with the json worker,
-// that's why we use the textmate extension from VSCode
-import '@codingame/monaco-vscode-json-default-extension';
-import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
+import { EditorApp } from 'monaco-languageclient/editorApp';
 import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { defineDefaultWorkerLoaders, useWorkerFactory } from 'monaco-languageclient/workerFactory';
 export const runClient = async () => {
     const htmlContainer = document.getElementById('monaco-editor-root');
     const vscodeApiConfig = {
         $type: 'classic',
-        logLevel: LogLevel.Debug,
-        serviceOverrides: {
-            ...getTextmateServiceOverride(),
-            ...getThemeServiceOverride()
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer
         },
+        logLevel: LogLevel.Debug,
         userConfiguration: {
             json: JSON.stringify({
                 'editor.experimental.asyncTokenization': true
             })
         },
-        monacoWorkerFactory: configureDefaultWorkerFactory
+        monacoWorkerFactory: configureClassicWorkerFactory
     };
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
-    // register the JSON language with Monaco
-    monaco.languages.register({
-        id: 'json',
-        extensions: ['.json', '.jsonc'],
-        aliases: ['JSON', 'json'],
-        mimetypes: ['application/json']
-    });
-    // create monaco editor
-    monaco.editor.create(htmlContainer, {
-        value: `{
+    await apiWrapper.start();
+    const languageId = 'json';
+    const code = `{
     "$schema": "http://json.schemastore.org/coffeelint",
     "line_endings": "unix"
-}`,
-        language: 'json',
-        automaticLayout: true,
-        wordBasedSuggestions: 'off'
-    });
+}`;
+    const codeUri = '/workspace/model.json';
+    const editorAppConfig = {
+        codeResources: {
+            modified: {
+                text: code,
+                uri: codeUri
+            }
+        },
+        languageDef: {
+            languageExtensionConfig: {
+                id: languageId,
+                extensions: ['.json', '.jsonc'],
+                aliases: ['JSON', 'json'],
+                mimetypes: ['application/json']
+            }
+        }
+    };
+    const editorApp = new EditorApp(editorAppConfig);
+    await editorApp.start(apiWrapper.getHtmlContainer());
     const languageClientConfig = {
+        languageId,
         clientOptions: {
-            documentSelector: ['json']
+            documentSelector: [languageId]
         },
         connection: {
             options: {
@@ -61,4 +64,13 @@ export const runClient = async () => {
     const languageClientWrapper = new LanguageClientWrapper(languageClientConfig, apiWrapper.getLogger());
     await languageClientWrapper.start();
 };
-//# sourceMappingURL=client.js.map
+export const configureClassicWorkerFactory = (logger) => {
+    const defaultworkerLoaders = defineDefaultWorkerLoaders();
+    // remove textmate worker as it is not compatible with classic mode
+    defaultworkerLoaders.TextMateWorker = undefined;
+    useWorkerFactory({
+        workerLoaders: defaultworkerLoaders,
+        logger
+    });
+};
+//# sourceMappingURL=classic.js.map

package/dist/json/client/classic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic.js","sourceRoot":"","sources":["../../../src/json/client/classic.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAwB,MAAM,iCAAiC,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAA6B,MAAM,iCAAiC,CAAC;AACnG,OAAO,EAAE,sBAAsB,EAA8B,MAAM,wCAAwC,CAAC;AAC5G,OAAO,EAAE,0BAA0B,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEnG,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE,CAAC;IACrE,MAAM,eAAe,GAA0B;QAC3C,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE;YACT,KAAK,EAAE,eAAe;YACtB,aAAa;SAChB;QACD,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;QACD,mBAAmB,EAAE,6BAA6B;KACrD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAC/D,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;IAEzB,MAAM,UAAU,GAAG,MAAM,CAAC;IAC1B,MAAM,IAAI,GAAG;;;EAGf,CAAC;IACC,MAAM,OAAO,GAAG,uBAAuB,CAAC;IACxC,MAAM,eAAe,GAAoB;QACrC,aAAa,EAAE;YACX,QAAQ,EAAE;gBACN,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,OAAO;aACf;SACJ;QACD,WAAW,EAAE;YACT,uBAAuB,EAAE;gBACrB,EAAE,EAAE,UAAU;gBACd,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;gBAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACzB,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAClC;SACJ;KACJ,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,eAAe,CAAC,CAAC;IACjD,MAAM,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAErD,MAAM,oBAAoB,GAAyB;QAC/C,UAAU;QACV,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,UAAU,CAAC;SACjC;QACD,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,cAAc;gBACrB,GAAG,EAAE,mCAAmC;aAC3C;SACJ;KACJ,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CACnD,oBAAoB,EACpB,UAAU,CAAC,SAAS,EAAE,CACzB,CAAC;IACF,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAAe,EAAE,EAAE;IAC7D,MAAM,oBAAoB,GAAG,0BAA0B,EAAE,CAAC;IAC1D,mEAAmE;IACnE,oBAAoB,CAAC,cAAc,GAAG,SAAS,CAAC;IAChD,gBAAgB,CAAC;QACb,aAAa,EAAE,oBAAoB;QACnC,MAAM;KACT,CAAC,CAAC;AACP,CAAC,CAAC"}

package/dist/json/client/config.js

@@ -6,6 +6,6 @@ export const jsontLsConfig = {
     port: 30000,
     path: '/sampleServer',
     basePath: '/home/mlc/packages/examples/resources/json',
-    documentSelector: 'json'
+    languageId: 'json'
 };
 //# sourceMappingURL=config.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/json/client/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,aAAa,GAAoB;IAC1C,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,eAAe;IACrB,QAAQ,EAAE,4CAA4C;IACtD,gBAAgB,EAAE,MAAM;CAC3B,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/json/client/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,aAAa,GAAoB;IAC1C,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,eAAe;IACrB,QAAQ,EAAE,4CAA4C;IACtD,UAAU,EAAE,MAAM;CACrB,CAAC"}

package/dist/json/client/{client.d.ts → extended.d.ts}

@@ -1,3 +1,3 @@
 import '@codingame/monaco-vscode-json-default-extension';
 export declare const runJsonWrapper: () => Promise<void>;
-//# sourceMappingURL=client.d.ts.map
+//# sourceMappingURL=extended.d.ts.map