Merge remote-tracking branch 'upstream/master' into refactor/reactive-vscode

KazariEX · KazariEX · commit f05412941327 · 2024-10-26T20:30:08.000+08:00
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -551,7 +551,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.4.7",
+		"@volar/vscode": "~2.4.8",
 		"@vscode/vsce": "latest",
 		"@vue/language-core": "2.1.6",
 		"@vue/language-server": "2.1.6",
diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.7",
+		"@volar/typescript": "~2.4.8",
 		"@vue/language-core": "2.1.6",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "2.1.6"
diff --git a/packages/language-core/lib/codegen/globalTypes.ts b/packages/language-core/lib/codegen/globalTypes.ts
@@ -92,7 +92,11 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 	function __VLS_getVForSourceType(source: number): [number, number, number][];
 	function __VLS_getVForSourceType(source: string): [string, number, number][];
 	function __VLS_getVForSourceType<T extends any[]>(source: T): [
-		item: T[number],
+		item: ${(
+			target >= 3 ? `import('${lib}').Reactive<T[number]>` :
+				target >= 2.7 ? `import('${lib}').UnwrapNestedRefs<T[number]>` :
+					`T[number]`
+		)},
 		key: number,
 		index: number,
 	][];
diff --git a/packages/language-core/lib/codegen/script/index.ts b/packages/language-core/lib/codegen/script/index.ts
@@ -124,7 +124,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 				yield `__VLS_template = () => {${newLine}`;
 				const templateCodegenCtx = yield* generateTemplate(options, ctx);
 				yield* generateComponentSelf(options, ctx, templateCodegenCtx);
-				yield `},${newLine}`;
+				yield `}${endOfLine}`;
 				yield generateSfcBlockSection(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures.all);
 			}
 		}
diff --git a/packages/language-core/lib/codegen/script/scriptSetup.ts b/packages/language-core/lib/codegen/script/scriptSetup.ts
@@ -464,7 +464,7 @@ function* generateModelEmit(
 		yield `type __VLS_ModelEmit = {${newLine}`;
 		for (const defineModel of defineModels) {
 			const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
-			yield `'update:${propName}': [${propName}:`;
+			yield `'update:${propName}': [value:`;
 			yield* generateDefinePropType(scriptSetup, propName, localName, defineModel);
 			yield `]${endOfLine}`;
 		}
diff --git a/packages/language-core/lib/codegen/template/element.ts b/packages/language-core/lib/codegen/template/element.ts
@@ -293,7 +293,8 @@ export function* generateElement(
 	ctx: TemplateCodegenContext,
 	node: CompilerDOM.ElementNode,
 	currentComponent: CompilerDOM.ElementNode | undefined,
-	componentCtxVar: string | undefined
+	componentCtxVar: string | undefined,
+	isVForChild: boolean
 ): Generator<Code> {
 	const startTagOffset = node.loc.start.offset + options.template.content.substring(node.loc.start.offset).indexOf(node.tag);
 	const endTagOffset = !node.isSelfClosing && options.template.lang === 'html'
@@ -350,7 +351,11 @@ export function* generateElement(
 
 	const [refName, offset] = yield* generateVScope(options, ctx, node, node.props);
 	if (refName) {
-		ctx.templateRefs.set(refName, [`__VLS_nativeElements['${node.tag}']`, offset!]);
+		let refValue = `__VLS_nativeElements['${node.tag}']`;
+		if (isVForChild) {
+			refValue = `[${refValue}]`;
+		}
+		ctx.templateRefs.set(refName, [refValue, offset!]);
 	}
 	if (ctx.singleRootNode === node) {
 		ctx.singleRootElType = `typeof __VLS_nativeElements['${node.tag}']`;
diff --git a/packages/language-core/lib/codegen/template/templateChild.ts b/packages/language-core/lib/codegen/template/templateChild.ts
@@ -31,7 +31,8 @@ export function* generateTemplateChild(
 	node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode,
 	currentComponent: CompilerDOM.ElementNode | undefined,
 	prevNode: CompilerDOM.TemplateChildNode | undefined,
-	componentCtxVar: string | undefined
+	componentCtxVar: string | undefined,
+	isVForChild: boolean = false
 ): Generator<Code> {
 	if (prevNode?.type === CompilerDOM.NodeTypes.COMMENT) {
 		const commentText = prevNode.content.trim().split(' ')[0];
@@ -82,7 +83,7 @@ export function* generateTemplateChild(
 				node.tagType === CompilerDOM.ElementTypes.ELEMENT
 				|| node.tagType === CompilerDOM.ElementTypes.TEMPLATE
 			) {
-				yield* generateElement(options, ctx, node, currentComponent, componentCtxVar);
+				yield* generateElement(options, ctx, node, currentComponent, componentCtxVar, isVForChild);
 			}
 			else {
 				yield* generateComponent(options, ctx, node, currentComponent);
diff --git a/packages/language-core/lib/codegen/template/vFor.ts b/packages/language-core/lib/codegen/template/vFor.ts
@@ -86,7 +86,7 @@ export function* generateVFor(
 	}
 	let prev: CompilerDOM.TemplateChildNode | undefined;
 	for (const childNode of node.children) {
-		yield* generateTemplateChild(options, ctx, childNode, currentComponent, prev, componentCtxVar);
+		yield* generateTemplateChild(options, ctx, childNode, currentComponent, prev, componentCtxVar, true);
 		prev = childNode;
 	}
 	for (const varName of forBlockVars) {
diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.7",
+		"@volar/language-core": "~2.4.8",
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
@@ -26,7 +26,7 @@
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/typescript": "~2.4.7",
+		"@volar/typescript": "~2.4.8",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
 	"peerDependencies": {
diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json
@@ -17,7 +17,7 @@
 		"@vue/language-core": "2.1.6"
 	},
 	"dependencies": {
-		"@volar/source-map": "~2.4.7",
+		"@volar/source-map": "~2.4.8",
 		"volar-service-pug": "0.0.62"
 	}
 }
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -16,9 +16,9 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.7",
-		"@volar/language-server": "~2.4.7",
-		"@volar/test-utils": "~2.4.7",
+		"@volar/language-core": "~2.4.8",
+		"@volar/language-server": "~2.4.8",
+		"@volar/test-utils": "~2.4.8",
 		"@vue/language-core": "2.1.6",
 		"@vue/language-service": "2.1.6",
 		"@vue/typescript-plugin": "2.1.6",
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -17,9 +17,9 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.7",
-		"@volar/language-service": "~2.4.7",
-		"@volar/typescript": "~2.4.7",
+		"@volar/language-core": "~2.4.8",
+		"@volar/language-service": "~2.4.8",
+		"@volar/typescript": "~2.4.8",
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/language-core": "2.1.6",
 		"@vue/shared": "^3.5.0",
@@ -41,7 +41,7 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.4.7",
+		"@volar/kit": "~2.4.8",
 		"vscode-languageserver-protocol": "^3.17.5"
 	}
 }
diff --git a/packages/tsc/package.json b/packages/tsc/package.json
@@ -17,7 +17,7 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.7",
+		"@volar/typescript": "~2.4.8",
 		"@vue/language-core": "2.1.6",
 		"semver": "^7.5.4"
 	},
diff --git a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
@@ -13,7 +13,7 @@ declare const _default: <Row extends BaseRow>(__VLS_props: NonNullable<Awaited<t
     attrs: any;
     slots: {
         default?(_: {
-            row: Row;
+            row: import("vue").Reactive<Row>;
         }): any;
     };
     emit: {};
@@ -91,7 +91,7 @@ type __VLS_PrettifyLocal<T> = {
 exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.vue.d.ts 1`] = `
 "declare const _default: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
-        readonly "onUpdate:title"?: (title: string) => any;
+        readonly "onUpdate:title"?: (value: string) => any;
         readonly onBar?: (data: number) => any;
     } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onUpdate:title" | "onBar"> & Partial<{}> & ({
         title?: string;
@@ -111,7 +111,7 @@ exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.v
             foo: number;
         }): any;
     };
-    emit: ((e: "bar", data: number) => void) & ((evt: "update:title", title: string) => void);
+    emit: ((e: "bar", data: number) => void) & ((evt: "update:title", value: string) => void);
 }>) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }> & {
@@ -127,7 +127,7 @@ type __VLS_PrettifyLocal<T> = {
 exports[`vue-tsc-dts > Input: generic/custom-extension-component.cext, Output: generic/custom-extension-component.cext.d.ts 1`] = `
 "declare const _default: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
-        readonly "onUpdate:title"?: (title: string) => any;
+        readonly "onUpdate:title"?: (value: string) => any;
         readonly onBar?: (data: number) => any;
     } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onUpdate:title" | "onBar"> & Partial<{}> & ({
         title?: string;
@@ -147,7 +147,7 @@ exports[`vue-tsc-dts > Input: generic/custom-extension-component.cext, Output: g
             foo: number;
         }): any;
     };
-    emit: ((e: "bar", data: number) => void) & ((evt: "update:title", title: string) => void);
+    emit: ((e: "bar", data: number) => void) & ((evt: "update:title", value: string) => void);
 }>) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }> & {
@@ -321,13 +321,13 @@ exports[`vue-tsc-dts > Input: reference-type-model/component.vue, Output: refere
     quxModifiers?: Record<'lazy' | 'trim', true>;
 };
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_PublicProps>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:foo": (foo: number) => void;
-    "update:bar": (bar: string[]) => void;
-    "update:qux": (qux: string) => void;
+    "update:foo": (value: number) => void;
+    "update:bar": (value: string[]) => void;
+    "update:qux": (value: string) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_PublicProps>>> & Readonly<{
-    "onUpdate:foo"?: (foo: number) => any;
-    "onUpdate:bar"?: (bar: string[]) => any;
-    "onUpdate:qux"?: (qux: string) => any;
+    "onUpdate:foo"?: (value: number) => any;
+    "onUpdate:bar"?: (value: string[]) => any;
+    "onUpdate:qux"?: (value: string) => any;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.7",
+		"@volar/typescript": "~2.4.8",
 		"@vue/language-core": "2.1.6",
 		"@vue/shared": "^3.5.0"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-workspace/tsc/passedFixtures/vue3/#3204/main.vue b/test-workspace/tsc/passedFixtures/vue3/#3204/main.vue
diff --git a/test-workspace/tsc/passedFixtures/vue3/#4890/main.vue b/test-workspace/tsc/passedFixtures/vue3/#4890/main.vue
diff --git a/test-workspace/tsc/passedFixtures/vue3/class-component/main.vue b/test-workspace/tsc/passedFixtures/vue3/class-component/main.vue
diff --git a/test-workspace/tsc/passedFixtures/vue3/templateRef/template-ref.vue b/test-workspace/tsc/passedFixtures/vue3/templateRef/template-ref.vue

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,`
`124`	`124`	yield `__VLS_template = () => {${newLine}`;
`125`	`125`	`const templateCodegenCtx = yield* generateTemplate(options, ctx);`
`126`	`126`	`yield* generateComponentSelf(options, ctx, templateCodegenCtx);`
`127`		- yield `},${newLine}`;
	`127`	+ yield `}${endOfLine}`;
`128`	`128`	`yield generateSfcBlockSection(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures.all);`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ function* generateModelEmit(`
`464`	`464`	yield `type __VLS_ModelEmit = {${newLine}`;
`465`	`465`	`for (const defineModel of defineModels) {`
`466`	`466`	`const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);`
`467`		- yield `'update:${propName}': [${propName}:`;
	`467`	+ yield `'update:${propName}': [value:`;
`468`	`468`	`yield* generateDefinePropType(scriptSetup, propName, localName, defineModel);`
`469`	`469`	yield `]${endOfLine}`;
`470`	`470`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ export function* generateVFor(`
`86`	`86`	`}`
`87`	`87`	`let prev: CompilerDOM.TemplateChildNode \| undefined;`
`88`	`88`	`for (const childNode of node.children) {`
`89`		`- yield* generateTemplateChild(options, ctx, childNode, currentComponent, prev, componentCtxVar);`
	`89`	`+ yield* generateTemplateChild(options, ctx, childNode, currentComponent, prev, componentCtxVar, true);`
`90`	`90`	`prev = childNode;`
`91`	`91`	`}`
`92`	`92`	`for (const varName of forBlockVars) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"@vue/language-core": "2.1.6"`
`18`	`18`	`},`
`19`	`19`	`"dependencies": {`
`20`		`- "@volar/source-map": "~2.4.7",`
	`20`	`+ "@volar/source-map": "~2.4.8",`
`21`	`21`	`"volar-service-pug": "0.0.62"`
`22`	`22`	`}`
`23`	`23`	`}`