From 6d4f4d8ba243ac06f52dc650d10710e28117c00b Mon Sep 17 00:00:00 2001
From: mengdaoshizhongxinyang <programmercyk@gmail.com>
Date: Mon, 5 Feb 2024 15:35:37 +0800
Subject: [PATCH 1/3] types(resolveType): fix defineComponent type error

---
 packages/dts-test/defineComponent.test-d.tsx  | 66 +++++++++++++++++++
 .../runtime-core/src/apiDefineComponent.ts    | 28 +++++++-
 packages/runtime-core/src/componentEmits.ts   | 21 ++++++
 3 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/packages/dts-test/defineComponent.test-d.tsx b/packages/dts-test/defineComponent.test-d.tsx
index 41646751b8b..30e2238765a 100644
--- a/packages/dts-test/defineComponent.test-d.tsx
+++ b/packages/dts-test/defineComponent.test-d.tsx
@@ -1290,6 +1290,72 @@ describe('function syntax w/ generics', () => {
   )
 })
 
+describe('function syntax w/ resolveType plugin', () => {
+  const Comp = defineComponent(
+    // jsx plugin resolveType is true
+    <T extends string | number>(
+      props: { msg: T; list: T[] },
+      ctx: {
+        emit: {
+          (key: 'foo', args1: string): any
+          (key: 'bar', args1: number): any
+        }
+        slots: {
+          foo?: (args1: string, args2: number) => any
+          default?: () => any
+        }
+      },
+    ) => {
+      // use Composition API here like in <script setup>
+      const count = ref(0)
+      // @ts-expect-error
+      ctx.emit('foo', 1)
+      // @ts-expect-error
+      ctx.emit('bar')
+
+      ctx.emit('bar', 1)
+
+      return () => (
+        // return a render function (both JSX and h() works)
+        <div>
+          {props.msg} {count.value}
+          {// @ts-expect-error
+          ctx.slots.foo?.()}
+          {// @ts-expect-error
+          ctx.slots.foo?.(1)}
+          {ctx.slots.foo?.('', 1)}
+        </div>
+      )
+    },
+  )
+
+  expectType<JSX.Element>(<Comp msg="fse" list={['foo']} onBar={args1 => {}} />)
+  expectType<JSX.Element>(<Comp msg={123} list={[123]} />)
+
+  expectType<JSX.Element>(
+    // @ts-expect-error missing prop
+    <Comp msg={123} />,
+  )
+
+  expectType<JSX.Element>(
+    // @ts-expect-error generics don't match
+    <Comp msg="fse" list={[123]} />,
+  )
+  expectType<JSX.Element>(
+    // @ts-expect-error generics don't match
+    <Comp msg={123} list={['123']} />,
+  )
+
+  expectType<JSX.Element>(
+    // @ts-expect-error generics don't match
+    <Comp msg={123} list={['123']} />,
+  )
+  expectType<JSX.Element>(
+    // @ts-expect-error Type 'string' is not assignable to type 'number'
+    <Comp msg={123} list={[123]} onFoo={(arg: number) => {}} />,
+  )
+})
+
 describe('function syntax w/ emits', () => {
   const Foo = defineComponent(
     (props: { msg: string }, ctx) => {
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 47bcf9f2acb..bf09828f55f 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -21,7 +21,11 @@ import type {
   ExtractDefaultPropTypes,
   ExtractPropTypes,
 } from './componentProps'
-import type { EmitsOptions, EmitsToProps } from './componentEmits'
+import type {
+  EmitsOptions,
+  EmitsOverloadFnToProps,
+  EmitsToProps,
+} from './componentEmits'
 import { extend, isFunction } from '@vue/shared'
 import type { VNodeProps } from './vnode'
 import type {
@@ -96,6 +100,24 @@ export type DefineComponent<
 
 // overload 1: direct setup function
 // (uses user defined props interface)
+export function defineComponent<
+  Props extends Record<string, any>,
+  E extends (key: any, ...args: any[]) => any,
+  Data extends Record<string, any>,
+  S extends Record<string, (...args: any[]) => any>,
+  Slots extends Partial<S>,
+>(
+  setup: (
+    props: Props,
+    ctx: {
+      attrs: Data
+      slots: Slots
+      emit: E
+      expose: (exposed?: Record<string, any>) => void
+    },
+  ) => RenderFunction | Promise<RenderFunction>,
+): (props: Props & EmitsOverloadFnToProps<E>) => any
+
 export function defineComponent<
   Props extends Record<string, any>,
   E extends EmitsOptions = {},
@@ -106,7 +128,7 @@ export function defineComponent<
     props: Props,
     ctx: SetupContext<E, S>,
   ) => RenderFunction | Promise<RenderFunction>,
-  options?: Pick<ComponentOptions, 'name' | 'inheritAttrs'> & {
+  options: Pick<ComponentOptions, 'name' | 'inheritAttrs'> & {
     props?: (keyof Props)[]
     emits?: E | EE[]
     slots?: S
@@ -122,7 +144,7 @@ export function defineComponent<
     props: Props,
     ctx: SetupContext<E, S>,
   ) => RenderFunction | Promise<RenderFunction>,
-  options?: Pick<ComponentOptions, 'name' | 'inheritAttrs'> & {
+  options: Pick<ComponentOptions, 'name' | 'inheritAttrs'> & {
     props?: ComponentObjectPropsOptions<Props>
     emits?: E | EE[]
     slots?: S
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
index 4551235bc5a..9fdb782e23b 100644
--- a/packages/runtime-core/src/componentEmits.ts
+++ b/packages/runtime-core/src/componentEmits.ts
@@ -1,5 +1,6 @@
 import {
   EMPTY_OBJ,
+  type Prettify,
   type UnionToIntersection,
   camelize,
   extend,
@@ -79,6 +80,26 @@ export type EmitFn<
           }[Event]
         >
 
+type EmitsOverloadFnToPropsHelper<
+  T extends (key: string, ...args: any[]) => any,
+  PartialOverload = unknown,
+  P = {},
+> = T extends (key: infer K, ...args: infer Args) => infer TReturn
+  ? K extends string
+    ? PartialOverload extends T
+      ? P
+      : EmitsOverloadFnToPropsHelper<
+          PartialOverload & T,
+          PartialOverload & ((key: K, ...args: Args) => TReturn),
+          P & { [k in K as `on${Capitalize<K>}`]: (...args: Args) => any }
+        >
+    : never
+  : never
+
+export type EmitsOverloadFnToProps<
+  T extends (key: any, ...args: any[]) => any,
+> = Partial<Prettify<EmitsOverloadFnToPropsHelper<T>>>
+
 export function emit(
   instance: ComponentInternalInstance,
   event: string,

From cca97ee5d493c6d27cca0d7ba4e5ddb295f8434a Mon Sep 17 00:00:00 2001
From: mengdaoshizhongxinyang <programmercyk@gmail.com>
Date: Mon, 5 Feb 2024 17:20:17 +0800
Subject: [PATCH 2/3] types(resolveType): fix defineComponent type error

---
 packages/dts-test/defineComponent.test-d.tsx    | 15 ++++++++-------
 packages/runtime-core/src/apiDefineComponent.ts |  8 ++------
 packages/runtime-core/src/component.ts          | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/dts-test/defineComponent.test-d.tsx b/packages/dts-test/defineComponent.test-d.tsx
index 30e2238765a..01685e002a2 100644
--- a/packages/dts-test/defineComponent.test-d.tsx
+++ b/packages/dts-test/defineComponent.test-d.tsx
@@ -1295,16 +1295,16 @@ describe('function syntax w/ resolveType plugin', () => {
     // jsx plugin resolveType is true
     <T extends string | number>(
       props: { msg: T; list: T[] },
-      ctx: {
-        emit: {
+      ctx: FunctionalContext<
+        {
           (key: 'foo', args1: string): any
           (key: 'bar', args1: number): any
+        },
+        {
+          foo: (args1: string, args2: number) => any
+          default: () => any
         }
-        slots: {
-          foo?: (args1: string, args2: number) => any
-          default?: () => any
-        }
-      },
+      >,
     ) => {
       // use Composition API here like in <script setup>
       const count = ref(0)
@@ -1580,6 +1580,7 @@ import type {
   ExtractPropTypes,
   VNodeProps,
 } from 'vue'
+import type { FunctionalContext } from 'packages/runtime-core/src/component'
 
 // code generated by tsc / vue-tsc, make sure this continues to work
 // so we don't accidentally change the args order of DefineComponent
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index bf09828f55f..95e098cc298 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -13,6 +13,7 @@ import type {
 import type {
   AllowedComponentProps,
   ComponentCustomProps,
+  FunctionalContext,
   SetupContext,
 } from './component'
 import type {
@@ -109,12 +110,7 @@ export function defineComponent<
 >(
   setup: (
     props: Props,
-    ctx: {
-      attrs: Data
-      slots: Slots
-      emit: E
-      expose: (exposed?: Record<string, any>) => void
-    },
+    ctx: FunctionalContext<E, S, Data>,
   ) => RenderFunction | Promise<RenderFunction>,
 ): (props: Props & EmitsOverloadFnToProps<E>) => any
 
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 1508627e579..1f7e7248a9d 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -238,6 +238,22 @@ export type SetupContext<
     }
   : never
 
+export type FunctionalContext<
+  E extends (key: any, ...args: any[]) => any = (
+    key: string,
+    ...args: any[]
+  ) => any,
+  S extends Record<string, (...args: any[]) => any> = {},
+  Data extends Record<string, any> = Record<string, any>,
+> = E extends any
+  ? {
+      attrs: Data
+      slots: Partial<S>
+      emit: E
+      expose: (exposed?: Record<string, any>) => void
+    }
+  : never
+
 /**
  * @internal
  */

From d30797d8d475599bc0c42e702ce7497fe9c30dd6 Mon Sep 17 00:00:00 2001
From: mengdaoshizhongxinyang <programmercyk@gmail.com>
Date: Mon, 5 Feb 2024 18:03:22 +0800
Subject: [PATCH 3/3] types(resolveType): fix defineComponent type error

---
 packages/dts-test/defineComponent.test-d.tsx | 2 +-
 packages/runtime-core/src/index.ts           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/dts-test/defineComponent.test-d.tsx b/packages/dts-test/defineComponent.test-d.tsx
index 01685e002a2..cfba9b4904b 100644
--- a/packages/dts-test/defineComponent.test-d.tsx
+++ b/packages/dts-test/defineComponent.test-d.tsx
@@ -2,6 +2,7 @@ import {
   type Component,
   type ComponentOptions,
   type ComponentPublicInstance,
+  type FunctionalContext,
   type PropType,
   type SetupContext,
   type Slots,
@@ -1580,7 +1581,6 @@ import type {
   ExtractPropTypes,
   VNodeProps,
 } from 'vue'
-import type { FunctionalContext } from 'packages/runtime-core/src/component'
 
 // code generated by tsc / vue-tsc, make sure this continues to work
 // so we don't accidentally change the args order of DefineComponent
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 7fbe58446f7..70a90339bd1 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -246,6 +246,7 @@ export type {
   FunctionalComponent,
   ComponentInternalInstance,
   SetupContext,
+  FunctionalContext,
   ComponentCustomProps,
   AllowedComponentProps,
   ComponentInstance,