@vue/language-service 2.0.13 → 2.0.15

package/lib/plugins/vue-codelens-references.js

@@ -30,7 +30,7 @@ function create() {
                 const decoded = context.decodeEmbeddedDocumentUri(uri);
                 const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                 const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                if (!virtualCode || !(sourceScript?.generated?.root instanceof language_core_1.VueGeneratedCode) || !sourceScript) {
+                if (!virtualCode || !(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) || !sourceScript) {
                     return;
                 }
                 return callback(virtualCode, sourceScript);

package/lib/plugins/vue-document-drop.js

@@ -22,7 +22,7 @@ function create(ts, getTsPluginClient) {
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     const vueVirtualCode = sourceScript?.generated?.root;
-                    if (!sourceScript || !virtualCode || !(vueVirtualCode instanceof language_core_1.VueGeneratedCode)) {
+                    if (!sourceScript || !virtualCode || !(vueVirtualCode instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
                     let importUri;

package/lib/plugins/vue-extract-file.js

@@ -18,7 +18,7 @@ function create(ts, getTsPluginClient) {
                     const decoded = context.decodeEmbeddedDocumentUri(document.uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!(sourceScript?.generated?.root instanceof language_core_1.VueGeneratedCode) || virtualCode?.id !== 'template') {
+                    if (!(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) || virtualCode?.id !== 'template') {
                         return;
                     }
                     const { sfc } = sourceScript.generated.root;
@@ -48,7 +48,7 @@ function create(ts, getTsPluginClient) {
                     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?.root instanceof language_core_1.VueGeneratedCode) || virtualCode?.id !== 'template') {
+                    if (!(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) || virtualCode?.id !== 'template') {
                         return codeAction;
                     }
                     const document = context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);

package/lib/plugins/vue-sfc.d.ts

@@ -2,6 +2,6 @@ import type { LanguageServicePlugin } from '@volar/language-service';
 import * as vue from '@vue/language-core';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
-    'vue/vueFile': (document: TextDocument) => vue.VueGeneratedCode | undefined;
+    'vue/vueFile': (document: TextDocument) => vue.VueVirtualCode | undefined;
 }
 export declare function create(): LanguageServicePlugin;

package/lib/plugins/vue-sfc.js

@@ -47,7 +47,7 @@ function create() {
                     },
                 },
                 async resolveEmbeddedCodeFormattingOptions(sourceScript, virtualCode, options) {
-                    if (sourceScript.generated?.root instanceof vue.VueGeneratedCode) {
+                    if (sourceScript.generated?.root instanceof vue.VueVirtualCode) {
                         if (virtualCode.id === 'scriptFormat' || virtualCode.id === 'scriptSetupFormat') {
                             if (await context.env.getConfiguration?.('vue.format.script.initialIndent') ?? false) {
                                 options.initialIndentLevel++;
@@ -156,7 +156,7 @@ function create() {
                 const decoded = context.decodeEmbeddedDocumentUri(document.uri);
                 const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                 const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                if (virtualCode instanceof vue.VueGeneratedCode) {
+                if (virtualCode instanceof vue.VueVirtualCode) {
                     return callback(virtualCode);
                 }
             }

package/lib/plugins/vue-template.js

@@ -16,6 +16,7 @@ let modelData;
 function create(mode, ts, getVueOptions, getTsPluginClient) {
     let customData = [];
     let extraCustomData = [];
+    let lastCompletionComponentNames = new Set();
     const onDidChangeCustomDataListeners = new Set();
     const onDidChangeCustomData = (listener) => {
         onDidChangeCustomDataListeners.add(listener);
@@ -91,7 +92,9 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     let currentVersion;
                     const decoded = context.decodeEmbeddedDocumentUri(document.uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
-                    if (sourceScript?.generated?.root instanceof language_core_1.VueGeneratedCode) {
+                    if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
+                        // #4298: Precompute HTMLDocument before provideHtmlData to avoid parseHTMLDocument requesting component names from tsserver
+                        baseServiceInstance.provideCompletionItems?.(document, position, completionContext, token);
                         sync = (await provideHtmlData(sourceScript.id, sourceScript.generated.root)).sync;
                         currentVersion = await sync();
                     }
@@ -102,8 +105,8 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (!htmlComplete) {
                         return;
                     }
-                    if (sourceScript?.generated?.root instanceof language_core_1.VueGeneratedCode) {
-                        await afterHtmlCompletion(htmlComplete, context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot), sourceScript.generated.root);
+                    if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
+                        await afterHtmlCompletion(htmlComplete, context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot));
                     }
                     return htmlComplete;
                 },
@@ -125,9 +128,9 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     for (const map of context.documents.getMaps(virtualCode)) {
                         const code = context.language.scripts.get(map.sourceDocument.uri)?.generated?.root;
                         const scanner = getScanner(baseServiceInstance, document);
-                        if (code instanceof language_core_1.VueGeneratedCode && scanner) {
+                        if (code instanceof language_core_1.VueVirtualCode && scanner) {
                             // visualize missing required props
-                            const casing = await (0, nameCasing_1.getNameCasing)(context, map.sourceDocument.uri, tsPluginClient);
+                            const casing = await (0, nameCasing_1.getNameCasing)(context, map.sourceDocument.uri);
                             const components = await tsPluginClient?.getComponentNames(code.fileName) ?? [];
                             const componentProps = {};
                             let token;
@@ -135,10 +138,9 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                             while ((token = scanner.scan()) !== html.TokenType.EOS) {
                                 if (token === html.TokenType.StartTag) {
                                     const tagName = scanner.getTokenText();
-                                    const component = tagName.indexOf('.') >= 0
-                                        ? components.find(component => component === tagName.split('.')[0])
+                                    const checkTag = tagName.indexOf('.') >= 0
+                                        ? tagName
                                         : components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
-                                    const checkTag = tagName.indexOf('.') >= 0 ? tagName : component;
                                     if (checkTag) {
                                         componentProps[checkTag] ??= await tsPluginClient?.getComponentProps(code.fileName, checkTag, true) ?? [];
                                         current = {
@@ -234,7 +236,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     }
                     for (const map of context.documents.getMaps(virtualCode)) {
                         const code = context.language.scripts.get(map.sourceDocument.uri)?.generated?.root;
-                        if (!(code instanceof language_core_1.VueGeneratedCode)) {
+                        if (!(code instanceof language_core_1.VueVirtualCode)) {
                             continue;
                         }
                         const templateErrors = [];
@@ -281,7 +283,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     const decoded = context.decodeEmbeddedDocumentUri(document.uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     if (!sourceScript
-                        || !(sourceScript.generated?.root instanceof language_core_1.VueGeneratedCode)
+                        || !(sourceScript.generated?.root instanceof language_core_1.VueVirtualCode)
                         || !sourceScript.generated.root.sfc.template) {
                         return [];
                     }
@@ -310,7 +312,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
             };
             async function provideHtmlData(sourceDocumentUri, vueCode) {
                 await (initializing ??= initialize());
-                const casing = await (0, nameCasing_1.getNameCasing)(context, sourceDocumentUri, tsPluginClient);
+                const casing = await (0, nameCasing_1.getNameCasing)(context, sourceDocumentUri);
                 if (builtInData.tags) {
                     for (const tag of builtInData.tags) {
                         if (tag.name === 'slot') {
@@ -349,6 +351,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                                         && name !== 'KeepAlive'
                                         && name !== 'Suspense'
                                         && name !== 'Teleport');
+                                    lastCompletionComponentNames = new Set(components);
                                     version++;
                                 })());
                                 return [];
@@ -503,10 +506,8 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     }
                 };
             }
-            async function afterHtmlCompletion(completionList, sourceDocument, code) {
+            async function afterHtmlCompletion(completionList, sourceDocument) {
                 const replacement = getReplacement(completionList, sourceDocument);
-                const componentNames = new Set((await tsPluginClient?.getComponentNames(code.fileName) ?? [])
-                    .map(language_core_1.hyphenateTag));
                 if (replacement) {
                     const isEvent = replacement.text.startsWith('v-on:') || replacement.text.startsWith('@');
                     const isProp = replacement.text.startsWith('v-bind:') || replacement.text.startsWith(':');
@@ -570,7 +571,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (itemId) {
                         item.documentation = undefined;
                     }
-                    if (item.kind === 10 && componentNames.has((0, language_core_1.hyphenateTag)(item.label))) {
+                    if (item.kind === 10 && lastCompletionComponentNames.has((0, language_core_1.hyphenateTag)(item.label))) {
                         item.kind = 6;
                         item.sortText = '\u0000' + (item.sortText ?? item.label);
                     }

package/lib/plugins/vue-toggle-v-bind-codeaction.js

@@ -13,7 +13,7 @@ function create(ts) {
                     const decoded = context.decodeEmbeddedDocumentUri(document.uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!(virtualCode instanceof language_core_1.VueGeneratedCode)) {
+                    if (!(virtualCode instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
                     const { template } = virtualCode.sfc;

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

@@ -13,7 +13,7 @@ function create(ts, getTsPluginClient) {
                     const decoded = context.decodeEmbeddedDocumentUri(document.uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!(sourceScript?.generated?.root instanceof vue.VueGeneratedCode) || virtualCode?.id !== 'template') {
+                    if (!(sourceScript?.generated?.root instanceof vue.VueVirtualCode) || virtualCode?.id !== 'template') {
                         return;
                     }
                     const hoverOffsets = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.0.13",
+	"version": "2.0.15",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -16,32 +16,32 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.8",
-		"@volar/language-service": "2.2.0-alpha.8",
-		"@volar/typescript": "2.2.0-alpha.8",
+		"@volar/language-core": "2.2.0-alpha.12",
+		"@volar/language-service": "2.2.0-alpha.12",
+		"@volar/typescript": "2.2.0-alpha.12",
 		"@vue/compiler-dom": "^3.4.0",
-		"@vue/language-core": "2.0.13",
+		"@vue/language-core": "2.0.15",
 		"@vue/shared": "^3.4.0",
-		"@vue/typescript-plugin": "2.0.13",
+		"@vue/typescript-plugin": "2.0.15",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.38",
-		"volar-service-emmet": "0.0.38",
-		"volar-service-html": "0.0.38",
-		"volar-service-json": "0.0.38",
-		"volar-service-pug": "0.0.38",
-		"volar-service-pug-beautify": "0.0.38",
-		"volar-service-typescript": "0.0.38",
-		"volar-service-typescript-twoslash-queries": "0.0.38",
-		"vscode-html-languageservice": "^5.1.0",
+		"volar-service-css": "0.0.40",
+		"volar-service-emmet": "0.0.40",
+		"volar-service-html": "0.0.40",
+		"volar-service-json": "0.0.40",
+		"volar-service-pug": "0.0.40",
+		"volar-service-pug-beautify": "0.0.40",
+		"volar-service-typescript": "0.0.40",
+		"volar-service-typescript-twoslash-queries": "0.0.40",
+		"vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "2.2.0-alpha.8",
+		"@volar/kit": "2.2.0-alpha.12",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "591d019acd0d34e390880d69b31fbc7b794b806b"
+	"gitHead": "095f44449d71cd5a4730306c9c8c40df4d44dce3"
 }

package/scripts/update-html-data.js

@@ -56,6 +56,24 @@ const langs = [
 		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-it/',
 		supported: true,
 	},
+	{
+		name: 'cs',
+		url: 'https://cs.vuejs.org/',
+		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-cs/',
+		supported: true,
+	},
+	{
+		name: 'ru',
+		url: 'https://ru.vuejs.org/',
+		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-ru/',
+		supported: true,
+	},
+	{
+		name: 'fa',
+		url: 'https://fa.vuejs.org/',
+		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-fa/',
+		supported: false,
+	},
 ];
 
 for (const lang of langs) {