@volar/monaco 1.10.0 → 1.10.2

package/README.md

@@ -115,7 +115,7 @@ languages.onLanguage('my-lang', () => {
 		() => [Uri.file('/Foo.my-lang'), Uri.file('/Bar.my-lang')],
 		editor
 	);
-	VolarMonaco.languages.registerProvides(worker, ['my-lang'], languages)
+	VolarMonaco.languages.registerProviders(worker, ['my-lang'], languages)
 });
 ```
 

package/out/editor.d.ts

@@ -1,6 +1,7 @@
-import { LanguageService } from '@volar/language-service';
+import type { LanguageService } from '@volar/language-service';
 import type { editor as _editor, IDisposable, Uri } from 'monaco-editor-core';
 export declare namespace editor {
     function activateMarkers(worker: _editor.MonacoWebWorker<LanguageService>, languages: string[], markersOwn: string, getSyncUris: () => Uri[], editor: typeof import('monaco-editor-core').editor): IDisposable;
     function activateAutoInsertion(worker: _editor.MonacoWebWorker<LanguageService>, languages: string[], getSyncUris: () => Uri[], editor: typeof import('monaco-editor-core').editor): IDisposable;
 }
+//# sourceMappingURL=editor.d.ts.map

package/out/editor.js

@@ -1,9 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editor = void 0;
 const markers_1 = require("./utils/markers");
-const protocol2monaco = require("./utils/protocol2monaco");
-const monaco2protocol = require("./utils/monaco2protocol");
+const protocol2monaco = __importStar(require("./utils/protocol2monaco"));
+const monaco2protocol = __importStar(require("./utils/monaco2protocol"));
 var editor;
 (function (editor_1) {
     function activateMarkers(worker, languages, markersOwn, getSyncUris, editor) {
@@ -32,7 +55,7 @@ var editor;
             }
         }
         function hostingMarkers(model) {
-            if (!languages.includes(model.getLanguageId())) {
+            if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
                 return;
             }
             let timer;
@@ -105,7 +128,7 @@ var editor;
             }
         }
         function hostingAutoInsertion(model) {
-            if (!languages.includes(model.getLanguageId())) {
+            if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
                 return;
             }
             listener.set(model, model.onDidChangeContent((e) => {

package/out/index.d.ts

@@ -1,2 +1,3 @@
-export * from './languages';
 export * from './editor';
+export * from './languages';
+//# sourceMappingURL=index.d.ts.map

package/out/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./languages"), exports);
 __exportStar(require("./editor"), exports);
+__exportStar(require("./languages"), exports);
 //# sourceMappingURL=index.js.map

package/out/languages.d.ts

@@ -1,5 +1,10 @@
 import type { editor, languages as _languages, IDisposable, Uri } from 'monaco-editor-core';
 import type { LanguageService } from '@volar/language-service';
 export declare namespace languages {
-    function registerProvides(worker: editor.MonacoWebWorker<LanguageService>, language: _languages.LanguageSelector, getSyncUris: () => Uri[], languages: typeof import('monaco-editor-core').languages): Promise<IDisposable>;
+    /**
+     * @deprecated Use `registerProviders` instead.
+     */
+    const registerProvides: typeof registerProviders;
+    function registerProviders(worker: editor.MonacoWebWorker<LanguageService>, language: _languages.LanguageSelector, getSyncUris: () => Uri[], languages: typeof import('monaco-editor-core').languages): Promise<IDisposable>;
 }
+//# sourceMappingURL=languages.d.ts.map

package/out/languages.js

@@ -4,7 +4,11 @@ exports.languages = void 0;
 const provider_1 = require("./utils/provider");
 var languages;
 (function (languages_1) {
-    async function registerProvides(worker, language, getSyncUris, languages) {
+    /**
+     * @deprecated Use `registerProviders` instead.
+     */
+    languages_1.registerProvides = registerProviders;
+    async function registerProviders(worker, language, getSyncUris, languages) {
         const provider = await (0, provider_1.createLanguageFeaturesProvider)(worker, getSyncUris);
         const disposables = [
             languages.registerHoverProvider(language, provider),
@@ -34,6 +38,6 @@ var languages;
         ];
         return { dispose: () => disposables.forEach((d) => d.dispose()) };
     }
-    languages_1.registerProvides = registerProvides;
+    languages_1.registerProviders = registerProviders;
 })(languages || (exports.languages = languages = {}));
 //# sourceMappingURL=languages.js.map

package/out/utils/markers.d.ts

@@ -1,3 +1,4 @@
 import type * as vscode from 'vscode-languageserver-protocol';
 import type { editor } from 'monaco-editor-core';
 export declare const markers: WeakMap<editor.IMarkerData, vscode.Diagnostic>;
+//# sourceMappingURL=markers.d.ts.map

package/out/utils/monaco2protocol.d.ts

@@ -11,3 +11,4 @@ export declare function asParameterInformation(parameterInformation: languages.P
 export declare function asMarkdownString(entry: IMarkdownString | string | undefined): protocol.MarkupContent | string | undefined;
 export declare function asTriggerKind(kind: languages.CompletionTriggerKind): protocol.CompletionTriggerKind;
 export declare function asFormattingOptions(options: languages.FormattingOptions): protocol.FormattingOptions;
+//# sourceMappingURL=monaco2protocol.d.ts.map

package/out/utils/protocol2monaco.d.ts

@@ -36,3 +36,4 @@ export declare function asInlayHintKind(kind: protocol.InlayHintKind): languages
 export declare function asInlayHintLabel(label: protocol.InlayHint['label']): languages.InlayHint['label'];
 export declare function asInlayHintLabelPart(part: protocol.InlayHintLabelPart): languages.InlayHintLabelPart;
 export declare function asPosition(position: protocol.Position): IPosition;
+//# sourceMappingURL=protocol2monaco.d.ts.map

package/out/utils/provider.d.ts

@@ -1,3 +1,4 @@
 import { LanguageService } from '@volar/language-service';
 import type { editor, languages, Uri } from 'monaco-editor-core';
 export declare function createLanguageFeaturesProvider(worker: editor.MonacoWebWorker<LanguageService>, getSyncUris: () => Uri[]): Promise<languages.HoverProvider & languages.DocumentSymbolProvider & languages.DocumentHighlightProvider & languages.LinkedEditingRangeProvider & languages.DefinitionProvider & languages.TypeDefinitionProvider & languages.ImplementationProvider & languages.CodeLensProvider & languages.CodeActionProvider & languages.DocumentFormattingEditProvider & languages.DocumentRangeFormattingEditProvider & languages.OnTypeFormattingEditProvider & languages.LinkProvider & languages.CompletionItemProvider & languages.DocumentColorProvider & languages.FoldingRangeProvider & languages.DeclarationProvider & languages.SignatureHelpProvider & languages.RenameProvider & languages.ReferenceProvider & languages.SelectionRangeProvider & languages.InlayHintsProvider & languages.DocumentSemanticTokensProvider & languages.DocumentRangeSemanticTokensProvider>;
+//# sourceMappingURL=provider.d.ts.map

package/out/utils/provider.js

@@ -1,10 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageFeaturesProvider = void 0;
 const language_service_1 = require("@volar/language-service");
 const markers_1 = require("./markers");
-const monaco2protocol = require("./monaco2protocol");
-const protocol2monaco = require("./protocol2monaco");
+const monaco2protocol = __importStar(require("./monaco2protocol"));
+const protocol2monaco = __importStar(require("./protocol2monaco"));
 async function createLanguageFeaturesProvider(worker, getSyncUris) {
     const completionItems = new WeakMap();
     const codeLens = new WeakMap();

package/out/worker.d.ts

@@ -1,58 +1,7 @@
-import { type TypeScriptLanguageHost, type Config, type ServiceEnvironment, type SharedModules } from '@volar/language-service';
+import { type TypeScriptLanguageHost, type Config, type ServiceEnvironment, type SharedModules, type LanguageService } from '@volar/language-service';
 import type * as monaco from 'monaco-editor-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function createServiceEnvironment(): ServiceEnvironment;
 export declare function createLanguageHost(getMirrorModels: monaco.worker.IWorkerContext<any>['getMirrorModels'], env: ServiceEnvironment, rootPath: string, compilerOptions?: ts.CompilerOptions): TypeScriptLanguageHost;
-export declare function createLanguageService(modules: SharedModules, env: ServiceEnvironment, config: Config, host: TypeScriptLanguageHost): {
-    getTriggerCharacters: () => string[];
-    getAutoFormatTriggerCharacters: () => string[];
-    getSignatureHelpTriggerCharacters: () => string[];
-    getSignatureHelpRetriggerCharacters: () => string[];
-    format: (uri: string, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
-        ch: string;
-        position: import("@volar/language-service").Position;
-    } | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").TextEdit[] | undefined>;
-    getFoldingRanges: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
-    getSelectionRanges: (uri: string, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
-    findLinkedEditingRanges: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
-    findDocumentSymbols: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
-    findDocumentColors: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
-    getColorPresentations: (uri: string, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
-    doValidation: (uri: string, mode: "all" | "semantic" | "syntactic", token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
-    findReferences: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
-    findFileReferences: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableResult<import("@volar/language-service").Location[]>;
-    findDefinition: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    findTypeDefinition: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    findImplementations: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    prepareRename: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<NonNullable<import("@volar/language-service").Range | {
-        range: import("@volar/language-service").Range;
-        placeholder: string;
-    } | {
-        message: string;
-    } | null | undefined> | undefined>;
-    doRename: (uri: string, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
-    getEditsForFileRename: (oldUri: string, newUri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
-    getSemanticTokens: (uri: string, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken | undefined, reportProgress?: ((tokens: import("@volar/language-service").SemanticTokens) => void) | undefined) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
-    doHover: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Hover | undefined>;
-    doComplete: (uri: string, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionList>;
-    doCodeActions: (uri: string, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
-    doCodeActionResolve: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction>;
-    doCompletionResolve: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionItem>;
-    getSignatureHelp: (uri: string, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
-    doCodeLens: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens[]>;
-    doCodeLensResolve: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens>;
-    findDocumentHighlights: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
-    findDocumentLinks: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
-    doDocumentLinkResolve: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens>;
-    findWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
-    doAutoInsert: (uri: string, position: import("@volar/language-service").Position, autoInsertContext: import("@volar/language-service").AutoInsertionContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<NonNullable<string | import("@volar/language-service").TextEdit | null | undefined> | undefined>;
-    getInlayHints: (uri: string, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
-    doInlayHintResolve: (item: import("@volar/language-service").InlayHint, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint>;
-    callHierarchy: {
-        doPrepare(uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined): Promise<import("@volar/language-service").CallHierarchyItem[] | undefined>;
-        getIncomingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyIncomingCall[]>;
-        getOutgoingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyOutgoingCall[]>;
-    };
-    dispose: () => void;
-    context: import("@volar/language-service").ServiceContext<any>;
-};
+export declare function createLanguageService<T = {}>(modules: SharedModules, env: ServiceEnvironment, config: Config, host: TypeScriptLanguageHost, extraApis?: T): LanguageService & T;
+//# sourceMappingURL=worker.d.ts.map

package/out/worker.js

@@ -62,7 +62,7 @@ function createLanguageHost(getMirrorModels, env, rootPath, compilerOptions = {}
     return host;
 }
 exports.createLanguageHost = createLanguageHost;
-function createLanguageService(modules, env, config, host) {
+function createLanguageService(modules, env, config, host, extraApis = {}) {
     const languageService = (0, language_service_1.createLanguageService)(modules, env, config, host);
     class InnocentRabbit {
     }
@@ -73,6 +73,12 @@ function createLanguageService(modules, env, config, host) {
             InnocentRabbit.prototype[api] = languageService[api];
         }
     }
+    for (const api in extraApis) {
+        const isFunction = typeof extraApis[api] === 'function';
+        if (isFunction) {
+            InnocentRabbit.prototype[api] = extraApis[api];
+        }
+    }
     return new InnocentRabbit();
 }
 exports.createLanguageService = createLanguageService;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "1.10.0",
+	"version": "1.10.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -15,12 +15,12 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "1.10.0",
+		"@volar/language-service": "1.10.2",
 		"vscode-uri": "^3.0.7"
 	},
 	"devDependencies": {
 		"monaco-editor-core": "latest",
 		"vscode-languageserver-protocol": "^3.17.3"
 	},
-	"gitHead": "c25bdec20ee11d278049a738743c694431f08796"
+	"gitHead": "15d5e9129c034ef839f6b4646e495b5e80890764"
 }