@codingame/monaco-vscode-editor-api 15.0.2 → 16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-api",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - monaco-editor compatible api",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2"
+    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0"
   },
   "exports": {
     ".": "./esm/vs/editor/editor.api.js",

package/vscode/src/vs/editor/standalone/browser/standalone-tokens.css

@@ -0,0 +1,42 @@
+.monaco-editor.standalone {
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", system-ui, "Ubuntu", "Droid Sans", sans-serif;
+	--monaco-monospace-font: "SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
+}
+.monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item:focus .action-label {
+	stroke-width: 1.2px;
+}
+.monaco-editor.standalone.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,
+.monaco-editor.standalone.hc-black .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,
+.monaco-editor.standalone.hc-light .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label {
+	stroke-width: 1.2px;
+}
+.monaco-hover p {
+	margin: 0;
+}
+.monaco-aria-container {
+	position: absolute !important;
+	top: 0;
+	height: 1px;
+	width: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	clip: rect(1px, 1px, 1px, 1px);
+	clip-path: inset(50%);
+}
+.monaco-editor.standalone .synthetic-focus, .monaco-diff-editor.standalone .synthetic-focus,
+.monaco-editor.standalone [tabindex="0"]:focus, .monaco-diff-editor.standalone [tabindex="0"]:focus,
+.monaco-editor.standalone [tabindex="-1"]:focus, .monaco-diff-editor.standalone [tabindex="-1"]:focus,
+.monaco-editor.standalone button:focus, .monaco-diff-editor.standalone button:focus,
+.monaco-editor.standalone input[type=button]:focus, .monaco-diff-editor.standalone input[type=button]:focus,
+.monaco-editor.standalone input[type=checkbox]:focus, .monaco-diff-editor.standalone input[type=checkbox]:focus,
+.monaco-editor.standalone input[type=search]:focus, .monaco-diff-editor.standalone input[type=search]:focus,
+.monaco-editor.standalone input[type=text]:focus, .monaco-diff-editor.standalone input[type=text]:focus,
+.monaco-editor.standalone select:focus, .monaco-diff-editor.standalone select:focus,
+.monaco-editor.standalone textarea:focus, .monaco-diff-editor.standalone textarea:focus {
+	outline-width: 1px;
+	outline-style: solid;
+	outline-offset: -1px;
+	outline-color: var(--vscode-focusBorder);
+	opacity: 1
+}

package/vscode/src/vs/editor/standalone/browser/standaloneEditor.d.ts

@@ -1,7 +1,7 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
-import { IWebWorkerOptions, MonacoWebWorker } from "./standaloneWebWorker.js";
+import { IInternalWebWorkerOptions, MonacoWebWorker } from "./standaloneWebWorker.js";
 import { IPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { IDiffEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
@@ -53,7 +53,7 @@ export declare function onDidChangeModelLanguage(listener: (e: {
     readonly model: ITextModel;
     readonly oldLanguage: string;
 }) => void): IDisposable;
-export declare function createWebWorker<T extends object>(opts: IWebWorkerOptions): MonacoWebWorker<T>;
+export declare function createWebWorker<T extends object>(opts: IInternalWebWorkerOptions): MonacoWebWorker<T>;
 export declare function colorizeElement(domNode: HTMLElement, options: IColorizerElementOptions): Promise<void>;
 export declare function colorize(text: string, languageId: string, options: IColorizerOptions): Promise<string>;
 export declare function colorizeModelLine(model: ITextModel, lineNumber: number, tabSize?: number): string;

package/vscode/src/vs/editor/standalone/browser/standaloneEditor.js

@@ -3,7 +3,7 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { splitLines } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import './standalone-tokens.css.js';
+import './standalone-tokens.css';
 import { FontMeasurements } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/fontMeasurements';
 import { EditorCommand } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';

package/vscode/src/vs/editor/standalone/browser/standaloneWebWorker.d.ts

@@ -1,15 +1,13 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
-export declare function createWebWorker<T extends object>(modelService: IModelService, opts: IWebWorkerOptions): MonacoWebWorker<T>;
+export declare function createWebWorker<T extends object>(modelService: IModelService, opts: IInternalWebWorkerOptions): MonacoWebWorker<T>;
 export interface MonacoWebWorker<T> {
     dispose(): void;
     getProxy(): Promise<T>;
     withSyncedResources(resources: URI[]): Promise<T>;
 }
-export interface IWebWorkerOptions {
-    moduleId: string;
-    createData?: any;
-    label?: string;
+export interface IInternalWebWorkerOptions {
+    worker: Worker;
     host?: any;
     keepIdleModels?: boolean;
 }

package/vscode/src/vs/editor/standalone/browser/standaloneWebWorker.js

@@ -1,23 +1,25 @@
 
-import { getAllMethodNames } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { EditorWorkerClient } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/editorWorkerService';
-import { standaloneEditorWorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
 
 function createWebWorker(modelService, opts) {
     return ( new MonacoWebWorkerImpl(modelService, opts));
 }
 class MonacoWebWorkerImpl extends EditorWorkerClient {
     constructor(modelService, opts) {
-        const workerDescriptor = {
-            moduleId: standaloneEditorWorkerDescriptor.moduleId,
-            esmModuleLocation: standaloneEditorWorkerDescriptor.esmModuleLocation,
-            label: opts.label,
-        };
-        super(workerDescriptor, opts.keepIdleModels || false, modelService);
-        this._foreignModuleId = opts.moduleId;
-        this._foreignModuleCreateData = opts.createData || null;
+        super(opts.worker, opts.keepIdleModels || false, modelService);
         this._foreignModuleHost = opts.host || null;
-        this._foreignProxy = null;
+        this._foreignProxy = this._getProxy().then(proxy => {
+            return ( new Proxy({}, {
+                get(target, prop, receiver) {
+                    if (typeof prop !== 'string') {
+                        throw ( new Error(`Not supported`));
+                    }
+                    return (...args) => {
+                        return proxy.$fmr(prop, args);
+                    };
+                }
+            }));
+        });
     }
     fhr(method, args) {
         if (!this._foreignModuleHost || typeof this._foreignModuleHost[method] !== 'function') {
@@ -30,33 +32,8 @@ class MonacoWebWorkerImpl extends EditorWorkerClient {
             return Promise.reject(e);
         }
     }
-    _getForeignProxy() {
-        if (!this._foreignProxy) {
-            this._foreignProxy = this._getProxy().then((proxy) => {
-                const foreignHostMethods = this._foreignModuleHost ? getAllMethodNames(this._foreignModuleHost) : [];
-                return proxy.$loadForeignModule(this._foreignModuleId, this._foreignModuleCreateData, foreignHostMethods).then((foreignMethods) => {
-                    this._foreignModuleCreateData = null;
-                    const proxyMethodRequest = (method, args) => {
-                        return proxy.$fmr(method, args);
-                    };
-                    const createProxyMethod = (method, proxyMethodRequest) => {
-                        return function () {
-                            const args = Array.prototype.slice.call(arguments, 0);
-                            return proxyMethodRequest(method, args);
-                        };
-                    };
-                    const foreignProxy = {};
-                    for (const foreignMethod of foreignMethods) {
-                        foreignProxy[foreignMethod] = createProxyMethod(foreignMethod, proxyMethodRequest);
-                    }
-                    return foreignProxy;
-                });
-            });
-        }
-        return this._foreignProxy;
-    }
     getProxy() {
-        return this._getForeignProxy();
+        return this._foreignProxy;
     }
     withSyncedResources(resources) {
         return this.workerWithSyncedResources(resources).then(_ => ( this.getProxy()));

package/vscode/src/vs/editor/standalone/browser/standalone-tokens.css.js

@@ -1,6 +0,0 @@
-import n from '@codingame/monaco-vscode-api/external/rollup-plugin-styles/dist/runtime/inject-css';
-
-var css = ".monaco-editor.standalone{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Consolas,\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace;font-family:-apple-system,BlinkMacSystemFont,Segoe WPC,Segoe UI,HelveticaNeue-Light,system-ui,Ubuntu,Droid Sans,sans-serif}.monaco-editor.standalone.hc-black .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-editor.standalone.hc-light .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-editor.standalone.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item:focus .action-label{stroke-width:1.2px}.monaco-hover p{margin:0}.monaco-aria-container{clip:rect(1px,1px,1px,1px);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute!important;top:0;width:1px}.monaco-diff-editor.standalone .synthetic-focus,.monaco-diff-editor.standalone [tabindex=\"-1\"]:focus,.monaco-diff-editor.standalone [tabindex=\"0\"]:focus,.monaco-diff-editor.standalone button:focus,.monaco-diff-editor.standalone input[type=button]:focus,.monaco-diff-editor.standalone input[type=checkbox]:focus,.monaco-diff-editor.standalone input[type=search]:focus,.monaco-diff-editor.standalone input[type=text]:focus,.monaco-diff-editor.standalone select:focus,.monaco-diff-editor.standalone textarea:focus,.monaco-editor.standalone .synthetic-focus,.monaco-editor.standalone [tabindex=\"-1\"]:focus,.monaco-editor.standalone [tabindex=\"0\"]:focus,.monaco-editor.standalone button:focus,.monaco-editor.standalone input[type=button]:focus,.monaco-editor.standalone input[type=checkbox]:focus,.monaco-editor.standalone input[type=search]:focus,.monaco-editor.standalone input[type=text]:focus,.monaco-editor.standalone select:focus,.monaco-editor.standalone textarea:focus{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}";
-n(css,{});
-
-export { css, css as default };