@vue/language-service 2.1.10 → 2.2.0

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
-const vue = require("@vue/language-core");
+const language_core_1 = require("@vue/language-core");
 const vscode_uri_1 = require("vscode-uri");
 const twoslashReg = /<!--\s*\^\?\s*-->/g;
 function create(getTsPluginClient) {
@@ -14,10 +14,15 @@ function create(getTsPluginClient) {
             const tsPluginClient = getTsPluginClient?.(context);
             return {
                 async provideInlayHints(document, range) {
-                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
+                    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?.root instanceof vue.VueVirtualCode) || virtualCode?.id !== 'template') {
+                    if (!sourceScript?.generated || virtualCode?.id !== 'template') {
+                        return;
+                    }
+                    const root = sourceScript.generated.root;
+                    if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
                     const hoverOffsets = [];
@@ -33,7 +38,7 @@ function create(getTsPluginClient) {
                     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(sourceScript.generated.root.fileName, sourceOffset);
+                            const quickInfo = await tsPluginClient?.getQuickInfoAtPosition(root.fileName, sourceOffset);
                             if (quickInfo) {
                                 inlayHints.push({
                                     position: { line: pointerPosition.line, character: pointerPosition.character + 2 },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.1.10",
+	"version": "2.2.0",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -17,14 +17,14 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.8",
-		"@volar/language-service": "~2.4.8",
-		"@volar/typescript": "~2.4.8",
+		"@volar/language-core": "~2.4.11",
+		"@volar/language-service": "~2.4.11",
+		"@volar/typescript": "~2.4.11",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/language-core": "2.1.10",
+		"@vue/language-core": "2.2.0",
 		"@vue/shared": "^3.5.0",
-		"@vue/typescript-plugin": "2.1.10",
-		"alien-signals": "^0.2.0",
+		"@vue/typescript-plugin": "2.2.0",
+		"alien-signals": "^0.4.9",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.62",
 		"volar-service-emmet": "0.0.62",
@@ -41,7 +41,8 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.4.8",
+		"@volar/kit": "~2.4.11",
 		"vscode-languageserver-protocol": "^3.17.5"
-	}
+	},
+	"gitHead": "5babca774658d4b9afbe877ac7c8cafdaecf2c3e"
 }

package/scripts/update-html-data.js

@@ -84,12 +84,22 @@ const langs = [
 
 for (const lang of langs) {
 	if (lang.supported) {
+		localeWorker(lang);
 		templateWorker(lang);
 		sfcWorker(lang);
 		modelWorker(lang);
 	}
 }
 
+function localeWorker(lang) {
+
+	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);
@@ -102,7 +112,7 @@ async function sfcWorker(lang) {
 		name: 'lang',
 		description: {
 			kind: 'markdown',
-			value: sfcDoc.split('\n## ')[4].split('\n').slice(1).join('\n'),
+			value: sfcDoc.split('\n## ')[4].split('\n').slice(1).join('\n').trim(),
 		},
 		values: [
 			// // custom block
@@ -115,10 +125,7 @@ async function sfcWorker(lang) {
 			// { name: 'gql' },
 			// { name: 'graphql' },
 		],
-		references: langs.map(lang => ({
-			name: lang.name,
-			url: `${lang.url}api/sfc-spec.html#pre-processors`,
-		})),
+		references: 'api/sfc-spec.html#pre-processors',
 	};
 	/**
 	 * @type {import('vscode-html-languageservice').IAttributeData}
@@ -127,12 +134,9 @@ async function sfcWorker(lang) {
 		name: 'src',
 		description: {
 			kind: 'markdown',
-			value: sfcDoc.split('\n## ')[5].split('\n').slice(1).join('\n'),
+			value: sfcDoc.split('\n## ')[5].split('\n').slice(1).join('\n').trim(),
 		},
-		references: langs.map(lang => ({
-			name: lang.name,
-			url: `${lang.url}api/sfc-spec.html#src-imports`,
-		})),
+		references: 'api/sfc-spec.html#src-imports',
 	};
 	const languageBlocks = sfcDoc
 		.split('\n## ')[2]
@@ -151,10 +155,7 @@ async function sfcWorker(lang) {
 					kind: 'markdown',
 					value: lines.slice(1).join('\n'),
 				},
-				references: langs.map(lang => ({
-					name: lang.name,
-					url: `${lang.url}api/sfc-spec.html#${normalizeHash(name)}`,
-				})),
+				references: `api/sfc-spec.html#${normalizeHash(name)}`,
 			};
 			if (name === 'template') {
 				data.attributes.push({
@@ -194,24 +195,18 @@ async function sfcWorker(lang) {
 					valueSet: 'v',
 					description: {
 						kind: 'markdown',
-						value: cssFeaturesDoc.split('\n## ')[1].split('\n').slice(1).join('\n'),
+						value: cssFeaturesDoc.split('\n## ')[1].split('\n').slice(1).join('\n').trim(),
 					},
-					references: langs.map(lang => ({
-						name: lang.name,
-						url: `${lang.url}api/sfc-css-features.html#scoped-css`,
-					})),
+					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'),
+						value: cssFeaturesDoc.split('\n## ')[2].split('\n').slice(1).join('\n').trim(),
 					},
-					references: langs.map(lang => ({
-						name: lang.name,
-						url: `${lang.url}api/sfc-css-features.html#css-modules`,
-					})),
+					references: 'api/sfc-css-features.html#css-modules',
 				});
 			}
 			return data;
@@ -263,12 +258,9 @@ async function modelWorker(lang) {
 				name,
 				description: {
 					kind: 'markdown',
-					value: lines.slice(1).join('\n'),
+					value: lines.slice(1).join('\n').trim(),
 				},
-				references: langs.map(lang => ({
-					name: lang.name,
-					url: `${lang.url}guide/essentials/forms.html#${normalizeHash(name)}`,
-				})),
+				references: `guide/essentials/forms.html#${normalizeHash(name)}`,
 			};
 			return data;
 		});
@@ -288,47 +280,40 @@ async function modelWorker(lang) {
 
 async function templateWorker(lang) {
 
-	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 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 directives = directivesDoc
+	const components = componentsDoc
 		.split('\n## ')
 		.slice(1)
 		.map((section) => {
 			const lines = section.split('\n');
-			const name = normalizeAttrName(lines[0]);
+			const name = normalizeTagName(lines[0]);
 			/**
-			 * @type {import('vscode-html-languageservice').IAttributeData}
+			 * @type {import('vscode-html-languageservice').ITagData}
 			 */
 			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'),
 				},
-				references: langs.map(lang => ({
-					name: lang.name,
-					url: `${lang.url}api/built-in-directives.html#${normalizeHash(name)}`,
-				})),
+				attributes: [],
+				references: `api/built-in-components.html#${normalizeHash(name)}`,
 			};
 			return data;
 		});
-	const attributes = attributesDoc
+	const elements = elementsDoc
 		.split('\n## ')
 		.slice(1)
 		.map((section) => {
 			const lines = section.split('\n');
-			const name = normalizeAttrName(lines[0]);
+			const name = normalizeTagName(lines[0]);
 			/**
-			 * @type {import('vscode-html-languageservice').IAttributeData}
+			 * @type {import('vscode-html-languageservice').ITagData}
 			 */
 			const data = {
 				name,
@@ -336,59 +321,78 @@ async function templateWorker(lang) {
 					kind: 'markdown',
 					value: lines.slice(1).join('\n'),
 				},
-				references: langs.map(lang => ({
-					name: lang.name,
-					url: `${lang.url}api/built-in-special-attributes.html#${normalizeHash(name)}`,
-				})),
+				attributes: [],
+				references: `api/built-in-special-elements.html#${normalizeHash(name)}`,
 			};
 			return data;
 		});
-	const components = componentsDoc
+	const directives = directivesDoc
 		.split('\n## ')
 		.slice(1)
 		.map((section) => {
 			const lines = section.split('\n');
-			const name = normalizeTagName(lines[0]);
+			const name = normalizeAttrName(lines[0]);
 			/**
-			 * @type {import('vscode-html-languageservice').ITagData}
+			 * @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'),
+					value: lines.slice(1).join('\n').trim(),
 				},
-				attributes: [],
-				references: langs.map(lang => ({
-					name: lang.name,
-					url: `${lang.url}api/built-in-components.html#${normalizeHash(name)}`,
-				})),
+				references: `api/built-in-directives.html#${normalizeHash(name)}`,
 			};
 			return data;
 		});
-	const elements = elementsDoc
+	const attributes = attributesDoc
 		.split('\n## ')
 		.slice(1)
 		.map((section) => {
 			const lines = section.split('\n');
-			const name = normalizeTagName(lines[0]);
+			const name = normalizeAttrName(lines[0]);
 			/**
-			 * @type {import('vscode-html-languageservice').ITagData}
+			 * @type {import('vscode-html-languageservice').IAttributeData}
 			 */
 			const data = {
 				name,
 				description: {
 					kind: 'markdown',
-					value: lines.slice(1).join('\n'),
+					value: lines.slice(1).join('\n').trim(),
 				},
-				attributes: [],
-				references: langs.map(lang => ({
-					name: lang.name,
-					url: `${lang.url}api/built-in-special-elements.html#${normalizeHash(name)}`,
-				})),
+				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}
@@ -401,7 +405,7 @@ async function templateWorker(lang) {
 		],
 		globalAttributes: [
 			...directives,
-			...attributes
+			...attributes,
 		],
 	};