From 6a54fc21155e4c063f457de346685d2b347a0894 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Tue, 24 Dec 2024 16:42:54 +0800
Subject: [PATCH 1/6] fix: intersect local `$slots` with `__VLS_ctx.$slots`

---
 .../language-core/lib/codegen/template/index.ts   |  2 +-
 .../tsc/passedFixtures/vue3/#5082/main.vue        | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 test-workspace/tsc/passedFixtures/vue3/#5082/main.vue

diff --git a/packages/language-core/lib/codegen/template/index.ts b/packages/language-core/lib/codegen/template/index.ts
index 63bcdfa5d6..3b13f35395 100644
--- a/packages/language-core/lib/codegen/template/index.ts
+++ b/packages/language-core/lib/codegen/template/index.ts
@@ -86,7 +86,7 @@ function* generateSlots(options: TemplateCodegenOptions, ctx: TemplateCodegenCon
 		yield `}${endOfLine}`;
 	}
 	const name = getSlotsPropertyName(options.vueCompilerOptions.target);
-	yield `var ${name}!: typeof ${options.slotsAssignName ?? '__VLS_slots'}${endOfLine}`;
+	yield `var ${name}!: typeof __VLS_ctx.${name} & typeof ${options.slotsAssignName ?? '__VLS_slots'}${endOfLine}`;
 }
 
 function* generateInheritedAttrs(ctx: TemplateCodegenContext): Generator<Code> {
diff --git a/test-workspace/tsc/passedFixtures/vue3/#5082/main.vue b/test-workspace/tsc/passedFixtures/vue3/#5082/main.vue
new file mode 100644
index 0000000000..a6f8698db6
--- /dev/null
+++ b/test-workspace/tsc/passedFixtures/vue3/#5082/main.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { exactType } from '../../shared';
+</script>
+
+<script lang="ts">
+import { Slot, SlotsType } from 'vue';
+
+export default {
+	slots: Object as SlotsType<{ foo?: {} }>
+};
+</script>
+
+<template>
+	{{ exactType($slots.foo, {} as Slot<{} | undefined> | undefined) }}
+</template>

From 210ac37e094aff22b43d0545966b8ed79c648838 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Tue, 24 Dec 2024 16:48:02 +0800
Subject: [PATCH 2/6] test: update

---
 .../tsc/passedFixtures/vue3/#5082/main.vue        | 15 ---------------
 .../tsc/passedFixtures/vue3/slots/main.vue        | 10 ++++++++--
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 test-workspace/tsc/passedFixtures/vue3/#5082/main.vue

diff --git a/test-workspace/tsc/passedFixtures/vue3/#5082/main.vue b/test-workspace/tsc/passedFixtures/vue3/#5082/main.vue
deleted file mode 100644
index a6f8698db6..0000000000
--- a/test-workspace/tsc/passedFixtures/vue3/#5082/main.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<script setup lang="ts">
-import { exactType } from '../../shared';
-</script>
-
-<script lang="ts">
-import { Slot, SlotsType } from 'vue';
-
-export default {
-	slots: Object as SlotsType<{ foo?: {} }>
-};
-</script>
-
-<template>
-	{{ exactType($slots.foo, {} as Slot<{} | undefined> | undefined) }}
-</template>
diff --git a/test-workspace/tsc/passedFixtures/vue3/slots/main.vue b/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
index ed4b9556f7..e02d348208 100644
--- a/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
+++ b/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
@@ -1,5 +1,8 @@
 <template>
 	<!-- $slots type -->
+	{{ exactType($slots.foo, {} as Slot<{} | undefined> | undefined) }}
+
+	<!-- component slots type -->
 	<Comp value="1">
 		<template #foo="bindings">{{ exactType(bindings, {} as string) }}</template>
 	</Comp>
@@ -26,7 +29,10 @@
 </template>
 
 <script lang="ts">
-export default { name: 'Self' };
+export default {
+	name: 'Self',
+	slots: Object as SlotsType<{ foo?: {} }>
+};
 
 declare const Comp: new <T>(props: { value: T; }) => {
 	$props: typeof props;
@@ -37,7 +43,7 @@ declare const Comp: new <T>(props: { value: T; }) => {
 </script>
 
 <script lang="ts" setup>
-import { ref, useSlots, VNode } from 'vue';
+import { ref, type Slot, type SlotsType, useSlots, type VNode } from 'vue';
 import { exactType } from '../../shared';
 
 const baz = ref('baz' as const);

From 064167002fd35874ae49df190484aefc1f43875c Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Tue, 24 Dec 2024 16:53:29 +0800
Subject: [PATCH 3/6] fix: intersect `__VLS_slots` with ...

---
 packages/language-core/lib/codegen/template/index.ts  |  7 ++++---
 test-workspace/tsc/passedFixtures/vue3/slots/main.vue | 11 +++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/language-core/lib/codegen/template/index.ts b/packages/language-core/lib/codegen/template/index.ts
index 3b13f35395..7638cb8990 100644
--- a/packages/language-core/lib/codegen/template/index.ts
+++ b/packages/language-core/lib/codegen/template/index.ts
@@ -54,8 +54,10 @@ export function* generateTemplate(options: TemplateCodegenOptions): Generator<Co
 }
 
 function* generateSlots(options: TemplateCodegenOptions, ctx: TemplateCodegenContext): Generator<Code> {
+	const name = getSlotsPropertyName(options.vueCompilerOptions.target);
+
 	if (!options.hasDefineSlots) {
-		yield `var __VLS_slots!: `;
+		yield `var __VLS_slots!: typeof __VLS_ctx.${name} & `;
 		for (const { expVar, varName } of ctx.dynamicSlots) {
 			ctx.hasSlot = true;
 			yield `Partial<Record<NonNullable<typeof ${expVar}>, (_: typeof ${varName}) => any>> &${newLine}`;
@@ -85,8 +87,7 @@ function* generateSlots(options: TemplateCodegenOptions, ctx: TemplateCodegenCon
 		}
 		yield `}${endOfLine}`;
 	}
-	const name = getSlotsPropertyName(options.vueCompilerOptions.target);
-	yield `var ${name}!: typeof __VLS_ctx.${name} & typeof ${options.slotsAssignName ?? '__VLS_slots'}${endOfLine}`;
+	yield `var ${name}!: typeof ${options.slotsAssignName ?? '__VLS_slots'}${endOfLine}`;
 }
 
 function* generateInheritedAttrs(ctx: TemplateCodegenContext): Generator<Code> {
diff --git a/test-workspace/tsc/passedFixtures/vue3/slots/main.vue b/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
index e02d348208..4a401fcf27 100644
--- a/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
+++ b/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
@@ -1,7 +1,4 @@
 <template>
-	<!-- $slots type -->
-	{{ exactType($slots.foo, {} as Slot<{} | undefined> | undefined) }}
-
 	<!-- component slots type -->
 	<Comp value="1">
 		<template #foo="bindings">{{ exactType(bindings, {} as string) }}</template>
@@ -31,7 +28,7 @@
 <script lang="ts">
 export default {
 	name: 'Self',
-	slots: Object as SlotsType<{ foo?: {} }>
+	slots: Object as SlotsType<{ foo?: (_: any) => any }>
 };
 
 declare const Comp: new <T>(props: { value: T; }) => {
@@ -43,13 +40,15 @@ declare const Comp: new <T>(props: { value: T; }) => {
 </script>
 
 <script lang="ts" setup>
-import { ref, type Slot, type SlotsType, useSlots, type VNode } from 'vue';
+import { ref, type SlotsType, useSlots, type VNode } from 'vue';
 import { exactType } from '../../shared';
 
 const baz = ref('baz' as const);
 
 const slots = useSlots();
-exactType(slots, {} as {
+exactType(slots, {} as Readonly<{
+	foo?(_: any): any
+}> & {
 	bar?(_: { str: string; num: number; }): any;
 } & {
 	baz?(_: { str: string; num: number; }): any;

From 09bda6c967aedef8dfde87f4257921e890acba93 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Tue, 24 Dec 2024 17:28:39 +0800
Subject: [PATCH 4/6] fix: omit string index from `__VLS_ctx.$slots`

---
 packages/language-core/lib/codegen/globalTypes.ts    |  3 +++
 packages/language-core/lib/codegen/template/index.ts |  2 +-
 packages/tsc/tests/__snapshots__/dts.spec.ts.snap    | 12 +++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/language-core/lib/codegen/globalTypes.ts b/packages/language-core/lib/codegen/globalTypes.ts
index ac0a213671..2a9b1e06fb 100644
--- a/packages/language-core/lib/codegen/globalTypes.ts
+++ b/packages/language-core/lib/codegen/globalTypes.ts
@@ -97,6 +97,9 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
 		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 	>>;
+	type __VLS_OmitStringIndex<T> = {
+		[K in keyof T as string extends K ? never : K]: T[K];
+	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 
 	function __VLS_getVForSourceType(source: number): [number, number, number][];
diff --git a/packages/language-core/lib/codegen/template/index.ts b/packages/language-core/lib/codegen/template/index.ts
index 7638cb8990..5fea80d2de 100644
--- a/packages/language-core/lib/codegen/template/index.ts
+++ b/packages/language-core/lib/codegen/template/index.ts
@@ -57,7 +57,7 @@ function* generateSlots(options: TemplateCodegenOptions, ctx: TemplateCodegenCon
 	const name = getSlotsPropertyName(options.vueCompilerOptions.target);
 
 	if (!options.hasDefineSlots) {
-		yield `var __VLS_slots!: typeof __VLS_ctx.${name} & `;
+		yield `var __VLS_slots!: __VLS_OmitStringIndex<typeof __VLS_ctx.${name}> & `;
 		for (const { expVar, varName } of ctx.dynamicSlots) {
 			ctx.hasSlot = true;
 			yield `Partial<Record<NonNullable<typeof ${expVar}>, (_: typeof ${varName}) => any>> &${newLine}`;
diff --git a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
index 6959c4430d..f6aa3c47ea 100644
--- a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
+++ b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
@@ -11,7 +11,9 @@ declare const _default: <Row extends BaseRow>(__VLS_props: NonNullable<Awaited<t
     } & Partial<{}>> & (import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps);
     expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
     attrs: any;
-    slots: {
+    slots: __VLS_OmitStringIndex<Readonly<{
+        [name: string]: import("vue").Slot<any>;
+    }>> & {
         default?(_: {
             row: Row;
         }): any;
@@ -619,7 +621,9 @@ export {};
 exports[`vue-tsc-dts > Input: template-slots/component.vue, Output: template-slots/component.vue.d.ts 1`] = `
 "declare function __VLS_template(): {
     attrs: Partial<{}>;
-    slots: {
+    slots: __VLS_OmitStringIndex<Readonly<{
+        [name: string]: import("vue").Slot<any>;
+    }>> & {
         'no-bind'?(_: {}): any;
         default?(_: {
             num: number;
@@ -721,7 +725,9 @@ type __VLS_WithTemplateSlots<T, S> = T & {
 exports[`vue-tsc-dts > Input: template-slots/component-no-script.vue, Output: template-slots/component-no-script.vue.d.ts 1`] = `
 "declare function __VLS_template(): {
     attrs: Partial<{}>;
-    slots: {
+    slots: __VLS_OmitStringIndex<Readonly<{
+        [name: string]: import("vue").Slot<any>;
+    }>> & {
         'no-bind'?(_: {}): any;
         default?(_: {
             num: number;

From 86a9fcec83d7e423d910f1a0bb7a0aba4097d14a Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Tue, 24 Dec 2024 17:30:04 +0800
Subject: [PATCH 5/6] chore: lint

---
 test-workspace/tsc/passedFixtures/vue3/slots/main.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-workspace/tsc/passedFixtures/vue3/slots/main.vue b/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
index 4a401fcf27..3c7a441714 100644
--- a/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
+++ b/test-workspace/tsc/passedFixtures/vue3/slots/main.vue
@@ -28,7 +28,7 @@
 <script lang="ts">
 export default {
 	name: 'Self',
-	slots: Object as SlotsType<{ foo?: (_: any) => any }>
+	slots: Object as SlotsType<{ foo?: (_: any) => any }>,
 };
 
 declare const Comp: new <T>(props: { value: T; }) => {
@@ -47,7 +47,7 @@ const baz = ref('baz' as const);
 
 const slots = useSlots();
 exactType(slots, {} as Readonly<{
-	foo?(_: any): any
+	foo?(_: any): any;
 }> & {
 	bar?(_: { str: string; num: number; }): any;
 } & {

From ff251712f9ed14d30c52269b048e8ddf7fd2a8c7 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Tue, 24 Dec 2024 17:43:24 +0800
Subject: [PATCH 6/6] refactor: rename some properties

---
 .../lib/codegen/template/context.ts           |  6 ++---
 .../lib/codegen/template/index.ts             | 10 +++----
 .../lib/codegen/template/slotOutlet.ts        | 26 +++++++++----------
 .../tsc/tests/__snapshots__/dts.spec.ts.snap  | 18 ++++++-------
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/packages/language-core/lib/codegen/template/context.ts b/packages/language-core/lib/codegen/template/context.ts
index 662ee6cff2..a9b797162e 100644
--- a/packages/language-core/lib/codegen/template/context.ts
+++ b/packages/language-core/lib/codegen/template/context.ts
@@ -106,14 +106,14 @@ export function createTemplateCodegenContext(options: Pick<TemplateCodegenOption
 	const accessExternalVariables = new Map<string, Set<number>>();
 	const slots: {
 		name: string;
-		loc?: number;
+		offset?: number;
 		tagRange: [number, number];
-		varName: string;
 		nodeLoc: any;
+		propsVar: string;
 	}[] = [];
 	const dynamicSlots: {
 		expVar: string;
-		varName: string;
+		propsVar: string;
 	}[] = [];
 	const hasSlotElements = new Set<CompilerDOM.ElementNode>();;
 	const blockConditions: string[] = [];
diff --git a/packages/language-core/lib/codegen/template/index.ts b/packages/language-core/lib/codegen/template/index.ts
index 5fea80d2de..e5c8637155 100644
--- a/packages/language-core/lib/codegen/template/index.ts
+++ b/packages/language-core/lib/codegen/template/index.ts
@@ -58,19 +58,19 @@ function* generateSlots(options: TemplateCodegenOptions, ctx: TemplateCodegenCon
 
 	if (!options.hasDefineSlots) {
 		yield `var __VLS_slots!: __VLS_OmitStringIndex<typeof __VLS_ctx.${name}> & `;
-		for (const { expVar, varName } of ctx.dynamicSlots) {
+		for (const { expVar, propsVar } of ctx.dynamicSlots) {
 			ctx.hasSlot = true;
-			yield `Partial<Record<NonNullable<typeof ${expVar}>, (_: typeof ${varName}) => any>> &${newLine}`;
+			yield `Partial<Record<NonNullable<typeof ${expVar}>, (props: typeof ${propsVar}) => any>> &${newLine}`;
 		}
 		yield `{${newLine}`;
 		for (const slot of ctx.slots) {
 			ctx.hasSlot = true;
-			if (slot.name && slot.loc !== undefined) {
+			if (slot.name && slot.offset !== undefined) {
 				yield* generateObjectProperty(
 					options,
 					ctx,
 					slot.name,
-					slot.loc,
+					slot.offset,
 					ctx.codeFeatures.withoutHighlightAndCompletion,
 					slot.nodeLoc
 				);
@@ -83,7 +83,7 @@ function* generateSlots(options: TemplateCodegenOptions, ctx: TemplateCodegenCon
 					`default`
 				);
 			}
-			yield `?(_: typeof ${slot.varName}): any,${newLine}`;
+			yield `?(props: typeof ${slot.propsVar}): any,${newLine}`;
 		}
 		yield `}${endOfLine}`;
 	}
diff --git a/packages/language-core/lib/codegen/template/slotOutlet.ts b/packages/language-core/lib/codegen/template/slotOutlet.ts
index a8b07fb40c..eae8d8c1b6 100644
--- a/packages/language-core/lib/codegen/template/slotOutlet.ts
+++ b/packages/language-core/lib/codegen/template/slotOutlet.ts
@@ -14,7 +14,7 @@ export function* generateSlotOutlet(
 	node: CompilerDOM.SlotOutletNode
 ): Generator<Code> {
 	const startTagOffset = node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
-	const varSlot = ctx.getInternalVariable();
+	const propsVar = ctx.getInternalVariable();
 	const nameProp = node.props.find(prop => {
 		if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE) {
 			return prop.name === 'name';
@@ -43,7 +43,7 @@ export function* generateSlotOutlet(
 					? `'${nameProp.value.content}'`
 					: nameProp?.type === CompilerDOM.NodeTypes.DIRECTIVE && nameProp.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
 						? nameProp.exp.content
-						: `('default' as const)`
+						: `'default'`
 			),
 			`]`
 		);
@@ -59,7 +59,7 @@ export function* generateSlotOutlet(
 		yield `)${endOfLine}`;
 	}
 	else {
-		yield `var ${varSlot} = {${newLine}`;
+		yield `var ${propsVar} = {${newLine}`;
 		yield* generateElementProps(options, ctx, node, node.props.filter(prop => prop !== nameProp), options.vueCompilerOptions.strictTemplates, true);
 		yield `}${endOfLine}`;
 
@@ -69,10 +69,10 @@ export function* generateSlotOutlet(
 		) {
 			ctx.slots.push({
 				name: nameProp.value.content,
-				loc: nameProp.loc.start.offset + nameProp.loc.source.indexOf(nameProp.value.content, nameProp.name.length),
+				offset: nameProp.loc.start.offset + nameProp.loc.source.indexOf(nameProp.value.content, nameProp.name.length),
 				tagRange: [startTagOffset, startTagOffset + node.tag.length],
-				varName: varSlot,
 				nodeLoc: node.loc,
+				propsVar,
 			});
 		}
 		else if (
@@ -83,8 +83,8 @@ export function* generateSlotOutlet(
 			if (isShortHand) {
 				ctx.inlayHints.push(createVBindShorthandInlayHintInfo(nameProp.exp.loc, 'name'));
 			}
-			const slotExpVar = ctx.getInternalVariable();
-			yield `var ${slotExpVar} = `;
+			const expVar = ctx.getInternalVariable();
+			yield `var ${expVar} = __VLS_tryAsConstant(`;
 			yield* generateInterpolation(
 				options,
 				ctx,
@@ -92,22 +92,20 @@ export function* generateSlotOutlet(
 				ctx.codeFeatures.all,
 				nameProp.exp.content,
 				nameProp.exp.loc.start.offset,
-				nameProp.exp,
-				'(',
-				')'
+				nameProp.exp
 			);
-			yield ` as const${endOfLine}`;
+			yield `)${endOfLine}`;
 			ctx.dynamicSlots.push({
-				expVar: slotExpVar,
-				varName: varSlot,
+				expVar,
+				propsVar,
 			});
 		}
 		else {
 			ctx.slots.push({
 				name: 'default',
 				tagRange: [startTagOffset, startTagOffset + node.tag.length],
-				varName: varSlot,
 				nodeLoc: node.loc,
+				propsVar,
 			});
 		}
 	}
diff --git a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
index f6aa3c47ea..bd1df52836 100644
--- a/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
+++ b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap
@@ -14,7 +14,7 @@ declare const _default: <Row extends BaseRow>(__VLS_props: NonNullable<Awaited<t
     slots: __VLS_OmitStringIndex<Readonly<{
         [name: string]: import("vue").Slot<any>;
     }>> & {
-        default?(_: {
+        default?(props: {
             row: Row;
         }): any;
     };
@@ -624,14 +624,14 @@ exports[`vue-tsc-dts > Input: template-slots/component.vue, Output: template-slo
     slots: __VLS_OmitStringIndex<Readonly<{
         [name: string]: import("vue").Slot<any>;
     }>> & {
-        'no-bind'?(_: {}): any;
-        default?(_: {
+        'no-bind'?(props: {}): any;
+        default?(props: {
             num: number;
         }): any;
-        'named-slot'?(_: {
+        'named-slot'?(props: {
             str: string;
         }): any;
-        vbind?(_: {
+        vbind?(props: {
             num: number;
             str: string;
         }): any;
@@ -728,14 +728,14 @@ exports[`vue-tsc-dts > Input: template-slots/component-no-script.vue, Output: te
     slots: __VLS_OmitStringIndex<Readonly<{
         [name: string]: import("vue").Slot<any>;
     }>> & {
-        'no-bind'?(_: {}): any;
-        default?(_: {
+        'no-bind'?(props: {}): any;
+        default?(props: {
             num: number;
         }): any;
-        'named-slot'?(_: {
+        'named-slot'?(props: {
             str: string;
         }): any;
-        vbind?(_: {
+        vbind?(props: {
             num: number;
             str: string;
         }): any;