@vue/language-service 3.2.7 → 3.2.9

package/lib/plugins/css.js

@@ -23,7 +23,7 @@ function create({ resolveModuleName }) {
                         const map = modulePathCache;
                         if (!map.has(ref)) {
                             const fileName = baseUri.fsPath.replace(/\\/g, '/');
-                            const promise = resolveModuleName(fileName, ref);
+                            const promise = resolveModuleName(fileName, ref, true);
                             map.set(ref, promise);
                             if (promise instanceof Promise) {
                                 promise.then(res => map.set(ref, res));
@@ -34,7 +34,7 @@ function create({ resolveModuleName }) {
                             throw cached;
                         }
                         if (cached) {
-                            return cached;
+                            return vscode_uri_1.URI.file(cached).toString();
                         }
                     }
                     return (0, volar_service_css_1.resolveReference)(ref, baseUri, context.env.workspaceFolders);

package/lib/plugins/vue-template.js

@@ -100,12 +100,13 @@ function create(ts, languageId, tsserver) {
                     throw cached;
                 }
                 if (cached) {
-                    return cached;
+                    return vscode_uri_1.URI.file(cached).toString();
                 }
             }
             return (0, volar_service_html_1.resolveReference)(ref, baseUri, context.env.workspaceFolders);
         },
     });
+    const defaultHTMLProvider = html.getDefaultHTMLDataProvider();
     const baseService = languageId === 'jade'
         ? (0, volar_service_pug_1.create)({
             useDefaultDataProvider: false,
@@ -169,31 +170,10 @@ function create(ts, languageId, tsserver) {
                             ...codegen.getImportedComponents(),
                             ...codegen.getSetupExposed(),
                         ]);
-                        // copied from https://github.com/microsoft/vscode-html-languageservice/blob/10daf45dc16b4f4228987cf7cddf3a7dbbdc7570/src/beautify/beautify-html.js#L2746-L2761
-                        voidElements = [
-                            'area',
-                            'base',
-                            'br',
-                            'col',
-                            'embed',
-                            'hr',
-                            'img',
-                            'input',
-                            'keygen',
-                            'link',
-                            'menuitem',
-                            'meta',
-                            'param',
-                            'source',
-                            'track',
-                            'wbr',
-                            '!doctype',
-                            '?xml',
-                            'basefont',
-                            'isindex',
-                        ].filter(tag => tag
-                            && !componentNames.has(tag)
-                            && !componentNames.has((0, shared_1.capitalize)((0, shared_1.camelize)(tag))));
+                        voidElements = defaultHTMLProvider.provideTags()
+                            .filter(tag => tag.void)
+                            .map(tag => tag.name)
+                            .filter(tag => !componentNames.has(tag) && !componentNames.has((0, shared_1.capitalize)(tag)));
                     }
                     return (0, htmlFormatter_1.format)(document, range, options, voidElements);
                 };
@@ -207,7 +187,7 @@ function create(ts, languageId, tsserver) {
             const vModelModifiers = extractModelModifiers(modelData.globalAttributes);
             const transformedItems = new WeakSet();
             const defaultHtmlTags = new Map();
-            for (const tag of html.getDefaultHTMLDataProvider().provideTags()) {
+            for (const tag of defaultHTMLProvider.provideTags()) {
                 defaultHtmlTags.set(tag.name, tag);
             }
             let lastCompletionDocument;
@@ -499,7 +479,7 @@ function create(ts, languageId, tsserver) {
                         return;
                     }
                     updateExtraCustomData([
-                        html.getDefaultHTMLDataProvider(),
+                        defaultHTMLProvider,
                     ]);
                     return baseServiceInstance.provideDocumentSymbols?.(document, token);
                 },

package/package.json

@@ -1,11 +1,13 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.2.7",
+	"version": "3.2.9",
 	"license": "MIT",
 	"files": [
 		"data",
-		"**/*.js",
-		"**/*.d.ts"
+		"index.d.ts",
+		"index.js",
+		"lib/**/*.d.ts",
+		"lib/**/*.js"
 	],
 	"sideEffects": false,
 	"repository": {
@@ -18,27 +20,27 @@
 	},
 	"dependencies": {
 		"@volar/language-service": "2.4.28",
-		"@vue/language-core": "3.2.7",
+		"@vue/language-core": "3.2.9",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.70",
-		"volar-service-emmet": "0.0.70",
-		"volar-service-html": "0.0.70",
-		"volar-service-json": "0.0.70",
-		"volar-service-pug": "0.0.70",
-		"volar-service-pug-beautify": "0.0.70",
-		"volar-service-typescript": "0.0.70",
+		"volar-service-css": "0.0.71",
+		"volar-service-emmet": "0.0.71",
+		"volar-service-html": "0.0.71",
+		"volar-service-json": "0.0.71",
+		"volar-service-pug": "0.0.71",
+		"volar-service-pug-beautify": "0.0.71",
+		"volar-service-typescript": "0.0.71",
 		"vscode-html-languageservice": "^5.6.2",
 		"vscode-uri": "^3.1.0"
 	},
 	"devDependencies": {
-		"@types/node": "^22.10.4",
+		"@types/node": "^24.1.0",
 		"@types/path-browserify": "^1.0.3",
 		"@volar/kit": "2.4.28",
 		"@volar/typescript": "2.4.28",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/typescript-plugin": "3.2.7",
+		"@vue/typescript-plugin": "3.2.9",
 		"vscode-css-languageservice": "^6.3.10"
 	},
-	"gitHead": "a7092edf12862f0db8e39bd2afbda3d54aa26506"
+	"gitHead": "9c1fd47ffe25e86394232dfc76453a5f76cb4fe0"
 }

package/scripts/update-html-data.js

@@ -1,455 +0,0 @@
-// @ts-check
-const fs = require('fs');
-const path = require('path');
-const langs = [
-	{
-		name: 'en',
-		url: 'https://vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs/docs/',
-		supported: true,
-	},
-	{
-		name: 'zh-cn',
-		url: 'https://cn.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-zh-cn/',
-		supported: true,
-	},
-	{
-		name: 'zh-hk',
-		url: 'https://zh-hk.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-zh-hk/',
-		supported: true,
-	},
-	{
-		name: 'ja',
-		url: 'https://ja.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-ja/',
-		supported: true,
-	},
-	{
-		name: 'ua',
-		url: 'https://ua.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-ua/',
-		supported: false,
-	},
-	{
-		name: 'fr',
-		url: 'https://fr.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-fr/',
-		supported: true,
-	},
-	{
-		name: 'ko',
-		url: 'https://ko.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-ko/',
-		supported: true,
-	},
-	{
-		name: 'pt',
-		url: 'https://pt.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-pt/',
-		supported: true,
-	},
-	{
-		name: 'bn',
-		url: 'https://bn.vuejs.org/',
-		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-bn/',
-		supported: false,
-	},
-	{
-		name: 'it',
-		url: 'https://it.vuejs.org/',
-		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,
-	},
-];
-
-localeWorker();
-for (const lang of langs) {
-	if (lang.supported) {
-		templateWorker(lang);
-		sfcWorker(lang);
-		modelWorker(lang);
-	}
-}
-
-function localeWorker() {
-	const data = langs.map(({ name, url }) => ({ name, url }));
-
-	const writePath = path.resolve(__dirname, '../data/locale.json');
-	fs.writeFileSync(writePath, JSON.stringify(data, null, 2));
-	console.log(writePath);
-}
-
-async function sfcWorker(lang) {
-	const sfcDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/sfc-spec.md', lang.url);
-	const cssFeaturesDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/sfc-css-features.md', lang.url);
-
-	/**
-	 * @type {import('vscode-html-languageservice').IAttributeData}
-	 */
-	const langAttr = {
-		name: 'lang',
-		description: {
-			kind: 'markdown',
-			value: sfcDoc.split('\n## ')[4].split('\n').slice(1).join('\n').trim(),
-		},
-		values: [
-			// // custom block
-			// { name: 'md' },
-			// { name: 'json' },
-			// { name: 'jsonc' },
-			// { name: 'json5' },
-			// { name: 'yaml' },
-			// { name: 'toml' },
-			// { name: 'gql' },
-			// { name: 'graphql' },
-		],
-		references: 'api/sfc-spec.html#pre-processors',
-	};
-	/**
-	 * @type {import('vscode-html-languageservice').IAttributeData}
-	 */
-	const srcAttr = {
-		name: 'src',
-		description: {
-			kind: 'markdown',
-			value: sfcDoc.split('\n## ')[5].split('\n').slice(1).join('\n').trim(),
-		},
-		references: 'api/sfc-spec.html#src-imports',
-	};
-	const languageBlocks = sfcDoc
-		.split('\n## ')[2]
-		.split('\n### ')
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			const name = normalizeTagName(lines[0]);
-			/**
-			 * @type {import('vscode-html-languageservice').ITagData}
-			 */
-			const data = {
-				name,
-				attributes: name === 'script setup' ? [] : [srcAttr],
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n'),
-				},
-				references: `api/sfc-spec.html#${normalizeHash(name)}`,
-			};
-			if (name === 'template') {
-				data.attributes.push({
-					...langAttr,
-					values: [
-						{ name: 'html' },
-						{ name: 'pug' },
-					],
-				});
-			}
-			if (name === 'script') {
-				data.attributes.push({
-					...langAttr,
-					values: [
-						{ name: 'ts' },
-						{ name: 'js' },
-						{ name: 'tsx' },
-						{ name: 'jsx' },
-					],
-				});
-				data.attributes.push({ name: 'generic' });
-			}
-			if (name === 'style') {
-				data.attributes.push({
-					...langAttr,
-					values: [
-						{ name: 'css' },
-						{ name: 'scss' },
-						{ name: 'less' },
-						{ name: 'stylus' },
-						{ name: 'postcss' },
-						{ name: 'sass' },
-					],
-				});
-				data.attributes.push({
-					name: 'scoped',
-					valueSet: 'v',
-					description: {
-						kind: 'markdown',
-						value: cssFeaturesDoc.split('\n## ')[1].split('\n').slice(1).join('\n').trim(),
-					},
-					references: 'api/sfc-css-features.html#scoped-css',
-				});
-				data.attributes.push({
-					name: 'module',
-					valueSet: 'v',
-					description: {
-						kind: 'markdown',
-						value: cssFeaturesDoc.split('\n## ')[2].split('\n').slice(1).join('\n').trim(),
-					},
-					references: 'api/sfc-css-features.html#css-modules',
-				});
-			}
-			return data;
-		});
-
-	const scriptBlock = languageBlocks.find(b => b.name === 'script');
-	const scriptSetupBlock = languageBlocks.find(b => b.name === 'script setup');
-
-	if (!scriptBlock || !scriptSetupBlock) {
-		throw new Error('script or script setup block not found');
-	}
-
-	scriptBlock.attributes.push({
-		name: 'setup',
-		valueSet: 'v',
-		description: scriptSetupBlock.description,
-		references: scriptSetupBlock.references,
-	});
-
-	/**
-	 * @type {import('vscode-html-languageservice').HTMLDataV1}
-	 */
-	const data = {
-		version: 1.1,
-		tags: languageBlocks,
-		globalAttributes: [langAttr, srcAttr],
-	};
-
-	const writePath = path.resolve(__dirname, '../data/language-blocks/' + lang.name + '.json');
-	fs.writeFileSync(writePath, JSON.stringify(data, null, 2));
-	console.log(writePath);
-}
-
-async function modelWorker(lang) {
-	const formsDoc = await fetchText(lang.repoUrl + 'HEAD/src/guide/essentials/forms.md', lang.url);
-	const modifiers = formsDoc
-		.split('\n## ')[3]
-		.split('\n### ')
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			let name = normalizeAttrName(lines[0]);
-			name = name.split('.')[1];
-			/**
-			 * @type {import('vscode-html-languageservice').IAttributeData}
-			 */
-			const data = {
-				name,
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n').trim(),
-				},
-				references: `guide/essentials/forms.html#${normalizeHash(name)}`,
-			};
-			return data;
-		});
-
-	/**
-	 * @type {import('vscode-html-languageservice').HTMLDataV1}
-	 */
-	const data = {
-		version: 1.1,
-		globalAttributes: modifiers,
-	};
-
-	const writePath = path.resolve(__dirname, '../data/model-modifiers/' + lang.name + '.json');
-	fs.writeFileSync(writePath, JSON.stringify(data, null, 2));
-	console.log(writePath);
-}
-
-async function templateWorker(lang) {
-	const componentsDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/built-in-components.md', lang.url);
-	const elementsDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/built-in-special-elements.md', lang.url);
-	const directivesDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/built-in-directives.md', lang.url);
-	const attributesDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/built-in-special-attributes.md', lang.url);
-	const ssrDoc = await fetchText(lang.repoUrl + 'HEAD/src/api/ssr.md', lang.url);
-
-	const components = componentsDoc
-		.split('\n## ')
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			const name = normalizeTagName(lines[0]);
-			/**
-			 * @type {import('vscode-html-languageservice').ITagData}
-			 */
-			const data = {
-				name,
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n'),
-				},
-				attributes: [],
-				references: `api/built-in-components.html#${normalizeHash(name)}`,
-			};
-			return data;
-		});
-	const elements = elementsDoc
-		.split('\n## ')
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			const name = normalizeTagName(lines[0]);
-			/**
-			 * @type {import('vscode-html-languageservice').ITagData}
-			 */
-			const data = {
-				name,
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n'),
-				},
-				attributes: [],
-				references: `api/built-in-special-elements.html#${normalizeHash(name)}`,
-			};
-			return data;
-		});
-	const directives = directivesDoc
-		.split('\n## ')
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			const name = normalizeAttrName(lines[0]);
-			/**
-			 * @type {import('vscode-html-languageservice').IAttributeData}
-			 */
-			const data = {
-				name,
-				valueSet: name === 'v-cloak'
-						|| name === 'v-else'
-						|| name === 'v-once'
-						|| name === 'v-pre'
-					? 'v'
-					: undefined,
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n').trim(),
-				},
-				references: `api/built-in-directives.html#${normalizeHash(name)}`,
-			};
-			return data;
-		});
-	const attributes = attributesDoc
-		.split('\n## ')
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			const name = normalizeAttrName(lines[0]);
-			/**
-			 * @type {import('vscode-html-languageservice').IAttributeData}
-			 */
-			const data = {
-				name,
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n').trim(),
-				},
-				references: `api/built-in-special-attributes.html#${normalizeHash(name)}`,
-			};
-			return data;
-		});
-	const dataAllowMismatch = ssrDoc
-		.split(/## data-allow-mismatch.*\n/)
-		.slice(1)
-		.map(section => {
-			const lines = section.split('\n');
-			const name = 'data-allow-mismatch';
-			/**
-			 * @type {import('vscode-html-languageservice').IAttributeData}
-			 */
-			const data = {
-				name,
-				description: {
-					kind: 'markdown',
-					value: lines.slice(1).join('\n'),
-				},
-				references: `api/ssr.html#${normalizeHash(name)}`,
-			};
-			return data;
-		})[0];
-
-	if (dataAllowMismatch) {
-		attributes.push(dataAllowMismatch);
-	}
-
-	/**
-	 * @type {import('vscode-html-languageservice').HTMLDataV1}
-	 */
-	const data = {
-		version: 1.1,
-		tags: [
-			...components,
-			...elements,
-		],
-		globalAttributes: [
-			...directives,
-			...attributes,
-		],
-	};
-
-	const writePath = path.resolve(__dirname, '../data/template/' + lang.name + '.json');
-	fs.writeFileSync(writePath, JSON.stringify(data, null, 2));
-	console.log(writePath);
-}
-
-async function fetchText(url, baseUrl) {
-	let text = await (await fetch(url)).text();
-	text = text.replace(/```vue-html/g, '```html');
-	text = text.replace(/\{#.*?\}/g, '');
-	text = resolveMarkdownLinks(text, baseUrl);
-	return text;
-}
-
-function resolveMarkdownLinks(text, url) {
-	return text.replace(/\[(.*?)\]\(\/(.*?)\)/g, (match, p1, p2) => {
-		const p2Parts = p2.split('#');
-		if (!p2Parts[0].endsWith('.html')) {
-			p2Parts[0] += '.html';
-		}
-		p2 = p2Parts.join('#');
-		return `[${p1}](${url}${p2})`;
-	});
-}
-
-function normalizeTagName(name) {
-	name = name.trim();
-	return _normalizeName(name);
-}
-
-function normalizeAttrName(name) {
-	name = name.trim();
-	name = name.split(' ')[0];
-	return _normalizeName(name);
-}
-
-function _normalizeName(name) {
-	if (name.startsWith('`')) {
-		name = name.split('`')[1].split('`')[0];
-	}
-	if (name.startsWith('<')) {
-		name = name.split('<')[1].split('>')[0];
-	}
-	return name;
-}
-
-function normalizeHash(str) {
-	return str.replace(/ /g, '-').toLowerCase();
-}