@vue/language-service 3.0.3 → 3.0.5

package/lib/plugins/vue-twoslash-queries.d.ts

@@ -1,2 +1,2 @@
-import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
-export declare function create(getTsPluginClient?: (context: LanguageServiceContext) => import('@vue/typescript-plugin/lib/requests').Requests | undefined): LanguageServicePlugin;
+import type { LanguageServicePlugin } from '@volar/language-service';
+export declare function create({ getQuickInfoAtPosition }: import('@vue/typescript-plugin/lib/requests').Requests): LanguageServicePlugin;

package/lib/plugins/vue-twoslash-queries.js

@@ -1,32 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
-const language_core_1 = require("@vue/language-core");
-const vscode_uri_1 = require("vscode-uri");
+const utils_1 = require("../utils");
 const twoslashTemplateReg = /<!--\s*\^\?\s*-->/g;
 const twoslashScriptReg = /(?<=^|\n)\s*\/\/\s*\^\?/g;
-function create(getTsPluginClient) {
+function create({ getQuickInfoAtPosition }) {
     return {
         name: 'vue-twoslash-queries',
         capabilities: {
             inlayHintProvider: {},
         },
         create(context) {
-            const tsPluginClient = getTsPluginClient?.(context);
             return {
                 async provideInlayHints(document, range) {
-                    const uri = vscode_uri_1.URI.parse(document.uri);
-                    const decoded = context.decodeEmbeddedDocumentUri(uri);
-                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
-                    const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!sourceScript?.generated
-                        || (virtualCode?.id !== 'template' && !virtualCode?.id.startsWith('script_'))) {
-                        return;
-                    }
-                    const root = sourceScript.generated.root;
-                    if (!(root instanceof language_core_1.VueVirtualCode)) {
+                    const info = (0, utils_1.getEmbeddedInfo)(context, document, id => id === 'template' || id.startsWith('script_'));
+                    if (!info) {
                         return;
                     }
+                    const { sourceScript, virtualCode, root } = info;
                     const hoverOffsets = [];
                     const inlayHints = [];
                     const twoslashReg = virtualCode.id === 'template' ? twoslashTemplateReg : twoslashScriptReg;
@@ -41,11 +32,11 @@ function create(getTsPluginClient) {
                             }),
                         ]);
                     }
-                    const sourceDocument = context.documents.get(decoded[0], sourceScript.languageId, sourceScript.snapshot);
+                    const sourceDocument = context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot);
                     for (const [pointerPosition, hoverOffset] of hoverOffsets) {
                         const map = context.language.maps.get(virtualCode, sourceScript);
                         for (const [sourceOffset] of map.toSourceLocation(hoverOffset)) {
-                            const quickInfo = await tsPluginClient?.getQuickInfoAtPosition(root.fileName, sourceDocument.positionAt(sourceOffset));
+                            const quickInfo = await getQuickInfoAtPosition(root.fileName, sourceDocument.positionAt(sourceOffset));
                             if (quickInfo) {
                                 inlayHints.push({
                                     position: { line: pointerPosition.line, character: pointerPosition.character + 2 },

package/lib/utils.d.ts

@@ -0,0 +1,8 @@
+import { type LanguageServiceContext, type SourceScript, type TextDocument } from '@volar/language-service';
+import { VueVirtualCode } from '@vue/language-core';
+import { URI } from 'vscode-uri';
+export declare function getEmbeddedInfo(context: LanguageServiceContext, document: TextDocument, embeddedCodeId?: string | ((id: string) => boolean), languageId?: string): {
+    sourceScript: Required<SourceScript<URI>>;
+    virtualCode: import("@volar/language-service").VirtualCode;
+    root: VueVirtualCode;
+} | undefined;

package/lib/utils.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEmbeddedInfo = getEmbeddedInfo;
+const language_core_1 = require("@vue/language-core");
+const vscode_uri_1 = require("vscode-uri");
+function getEmbeddedInfo(context, document, embeddedCodeId, languageId) {
+    const uri = vscode_uri_1.URI.parse(document.uri);
+    const decoded = context.decodeEmbeddedDocumentUri(uri);
+    if (!decoded) {
+        return;
+    }
+    if (embeddedCodeId) {
+        if (typeof embeddedCodeId === 'string') {
+            if (decoded[1] !== embeddedCodeId) {
+                return;
+            }
+        }
+        else if (!embeddedCodeId(decoded[1])) {
+            return;
+        }
+    }
+    if (languageId && document.languageId !== languageId) {
+        return;
+    }
+    const sourceScript = context.language.scripts.get(decoded[0]);
+    if (!sourceScript?.generated) {
+        return;
+    }
+    const virtualCode = sourceScript.generated.embeddedCodes.get(decoded[1]);
+    if (!virtualCode) {
+        return;
+    }
+    const root = sourceScript.generated.root;
+    if (!(root instanceof language_core_1.VueVirtualCode)) {
+        return;
+    }
+    return {
+        sourceScript: sourceScript,
+        virtualCode,
+        root,
+    };
+}
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.0.3",
+	"version": "3.0.5",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -17,8 +17,8 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.4.20",
-		"@vue/language-core": "3.0.3",
+		"@volar/language-service": "2.4.22",
+		"@vue/language-core": "3.0.5",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.65",
@@ -34,11 +34,11 @@
 	"devDependencies": {
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/kit": "2.4.20",
-		"@volar/typescript": "2.4.20",
+		"@volar/kit": "2.4.22",
+		"@volar/typescript": "2.4.22",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/typescript-plugin": "3.0.3",
+		"@vue/typescript-plugin": "3.0.5",
 		"vscode-css-languageservice": "^6.3.1"
 	},
-	"gitHead": "129f30ff8d8d976abf0431063be5c6c4cf88f0fd"
+	"gitHead": "036b6b1882179d35586e16f2a5cba5150e5d18e6"
 }