@volar/monaco 1.10.0 → 1.10.1

package/out/editor.d.ts

@@ -1,4 +1,4 @@
-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;

package/out/editor.js

@@ -32,7 +32,7 @@ var editor;
             }
         }
         function hostingMarkers(model) {
-            if (!languages.includes(model.getLanguageId())) {
+            if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
                 return;
             }
             let timer;
@@ -105,7 +105,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,2 @@
-export * from './languages';
 export * from './editor';
+export * from './languages';

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/worker.d.ts

@@ -1,58 +1,6 @@
-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;

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.1",
 	"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.1",
 		"vscode-uri": "^3.0.7"
 	},
 	"devDependencies": {
 		"monaco-editor-core": "latest",
 		"vscode-languageserver-protocol": "^3.17.3"
 	},
-	"gitHead": "c25bdec20ee11d278049a738743c694431f08796"
+	"gitHead": "65775648936d786847511f3d8bdd8a3d1dca2e4e"
 }