feat(language-core): revert overcorrects v-for type inference (#5836)

johnsoncodehk · web-flow · commit e0fb9e884493 · 2025-12-09T14:20:36.000+08:00
diff --git a/packages/language-core/lib/codegen/globalTypes.ts b/packages/language-core/lib/codegen/globalTypes.ts
@@ -140,20 +140,13 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 	type __VLS_ProxyRefs<T> = import('${lib}').ShallowUnwrapRef<T>;
 
-	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
-		item: T extends number ? number
-			: T extends string ? string
-			: T extends any[] ? T[number]
-			: T extends Iterable<infer T1> ? T1
-			: any,
-		index: number,
-	][];
-	function __VLS_getVForSourceType<T>(source: T): [
-		item: T[keyof T],
-		key: keyof T,
-		index: number,
-	][];
-	function __VLS_getSlotParameters<S, D extends S>(slot: S, decl?: D):
+	function __VLS_vFor<T>(source: T):
+		T extends number ? [number, number][]
+		: T extends string ? [string, number][]
+		: T extends any[] ? [T[number], number][]
+		: T extends Iterable<infer V> ? [V, number][]
+		: [T[keyof T], keyof T, number][];
+	function __VLS_vSlot<S, D extends S>(slot: S, decl?: D):
 		D extends (...args: infer P) => any ? P : any[];
 	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('${lib}').ObjectDirective
 		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
diff --git a/packages/language-core/lib/codegen/template/vFor.ts b/packages/language-core/lib/codegen/template/vFor.ts
@@ -30,7 +30,7 @@ export function* generateVFor(
 	}
 	yield `] of `;
 	if (source.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-		yield `__VLS_getVForSourceType(`;
+		yield `__VLS_vFor(`;
 		yield* generateInterpolation(
 			options,
 			ctx,
diff --git a/packages/language-core/lib/codegen/template/vSlot.ts b/packages/language-core/lib/codegen/template/vSlot.ts
@@ -139,7 +139,7 @@ function* generateSlotParameters(
 
 	yield `const [`;
 	yield* interpolation;
-	yield `] = __VLS_getSlotParameters(${slotVar}!`;
+	yield `] = __VLS_vSlot(${slotVar}!`;
 
 	if (types.some(t => t)) {
 		yield `, `;
diff --git a/test-workspace/tsc/passedFixtures/vue3/#2758/child.vue b/test-workspace/tsc/passedFixtures/vue3/#2758/child.vue
@@ -1,11 +1,7 @@
 <template>
 	<slot />
 	<template v-for="(value, key) of ({} as T)">
-		<slot
-		v-if="typeof key === 'string'"
-		:name="`cell:${key}`"
-		:value="value"
-		/>
+		<slot v-if="typeof key === 'string'" :name="`cell:${key}`" :value="(value as T[keyof T])" />
 	</template>
 </template>
 
diff --git a/test-workspace/tsc/passedFixtures/vue3/#4812/main.vue b/test-workspace/tsc/passedFixtures/vue3/#4812/main.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+
+interface Item {
+	id: number | string
+}
+interface InfoObj {
+	[key: string]: Item
+}
+const data = ref<Item[] | InfoObj>([])
+</script>
+
+<template>
+	<div v-for="item in data">{{ item.id }}</div>
+</template>
diff --git a/test-workspace/tsc/passedFixtures/vue3/v-for/generic.vue b/test-workspace/tsc/passedFixtures/vue3/v-for/generic.vue
@@ -1,10 +1,10 @@
 <template>
 	<div v-for="(val, key) in ({} as T)">
-		{{ exactType(val, {} as T[keyof T]) }}
-		{{ exactType(key, {} as keyof T) }}
+		{{ exactType(val, {} as string | boolean) }}
+		{{ exactType(key, {} as string | number) }}
 	</div>
 </template>
 
-<script lang="ts" setup generic="T extends Record<string, string>">
+<script lang="ts" setup generic="T extends Record<string, string> | boolean[]">
 import { exactType } from '../../shared';
 </script>
diff --git a/test-workspace/tsc/passedFixtures/vue3/v-for/main.vue b/test-workspace/tsc/passedFixtures/vue3/v-for/main.vue
@@ -27,10 +27,8 @@
   </div>
   <!-- objUnion -->
   <div v-for="(val, key, index) in objUnion">
-    <!-- {{ exactType(val, {} as string | number) }} -->
-    {{ exactType(val, {} as string) }}
-    <!-- {{ exactType(key, {} as 'a' | 'b') }} -->
-    {{ exactType(key, {} as 'a') }}
+    {{ exactType(val, {} as string | number) }}
+    {{ exactType(key, {} as 'a' | 'b') }}
     {{ exactType(index, {} as number) }}
   </div>
   <!-- record -->
@@ -42,7 +40,7 @@
   <!-- any -->
   <div v-for="(val, index) in _any">
     {{ exactType(val, {} as any) }}
-    {{ exactType(index, {} as number) }}
+    {{ exactType(index, {} as string | number | symbol) }}
   </div>
 </template>
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export function* generateVFor(`
`30`	`30`	`}`
`31`	`31`	yield `] of `;
`32`	`32`	`if (source.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {`
`33`		- yield `__VLS_getVForSourceType(`;
	`33`	+ yield `__VLS_vFor(`;
`34`	`34`	`yield* generateInterpolation(`
`35`	`35`	`options,`
`36`	`36`	`ctx,`