monaco-languageclient 9.8.0 → 10.0.0-next.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [10.0.0-next.0] - 2025-0z-xy
+
+- Move MonacoLanguageClientWrapper to monaco-languageclient [#920](https://github.com/TypeFox/monaco-languageclient/pull/920)
+- Updated all `@codingame/monaco-vscode` packages to `18.2.0`.
+
 ## [9.8.0] - 2025-06-24
 
 - Updated all `@codingame/monaco-vscode` packages to `18.1.0`.

package/lib/{commonTypes.d.ts → common/commonTypes.d.ts}

@@ -1,8 +1,8 @@
-import type { MonacoLanguageClient } from './client.js';
+import { BaseLanguageClient } from 'vscode-languageclient/browser.js';
 export type ConnectionConfigOptions = WebSocketConfigOptionsDirect | WebSocketConfigOptionsParams | WebSocketConfigOptionsUrl | WorkerConfigOptionsParams | WorkerConfigOptionsDirect;
 export interface WebSocketCallOptions {
     /** Adds handle on languageClient */
-    onCall: (languageClient?: MonacoLanguageClient) => void;
+    onCall: (languageClient?: BaseLanguageClient) => void;
     /** Reports Status Of Language Client */
     reportStatus?: boolean;
 }

package/lib/common/commonTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../../src/common/commonTypes.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,GAAG,4BAA4B,GAAG,yBAAyB,GAAG,yBAAyB,GAAG,yBAAyB,CAAC;AAEtL,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACtD,wCAAwC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,4BAA4B;IACzC,KAAK,EAAE,iBAAiB,CAAA;IACxB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACpE,KAAK,EAAE,iBAAiB,CAAA;IACxB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,kBAAkB;IAC/B,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,yBAA0B,SAAQ,kBAAkB;IACjE,KAAK,EAAE,cAAc,CAAA;IACrB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,EAAE,cAAc,CAAA;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACtC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B"}

package/lib/common/commonTypes.js

@@ -0,0 +1,6 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { BaseLanguageClient } from 'vscode-languageclient/browser.js';
+//# sourceMappingURL=commonTypes.js.map

package/lib/common/commonTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../src/common/commonTypes.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC"}

package/lib/common/index.d.ts

@@ -0,0 +1,4 @@
+export * from './commonTypes.js';
+export * from './logging.js';
+export * from './utils.js';
+//# sourceMappingURL=index.d.ts.map

package/lib/common/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAKA,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC"}

package/lib/{tools → common}/index.js

@@ -2,6 +2,7 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
+export * from './commonTypes.js';
 export * from './logging.js';
 export * from './utils.js';
 //# sourceMappingURL=index.js.map

package/lib/common/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC"}

package/lib/common/logging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/common/logging.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAE,KAAK,OAAO,EAAE,MAAM,+CAA+C,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,MAAM,WAAW,MAAO,SAAQ,OAAO;IACnC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;CACnE;AAED,qBAAa,aAAc,SAAQ,mBAAmB;gBAEtC,QAAQ,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,OAAO;IAIpD,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE;CAO1D"}

package/lib/common/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/common/logging.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAgB,MAAM,+CAA+C,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAMxD,MAAM,OAAO,aAAc,SAAQ,mBAAmB;IAElD,YAAY,QAAmB,EAAE,SAAmB;QAChD,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,iBAAiB,CAAC,OAAe,EAAE,GAAG,MAAiB;QACnD,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;CAEJ"}

package/lib/common/utils.d.ts

@@ -0,0 +1,5 @@
+import type { WebSocketUrlParams, WebSocketUrlString } from './commonTypes.js';
+export declare const createUrl: (config: WebSocketUrlParams | WebSocketUrlString) => string;
+export declare const verifyUrlOrCreateDataUrl: (input: string | URL) => string;
+export declare const delayExecution: (ms: number) => Promise<unknown>;
+//# sourceMappingURL=utils.d.ts.map

package/lib/common/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,eAAO,MAAM,SAAS,GAAI,QAAQ,kBAAkB,GAAG,kBAAkB,WA+BxE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,OAAO,MAAM,GAAG,GAAG,WAS3D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,qBAExC,CAAC"}

package/lib/{tools → common}/utils.js

@@ -33,4 +33,18 @@ export const createUrl = (config) => {
     }
     return buildUrl;
 };
+export const verifyUrlOrCreateDataUrl = (input) => {
+    if (input instanceof URL) {
+        return input.href;
+    }
+    else {
+        const bytes = new TextEncoder().encode(input);
+        const binString = Array.from(bytes, (b) => String.fromCodePoint(b)).join('');
+        const base64 = btoa(binString);
+        return new URL(`data:text/plain;base64,${base64}`).href;
+    }
+};
+export const delayExecution = (ms) => {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+};
 //# sourceMappingURL=utils.js.map

package/lib/common/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAIhG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAA+C,EAAE,EAAE;IACzE,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAK,MAA6B,CAAC,GAAG,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAA4B,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAC3B,CAAC;SAAM,CAAC;QACJ,MAAM,OAAO,GAAG,MAA4B,CAAC;QAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,QAAQ,GAAG,GAAG,QAAQ,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;gBACtB,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;QACL,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC7D,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3F,CAAC;YAED,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC5D,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,IAAI,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,OAAO,IAAI,GAAG,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC;IAC5D,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE;IACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}

package/lib/editorApp/config.d.ts

@@ -0,0 +1,55 @@
+import { LogLevel } from '@codingame/monaco-vscode-api';
+import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
+import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
+import { type OverallConfigType } from 'monaco-languageclient/vscodeApiWrapper';
+export declare class ModelRefs {
+    modified?: IReference<ITextFileEditorModel>;
+    original?: IReference<ITextFileEditorModel>;
+}
+export interface TextModels {
+    modified?: monaco.editor.ITextModel | null;
+    original?: monaco.editor.ITextModel | null;
+}
+export interface TextContents {
+    modified?: string;
+    original?: string;
+}
+export interface CodeContent {
+    text: string;
+    uri: string;
+    enforceLanguageId?: string;
+}
+export interface CodeResources {
+    modified?: CodeContent;
+    original?: CodeContent;
+}
+export interface CallbackDisposeable {
+    modified?: monaco.IDisposable;
+    original?: monaco.IDisposable;
+}
+export interface DisposableModelRefs {
+    modified?: IReference<ITextFileEditorModel>;
+    original?: IReference<ITextFileEditorModel>;
+}
+export interface EditorAppConfig {
+    id?: string;
+    $type?: OverallConfigType;
+    logLevel?: LogLevel | number;
+    codeResources?: CodeResources;
+    useDiffEditor?: boolean;
+    domReadOnly?: boolean;
+    readOnly?: boolean;
+    overrideAutomaticLayout?: boolean;
+    editorOptions?: monaco.editor.IStandaloneEditorConstructionOptions;
+    diffEditorOptions?: monaco.editor.IStandaloneDiffEditorConstructionOptions;
+    languageDef?: {
+        languageExtensionConfig: monaco.languages.ILanguageExtensionPoint;
+        monarchLanguage?: monaco.languages.IMonarchLanguage;
+        theme?: {
+            name: monaco.editor.BuiltinTheme | string;
+            data: monaco.editor.IStandaloneThemeData;
+        };
+    };
+}
+//# sourceMappingURL=config.d.ts.map

package/lib/editorApp/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,qBAAa,SAAS;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,eAAe;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,wCAAwC,CAAC;IAC3E,WAAW,CAAC,EAAE;QACV,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC;QAClE,eAAe,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpD,KAAK,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC;YAC1C,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;SAC5C,CAAA;KACJ,CAAA;CACJ"}

package/lib/editorApp/config.js

@@ -0,0 +1,13 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { LogLevel } from '@codingame/monaco-vscode-api';
+import {} from '@codingame/monaco-vscode-api/monaco';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
+import {} from 'monaco-languageclient/vscodeApiWrapper';
+export class ModelRefs {
+    modified;
+    original;
+}
+//# sourceMappingURL=config.js.map

package/lib/editorApp/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/editorApp/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAE9D,OAAO,EAA0B,MAAM,wCAAwC,CAAC;AAEhF,MAAM,OAAO,SAAS;IAClB,QAAQ,CAAoC;IAC5C,QAAQ,CAAoC;CAC/C"}

package/lib/editorApp/editorApp.d.ts

@@ -0,0 +1,66 @@
+import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
+import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
+import { type Logger } from 'monaco-languageclient/common';
+import { type CodeContent, type CodeResources, type EditorAppConfig, type TextContents, type TextModels } from './config.js';
+/**
+ * This is the base class for both Monaco Ediotor Apps:
+ * - EditorAppClassic
+ * - EditorAppExtended
+ *
+ * It provides the generic functionality for both implementations.
+ */
+export declare class EditorApp {
+    private $type;
+    private id;
+    private config;
+    protected logger: Logger;
+    private editor;
+    private diffEditor;
+    private modelRefs;
+    private onTextChanged?;
+    private textChangedDiposeables;
+    private modelDisposables;
+    private modelRefDisposeTimeout;
+    private startingAwait?;
+    private startingResolve;
+    private disposingAwait?;
+    private disposingResolve;
+    constructor(userAppConfig?: EditorAppConfig);
+    isDiffEditor(): boolean;
+    getConfig(): EditorAppConfig;
+    getEditor(): monaco.editor.IStandaloneCodeEditor | undefined;
+    getDiffEditor(): monaco.editor.IStandaloneDiffEditor | undefined;
+    getTextModels(): TextModels;
+    getLogger(): Logger;
+    registerOnTextChangedCallback(onTextChanged?: (textChanges: TextContents) => void): void;
+    setModelRefDisposeTimeout(modelRefDisposeTimeout: number): void;
+    private markStarting;
+    private markStarted;
+    isStarting(): boolean;
+    getStartingAwait(): Promise<void> | undefined;
+    isStarted(): boolean;
+    /**
+     * Starts the single editor application.
+     */
+    start(htmlContainer: HTMLElement): Promise<void>;
+    createEditors(htmlContainer: HTMLElement): Promise<void>;
+    updateCode(code: {
+        modified?: string;
+        original?: string;
+    }): void;
+    updateCodeResources(codeResources?: CodeResources): Promise<void>;
+    buildModelReference(codeContent: CodeContent, logger?: Logger): Promise<IReference<ITextFileEditorModel>>;
+    private announceModelUpdate;
+    dispose(): Promise<void>;
+    isDisposed(): boolean;
+    private markDisposing;
+    private markDisposed;
+    isDisposing(): boolean;
+    getDisposingAwait(): Promise<void> | undefined;
+    disposeModelRefs(): Promise<void>;
+    updateLayout(): void;
+    reportStatus(): string[];
+}
+export declare const didModelContentChange: (textModels: TextModels, onTextChanged?: (textChanges: TextContents) => void) => void;
+//# sourceMappingURL=editorApp.d.ts.map

package/lib/editorApp/editorApp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"editorApp.d.ts","sourceRoot":"","sources":["../../src/editorApp/editorApp.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACtG,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG1E,OAAO,EAAuC,KAAK,WAAW,EAAE,KAAK,aAAa,EAA4B,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5L;;;;;;GAMG;AACH,qBAAa,SAAS;IAElB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAkB;IAEhC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAuB;IAE/C,OAAO,CAAC,MAAM,CAAkD;IAChE,OAAO,CAAC,UAAU,CAAkD;IAEpE,OAAO,CAAC,SAAS,CAA8B;IAE/C,OAAO,CAAC,aAAa,CAAC,CAAsC;IAC5D,OAAO,CAAC,sBAAsB,CAA2B;IACzD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,sBAAsB,CAAM;IAEpC,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,eAAe,CAA4C;IAEnE,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAA4C;gBAExD,aAAa,CAAC,EAAE,eAAe;IA0B3C,YAAY;IAIZ,SAAS,IAAI,eAAe;IAI5B,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS;IAI5D,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,SAAS;IAIhE,aAAa,IAAI,UAAU;IAO3B,SAAS;IAIT,6BAA6B,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI;IAI1E,yBAAyB,CAAC,sBAAsB,EAAE,MAAM;IAI/D,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,WAAW;IAKnB,UAAU;IAIV,gBAAgB;IAIhB,SAAS;IAIT;;OAEG;IACG,KAAK,CAAC,aAAa,EAAE,WAAW;IA+EhC,aAAa,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,UAAU,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;IAgBnD,mBAAmB,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CjE,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAgB/G,OAAO,CAAC,mBAAmB;IA4BrB,OAAO;IAyBb,UAAU,IAAI,OAAO;IAMrB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,YAAY;IAKpB,WAAW;IAIX,iBAAiB;IAIX,gBAAgB;IAuCtB,YAAY;IAQZ,YAAY;CAOf;AAED,eAAO,MAAM,qBAAqB,GAAI,YAAY,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI,SAOhH,CAAC"}

package/lib/editorApp/editorApp.js

@@ -0,0 +1,404 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { ConfigurationTarget, IConfigurationService, LogLevel, StandaloneServices } from '@codingame/monaco-vscode-api';
+import { createModelReference } from '@codingame/monaco-vscode-api/monaco';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
+import { ConsoleLogger } from 'monaco-languageclient/common';
+import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWrapper';
+import * as vscode from 'vscode';
+import { ModelRefs } from './config.js';
+/**
+ * This is the base class for both Monaco Ediotor Apps:
+ * - EditorAppClassic
+ * - EditorAppExtended
+ *
+ * It provides the generic functionality for both implementations.
+ */
+export class EditorApp {
+    $type;
+    id;
+    config;
+    logger = new ConsoleLogger();
+    editor;
+    diffEditor;
+    modelRefs = new ModelRefs();
+    onTextChanged;
+    textChangedDiposeables = {};
+    modelDisposables = {};
+    modelRefDisposeTimeout = -1;
+    startingAwait;
+    startingResolve;
+    disposingAwait;
+    disposingResolve;
+    constructor(userAppConfig) {
+        this.$type = userAppConfig?.$type ?? 'extended';
+        this.id = userAppConfig?.id ?? Math.floor(Math.random() * 1000001).toString();
+        if ((userAppConfig?.useDiffEditor ?? false) && !userAppConfig?.codeResources?.original) {
+            throw new Error(`Use diff editor was used without a valid config. code: ${userAppConfig?.codeResources?.modified} codeOriginal: ${userAppConfig?.codeResources?.original}`);
+        }
+        this.config = {
+            codeResources: userAppConfig?.codeResources ?? undefined,
+            useDiffEditor: userAppConfig?.useDiffEditor ?? false,
+            readOnly: userAppConfig?.readOnly ?? false,
+            domReadOnly: userAppConfig?.domReadOnly ?? false,
+            overrideAutomaticLayout: userAppConfig?.overrideAutomaticLayout ?? true
+        };
+        this.config.editorOptions = {
+            ...userAppConfig?.editorOptions,
+            automaticLayout: userAppConfig?.overrideAutomaticLayout ?? true
+        };
+        this.config.diffEditorOptions = {
+            ...userAppConfig?.diffEditorOptions,
+            automaticLayout: userAppConfig?.overrideAutomaticLayout ?? true
+        };
+        this.config.languageDef = userAppConfig?.languageDef;
+        this.logger.setLevel(this.config.logLevel ?? LogLevel.Off);
+    }
+    isDiffEditor() {
+        return this.config.useDiffEditor === true;
+    }
+    getConfig() {
+        return this.config;
+    }
+    getEditor() {
+        return this.editor;
+    }
+    getDiffEditor() {
+        return this.diffEditor;
+    }
+    getTextModels() {
+        return {
+            modified: this.modelRefs.modified?.object.textEditorModel ?? undefined,
+            original: this.modelRefs.original?.object.textEditorModel ?? undefined
+        };
+    }
+    getLogger() {
+        return this.logger;
+    }
+    registerOnTextChangedCallback(onTextChanged) {
+        this.onTextChanged = onTextChanged;
+    }
+    setModelRefDisposeTimeout(modelRefDisposeTimeout) {
+        this.modelRefDisposeTimeout = modelRefDisposeTimeout;
+    }
+    markStarting() {
+        this.startingAwait = new Promise((resolve) => {
+            this.startingResolve = resolve;
+        });
+    }
+    markStarted() {
+        this.startingResolve();
+        this.startingAwait = undefined;
+    }
+    isStarting() {
+        return this.startingAwait !== undefined;
+    }
+    getStartingAwait() {
+        return this.startingAwait;
+    }
+    isStarted() {
+        return this.editor !== undefined || this.diffEditor !== undefined;
+    }
+    /**
+     * Starts the single editor application.
+     */
+    async start(htmlContainer) {
+        if (this.isStarting()) {
+            await this.getStartingAwait();
+        }
+        this.markStarting();
+        if (!this.isDisposed()) {
+            throw new Error('You called start without properly disposing the EditorApp.');
+        }
+        const languageDef = this.config.languageDef;
+        if (languageDef) {
+            if (this.$type === 'extended') {
+                throw new Error('Language definition is not supported for extended editor apps where textmate is used.');
+            }
+            // register own language first
+            monaco.languages.register(languageDef.languageExtensionConfig);
+            const languageRegistered = monaco.languages.getLanguages().filter(x => x.id === languageDef.languageExtensionConfig.id);
+            if (languageRegistered.length === 0) {
+                // this is only meaningful for languages supported by monaco out of the box
+                monaco.languages.register({
+                    id: languageDef.languageExtensionConfig.id
+                });
+            }
+            // apply monarch definitions
+            if (languageDef.monarchLanguage) {
+                monaco.languages.setMonarchTokensProvider(languageDef.languageExtensionConfig.id, languageDef.monarchLanguage);
+            }
+            if (languageDef.theme) {
+                monaco.editor.defineTheme(languageDef.theme.name, languageDef.theme.data);
+                monaco.editor.setTheme(languageDef.theme.name);
+            }
+        }
+        if (this.config.editorOptions?.['semanticHighlighting.enabled'] !== undefined) {
+            StandaloneServices.get(IConfigurationService).updateValue('editor.semanticHighlighting.enabled', this.config.editorOptions['semanticHighlighting.enabled'], ConfigurationTarget.USER);
+        }
+        // ensure proper default resources are initialized, uris have to be unique
+        const modified = {
+            text: this.config.codeResources?.modified?.text ?? '',
+            uri: this.config.codeResources?.modified?.uri ?? `default-uri-modified-${this.id}`,
+            enforceLanguageId: this.config.codeResources?.modified?.enforceLanguageId ?? undefined
+        };
+        this.modelRefs.modified = await this.buildModelReference(modified, this.logger);
+        if (this.isDiffEditor()) {
+            const original = {
+                text: this.config.codeResources?.original?.text ?? '',
+                uri: this.config.codeResources?.original?.uri ?? `default-uri-original-${this.id}`,
+                enforceLanguageId: this.config.codeResources?.original?.enforceLanguageId ?? undefined
+            };
+            this.modelRefs.original = await this.buildModelReference(original, this.logger);
+        }
+        try {
+            const envEnhanced = getEnhancedMonacoEnvironment();
+            const viewServiceType = envEnhanced.viewServiceType;
+            if (viewServiceType === 'EditorService' || viewServiceType === undefined) {
+                this.logger.info(`Starting monaco-editor (${this.id})`);
+                await this.createEditors(htmlContainer);
+            }
+            else {
+                this.logger.info('No EditorService configured. monaco-editor will not be started.');
+            }
+            this.logger.info('EditorApp start completed successfully.');
+            // eslint-disable-next-line no-useless-catch
+        }
+        catch (e) {
+            throw e;
+        }
+        finally {
+            // in case of rejection, mark as started, otherwise the promise will never resolve
+            this.markStarted();
+        }
+    }
+    async createEditors(htmlContainer) {
+        if (this.isDiffEditor()) {
+            this.diffEditor = monaco.editor.createDiffEditor(htmlContainer, this.config.diffEditorOptions);
+            const modified = this.modelRefs.modified?.object.textEditorModel ?? undefined;
+            const original = this.modelRefs.original?.object.textEditorModel ?? undefined;
+            if (modified !== undefined && original !== undefined) {
+                const model = {
+                    modified,
+                    original
+                };
+                this.diffEditor.setModel(model);
+                this.announceModelUpdate(model);
+            }
+        }
+        else {
+            const model = {
+                modified: this.modelRefs.modified?.object.textEditorModel
+            };
+            this.editor = monaco.editor.create(htmlContainer, {
+                ...this.config.editorOptions,
+                model: model.modified
+            });
+            this.announceModelUpdate(model);
+        }
+    }
+    updateCode(code) {
+        if (this.isDiffEditor()) {
+            if (code.modified !== undefined) {
+                this.diffEditor?.getModifiedEditor().setValue(code.modified);
+            }
+            if (code.original !== undefined) {
+                this.diffEditor?.getOriginalEditor().setValue(code.original);
+            }
+        }
+        else {
+            if (code.modified !== undefined) {
+                this.editor?.setValue(code.modified);
+            }
+        }
+    }
+    async updateCodeResources(codeResources) {
+        let updateModified = false;
+        let updateOriginal = false;
+        if (codeResources?.modified !== undefined && codeResources.modified.uri !== this.modelRefs.modified?.object.resource.path) {
+            this.modelDisposables.modified = this.modelRefs.modified;
+            this.modelRefs.modified = await this.buildModelReference(codeResources.modified, this.logger);
+            updateModified = true;
+        }
+        if (codeResources?.original !== undefined && codeResources.original.uri !== this.modelRefs.original?.object.resource.path) {
+            this.modelDisposables.original = this.modelRefs.original;
+            this.modelRefs.original = await this.buildModelReference(codeResources.original, this.logger);
+            updateOriginal = true;
+        }
+        if (this.isDiffEditor()) {
+            if (updateModified && updateOriginal) {
+                const modified = this.modelRefs.modified?.object.textEditorModel ?? undefined;
+                const original = this.modelRefs.original?.object.textEditorModel ?? undefined;
+                if (modified !== undefined && original !== undefined) {
+                    const model = {
+                        modified,
+                        original
+                    };
+                    this.diffEditor?.setModel(model);
+                    this.announceModelUpdate(model);
+                }
+            }
+            else {
+                this.logger.info('Diff Editor: Code resources were not updated. They are ether unchanged or undefined.');
+            }
+        }
+        else {
+            if (updateModified) {
+                const model = {
+                    modified: this.modelRefs.modified?.object.textEditorModel
+                };
+                if (model.modified !== undefined && model.modified !== null) {
+                    this.editor?.setModel(model.modified);
+                    this.announceModelUpdate(model);
+                }
+            }
+            else {
+                this.logger.info('Editor: Code resources were not updated. They are either unchanged or undefined.');
+            }
+        }
+        await this.disposeModelRefs();
+    }
+    async buildModelReference(codeContent, logger) {
+        const code = codeContent.text;
+        const modelRef = await createModelReference(vscode.Uri.parse(codeContent.uri), code);
+        // update the text if different
+        if (modelRef.object.textEditorModel?.getValue() !== code) {
+            modelRef.object.textEditorModel?.setValue(code);
+        }
+        const enforceLanguageId = codeContent.enforceLanguageId;
+        if (enforceLanguageId !== undefined) {
+            modelRef.object.setLanguageId(enforceLanguageId);
+            logger?.info(`Main languageId is enforced: ${enforceLanguageId}`);
+        }
+        return modelRef;
+    }
+    ;
+    announceModelUpdate(textModels) {
+        if (this.onTextChanged !== undefined) {
+            let changed = false;
+            if (textModels.modified !== undefined && textModels.modified !== null) {
+                const old = this.textChangedDiposeables.modified;
+                this.textChangedDiposeables.modified = textModels.modified.onDidChangeContent(() => {
+                    didModelContentChange(textModels, this.onTextChanged);
+                });
+                old?.dispose();
+                changed = true;
+            }
+            if (textModels.original !== undefined && textModels.original !== null) {
+                const old = this.textChangedDiposeables.original;
+                this.textChangedDiposeables.original = textModels.original.onDidChangeContent(() => {
+                    didModelContentChange(textModels, this.onTextChanged);
+                });
+                old?.dispose();
+                changed = true;
+            }
+            if (changed) {
+                // do it initially
+                didModelContentChange(textModels, this.onTextChanged);
+            }
+        }
+    }
+    async dispose() {
+        if (this.isDisposing()) {
+            await this.getDisposingAwait();
+        }
+        this.markDisposing();
+        if (this.editor) {
+            this.editor.dispose();
+            this.editor = undefined;
+        }
+        if (this.diffEditor) {
+            this.diffEditor.dispose();
+            this.diffEditor = undefined;
+        }
+        this.textChangedDiposeables.modified?.dispose();
+        this.textChangedDiposeables.original?.dispose();
+        this.textChangedDiposeables.modified = undefined;
+        this.textChangedDiposeables.original = undefined;
+        await this.disposeModelRefs();
+        this.markDisposed();
+    }
+    isDisposed() {
+        return this.editor === undefined && this.diffEditor === undefined &&
+            // this.textChangedDiposeables.modified === undefined && this.textChangedDiposeables.original === undefined &&
+            this.modelDisposables.original === undefined && this.modelDisposables.modified === undefined;
+    }
+    markDisposing() {
+        this.disposingAwait = new Promise((resolve) => {
+            this.disposingResolve = resolve;
+        });
+    }
+    markDisposed() {
+        this.disposingResolve();
+        this.disposingAwait = undefined;
+    }
+    isDisposing() {
+        return this.disposingAwait !== undefined;
+    }
+    getDisposingAwait() {
+        return this.disposingAwait;
+    }
+    async disposeModelRefs() {
+        const diposeRefs = () => {
+            if (this.logger.getLevel() === LogLevel.Debug) {
+                const models = monaco.editor.getModels();
+                this.logger.debug('Current model URIs:');
+                models.forEach((model, _index) => {
+                    this.logger.debug(`${model.uri.toString()}`);
+                });
+            }
+            if (this.modelDisposables.modified !== undefined && !(this.modelDisposables.modified.object.isDisposed() === true)) {
+                this.modelDisposables.modified.dispose();
+                this.modelDisposables.modified = undefined;
+            }
+            if (this.modelDisposables.original !== undefined && !(this.modelDisposables.original.object.isDisposed() === true)) {
+                this.modelDisposables.original.dispose();
+                this.modelDisposables.original = undefined;
+            }
+            if (this.logger.getLevel() === LogLevel.Debug) {
+                if (this.modelDisposables.modified === undefined && this.modelDisposables.original === undefined) {
+                    this.logger.debug('All model references are disposed.');
+                }
+                else {
+                    this.logger.debug('Model references are still available.');
+                }
+            }
+        };
+        if (this.modelRefDisposeTimeout > 0) {
+            this.logger.debug('Using async dispose of model references');
+            await new Promise(resolve => setTimeout(() => {
+                diposeRefs();
+                resolve();
+            }, this.modelRefDisposeTimeout));
+        }
+        else {
+            diposeRefs();
+        }
+    }
+    updateLayout() {
+        if (this.isDiffEditor()) {
+            this.diffEditor?.layout();
+        }
+        else {
+            this.editor?.layout();
+        }
+    }
+    reportStatus() {
+        const status = [];
+        status.push('EditorApp status:');
+        status.push(`Editor: ${this.editor?.getId()}`);
+        status.push(`DiffEditor: ${this.diffEditor?.getId()}`);
+        return status;
+    }
+}
+export const didModelContentChange = (textModels, onTextChanged) => {
+    const modified = textModels.modified?.getValue() ?? '';
+    const original = textModels.original?.getValue() ?? '';
+    onTextChanged?.({
+        modified,
+        original
+    });
+};
+//# sourceMappingURL=editorApp.js.map