Merge branch 'vuejs:master' into master

Author: transtone

.github/workflows/auto-fix.yml

@@ -3,7 +3,13 @@ name: auto-fix
 on:
   push:
     branches:
-      - 'master'
+      - master
+  pull_request_target:
+    branches:
+      - master
+
+permissions:
+  contents: write
 
 jobs:
   auto-fix:

.github/workflows/close-cannot-repoduce-issues.yml

@@ -0,0 +1,21 @@
+name: Auto close issues with "can't reproduce" label
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+permissions:
+  issues: write
+
+jobs:
+  close-issues:
+    if: github.repository == 'vuejs/language-tools'
+    runs-on: ubuntu-latest
+    steps:
+      - name: can't reproduce
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: close-issues
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "can't reproduce"
+          inactive-day: 3

.github/workflows/pkg.pr.new.yml

@@ -1,4 +1,5 @@
 name: publish-any-commit
+
 on: [push, pull_request]
 
 jobs:

CHANGELOG.md

@@ -2,6 +2,32 @@
 
 > [Join the Insiders Program](https://github.com/vuejs/language-tools/wiki/Get-Insiders-Edition) for more exclusive features and updates.
 
+## 2.2.8 <sup>official</sup>, 2.2.9 <sup>insiders</sup> (2025-03-02)
+
+### Bug Fixes
+
+- revert "fix(language-core): validate `v-model` variable against model type"
+
+## 2.2.6 <sup>official</sup>, 2.2.7 <sup>insiders</sup> (2025-03-01)
+
+### Features
+
+- feat(language-core): infer prop JSDoc from `defineModel`'s leading comments (#5211) - Thanks to @KazariEX!
+
+### Bug Fixes
+
+- fix(language-core): map camelized prop name correctly (#5207) - Thanks to @KazariEX!
+- fix(component-meta): resolve `defineModel` options to collect `default` value (#5209) - Thanks to @KazariEX!
+- fix(language-core): avoid duplicate generation of `defineExpose`'s codes - Thanks to @KazariEX!
+- fix(language-core): generate camelized prop name for `defineModel` (#5213) - Thanks to @KazariEX!
+- fix(language-core): validate `v-model` variable against model type (#5214) - Thanks to @KazariEX!
+- fix(language-core): use keywords instead of semicolons to separate script sections (#5217) - Thanks to @KazariEX!
+
+### Other Changes
+
+- ci: auto close issues with `can't reproduce` label - Thanks to @KazariEX!
+- refactor(language-core): defer the calculation of `linkedCodeMappings` offsets (#5220) - Thanks to @KazariEX!
+
 ## 2.2.4 <sup>official</sup>, 2.2.5 <sup>insiders</sup> (2025-02-22)
 
 ### Features

extensions/vscode/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "volar",
-	"version": "2.2.4",
+	"version": "2.2.8",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
@@ -567,9 +567,9 @@
 		"@types/vscode": "^1.82.0",
 		"@volar/vscode": "~2.4.11",
 		"@vscode/vsce": "^3.2.1",
-		"@vue/language-core": "2.2.4",
-		"@vue/language-server": "2.2.4",
-		"@vue/typescript-plugin": "2.2.4",
+		"@vue/language-core": "2.2.8",
+		"@vue/language-server": "2.2.8",
+		"@vue/typescript-plugin": "2.2.8",
 		"esbuild": "^0.25.0",
 		"esbuild-visualizer": "^0.7.0",
 		"reactive-vscode": "^0.2.9",

insiders.json

@@ -1,6 +1,22 @@
 {
-	"latest": "2.2.5",
+	"latest": "2.2.9",
 	"versions": [
+		{
+			"version": "2.2.9",
+			"date": "2025-03-02",
+			"downloads": {
+				"GitHub": "https://github.com/volarjs/insiders/releases/tag/v2.2.9",
+				"AFDIAN": "https://afdian.com/p/d78b61e8f75011ef812652540025c377"
+			}
+		},
+		{
+			"version": "2.2.7",
+			"date": "2025-03-01",
+			"downloads": {
+				"GitHub": "https://github.com/volarjs/insiders/releases/tag/v2.2.7",
+				"AFDIAN": "https://afdian.com/p/f5f588def68311efb21b52540025c377"
+			}
+		},
 		{
 			"version": "2.2.5",
 			"date": "2025-02-22",

lerna.json

@@ -6,5 +6,5 @@
 		"packages/*",
 		"test-workspace"
 	],
-	"version": "2.2.4"
+	"version": "2.2.8"
 }

packages/component-meta/lib/base.ts

@@ -416,7 +416,7 @@ ${commandLine.vueOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode}
 				const type = typeChecker.getTypeOfSymbolAtLocation($exposed, symbolNode);
 				const properties = type.getProperties().filter(prop =>
 					// only exposed props will not have a valueDeclaration
-					!(prop as any).valueDeclaration
+					!prop.valueDeclaration
 				);
 
 				return properties.map(prop => {
@@ -728,10 +728,10 @@ function readVueComponentDefaultProps(
 
 	function scriptSetupWorker() {
 
-		const ast = sfc.scriptSetup?.ast;
-		if (!ast) {
+		if (!sfc.scriptSetup) {
 			return;
 		}
+		const { ast } = sfc.scriptSetup;
 
 		const codegen = vue.tsCodegen.get(sfc);
 		const scriptSetupRanges = codegen?.getScriptSetupRanges();
@@ -762,10 +762,22 @@ function readVueComponentDefaultProps(
 			}
 		}
 		else if (scriptSetupRanges?.defineProps?.destructured) {
-			for (const [prop, initializer] of scriptSetupRanges.defineProps.destructured) {
+			for (const [name, initializer] of scriptSetupRanges.defineProps.destructured) {
 				if (initializer) {
 					const expText = printer?.printNode(ts.EmitHint.Expression, initializer, ast) ?? initializer.getText(ast);
-					result[prop] = { default: expText };
+					result[name] = {
+						default: expText
+					};
+				}
+			}
+		}
+
+		if (scriptSetupRanges?.defineProp) {
+			for (const defineProp of scriptSetupRanges.defineProp) {
+				const obj = defineProp.argNode ? findObjectLiteralExpression(defineProp.argNode) : undefined;
+				if (obj) {
+					const name = defineProp.name ? sfc.scriptSetup.content.slice(defineProp.name.start, defineProp.name.end).slice(1, -1) : 'modelValue';
+					result[name] = resolveModelOption(ast, obj, printer, ts);
 				}
 			}
 		}
@@ -786,10 +798,10 @@ function readVueComponentDefaultProps(
 
 	function scriptWorker() {
 
-		const ast = sfc.script?.ast;
-		if (!ast) {
+		if (!sfc.script) {
 			return;
 		}
+		const { ast } = sfc.script;
 
 		const scriptResult = readTsComponentDefaultProps(ast, 'default', printer, ts);
 		for (const [key, value] of Object.entries(scriptResult)) {
@@ -899,7 +911,7 @@ function resolvePropsOption(
 					result[name].required = exp === 'true';
 				}
 				if (defaultProp) {
-					const expNode = resolveDefaultOptionExpression((defaultProp as any).initializer, ts);
+					const expNode = resolveDefaultOptionExpression(defaultProp.initializer, ts);
 					const expText = printer?.printNode(ts.EmitHint.Expression, expNode, ast) ?? expNode.getText(ast);
 					result[name].default = expText;
 				}
@@ -910,6 +922,28 @@ function resolvePropsOption(
 	return result;
 }
 
+function resolveModelOption(
+	ast: ts.SourceFile,
+	options: ts.ObjectLiteralExpression,
+	printer: ts.Printer | undefined,
+	ts: typeof import('typescript')
+) {
+	const result: { default?: string; } = {};
+
+	for (const prop of options.properties) {
+		if (ts.isPropertyAssignment(prop)) {
+			const name = prop.name.getText(ast);
+			if (name === 'default') {
+				const expNode = resolveDefaultOptionExpression(prop.initializer, ts);
+				const expText = printer?.printNode(ts.EmitHint.Expression, expNode, ast) ?? expNode.getText(ast);
+				result.default = expText;
+			}
+		}
+	}
+
+	return result;
+}
+
 function resolveDefaultOptionExpression(
 	_default: ts.Expression,
 	ts: typeof import('typescript')

packages/component-meta/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "2.2.4",
+	"version": "2.2.8",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,9 +14,9 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "2.2.4",
+		"@vue/language-core": "2.2.8",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "2.2.4"
+		"vue-component-type-helpers": "2.2.8"
 	},
 	"peerDependencies": {
 		"typescript": "*"

packages/component-meta/tests/index.spec.ts

@@ -25,23 +25,49 @@ const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describ
 
 		// expect(meta.type).toEqual(TypeMeta.Class);
 
+		const modelValue = meta.props.find(prop => prop.name === 'modelValue');
+		const onUpdateModelValue = meta.events.find(event => event.name === 'update:modelValue');
+
 		const foo = meta.props.find(prop => prop.name === 'foo');
 		const onUpdateFoo = meta.events.find(event => event.name === 'update:foo');
 
 		const bar = meta.props.find(prop => prop.name === 'bar');
-		const onUpdateBar = meta.events.find(event => event.name === 'update:bar');
+		const barModifiers = meta.props.find(prop => prop.name === 'barModifiers');
+		const onUpdateBaz = meta.events.find(event => event.name === 'update:bar');
 
-		const qux = meta.props.find(prop => prop.name === 'qux');
-		const quxModifiers = meta.props.find(prop => prop.name === 'quxModifiers');
-		const onUpdateQux = meta.events.find(event => event.name === 'update:qux');
+		expect(modelValue).toBeDefined();
+		expect(modelValue?.default).toBeUndefined();
+		expect(modelValue?.required).toBeTruthy();
+		expect(modelValue?.type).toEqual('number');
+		expect(modelValue?.description).toEqual('required number modelValue');
+		expect(modelValue?.schema).toEqual('number');
+		expect(onUpdateModelValue).toBeDefined();
 
 		expect(foo).toBeDefined();
-		expect(bar).toBeDefined();
-		expect(qux).toBeDefined();
-		expect(quxModifiers).toBeDefined();
+		expect(foo?.default).toBe('false');
+		expect(foo?.required).toBeFalsy();
+		expect(foo?.type).toEqual('boolean | undefined');
+		expect(foo?.description).toEqual('optional boolean foo with default false');
+		expect(foo?.schema).toEqual({
+			kind: 'enum',
+			type: 'boolean | undefined',
+			schema: ['undefined', 'false', 'true'],
+		});
 		expect(onUpdateFoo).toBeDefined();
-		expect(onUpdateBar).toBeDefined();
-		expect(onUpdateQux).toBeDefined();
+
+		expect(bar).toBeDefined();
+		expect(bar?.default).toBeUndefined();
+		expect(bar?.required).toBeFalsy();
+		expect(bar?.type).toEqual('string | undefined');
+		expect(bar?.description).toEqual('optional string bar with lazy and trim modifiers');
+		expect(bar?.schema).toEqual({
+			kind: 'enum',
+			type: 'string | undefined',
+			schema: ['undefined', 'string'],
+		});
+		// TODO: The types of modifiers are inconsistent in the two running results
+		expect(barModifiers).toBeDefined();
+		expect(onUpdateBaz).toBeDefined();
 	});
 
 	test('reference-type-props', () => {

packages/component-type-helpers/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-type-helpers",
-	"version": "2.2.4",
+	"version": "2.2.8",
 	"license": "MIT",
 	"files": [
 		"**/*.js",

packages/language-core/lib/codegen/globalTypes.ts

@@ -14,12 +14,7 @@ export function getGlobalTypesFileName({
 		checkUnknownProps,
 		checkUnknownEvents,
 		checkUnknownComponents,
-	].map(v => {
-		if (typeof v === 'boolean') {
-			return v ? 1 : 0;
-		}
-		return v;
-	}).join('_') + '.d.ts';
+	].map(v => (typeof v === 'boolean' ? Number(v) : v)).join('_') + '.d.ts';
 }
 
 export function generateGlobalTypes({

packages/language-core/lib/codegen/script/component.ts

@@ -32,9 +32,7 @@ export function* generateComponent(
 	yield `},${newLine}`;
 	if (!ctx.bypassDefineComponent) {
 		const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
-		for (const code of emitOptionCodes) {
-			yield code;
-		}
+		yield* emitOptionCodes;
 		yield* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, !!emitOptionCodes.length, true);
 	}
 	if (

packages/language-core/lib/codegen/script/componentSelf.ts

@@ -33,27 +33,19 @@ export function* generateComponentSelf(
 				if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
 					continue;
 				}
-				const templateOffset = options.getGeneratedLength();
-				yield `${varName}: ${varName} as typeof `;
 
-				const scriptOffset = options.getGeneratedLength();
+				const token = Symbol(varName.length);
+				yield ['', undefined, 0, { __linkedToken: token }];
+				yield `${varName}: ${varName} as typeof `;
+				yield ['', undefined, 0, { __linkedToken: token }];
 				yield `${varName},${newLine}`;
-
-				options.linkedCodeMappings.push({
-					sourceOffsets: [scriptOffset],
-					generatedOffsets: [templateOffset],
-					lengths: [varName.length],
-					data: undefined,
-				});
 			}
 		}
 		yield `}${endOfLine}`; // return {
 		yield `},${newLine}`; // setup() {
 		if (options.sfc.scriptSetup && options.scriptSetupRanges && !ctx.bypassDefineComponent) {
 			const emitOptionCodes = [...generateEmitsOption(options, options.scriptSetupRanges)];
-			for (const code of emitOptionCodes) {
-				yield code;
-			}
+			yield* emitOptionCodes;
 			yield* generatePropsOption(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges, !!emitOptionCodes.length, false);
 		}
 		if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {

packages/language-core/lib/codegen/script/context.ts

@@ -18,7 +18,6 @@ export function createScriptCodegenContext(options: ScriptCodegenOptions) {
 	return {
 		generatedTemplate: false,
 		generatedPropsType: false,
-		scriptSetupGeneratedOffset: undefined as number | undefined,
 		bypassDefineComponent: options.lang === 'js' || options.lang === 'jsx',
 		bindingNames: new Set([
 			...options.scriptRanges?.bindings.map(