monaco-languageclient-examples 2025.6.3 → 2025.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -2
- package/dist/appPlayground/common.d.ts +2 -2
- package/dist/appPlayground/common.d.ts.map +1 -1
- package/dist/appPlayground/common.js +3 -2
- package/dist/appPlayground/common.js.map +1 -1
- package/dist/appPlayground/config.d.ts +2 -4
- package/dist/appPlayground/config.d.ts.map +1 -1
- package/dist/appPlayground/config.js +63 -65
- package/dist/appPlayground/config.js.map +1 -1
- package/dist/appPlayground/launcher.js +1 -1
- package/dist/appPlayground/launcher.js.map +1 -1
- package/dist/appPlayground/main.d.ts.map +1 -1
- package/dist/appPlayground/main.js +4 -5
- package/dist/appPlayground/main.js.map +1 -1
- package/dist/appPlayground/reactLauncher.js +1 -1
- package/dist/appPlayground/reactLauncher.js.map +1 -1
- package/dist/appPlayground/reactMain.d.ts.map +1 -1
- package/dist/appPlayground/reactMain.js +3 -2
- package/dist/appPlayground/reactMain.js.map +1 -1
- package/dist/bare/client.d.ts.map +1 -1
- package/dist/bare/client.js +15 -12
- package/dist/bare/client.js.map +1 -1
- package/dist/browser/main.d.ts.map +1 -1
- package/dist/browser/main.js +27 -28
- package/dist/browser/main.js.map +1 -1
- package/dist/clangd/client/config.d.ts +3 -10
- package/dist/clangd/client/config.d.ts.map +1 -1
- package/dist/clangd/client/config.js +85 -85
- package/dist/clangd/client/config.js.map +1 -1
- package/dist/clangd/client/main.d.ts.map +1 -1
- package/dist/clangd/client/main.js +9 -12
- package/dist/clangd/client/main.js.map +1 -1
- package/dist/clangd/worker/clangd-server.js.map +1 -1
- package/dist/common/client/utils.d.ts +1 -8
- package/dist/common/client/utils.d.ts.map +1 -1
- package/dist/common/client/utils.js +3 -0
- package/dist/common/client/utils.js.map +1 -1
- package/dist/debugger/client/debugger.d.ts +1 -1
- package/dist/debugger/client/debugger.d.ts.map +1 -1
- package/dist/eclipse.jdt.ls/client/main.d.ts +1 -1
- package/dist/eclipse.jdt.ls/client/main.d.ts.map +1 -1
- package/dist/eclipse.jdt.ls/client/main.js +74 -4
- package/dist/eclipse.jdt.ls/client/main.js.map +1 -1
- package/dist/eclipse.jdt.ls/config.d.ts +5 -2
- package/dist/eclipse.jdt.ls/config.d.ts.map +1 -1
- package/dist/eclipse.jdt.ls/config.js +1 -2
- package/dist/eclipse.jdt.ls/config.js.map +1 -1
- package/dist/groovy/client/main.d.ts +1 -1
- package/dist/groovy/client/main.d.ts.map +1 -1
- package/dist/groovy/client/main.js +63 -4
- package/dist/groovy/client/main.js.map +1 -1
- package/dist/groovy/config.d.ts +5 -2
- package/dist/groovy/config.d.ts.map +1 -1
- package/dist/groovy/config.js +1 -2
- package/dist/groovy/config.js.map +1 -1
- package/dist/json/client/wrapperWs.d.ts +5 -0
- package/dist/json/client/wrapperWs.d.ts.map +1 -0
- package/dist/json/client/wrapperWs.js +87 -0
- package/dist/json/client/wrapperWs.js.map +1 -0
- package/dist/json/server/main.js.map +1 -1
- package/dist/langium/langium-dsl/config/classicConfig.d.ts +2 -2
- package/dist/langium/langium-dsl/config/classicConfig.d.ts.map +1 -1
- package/dist/langium/langium-dsl/config/classicConfig.js +45 -53
- package/dist/langium/langium-dsl/config/classicConfig.js.map +1 -1
- package/dist/langium/langium-dsl/config/extendedConfig.d.ts +2 -2
- package/dist/langium/langium-dsl/config/extendedConfig.d.ts.map +1 -1
- package/dist/langium/langium-dsl/config/extendedConfig.js +40 -40
- package/dist/langium/langium-dsl/config/extendedConfig.js.map +1 -1
- package/dist/langium/langium-dsl/wrapperLangium.d.ts.map +1 -1
- package/dist/langium/langium-dsl/wrapperLangium.js +16 -23
- package/dist/langium/langium-dsl/wrapperLangium.js.map +1 -1
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts +4 -4
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.d.ts.map +1 -1
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.js +41 -40
- package/dist/langium/statemachine/config/wrapperStatemachineConfig.js.map +1 -1
- package/dist/langium/statemachine/launcher.js +1 -1
- package/dist/langium/statemachine/launcher.js.map +1 -1
- package/dist/langium/statemachine/ls/generated/ast.d.ts +127 -22
- package/dist/langium/statemachine/ls/generated/ast.d.ts.map +1 -1
- package/dist/langium/statemachine/ls/generated/ast.js +112 -97
- package/dist/langium/statemachine/ls/generated/ast.js.map +1 -1
- package/dist/langium/statemachine/ls/generated/grammar.d.ts +2 -2
- package/dist/langium/statemachine/ls/generated/grammar.d.ts.map +1 -1
- package/dist/langium/statemachine/ls/generated/grammar.js +43 -41
- package/dist/langium/statemachine/ls/generated/grammar.js.map +1 -1
- package/dist/langium/statemachine/ls/generated/module.d.ts +3 -3
- package/dist/langium/statemachine/ls/generated/module.d.ts.map +1 -1
- package/dist/langium/statemachine/ls/generated/module.js +6 -6
- package/dist/langium/statemachine/ls/generated/module.js.map +1 -1
- package/dist/langium/statemachine/ls/statemachine-module.js +2 -2
- package/dist/langium/statemachine/ls/statemachine-module.js.map +1 -1
- package/dist/langium/statemachine/main-react.js +3 -2
- package/dist/langium/statemachine/main-react.js.map +1 -1
- package/dist/langium/statemachine/main.d.ts.map +1 -1
- package/dist/langium/statemachine/main.js +27 -38
- package/dist/langium/statemachine/main.js.map +1 -1
- package/dist/multi/config.d.ts +1 -1
- package/dist/multi/config.d.ts.map +1 -1
- package/dist/multi/config.js +1 -0
- package/dist/multi/config.js.map +1 -1
- package/dist/multi/twoLanguageClients.d.ts.map +1 -1
- package/dist/multi/twoLanguageClients.js +49 -45
- package/dist/multi/twoLanguageClients.js.map +1 -1
- package/dist/node.d.ts +3 -0
- package/dist/node.d.ts.map +1 -1
- package/dist/node.js +3 -3
- package/dist/node.js.map +1 -1
- package/dist/python/client/config.d.ts +3 -7
- package/dist/python/client/config.d.ts.map +1 -1
- package/dist/python/client/config.js +97 -93
- package/dist/python/client/config.js.map +1 -1
- package/dist/python/client/main.d.ts.map +1 -1
- package/dist/python/client/main.js +10 -16
- package/dist/python/client/main.js.map +1 -1
- package/dist/python/client/reactPython.d.ts.map +1 -1
- package/dist/python/client/reactPython.js +9 -8
- package/dist/python/client/reactPython.js.map +1 -1
- package/dist/ts/wrapperTs.d.ts.map +1 -1
- package/dist/ts/wrapperTs.js +45 -50
- package/dist/ts/wrapperTs.js.map +1 -1
- package/json.html +1 -1
- package/package.json +45 -44
- package/src/appPlayground/common.ts +3 -3
- package/src/appPlayground/config.ts +65 -69
- package/src/appPlayground/launcher.ts +1 -2
- package/src/appPlayground/main.ts +5 -8
- package/src/appPlayground/reactLauncher.ts +1 -2
- package/src/appPlayground/reactMain.tsx +4 -4
- package/src/bare/client.ts +16 -15
- package/src/browser/main.ts +27 -29
- package/src/clangd/client/config.ts +87 -97
- package/src/clangd/client/main.ts +10 -14
- package/src/clangd/worker/clangd-server.ts +2 -2
- package/src/common/client/utils.ts +2 -7
- package/src/debugger/client/debugger.ts +1 -1
- package/src/eclipse.jdt.ls/client/main.ts +78 -4
- package/src/eclipse.jdt.ls/config.ts +2 -6
- package/src/groovy/client/main.ts +65 -4
- package/src/groovy/config.ts +2 -6
- package/src/json/client/wrapperWs.ts +90 -0
- package/src/json/server/main.ts +1 -1
- package/src/langium/langium-dsl/config/classicConfig.ts +48 -64
- package/src/langium/langium-dsl/config/extendedConfig.ts +42 -49
- package/src/langium/langium-dsl/wrapperLangium.ts +15 -25
- package/src/langium/statemachine/config/wrapperStatemachineConfig.ts +45 -48
- package/src/langium/statemachine/launcher.ts +1 -1
- package/src/langium/statemachine/ls/generated/ast.ts +131 -111
- package/src/langium/statemachine/ls/generated/grammar.ts +43 -41
- package/src/langium/statemachine/ls/generated/module.ts +6 -6
- package/src/langium/statemachine/ls/statemachine-module.ts +2 -2
- package/src/langium/statemachine/ls/statemachine.langium +20 -5
- package/src/langium/statemachine/main-react.tsx +4 -4
- package/src/langium/statemachine/main.ts +27 -43
- package/src/multi/config.ts +3 -3
- package/src/multi/twoLanguageClients.ts +52 -48
- package/src/node.ts +3 -3
- package/src/python/client/config.ts +99 -101
- package/src/python/client/main.ts +11 -20
- package/src/python/client/reactPython.tsx +10 -11
- package/src/ts/wrapperTs.ts +45 -52
- package/two_langauge_clients.html +1 -0
- package/dist/common/client/extendedClient.d.ts +0 -9
- package/dist/common/client/extendedClient.d.ts.map +0 -1
- package/dist/common/client/extendedClient.js +0 -97
- package/dist/common/client/extendedClient.js.map +0 -1
- package/dist/json/client/client.d.ts +0 -3
- package/dist/json/client/client.d.ts.map +0 -1
- package/dist/json/client/client.js +0 -13
- package/dist/json/client/client.js.map +0 -1
- package/dist/json/client/config.d.ts +0 -3
- package/dist/json/client/config.d.ts.map +0 -1
- package/dist/json/client/config.js +0 -11
- package/dist/json/client/config.js.map +0 -1
- package/src/common/client/extendedClient.ts +0 -111
- package/src/json/client/client.ts +0 -14
- package/src/json/client/config.ts +0 -13
|
@@ -8,12 +8,10 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
|
|
|
8
8
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
9
9
|
import '@codingame/monaco-vscode-python-default-extension';
|
|
10
10
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
11
|
-
import {
|
|
12
|
-
import { configureDefaultWorkerFactory } from 'monaco-
|
|
11
|
+
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
12
|
+
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
13
13
|
import { disableElement } from '../common/client/utils.js';
|
|
14
14
|
import { createJsonLanguageClientConfig, createPythonLanguageClientConfig } from './config.js';
|
|
15
|
-
import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
|
|
16
|
-
import { LanguageClientsManager } from 'monaco-languageclient/lcwrapper';
|
|
17
15
|
export const runMultipleLanguageClientsExample = async () => {
|
|
18
16
|
disableElement('button-flip', true);
|
|
19
17
|
const textJson = `{
|
|
@@ -27,56 +25,59 @@ print("Hello Moon!")
|
|
|
27
25
|
`;
|
|
28
26
|
let currentText = textJson;
|
|
29
27
|
let currenFileExt = 'json';
|
|
30
|
-
const
|
|
31
|
-
|
|
28
|
+
const wrapperConfig = {
|
|
29
|
+
id: '42',
|
|
32
30
|
$type: 'extended',
|
|
33
|
-
htmlContainer,
|
|
31
|
+
htmlContainer: document.getElementById('monaco-editor-root'),
|
|
34
32
|
logLevel: LogLevel.Debug,
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
vscodeApiConfig: {
|
|
34
|
+
serviceOverrides: {
|
|
35
|
+
...getKeybindingsServiceOverride()
|
|
36
|
+
},
|
|
37
|
+
userConfiguration: {
|
|
38
|
+
json: JSON.stringify({
|
|
39
|
+
'workbench.colorTheme': 'Default Dark Modern',
|
|
40
|
+
'editor.wordBasedSuggestions': 'off',
|
|
41
|
+
'editor.experimental.asyncTokenization': true
|
|
42
|
+
})
|
|
43
|
+
}
|
|
37
44
|
},
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
45
|
+
editorAppConfig: {
|
|
46
|
+
codeResources: {
|
|
47
|
+
modified: {
|
|
48
|
+
text: currentText,
|
|
49
|
+
uri: `/workspace/example.${currenFileExt}`
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
44
53
|
},
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
id: '42',
|
|
50
|
-
codeResources: {
|
|
51
|
-
modified: {
|
|
52
|
-
text: currentText,
|
|
53
|
-
uri: `/workspace/example.${currenFileExt}`
|
|
54
|
+
languageClientConfigs: {
|
|
55
|
+
configs: {
|
|
56
|
+
json: createJsonLanguageClientConfig(),
|
|
57
|
+
python: createPythonLanguageClientConfig()
|
|
54
58
|
}
|
|
55
59
|
}
|
|
56
60
|
};
|
|
57
|
-
|
|
58
|
-
const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
|
|
59
|
-
await apiWrapper.init();
|
|
60
|
-
const lcManager = new LanguageClientsManager();
|
|
61
|
-
const languageClientConfigs = {
|
|
62
|
-
configs: {
|
|
63
|
-
json: createJsonLanguageClientConfig(),
|
|
64
|
-
python: createPythonLanguageClientConfig()
|
|
65
|
-
}
|
|
66
|
-
};
|
|
67
|
-
const editorApp = new EditorApp(editorAppConfig);
|
|
61
|
+
const wrapper = new MonacoEditorLanguageClientWrapper();
|
|
68
62
|
document.querySelector('#button-start')?.addEventListener('click', async () => {
|
|
69
63
|
try {
|
|
70
64
|
disableElement('button-start', true);
|
|
71
65
|
disableElement('button-flip', false);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
66
|
+
disableElement('checkbox-extlc', true);
|
|
67
|
+
const externalLc = document.getElementById('checkbox-extlc').checked;
|
|
68
|
+
wrapperConfig.languageClientConfigs.automaticallyInit = !externalLc;
|
|
69
|
+
wrapperConfig.languageClientConfigs.automaticallyStart = !externalLc;
|
|
70
|
+
wrapperConfig.languageClientConfigs.automaticallyDispose = !externalLc;
|
|
71
|
+
await wrapper.initAndStart(wrapperConfig);
|
|
72
|
+
if (wrapperConfig.editorAppConfig?.codeResources?.modified !== undefined) {
|
|
73
|
+
wrapperConfig.editorAppConfig.codeResources.modified.text = currentText;
|
|
74
|
+
wrapperConfig.editorAppConfig.codeResources.modified.uri = `/workspace/example.${currenFileExt}`;
|
|
75
|
+
}
|
|
76
|
+
// init language clients after start
|
|
77
|
+
if (externalLc) {
|
|
78
|
+
wrapper.initLanguageClients();
|
|
79
|
+
await wrapper.startLanguageClients();
|
|
76
80
|
}
|
|
77
|
-
// init and start language clients after start
|
|
78
|
-
await lcManager.setConfigs(languageClientConfigs);
|
|
79
|
-
await lcManager.start();
|
|
80
81
|
}
|
|
81
82
|
catch (e) {
|
|
82
83
|
console.error(e);
|
|
@@ -86,13 +87,16 @@ print("Hello Moon!")
|
|
|
86
87
|
disableElement('button-flip', true);
|
|
87
88
|
disableElement('button-dispose', true);
|
|
88
89
|
disableElement('button-start', false);
|
|
89
|
-
|
|
90
|
-
await
|
|
90
|
+
const externalLc = document.getElementById('checkbox-extlc').checked;
|
|
91
|
+
await wrapper.dispose();
|
|
92
|
+
if (externalLc) {
|
|
93
|
+
wrapper.disposeLanguageClients();
|
|
94
|
+
}
|
|
91
95
|
});
|
|
92
96
|
document.querySelector('#button-flip')?.addEventListener('click', async () => {
|
|
93
97
|
currentText = currentText === textJson ? textPython : textJson;
|
|
94
98
|
currenFileExt = currenFileExt === 'json' ? 'py' : 'json';
|
|
95
|
-
|
|
99
|
+
wrapper.updateCodeResources({
|
|
96
100
|
modified: {
|
|
97
101
|
text: currentText,
|
|
98
102
|
uri: `/workspace/example.${currenFileExt}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"twoLanguageClients.js","sourceRoot":"","sources":["../../src/multi/twoLanguageClients.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,2BAA2B,CAAC;AACnC,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,uCAAuC;AACvC,OAAO,iDAAiD,CAAC;AACzD,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"twoLanguageClients.js","sourceRoot":"","sources":["../../src/multi/twoLanguageClients.ts"],"names":[],"mappings":"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"}
|
package/dist/node.d.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
export * from './common/node/server-commons.js';
|
|
2
2
|
export * from './common/node/language-server-runner.js';
|
|
3
|
+
export * from './json/server/json-server.js';
|
|
4
|
+
export * from './json/server/main.js';
|
|
5
|
+
export * from './python/server/main.js';
|
|
3
6
|
//# sourceMappingURL=node.d.ts.map
|
package/dist/node.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAMA,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC"}
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAMA,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC"}
|
package/dist/node.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
/* server side export only */
|
|
6
6
|
export * from './common/node/server-commons.js';
|
|
7
7
|
export * from './common/node/language-server-runner.js';
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
export * from './json/server/json-server.js';
|
|
9
|
+
export * from './json/server/main.js';
|
|
10
|
+
export * from './python/server/main.js';
|
|
11
11
|
//# sourceMappingURL=node.js.map
|
package/dist/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,6BAA6B;AAC7B,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,6BAA6B;AAC7B,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC"}
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
import '@codingame/monaco-vscode-python-default-extension';
|
|
2
|
-
import type {
|
|
3
|
-
import type { LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
|
|
4
|
-
import { type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
|
|
2
|
+
import type { WrapperConfig } from 'monaco-editor-wrapper';
|
|
5
3
|
import { type ConfigParams } from '../../debugger/common/definitions.js';
|
|
6
4
|
export declare const createDefaultConfigParams: (homeDir: string, htmlContainer?: HTMLElement) => ConfigParams;
|
|
7
5
|
export type PythonAppConfig = {
|
|
8
|
-
|
|
9
|
-
vscodeApiConfig: MonacoVscodeApiConfig;
|
|
10
|
-
editorAppConfig: EditorAppConfig;
|
|
6
|
+
wrapperConfig: WrapperConfig;
|
|
11
7
|
configParams: ConfigParams;
|
|
12
8
|
};
|
|
13
|
-
export declare const
|
|
9
|
+
export declare const createWrapperConfig: () => PythonAppConfig;
|
|
14
10
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/python/client/config.ts"],"names":[],"mappings":"AAcA,OAAO,mDAAmD,CAAC;AAS3D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/python/client/config.ts"],"names":[],"mappings":"AAcA,OAAO,mDAAmD,CAAC;AAS3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAa3D,OAAO,EAA+B,KAAK,YAAY,EAAuB,MAAM,sCAAsC,CAAC;AAE3H,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,EAAE,gBAAgB,WAAW,KAAG,YAoCxF,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;CAC9B,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAO,eAuItC,CAAC"}
|
|
@@ -20,10 +20,11 @@ import getTestingServiceOverride from '@codingame/monaco-vscode-testing-service-
|
|
|
20
20
|
import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override';
|
|
21
21
|
import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override';
|
|
22
22
|
import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override';
|
|
23
|
-
import {
|
|
24
|
-
import {
|
|
25
|
-
import {
|
|
26
|
-
import {
|
|
23
|
+
import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
|
|
24
|
+
import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
|
|
25
|
+
import { MonacoLanguageClient } from 'monaco-languageclient';
|
|
26
|
+
import { createUrl } from 'monaco-languageclient/tools';
|
|
27
|
+
import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
|
|
27
28
|
import * as vscode from 'vscode';
|
|
28
29
|
import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
29
30
|
import badPyCode from '../../../resources/python/bad.py?raw';
|
|
@@ -61,12 +62,12 @@ export const createDefaultConfigParams = (homeDir, htmlContainer) => {
|
|
|
61
62
|
fileSystemProvider.registerFile(new RegisteredMemoryFile(files.get('hello.py').uri, helloPyCode));
|
|
62
63
|
fileSystemProvider.registerFile(new RegisteredMemoryFile(files.get('hello2.py').uri, hello2PyCode));
|
|
63
64
|
fileSystemProvider.registerFile(new RegisteredMemoryFile(files.get('bad.py').uri, badPyCode));
|
|
64
|
-
fileSystemProvider.registerFile(new RegisteredMemoryFile(configParams.workspaceFile, createDefaultWorkspaceContent(workspaceRoot)));
|
|
65
|
+
fileSystemProvider.registerFile(new RegisteredMemoryFile(configParams.workspaceFile, createDefaultWorkspaceContent(configParams.workspaceRoot)));
|
|
65
66
|
fileSystemProvider.registerFile(createDebugLaunchConfigFile(workspaceRoot, configParams.languageId));
|
|
66
67
|
registerFileSystemOverlay(1, fileSystemProvider);
|
|
67
68
|
return configParams;
|
|
68
69
|
};
|
|
69
|
-
export const
|
|
70
|
+
export const createWrapperConfig = () => {
|
|
70
71
|
const configParams = createDefaultConfigParams('/home/mlc', document.body);
|
|
71
72
|
const url = createUrl({
|
|
72
73
|
secured: false,
|
|
@@ -81,65 +82,101 @@ export const createPythonAppConfig = () => {
|
|
|
81
82
|
const iWebSocket = toSocket(webSocket);
|
|
82
83
|
const reader = new WebSocketMessageReader(iWebSocket);
|
|
83
84
|
const writer = new WebSocketMessageWriter(iWebSocket);
|
|
84
|
-
const
|
|
85
|
+
const wrapperConfig = {
|
|
85
86
|
$type: 'extended',
|
|
86
87
|
htmlContainer: configParams.htmlContainer,
|
|
87
88
|
logLevel: LogLevel.Debug,
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
89
|
+
languageClientConfigs: {
|
|
90
|
+
configs: {
|
|
91
|
+
python: {
|
|
92
|
+
name: 'Python Language Server Example',
|
|
93
|
+
connection: {
|
|
94
|
+
options: {
|
|
95
|
+
$type: 'WebSocketDirect',
|
|
96
|
+
webSocket: webSocket,
|
|
97
|
+
startOptions: {
|
|
98
|
+
onCall: (languageClient) => {
|
|
99
|
+
setTimeout(() => {
|
|
100
|
+
['pyright.restartserver', 'pyright.organizeimports'].forEach((cmdName) => {
|
|
101
|
+
vscode.commands.registerCommand(cmdName, (...args) => {
|
|
102
|
+
languageClient?.sendRequest('workspace/executeCommand', { command: cmdName, arguments: args });
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
}, 250);
|
|
106
|
+
},
|
|
107
|
+
reportStatus: true,
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
messageTransports: { reader, writer }
|
|
111
|
+
},
|
|
112
|
+
clientOptions: {
|
|
113
|
+
documentSelector: [configParams.languageId],
|
|
114
|
+
workspaceFolder: {
|
|
115
|
+
index: 0,
|
|
116
|
+
name: configParams.workspaceRoot,
|
|
117
|
+
uri: vscode.Uri.parse(configParams.workspaceRoot)
|
|
118
|
+
},
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
118
122
|
},
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
123
|
+
vscodeApiConfig: {
|
|
124
|
+
serviceOverrides: {
|
|
125
|
+
...getKeybindingsServiceOverride(),
|
|
126
|
+
...getLifecycleServiceOverride(),
|
|
127
|
+
...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
|
|
128
|
+
...getBannerServiceOverride(),
|
|
129
|
+
...getStatusBarServiceOverride(),
|
|
130
|
+
...getTitleBarServiceOverride(),
|
|
131
|
+
...getExplorerServiceOverride(),
|
|
132
|
+
...getRemoteAgentServiceOverride(),
|
|
133
|
+
...getEnvironmentServiceOverride(),
|
|
134
|
+
...getSecretStorageServiceOverride(),
|
|
135
|
+
...getStorageServiceOverride(),
|
|
136
|
+
...getSearchServiceOverride(),
|
|
137
|
+
...getDebugServiceOverride(),
|
|
138
|
+
...getTestingServiceOverride(),
|
|
139
|
+
...getPreferencesServiceOverride()
|
|
125
140
|
},
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
141
|
+
viewsConfig: {
|
|
142
|
+
viewServiceType: 'ViewsService',
|
|
143
|
+
htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
|
|
144
|
+
viewsInitFunc: defaultViewsInit
|
|
145
|
+
},
|
|
146
|
+
userConfiguration: {
|
|
147
|
+
json: JSON.stringify({
|
|
148
|
+
'workbench.colorTheme': 'Default Dark Modern',
|
|
149
|
+
'editor.guides.bracketPairsHorizontal': 'active',
|
|
150
|
+
'editor.wordBasedSuggestions': 'off',
|
|
151
|
+
'editor.experimental.asyncTokenization': true,
|
|
152
|
+
'debug.toolBarLocation': 'docked'
|
|
153
|
+
})
|
|
154
|
+
},
|
|
155
|
+
workspaceConfig: {
|
|
156
|
+
enableWorkspaceTrust: true,
|
|
157
|
+
windowIndicator: {
|
|
158
|
+
label: 'mlc-python-example',
|
|
159
|
+
tooltip: '',
|
|
160
|
+
command: ''
|
|
161
|
+
},
|
|
162
|
+
workspaceProvider: {
|
|
163
|
+
trusted: true,
|
|
164
|
+
async open() {
|
|
165
|
+
window.open(window.location.href);
|
|
166
|
+
return true;
|
|
167
|
+
},
|
|
168
|
+
workspace: {
|
|
169
|
+
workspaceUri: configParams.workspaceFile
|
|
170
|
+
}
|
|
131
171
|
},
|
|
132
|
-
|
|
133
|
-
|
|
172
|
+
configurationDefaults: {
|
|
173
|
+
'window.title': 'mlc-python-example${separator}${dirty}${activeEditorShort}'
|
|
174
|
+
},
|
|
175
|
+
productConfiguration: {
|
|
176
|
+
nameShort: 'mlc-python-example',
|
|
177
|
+
nameLong: 'mlc-python-example'
|
|
134
178
|
}
|
|
135
179
|
},
|
|
136
|
-
configurationDefaults: {
|
|
137
|
-
'window.title': 'mlc-python-example${separator}${dirty}${activeEditorShort}'
|
|
138
|
-
},
|
|
139
|
-
productConfiguration: {
|
|
140
|
-
nameShort: 'mlc-python-example',
|
|
141
|
-
nameLong: 'mlc-python-example'
|
|
142
|
-
}
|
|
143
180
|
},
|
|
144
181
|
extensions: [
|
|
145
182
|
{
|
|
@@ -154,45 +191,12 @@ export const createPythonAppConfig = () => {
|
|
|
154
191
|
},
|
|
155
192
|
provideDebuggerExtensionConfig(configParams)
|
|
156
193
|
],
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const languageClientConfig = {
|
|
160
|
-
name: 'Python Language Server Example',
|
|
161
|
-
connection: {
|
|
162
|
-
options: {
|
|
163
|
-
$type: 'WebSocketDirect',
|
|
164
|
-
webSocket: webSocket,
|
|
165
|
-
startOptions: {
|
|
166
|
-
onCall: (languageClient) => {
|
|
167
|
-
setTimeout(() => {
|
|
168
|
-
['pyright.restartserver', 'pyright.organizeimports'].forEach((cmdName) => {
|
|
169
|
-
vscode.commands.registerCommand(cmdName, (...args) => {
|
|
170
|
-
languageClient?.sendRequest('workspace/executeCommand', { command: cmdName, arguments: args });
|
|
171
|
-
});
|
|
172
|
-
});
|
|
173
|
-
}, 250);
|
|
174
|
-
},
|
|
175
|
-
reportStatus: true,
|
|
176
|
-
}
|
|
177
|
-
},
|
|
178
|
-
messageTransports: { reader, writer }
|
|
179
|
-
},
|
|
180
|
-
clientOptions: {
|
|
181
|
-
documentSelector: [configParams.languageId],
|
|
182
|
-
workspaceFolder: {
|
|
183
|
-
index: 0,
|
|
184
|
-
name: configParams.workspaceRoot,
|
|
185
|
-
uri: vscode.Uri.parse(configParams.workspaceRoot)
|
|
186
|
-
},
|
|
194
|
+
editorAppConfig: {
|
|
195
|
+
monacoWorkerFactory: configureDefaultWorkerFactory
|
|
187
196
|
}
|
|
188
197
|
};
|
|
189
|
-
const editorAppConfig = {
|
|
190
|
-
$type: vscodeApiConfig.$type
|
|
191
|
-
};
|
|
192
198
|
return {
|
|
193
|
-
|
|
194
|
-
languageClientConfig,
|
|
195
|
-
editorAppConfig,
|
|
199
|
+
wrapperConfig,
|
|
196
200
|
configParams: configParams
|
|
197
201
|
};
|
|
198
202
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/python/client/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AACtF,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,0BAA0B,MAAM,oDAAoD,CAAC;AAC5F,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAChJ,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,8BAA8B,MAAM,wDAAwD,CAAC;AACpG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,mDAAmD,CAAC;AAC3D,OAAO,6BAA6B,MAAM,wDAAwD,CAAC;AACnG,OAAO,wBAAwB,MAAM,kDAAkD,CAAC;AACxF,OAAO,+BAA+B,MAAM,0DAA0D,CAAC;AACvG,OAAO,yBAAyB,MAAM,mDAAmD,CAAC;AAC1F,OAAO,yBAAyB,MAAM,mDAAmD,CAAC;AAC1F,OAAO,wBAAwB,MAAM,uDAAuD,CAAC;AAC7F,OAAO,2BAA2B,MAAM,2DAA2D,CAAC;AACpG,OAAO,0BAA0B,MAAM,0DAA0D,CAAC;AAElG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/python/client/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,gBAAgB,qBAsB5B,CAAC"}
|
|
@@ -2,34 +2,28 @@
|
|
|
2
2
|
* Copyright (c) 2024 TypeFox and others.
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import {} from '@codingame/monaco-vscode-api/extensions';
|
|
6
|
-
import { EditorApp } from 'monaco-languageclient/editorApp';
|
|
7
|
-
import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
|
|
8
|
-
import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
|
|
9
5
|
import * as vscode from 'vscode';
|
|
6
|
+
import {} from '@codingame/monaco-vscode-api/extensions';
|
|
7
|
+
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
8
|
+
import { createWrapperConfig } from './config.js';
|
|
10
9
|
import { configureDebugging } from '../../debugger/client/debugger.js';
|
|
11
|
-
import { createPythonAppConfig } from './config.js';
|
|
12
10
|
export const runPythonWrapper = async () => {
|
|
13
|
-
const appConfig =
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
await apiWrapper.init();
|
|
17
|
-
const lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);
|
|
18
|
-
const editorApp = new EditorApp(appConfig.editorAppConfig);
|
|
19
|
-
if (editorApp.isStarted()) {
|
|
11
|
+
const appConfig = createWrapperConfig();
|
|
12
|
+
const wrapper = new MonacoEditorLanguageClientWrapper();
|
|
13
|
+
if (wrapper.isStarted()) {
|
|
20
14
|
console.warn('Editor was already started!');
|
|
21
15
|
}
|
|
22
16
|
else {
|
|
23
|
-
|
|
17
|
+
await wrapper.init(appConfig.wrapperConfig);
|
|
18
|
+
const result = wrapper.getExtensionRegisterResult('mlc-python-example');
|
|
24
19
|
result.setAsDefaultApi();
|
|
25
|
-
const initResult =
|
|
20
|
+
const initResult = wrapper.getExtensionRegisterResult('debugger-py-client');
|
|
26
21
|
if (initResult !== undefined) {
|
|
27
22
|
configureDebugging(await initResult.getApi(), appConfig.configParams);
|
|
28
23
|
}
|
|
29
|
-
await lcWrapper.start();
|
|
30
24
|
await vscode.commands.executeCommand('workbench.view.explorer');
|
|
31
25
|
await vscode.window.showTextDocument(appConfig.configParams.files.get('hello2.py').uri);
|
|
32
|
-
await
|
|
26
|
+
await wrapper.start();
|
|
33
27
|
}
|
|
34
28
|
};
|
|
35
29
|
//# sourceMappingURL=main.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reactPython.d.ts","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAcA,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"reactPython.d.ts","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAcA,eAAO,MAAM,cAAc,qBAgC1B,CAAC"}
|
|
@@ -2,19 +2,20 @@
|
|
|
2
2
|
* Copyright (c) 2024 TypeFox and others.
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
+
import * as vscode from 'vscode';
|
|
5
6
|
import {} from '@codingame/monaco-vscode-api/extensions';
|
|
6
|
-
import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import ReactDOM from 'react-dom/client';
|
|
9
|
-
import
|
|
9
|
+
import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
|
|
10
|
+
import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
|
|
11
|
+
import { createWrapperConfig } from './config.js';
|
|
10
12
|
import { configureDebugging } from '../../debugger/client/debugger.js';
|
|
11
|
-
import { createPythonAppConfig } from './config.js';
|
|
12
13
|
export const runPythonReact = async () => {
|
|
13
|
-
const appConfig =
|
|
14
|
-
const
|
|
15
|
-
const result =
|
|
14
|
+
const appConfig = createWrapperConfig();
|
|
15
|
+
const onLoad = async (wrapper) => {
|
|
16
|
+
const result = wrapper.getExtensionRegisterResult('mlc-python-example');
|
|
16
17
|
result.setAsDefaultApi();
|
|
17
|
-
const initResult =
|
|
18
|
+
const initResult = wrapper.getExtensionRegisterResult('debugger-py-client');
|
|
18
19
|
if (initResult !== undefined) {
|
|
19
20
|
configureDebugging(await initResult.getApi(), appConfig.configParams);
|
|
20
21
|
}
|
|
@@ -24,7 +25,7 @@ export const runPythonReact = async () => {
|
|
|
24
25
|
const root = ReactDOM.createRoot(document.getElementById('react-root'));
|
|
25
26
|
const App = () => {
|
|
26
27
|
return (React.createElement("div", { style: { 'backgroundColor': '#1f1f1f' } },
|
|
27
|
-
React.createElement(MonacoEditorReactComp, {
|
|
28
|
+
React.createElement(MonacoEditorReactComp, { wrapperConfig: appConfig.wrapperConfig, style: { 'height': '100%' }, onLoad: onLoad, onError: (e) => {
|
|
28
29
|
console.error(e);
|
|
29
30
|
} })));
|
|
30
31
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reactPython.js","sourceRoot":"","sources":["../../../src/python/client/reactPython.tsx"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperTs.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"
|
|
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"}
|